From 206355399ab776e7656546b8c3f968ad64c9e298 Mon Sep 17 00:00:00 2001 From: "bernard.xiong" Date: Mon, 19 Apr 2010 05:54:21 +0000 Subject: [PATCH] update mini2440 configure. git-svn-id: https://rt-thread.googlecode.com/svn/trunk@647 bbd45198-f89e-11dd-88c7-29a3b14d5316 --- bsp/mini2440/SConstruct | 2 +- bsp/mini2440/rtconfig.h | 3 +++ bsp/mini2440/rtconfig.py | 14 +++++--------- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/bsp/mini2440/SConstruct b/bsp/mini2440/SConstruct index 1a98304f12..e450c49ee1 100644 --- a/bsp/mini2440/SConstruct +++ b/bsp/mini2440/SConstruct @@ -50,4 +50,4 @@ env.Program(TARGET, objs) env.AddPostAction(TARGET, rtconfig.POST_ACTION) if GetOption('target') == 'mdk': - mdk.MDKProject('project_2.uV2', projects) + mdk.MDKProject('project.uV2', projects) diff --git a/bsp/mini2440/rtconfig.h b/bsp/mini2440/rtconfig.h index 469e2fb845..040ac8f3a0 100644 --- a/bsp/mini2440/rtconfig.h +++ b/bsp/mini2440/rtconfig.h @@ -73,6 +73,9 @@ /* SECTION: finsh, a C-Express shell */ /* Using FinSH as Shell*/ #define RT_USING_FINSH +/* Using symbol table */ +#define FINSH_USING_SYMTAB +#define FINSH_USING_DESCRIPTION /* SECTION: a runtime libc library */ /* a runtime libc library */ diff --git a/bsp/mini2440/rtconfig.py b/bsp/mini2440/rtconfig.py index fd9e605ef4..3f2ca1660a 100644 --- a/bsp/mini2440/rtconfig.py +++ b/bsp/mini2440/rtconfig.py @@ -2,15 +2,15 @@ import SCons.cpp # component options -# make all component false +# make all component false RT_USING_FINSH = False RT_USING_DFS = False -RT_USING_DFS_EFSL = False RT_USING_DFS_ELMFAT = False RT_USING_DFS_YAFFS2 = False RT_USING_LWIP = False RT_USING_WEBSERVER = False RT_USING_RTGUI = False +RT_USING_MODBUS = False # parse rtconfig.h to get used component PreProcessor = SCons.cpp.PreProcessor() @@ -24,12 +24,10 @@ rtconfig_ns = PreProcessor.cpp_namespace if rtconfig_ns.has_key('RT_USING_FINSH'): RT_USING_FINSH = True -# device virtual filesystem options +# device virtual filesystem options if rtconfig_ns.has_key('RT_USING_DFS'): RT_USING_DFS = True - - if rtconfig_ns.has_key('RT_USING_DFS_EFSL'): - RT_USING_DFS_EFSL = True + if rtconfig_ns.has_key('RT_USING_DFS_ELMFAT'): RT_USING_DFS_ELMFAT = True if rtconfig_ns.has_key('RT_USING_DFS_YAFFS2'): @@ -59,7 +57,7 @@ CROSS_TOOL = 'keil' if CROSS_TOOL == 'gcc': PLATFORM = 'gcc' EXEC_PATH = 'E:/Program Files/CodeSourcery/Sourcery G++ Lite/bin' -elif CROSS_TOOL == 'keil': +elif CROSS_TOOL == 'keil': PLATFORM = 'armcc' EXEC_PATH = 'E:/Keil' BUILD = 'debug' @@ -90,8 +88,6 @@ if PLATFORM == 'gcc': else: CFLAGS += ' -O2' - if RT_USING_FINSH: - CFLAGS += ' -D FINSH_USING_SYMTAB -DFINSH_USING_DESCRIPTION' if RT_USING_WEBSERVER: CFLAGS += ' -DWEBS -DUEMF -DRTT -D__NO_FCNTL=1 -DRT_USING_WEBSERVER' RT_USING_MINILIBC = True -- GitLab