X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=examples%2Flm3s1968%2Flm3s1968.mk;h=63be128ce6d7e8442670985b2061b746eb4d015e;hb=f35b6066ecdeffcc8998dd566b5246bdcf43c548;hp=b96e7bc99d349bb2356b66fd62eda28255dc334c;hpb=5b8c7d324c8934f7686aeb4c23454cebbfd1f83f;p=bertos.git

diff --git a/examples/lm3s1968/lm3s1968.mk b/examples/lm3s1968/lm3s1968.mk
index b96e7bc9..63be128c 100644
--- a/examples/lm3s1968/lm3s1968.mk
+++ b/examples/lm3s1968/lm3s1968.mk
@@ -10,29 +10,57 @@
 #
 
 # Set to 1 for debug builds
-lm3s1968_DEBUG = 1
+lm3s1968_DEBUG = 0
+
+include bertos/fonts/fonts.mk
 
 # Our target application
 TRG += lm3s1968
 
 lm3s1968_CSRC = \
 	examples/lm3s1968/lm3s1968.c \
+	bertos/gfx/bitmap.c \
+	bertos/gfx/line.c \
+	bertos/gfx/win.c \
+	bertos/gfx/text.c \
+	bertos/gfx/text_format.c \
+	bertos/fonts/luBS14.c \
+	bertos/fonts/helvB10.c \
+	bertos/icons/logo.c \
 	bertos/mware/formatwr.c \
 	bertos/mware/hex.c \
 	bertos/mware/sprintf.c \
+	bertos/mware/event.c \
+	bertos/struct/heap.c \
 	bertos/drv/timer.c \
-	bertos/cpu/cortex-m3/drv/irq_lm3s.c \
-	bertos/cpu/cortex-m3/drv/timer_lm3s.c \
+	bertos/drv/ser.c \
+	bertos/drv/lcd_rit128x96.c \
+	bertos/kern/kfile.c \
+	bertos/kern/monitor.c \
+	bertos/kern/proc_test.c \
+	bertos/kern/proc.c \
+	bertos/kern/signal.c \
+	bertos/cpu/cortex-m3/drv/gpio_lm3s.c \
 	bertos/cpu/cortex-m3/drv/clock_lm3s.c \
+	bertos/cpu/cortex-m3/drv/ser_lm3s.c \
 	bertos/cpu/cortex-m3/drv/kdebug_lm3s.c \
-	bertos/cpu/cortex-m3/hw/startup_lm3s.c
+	bertos/cpu/cortex-m3/drv/ssi_lm3s.c \
+	bertos/cpu/cortex-m3/drv/timer_cm3.c \
+	bertos/cpu/cortex-m3/drv/irq_cm3.c \
+	bertos/cpu/cortex-m3/hw/switch_ctx_cm3.c \
+	bertos/cpu/cortex-m3/hw/init_lm3s.c
+
+lm3s1968_CPPASRC = \
+	bertos/cpu/cortex-m3/hw/vectors_cm3.S \
+	bertos/cpu/cortex-m3/hw/crt_cm3.S \
+	#
 
 # This is an hosted application
 lm3s1968_PREFIX = arm-none-eabi-
 
-lm3s1968_CPPAFLAGS = -O0 -g -gdwarf-2 -g -gen-debug -mthumb -fno-strict-aliasing -fwrapv
-lm3s1968_CPPFLAGS = -O0 -D'ARCH=0' -D__ARM_LM3S1968__ -D'CPU_FREQ=(50000000L)' -D'WIZ_AUTOGEN' -g3 -gdwarf-2 -fverbose-asm -mthumb  -Iexamples/lm3s1968 -Ibertos/cpu/cortex-m3 -fno-strict-aliasing -fwrapv
-lm3s1968_LDFLAGS = -nostartfiles -T bertos/cpu/cortex-m3/scripts/lm3s1968_rom.ld -Wl,--no-warn-mismatch -fno-strict-aliasing -fwrapv
+lm3s1968_CPPAFLAGS = -mthumb -mno-thumb-interwork
+lm3s1968_CPPFLAGS = -D'ARCH=0' -D__ARM_LM3S1968__ -D'CPU_FREQ=(50000000L)' -D'WIZ_AUTOGEN' -mthumb -mno-thumb-interwork -Iexamples/lm3s1968 -Ibertos/cpu/cortex-m3 -fno-strict-aliasing -fwrapv
+lm3s1968_LDFLAGS = -nostartfiles -T bertos/cpu/cortex-m3/scripts/lm3s1968_rom.ld -Wl,--no-warn-mismatch -mthumb -mno-thumb-interwork
 
 lm3s1968_CPU = cortex-m3
 
@@ -40,11 +68,15 @@ lm3s1968_PROGRAMMER_CPU = lm3s1968
 lm3s1968_PROGRAMMER_TYPE = lm3s1968
 lm3s1968_FLASH_SCRIPT = bertos/prg_scripts/arm/flash-cortex.sh
 lm3s1968_STOPFLASH_SCRIPT = bertos/prg_scripts/arm/stopopenocd.sh
-lm3s1968_DEBUG_SCRIPT = bertos/prg_scripts/arm/debug.sh
+lm3s1968_DEBUG_SCRIPT = bertos/prg_scripts/arm/debug-cortex.sh
 lm3s1968_STOPDEBUG_SCRIPT = bertos/prg_scripts/arm/stopopenocd.sh
 
-# Debug stuff
-ifeq ($(demo_DEBUG),0)
-	demo_CFLAGS += -Os -fomit-frame-pointer
-	demo_CXXFLAGS += -Os -fomit-frame-pointer
+ifeq ($(lm3s1968_DEBUG),0)
+	# Production options
+	lm3s1968_CFLAGS += -O2 -fomit-frame-pointer
+	lm3s1968_CXXFLAGS += -O2 -fomit-frame-pointer
+else
+	# Debug options
+	lm3s1968_CPPAFLAGS += -g -gdwarf-2
+	lm3s1968_CPPFLAGS += -O0 -g3 -gdwarf-2 -fverbose-asm
 endif