From: asterix Date: Mon, 13 Sep 2010 12:43:11 +0000 (+0000) Subject: Update preset. X-Git-Tag: 2.6.0~169 X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=f5deb1d45ae26e5815fc6331bb099e523de52e5f;p=bertos.git Update preset. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@4232 38d2e660-2303-0410-9eaa-f027e97ec537 --- diff --git a/boards/ek-lm3s1968/examples/gps/cfg/cfg_emb_flash.h b/boards/ek-lm3s1968/examples/gps/cfg/cfg_emb_flash.h index 9378552f..fcfc5b61 100644 --- a/boards/ek-lm3s1968/examples/gps/cfg/cfg_emb_flash.h +++ b/boards/ek-lm3s1968/examples/gps/cfg/cfg_emb_flash.h @@ -43,7 +43,7 @@ * $WIZ$ type = "enum" * $WIZ$ value_list = "log_level" */ -#define CONFIG_FLASH_EMB_LOG_LEVEL LOG_LVL_INFO +#define CONFIG_FLASH_EMB_LOG_LEVEL LOG_LVL_ERR /** * module logging format. diff --git a/boards/ek-lm3s1968/examples/gps/gps.mk b/boards/ek-lm3s1968/examples/gps/gps.mk index 752fe65e..2d643801 100644 --- a/boards/ek-lm3s1968/examples/gps/gps.mk +++ b/boards/ek-lm3s1968/examples/gps/gps.mk @@ -34,14 +34,15 @@ gps_WIZARD_CSRC = \ bertos/drv/timer.c \ bertos/drv/ser.c \ bertos/mware/hex.c \ + bertos/struct/heap.c \ bertos/net/nmeap/src/nmeap01.c \ + bertos/cpu/cortex-m3/drv/flash_lm3s.c \ bertos/gfx/text.c \ bertos/cpu/cortex-m3/drv/timer_cm3.c \ - bertos/struct/heap.c \ + bertos/cpu/cortex-m3/drv/ser_lm3s.c \ bertos/kern/proc.c \ bertos/mware/event.c \ bertos/gfx/bitmap.c \ - bertos/cpu/cortex-m3/drv/ser_lm3s.c \ bertos/mware/sprintf.c \ # diff --git a/boards/ek-lm3s1968/examples/gps/gps_user.mk b/boards/ek-lm3s1968/examples/gps/gps_user.mk index e605afb6..1b387749 100644 --- a/boards/ek-lm3s1968/examples/gps/gps_user.mk +++ b/boards/ek-lm3s1968/examples/gps/gps_user.mk @@ -14,7 +14,6 @@ gps_PROGRAMMER_PORT = none # Files included by the user. gps_USER_CSRC = \ - bertos/cpu/cortex-m3/drv/flash_lm3s.c \ bertos/cpu/cortex-m3/drv/ssi_lm3s.c \ bertos/fonts/gohu.c \ bertos/fonts/luBS14.c \ diff --git a/boards/ek-lm3s1968/examples/gps/project.bertos b/boards/ek-lm3s1968/examples/gps/project.bertos index 8737046d..9d472760 100644 --- a/boards/ek-lm3s1968/examples/gps/project.bertos +++ b/boards/ek-lm3s1968/examples/gps/project.bertos @@ -44,58 +44,60 @@ p21 ssS'ENABLED_MODULES' p22 (lp23 -S'ser' +S'kernel' p24 -aS'kernel' +aS'ser' p25 aS'text' p26 aS'kbd' p27 -aS'semaphores' -p28 aS'kblock' -p29 +p28 aS'formatwr' +p29 +aS'flash' p30 -aS'kfile' -p31 aS'text_format' +p31 +aS'semaphores' p32 -aS'lcd_rit128x96' +aS'kfile' p33 -aS'heap' +aS'lcd_rit128x96' p34 -aS'sprintf' +aS'heap' p35 -aS'signal' +aS'sprintf' p36 -aS'timer' +aS'signal' p37 -aS'debug' +aS'timer' p38 -aS'kfile_block' +aS'debug' p39 -aS'nmea' +aS'kfile_block' p40 -asS'CPU_NAME' +aS'nmea' p41 -VLM3S1968 +asS'CPU_NAME' p42 -sS'PROJECT_HW_PATH' +VLM3S1968 p43 -S'../..' +sS'PROJECT_HW_PATH' p44 -sS'PROJECT_SRC_PATH' +S'../..' p45 -S'.' +sS'PROJECT_SRC_PATH' p46 -sS'PRESET' +S'.' p47 +sS'PRESET' +p48 I01 sS'OUTPUT' -p48 -(lp49 +p49 +(lp50 S'codelite' -p50 +p51 as. \ No newline at end of file