Remove the base/advance choice page.

[bertos.git] / examples / lm3s1968 / lm3s1968.mk

diff --git a/examples/lm3s1968/lm3s1968.mk b/examples/lm3s1968/lm3s1968.mk
index c8e2e812c17cdfbaac3633851afe9508cc9afbfd..d93a6c1b96a8beb44dcbfdd9fbfaf4a447b0e381 100644 (file)
--- a/examples/lm3s1968/lm3s1968.mk
+++ b/examples/lm3s1968/lm3s1968.mk
@@ -24,8 +24,9 @@ lm3s1968_CSRC = \
        bertos/gfx/win.c \
        bertos/gfx/text.c \
        bertos/gfx/text_format.c \
+       bertos/gui/menu.c \
+       bertos/fonts/gohu.c \
        bertos/fonts/luBS14.c \
-       bertos/fonts/helvB10.c \
        bertos/icons/logo.c \
        bertos/mware/formatwr.c \
        bertos/mware/hex.c \
@@ -34,23 +35,22 @@ lm3s1968_CSRC = \
        bertos/struct/heap.c \
        bertos/drv/timer.c \
        bertos/drv/ser.c \
+       bertos/drv/kbd.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/coop.c \
-       bertos/kern/preempt.c \
        bertos/kern/signal.c \
        bertos/cpu/cortex-m3/drv/gpio_lm3s.c \
-       bertos/cpu/cortex-m3/drv/timer_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/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
+       bertos/cpu/cortex-m3/hw/init_cm3.c
 
 lm3s1968_CPPASRC = \
        bertos/cpu/cortex-m3/hw/vectors_cm3.S \
@@ -60,15 +60,15 @@ lm3s1968_CPPASRC = \
 # This is an hosted application
 lm3s1968_PREFIX = arm-none-eabi-
 
-lm3s1968_CPPAFLAGS = -mthumb -mno-thumb-interwork -falign-functions=16 -fno-strict-aliasing -fwrapv
-lm3s1968_CPPFLAGS = -D'ARCH=0' -D__ARM_LM3S1968__ -D'CPU_FREQ=(50000000L)' -D'WIZ_AUTOGEN' -mthumb -mno-thumb-interwork -falign-functions=16 -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 -mthumb -mno-thumb-interwork -falign-functions=16
+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
 
-lm3s1968_PROGRAMMER_CPU = lm3s1968
-lm3s1968_PROGRAMMER_TYPE = lm3s1968
-lm3s1968_FLASH_SCRIPT = bertos/prg_scripts/arm/flash-cortex.sh
+lm3s1968_PROGRAMMER_CPU = lm3s
+lm3s1968_PROGRAMMER_TYPE = luminary
+lm3s1968_FLASH_SCRIPT = bertos/prg_scripts/arm/flash-lm3s.sh
 lm3s1968_STOPFLASH_SCRIPT = bertos/prg_scripts/arm/stopopenocd.sh
 lm3s1968_DEBUG_SCRIPT = bertos/prg_scripts/arm/debug.sh
 lm3s1968_STOPDEBUG_SCRIPT = bertos/prg_scripts/arm/stopopenocd.sh