diff options
Diffstat (limited to 'bsp')
95 files changed, 389 insertions, 1359 deletions
diff --git a/bsp/imxrt/imxrt1052-atk-commander/SConstruct b/bsp/imxrt/imxrt1052-atk-commander/SConstruct index e371dfb926..55ebf9d391 100644 --- a/bsp/imxrt/imxrt1052-atk-commander/SConstruct +++ b/bsp/imxrt/imxrt1052-atk-commander/SConstruct @@ -15,21 +15,32 @@ except: print(RTT_ROOT) exit(-1) -TARGET = 'rt-thread.' + rtconfig.TARGET_EXT - +TARGET = 'rtthread.' + rtconfig.TARGET_EXT DefaultEnvironment(tools=[]) -env = Environment(tools = ['mingw'], - AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS, - CC = rtconfig.CC, CFLAGS = rtconfig.CFLAGS, - AR = rtconfig.AR, ARFLAGS = '-rc', - CXX = rtconfig.CXX, CXXFLAGS = rtconfig.CXXFLAGS, - LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS) +if rtconfig.PLATFORM == 'armcc': + env = Environment(tools = ['mingw'], + AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS, + CC = rtconfig.CC, CFLAGS = rtconfig.CFLAGS, + CXX = rtconfig.CXX, CXXFLAGS = rtconfig.CXXFLAGS, + AR = rtconfig.AR, ARFLAGS = '-rc', + LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS, + # overwrite cflags, because cflags has '--C99' + CXXCOM = '$CXX -o $TARGET --cpp -c $CXXFLAGS $_CCCOMCOM $SOURCES') +else: + env = Environment(tools = ['mingw'], + AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS, + CC = rtconfig.CC, CFLAGS = rtconfig.CFLAGS, + CXX = rtconfig.CXX, CXXFLAGS = rtconfig.CXXFLAGS, + AR = rtconfig.AR, ARFLAGS = '-rc', + LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS, + CXXCOM = '$CXX -o $TARGET -c $CXXFLAGS $_CCCOMCOM $SOURCES') + env.PrependENVPath('PATH', rtconfig.EXEC_PATH) if rtconfig.PLATFORM == 'iar': env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES']) env.Replace(ARFLAGS = ['']) - env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') + env.Replace(LINKCOM = env["LINKCOM"] + ' --map rtthread.map') Export('RTT_ROOT') Export('rtconfig') @@ -41,9 +52,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +61,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) imxrt_library = 'MIMXRT1050' rtconfig.BSP_LIBRARY_TYPE = imxrt_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, imxrt_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ imxrt_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, imxrt_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/imxrt/imxrt1052-fire-pro/SConstruct b/bsp/imxrt/imxrt1052-fire-pro/SConstruct index e371dfb926..55ebf9d391 100644 --- a/bsp/imxrt/imxrt1052-fire-pro/SConstruct +++ b/bsp/imxrt/imxrt1052-fire-pro/SConstruct @@ -15,21 +15,32 @@ except: print(RTT_ROOT) exit(-1) -TARGET = 'rt-thread.' + rtconfig.TARGET_EXT - +TARGET = 'rtthread.' + rtconfig.TARGET_EXT DefaultEnvironment(tools=[]) -env = Environment(tools = ['mingw'], - AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS, - CC = rtconfig.CC, CFLAGS = rtconfig.CFLAGS, - AR = rtconfig.AR, ARFLAGS = '-rc', - CXX = rtconfig.CXX, CXXFLAGS = rtconfig.CXXFLAGS, - LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS) +if rtconfig.PLATFORM == 'armcc': + env = Environment(tools = ['mingw'], + AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS, + CC = rtconfig.CC, CFLAGS = rtconfig.CFLAGS, + CXX = rtconfig.CXX, CXXFLAGS = rtconfig.CXXFLAGS, + AR = rtconfig.AR, ARFLAGS = '-rc', + LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS, + # overwrite cflags, because cflags has '--C99' + CXXCOM = '$CXX -o $TARGET --cpp -c $CXXFLAGS $_CCCOMCOM $SOURCES') +else: + env = Environment(tools = ['mingw'], + AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS, + CC = rtconfig.CC, CFLAGS = rtconfig.CFLAGS, + CXX = rtconfig.CXX, CXXFLAGS = rtconfig.CXXFLAGS, + AR = rtconfig.AR, ARFLAGS = '-rc', + LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS, + CXXCOM = '$CXX -o $TARGET -c $CXXFLAGS $_CCCOMCOM $SOURCES') + env.PrependENVPath('PATH', rtconfig.EXEC_PATH) if rtconfig.PLATFORM == 'iar': env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES']) env.Replace(ARFLAGS = ['']) - env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') + env.Replace(LINKCOM = env["LINKCOM"] + ' --map rtthread.map') Export('RTT_ROOT') Export('rtconfig') @@ -41,9 +52,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +61,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) imxrt_library = 'MIMXRT1050' rtconfig.BSP_LIBRARY_TYPE = imxrt_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, imxrt_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ imxrt_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, imxrt_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/imxrt/imxrt1052-nxp-evk/SConstruct b/bsp/imxrt/imxrt1052-nxp-evk/SConstruct index e371dfb926..42b12299a3 100644 --- a/bsp/imxrt/imxrt1052-nxp-evk/SConstruct +++ b/bsp/imxrt/imxrt1052-nxp-evk/SConstruct @@ -15,21 +15,32 @@ except: print(RTT_ROOT) exit(-1) -TARGET = 'rt-thread.' + rtconfig.TARGET_EXT - +TARGET = 'rtthread.' + rtconfig.TARGET_EXT DefaultEnvironment(tools=[]) -env = Environment(tools = ['mingw'], - AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS, - CC = rtconfig.CC, CFLAGS = rtconfig.CFLAGS, - AR = rtconfig.AR, ARFLAGS = '-rc', - CXX = rtconfig.CXX, CXXFLAGS = rtconfig.CXXFLAGS, - LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS) +if rtconfig.PLATFORM == 'armcc': + env = Environment(tools = ['mingw'], + AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS, + CC = rtconfig.CC, CFLAGS = rtconfig.CFLAGS, + CXX = rtconfig.CXX, CXXFLAGS = rtconfig.CXXFLAGS, + AR = rtconfig.AR, ARFLAGS = '-rc', + LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS, + # overwrite cflags, because cflags has '--C99' + CXXCOM = '$CXX -o $TARGET --cpp -c $CXXFLAGS $_CCCOMCOM $SOURCES') +else: + env = Environment(tools = ['mingw'], + AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS, + CC = rtconfig.CC, CFLAGS = rtconfig.CFLAGS, + CXX = rtconfig.CXX, CXXFLAGS = rtconfig.CXXFLAGS, + AR = rtconfig.AR, ARFLAGS = '-rc', + LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS, + CXXCOM = '$CXX -o $TARGET -c $CXXFLAGS $_CCCOMCOM $SOURCES') + env.PrependENVPath('PATH', rtconfig.EXEC_PATH) if rtconfig.PLATFORM == 'iar': env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES']) env.Replace(ARFLAGS = ['']) - env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') + env.Replace(LINKCOM = env["LINKCOM"] + ' --map rtthread.map') Export('RTT_ROOT') Export('rtconfig') @@ -41,9 +52,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +61,14 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) imxrt_library = 'MIMXRT1050' rtconfig.BSP_LIBRARY_TYPE = imxrt_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, imxrt_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ imxrt_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, imxrt_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/drivers', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'drivers', 'SConscript'))) -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +# include peripherals +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'peripherals', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/imxrt/imxrt1052-seeed-ArchMix/SConstruct b/bsp/imxrt/imxrt1052-seeed-ArchMix/SConstruct index e371dfb926..55ebf9d391 100644 --- a/bsp/imxrt/imxrt1052-seeed-ArchMix/SConstruct +++ b/bsp/imxrt/imxrt1052-seeed-ArchMix/SConstruct @@ -15,21 +15,32 @@ except: print(RTT_ROOT) exit(-1) -TARGET = 'rt-thread.' + rtconfig.TARGET_EXT - +TARGET = 'rtthread.' + rtconfig.TARGET_EXT DefaultEnvironment(tools=[]) -env = Environment(tools = ['mingw'], - AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS, - CC = rtconfig.CC, CFLAGS = rtconfig.CFLAGS, - AR = rtconfig.AR, ARFLAGS = '-rc', - CXX = rtconfig.CXX, CXXFLAGS = rtconfig.CXXFLAGS, - LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS) +if rtconfig.PLATFORM == 'armcc': + env = Environment(tools = ['mingw'], + AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS, + CC = rtconfig.CC, CFLAGS = rtconfig.CFLAGS, + CXX = rtconfig.CXX, CXXFLAGS = rtconfig.CXXFLAGS, + AR = rtconfig.AR, ARFLAGS = '-rc', + LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS, + # overwrite cflags, because cflags has '--C99' + CXXCOM = '$CXX -o $TARGET --cpp -c $CXXFLAGS $_CCCOMCOM $SOURCES') +else: + env = Environment(tools = ['mingw'], + AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS, + CC = rtconfig.CC, CFLAGS = rtconfig.CFLAGS, + CXX = rtconfig.CXX, CXXFLAGS = rtconfig.CXXFLAGS, + AR = rtconfig.AR, ARFLAGS = '-rc', + LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS, + CXXCOM = '$CXX -o $TARGET -c $CXXFLAGS $_CCCOMCOM $SOURCES') + env.PrependENVPath('PATH', rtconfig.EXEC_PATH) if rtconfig.PLATFORM == 'iar': env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES']) env.Replace(ARFLAGS = ['']) - env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') + env.Replace(LINKCOM = env["LINKCOM"] + ' --map rtthread.map') Export('RTT_ROOT') Export('rtconfig') @@ -41,9 +52,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +61,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) imxrt_library = 'MIMXRT1050' rtconfig.BSP_LIBRARY_TYPE = imxrt_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, imxrt_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ imxrt_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, imxrt_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/imxrt/imxrt1060-nxp-evk/SConstruct b/bsp/imxrt/imxrt1060-nxp-evk/SConstruct index edbca1c148..b9be046c72 100644 --- a/bsp/imxrt/imxrt1060-nxp-evk/SConstruct +++ b/bsp/imxrt/imxrt1060-nxp-evk/SConstruct @@ -15,35 +15,42 @@ except: print(RTT_ROOT) exit(-1) -TARGET = 'rt-thread.' + rtconfig.TARGET_EXT - +TARGET = 'rtthread.' + rtconfig.TARGET_EXT DefaultEnvironment(tools=[]) -env = Environment(tools = ['mingw'], - AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS, - CC = rtconfig.CC, CFLAGS = rtconfig.CFLAGS, - AR = rtconfig.AR, ARFLAGS = '-rc', - CXX = rtconfig.CXX, CXXFLAGS = rtconfig.CXXFLAGS, - LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS) +if rtconfig.PLATFORM == 'armcc': + env = Environment(tools = ['mingw'], + AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS, + CC = rtconfig.CC, CFLAGS = rtconfig.CFLAGS, + CXX = rtconfig.CXX, CXXFLAGS = rtconfig.CXXFLAGS, + AR = rtconfig.AR, ARFLAGS = '-rc', + LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS, + # overwrite cflags, because cflags has '--C99' + CXXCOM = '$CXX -o $TARGET --cpp -c $CXXFLAGS $_CCCOMCOM $SOURCES') +else: + env = Environment(tools = ['mingw'], + AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS, + CC = rtconfig.CC, CFLAGS = rtconfig.CFLAGS, + CXX = rtconfig.CXX, CXXFLAGS = rtconfig.CXXFLAGS, + AR = rtconfig.AR, ARFLAGS = '-rc', + LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS, + CXXCOM = '$CXX -o $TARGET -c $CXXFLAGS $_CCCOMCOM $SOURCES') + env.PrependENVPath('PATH', rtconfig.EXEC_PATH) if rtconfig.PLATFORM == 'iar': env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES']) env.Replace(ARFLAGS = ['']) - env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') + env.Replace(LINKCOM = env["LINKCOM"] + ' --map rtthread.map') Export('RTT_ROOT') Export('rtconfig') SDK_ROOT = os.path.abspath('./') - if os.path.exists(SDK_ROOT + '/libraries'): libraries_path_prefix = SDK_ROOT + '/libraries' else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +60,14 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) imxrt_library = 'MIMXRT1060' rtconfig.BSP_LIBRARY_TYPE = imxrt_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, imxrt_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ imxrt_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, imxrt_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/drivers', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'drivers', 'SConscript'))) -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +# include peripherals +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'peripherals', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/imxrt/imxrt1064-nxp-evk/SConstruct b/bsp/imxrt/imxrt1064-nxp-evk/SConstruct index 36aaa922d4..96668a9c4c 100644 --- a/bsp/imxrt/imxrt1064-nxp-evk/SConstruct +++ b/bsp/imxrt/imxrt1064-nxp-evk/SConstruct @@ -15,35 +15,42 @@ except: print(RTT_ROOT) exit(-1) -TARGET = 'rt-thread.' + rtconfig.TARGET_EXT - +TARGET = 'rtthread.' + rtconfig.TARGET_EXT DefaultEnvironment(tools=[]) -env = Environment(tools = ['mingw'], - AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS, - CC = rtconfig.CC, CFLAGS = rtconfig.CFLAGS, - AR = rtconfig.AR, ARFLAGS = '-rc', - CXX = rtconfig.CXX, CXXFLAGS = rtconfig.CXXFLAGS, - LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS) +if rtconfig.PLATFORM == 'armcc': + env = Environment(tools = ['mingw'], + AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS, + CC = rtconfig.CC, CFLAGS = rtconfig.CFLAGS, + CXX = rtconfig.CXX, CXXFLAGS = rtconfig.CXXFLAGS, + AR = rtconfig.AR, ARFLAGS = '-rc', + LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS, + # overwrite cflags, because cflags has '--C99' + CXXCOM = '$CXX -o $TARGET --cpp -c $CXXFLAGS $_CCCOMCOM $SOURCES') +else: + env = Environment(tools = ['mingw'], + AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS, + CC = rtconfig.CC, CFLAGS = rtconfig.CFLAGS, + CXX = rtconfig.CXX, CXXFLAGS = rtconfig.CXXFLAGS, + AR = rtconfig.AR, ARFLAGS = '-rc', + LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS, + CXXCOM = '$CXX -o $TARGET -c $CXXFLAGS $_CCCOMCOM $SOURCES') + env.PrependENVPath('PATH', rtconfig.EXEC_PATH) if rtconfig.PLATFORM == 'iar': env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES']) env.Replace(ARFLAGS = ['']) - env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') + env.Replace(LINKCOM = env["LINKCOM"] + ' --map rtthread.map') Export('RTT_ROOT') Export('rtconfig') SDK_ROOT = os.path.abspath('./') - if os.path.exists(SDK_ROOT + '/libraries'): libraries_path_prefix = SDK_ROOT + '/libraries' else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +60,14 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) imxrt_library = 'MIMXRT1064' rtconfig.BSP_LIBRARY_TYPE = imxrt_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, imxrt_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ imxrt_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, imxrt_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/drivers', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'drivers', 'SConscript'))) -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +# include peripherals +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'peripherals', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/imxrt/libraries/templates/imxrt1050xxx/SConstruct b/bsp/imxrt/libraries/templates/imxrt1050xxx/SConstruct index e371dfb926..923c623f17 100644 --- a/bsp/imxrt/libraries/templates/imxrt1050xxx/SConstruct +++ b/bsp/imxrt/libraries/templates/imxrt1050xxx/SConstruct @@ -15,57 +15,41 @@ except: print(RTT_ROOT) exit(-1) -TARGET = 'rt-thread.' + rtconfig.TARGET_EXT - +TARGET = 'rtthread.' + rtconfig.TARGET_EXT DefaultEnvironment(tools=[]) -env = Environment(tools = ['mingw'], - AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS, - CC = rtconfig.CC, CFLAGS = rtconfig.CFLAGS, - AR = rtconfig.AR, ARFLAGS = '-rc', - CXX = rtconfig.CXX, CXXFLAGS = rtconfig.CXXFLAGS, - LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS) +if rtconfig.PLATFORM == 'armcc': + env = Environment(tools = ['mingw'], + AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS, + CC = rtconfig.CC, CFLAGS = rtconfig.CFLAGS, + CXX = rtconfig.CXX, CXXFLAGS = rtconfig.CXXFLAGS, + AR = rtconfig.AR, ARFLAGS = '-rc', + LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS, + # overwrite cflags, because cflags has '--C99' + CXXCOM = '$CXX -o $TARGET --cpp -c $CXXFLAGS $_CCCOMCOM $SOURCES') +else: + env = Environment(tools = ['mingw'], + AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS, + CC = rtconfig.CC, CFLAGS = rtconfig.CFLAGS, + CXX = rtconfig.CXX, CXXFLAGS = rtconfig.CXXFLAGS, + AR = rtconfig.AR, ARFLAGS = '-rc', + LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS, + CXXCOM = '$CXX -o $TARGET -c $CXXFLAGS $_CCCOMCOM $SOURCES') + env.PrependENVPath('PATH', rtconfig.EXEC_PATH) if rtconfig.PLATFORM == 'iar': env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES']) env.Replace(ARFLAGS = ['']) - env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') + env.Replace(LINKCOM = env["LINKCOM"] + ' --map rtthread.map') Export('RTT_ROOT') Export('rtconfig') -SDK_ROOT = os.path.abspath('./') - -if os.path.exists(SDK_ROOT + '/libraries'): - libraries_path_prefix = SDK_ROOT + '/libraries' -else: - libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' - -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - -SDK_LIB = libraries_path_prefix -Export('SDK_LIB') - # prepare building environment objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) -imxrt_library = 'MIMXRT1050' -rtconfig.BSP_LIBRARY_TYPE = imxrt_library - -bsp_vdir = 'build' - -# include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, imxrt_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ imxrt_library, duplicate=0)) - -# include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs = objs + SConscript('../libraries/drivers/SConscript') +objs = objs + SConscript('../libraries/MIMXRT1050/SConscript') # make a building DoBuilding(TARGET, objs) diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/SConstruct b/bsp/imxrt/libraries/templates/imxrt1064xxx/SConstruct index edbca1c148..a3f416164f 100644 --- a/bsp/imxrt/libraries/templates/imxrt1064xxx/SConstruct +++ b/bsp/imxrt/libraries/templates/imxrt1064xxx/SConstruct @@ -15,57 +15,41 @@ except: print(RTT_ROOT) exit(-1) -TARGET = 'rt-thread.' + rtconfig.TARGET_EXT - +TARGET = 'rtthread.' + rtconfig.TARGET_EXT DefaultEnvironment(tools=[]) -env = Environment(tools = ['mingw'], - AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS, - CC = rtconfig.CC, CFLAGS = rtconfig.CFLAGS, - AR = rtconfig.AR, ARFLAGS = '-rc', - CXX = rtconfig.CXX, CXXFLAGS = rtconfig.CXXFLAGS, - LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS) +if rtconfig.PLATFORM == 'armcc': + env = Environment(tools = ['mingw'], + AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS, + CC = rtconfig.CC, CFLAGS = rtconfig.CFLAGS, + CXX = rtconfig.CXX, CXXFLAGS = rtconfig.CXXFLAGS, + AR = rtconfig.AR, ARFLAGS = '-rc', + LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS, + # overwrite cflags, because cflags has '--C99' + CXXCOM = '$CXX -o $TARGET --cpp -c $CXXFLAGS $_CCCOMCOM $SOURCES') +else: + env = Environment(tools = ['mingw'], + AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS, + CC = rtconfig.CC, CFLAGS = rtconfig.CFLAGS, + CXX = rtconfig.CXX, CXXFLAGS = rtconfig.CXXFLAGS, + AR = rtconfig.AR, ARFLAGS = '-rc', + LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS, + CXXCOM = '$CXX -o $TARGET -c $CXXFLAGS $_CCCOMCOM $SOURCES') + env.PrependENVPath('PATH', rtconfig.EXEC_PATH) if rtconfig.PLATFORM == 'iar': env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES']) env.Replace(ARFLAGS = ['']) - env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') + env.Replace(LINKCOM = env["LINKCOM"] + ' --map rtthread.map') Export('RTT_ROOT') Export('rtconfig') -SDK_ROOT = os.path.abspath('./') - -if os.path.exists(SDK_ROOT + '/libraries'): - libraries_path_prefix = SDK_ROOT + '/libraries' -else: - libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' - -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - -SDK_LIB = libraries_path_prefix -Export('SDK_LIB') - # prepare building environment objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) -imxrt_library = 'MIMXRT1060' -rtconfig.BSP_LIBRARY_TYPE = imxrt_library - -bsp_vdir = 'build' - -# include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, imxrt_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ imxrt_library, duplicate=0)) - -# include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs = objs + SConscript('../libraries/drivers/SConscript') +objs = objs + SConscript('../libraries/MIMXRT1064/SConscript') # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/libraries/templates/stm32f0xx/SConstruct b/bsp/stm32/libraries/templates/stm32f0xx/SConstruct index faae7eeed3..277821b12c 100644 --- a/bsp/stm32/libraries/templates/stm32f0xx/SConstruct +++ b/bsp/stm32/libraries/templates/stm32f0xx/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32F0xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/libraries/templates/stm32f10x/SConstruct b/bsp/stm32/libraries/templates/stm32f10x/SConstruct index 8be268bf1c..e636260b5a 100644 --- a/bsp/stm32/libraries/templates/stm32f10x/SConstruct +++ b/bsp/stm32/libraries/templates/stm32f10x/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32F1xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/libraries/templates/stm32f2xx/SConstruct b/bsp/stm32/libraries/templates/stm32f2xx/SConstruct index 9c8aaca2fe..3b4403a7e4 100644 --- a/bsp/stm32/libraries/templates/stm32f2xx/SConstruct +++ b/bsp/stm32/libraries/templates/stm32f2xx/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32F2xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/libraries/templates/stm32f3xx/SConstruct b/bsp/stm32/libraries/templates/stm32f3xx/SConstruct index 217a62a04a..dfef5be14f 100644 --- a/bsp/stm32/libraries/templates/stm32f3xx/SConstruct +++ b/bsp/stm32/libraries/templates/stm32f3xx/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32F3xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/libraries/templates/stm32f4xx/SConstruct b/bsp/stm32/libraries/templates/stm32f4xx/SConstruct index 2e6891d41f..fe44ee0b8a 100644 --- a/bsp/stm32/libraries/templates/stm32f4xx/SConstruct +++ b/bsp/stm32/libraries/templates/stm32f4xx/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32F4xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/libraries/templates/stm32f7xx/SConstruct b/bsp/stm32/libraries/templates/stm32f7xx/SConstruct index 7839929ee3..1e20ca63a7 100644 --- a/bsp/stm32/libraries/templates/stm32f7xx/SConstruct +++ b/bsp/stm32/libraries/templates/stm32f7xx/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32F7xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/libraries/templates/stm32h7xx/SConstruct b/bsp/stm32/libraries/templates/stm32h7xx/SConstruct index 5f37aeca01..fc6658ebc7 100644 --- a/bsp/stm32/libraries/templates/stm32h7xx/SConstruct +++ b/bsp/stm32/libraries/templates/stm32h7xx/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32H7xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - -# include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) - # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +# include libraries +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/libraries/templates/stm32l1xx/SConstruct b/bsp/stm32/libraries/templates/stm32l1xx/SConstruct index 344c69af3a..13ca54bdb9 100644 --- a/bsp/stm32/libraries/templates/stm32l1xx/SConstruct +++ b/bsp/stm32/libraries/templates/stm32l1xx/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32L1xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/libraries/templates/stm32l4xx/SConstruct b/bsp/stm32/libraries/templates/stm32l4xx/SConstruct index a47cac3b41..57568a7bdf 100644 --- a/bsp/stm32/libraries/templates/stm32l4xx/SConstruct +++ b/bsp/stm32/libraries/templates/stm32l4xx/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32L4xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/libraries/templates/stm32l5xx/SConstruct b/bsp/stm32/libraries/templates/stm32l5xx/SConstruct index f527df6696..6d1acee40b 100644 --- a/bsp/stm32/libraries/templates/stm32l5xx/SConstruct +++ b/bsp/stm32/libraries/templates/stm32l5xx/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32L5xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/libraries/templates/stm32mp1xx/SConstruct b/bsp/stm32/libraries/templates/stm32mp1xx/SConstruct index 389edc6086..e75b162f9d 100644 --- a/bsp/stm32/libraries/templates/stm32mp1xx/SConstruct +++ b/bsp/stm32/libraries/templates/stm32mp1xx/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32MPxx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/libraries/templates/stm32wbxx/SConstruct b/bsp/stm32/libraries/templates/stm32wbxx/SConstruct index fbed954790..6aeca83d9f 100644 --- a/bsp/stm32/libraries/templates/stm32wbxx/SConstruct +++ b/bsp/stm32/libraries/templates/stm32wbxx/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32WBxx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32f072-st-nucleo/SConstruct b/bsp/stm32/stm32f072-st-nucleo/SConstruct index faae7eeed3..1df044209c 100644 --- a/bsp/stm32/stm32f072-st-nucleo/SConstruct +++ b/bsp/stm32/stm32f072-st-nucleo/SConstruct @@ -15,7 +15,7 @@ except: print(RTT_ROOT) exit(-1) -TARGET = 'rt-thread.' + rtconfig.TARGET_EXT +TARGET = 'rt-thread_acm32f030.' + rtconfig.TARGET_EXT DefaultEnvironment(tools=[]) env = Environment(tools = ['mingw'], @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32F0xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32f091-st-nucleo/SConstruct b/bsp/stm32/stm32f091-st-nucleo/SConstruct index faae7eeed3..277821b12c 100644 --- a/bsp/stm32/stm32f091-st-nucleo/SConstruct +++ b/bsp/stm32/stm32f091-st-nucleo/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32F0xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32f103-atk-nano/SConstruct b/bsp/stm32/stm32f103-atk-nano/SConstruct index 8be268bf1c..e636260b5a 100644 --- a/bsp/stm32/stm32f103-atk-nano/SConstruct +++ b/bsp/stm32/stm32f103-atk-nano/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32F1xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32f103-atk-warshipv3/SConstruct b/bsp/stm32/stm32f103-atk-warshipv3/SConstruct index 8be268bf1c..e636260b5a 100644 --- a/bsp/stm32/stm32f103-atk-warshipv3/SConstruct +++ b/bsp/stm32/stm32f103-atk-warshipv3/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32F1xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32f103-blue-pill/SConstruct b/bsp/stm32/stm32f103-blue-pill/SConstruct index 8be268bf1c..e636260b5a 100644 --- a/bsp/stm32/stm32f103-blue-pill/SConstruct +++ b/bsp/stm32/stm32f103-blue-pill/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32F1xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32f103-dofly-M3S/SConstruct b/bsp/stm32/stm32f103-dofly-M3S/SConstruct index 8be268bf1c..541fddf58a 100644 --- a/bsp/stm32/stm32f103-dofly-M3S/SConstruct +++ b/bsp/stm32/stm32f103-dofly-M3S/SConstruct @@ -15,7 +15,7 @@ except: print(RTT_ROOT) exit(-1) -TARGET = 'rt-thread.' + rtconfig.TARGET_EXT +TARGET = 'rtthread.' + rtconfig.TARGET_EXT DefaultEnvironment(tools=[]) env = Environment(tools = ['mingw'], @@ -29,7 +29,7 @@ env.PrependENVPath('PATH', rtconfig.EXEC_PATH) if rtconfig.PLATFORM == 'iar': env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES']) env.Replace(ARFLAGS = ['']) - env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') + env.Replace(LINKCOM = env["LINKCOM"] + ' --map rtthread.map') Export('RTT_ROOT') Export('rtconfig') @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32F1xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32f103-dofly-lyc8/SConstruct b/bsp/stm32/stm32f103-dofly-lyc8/SConstruct index 8be268bf1c..2a46bcc92c 100644 --- a/bsp/stm32/stm32f103-dofly-lyc8/SConstruct +++ b/bsp/stm32/stm32f103-dofly-lyc8/SConstruct @@ -29,7 +29,7 @@ env.PrependENVPath('PATH', rtconfig.EXEC_PATH) if rtconfig.PLATFORM == 'iar': env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES']) env.Replace(ARFLAGS = ['']) - env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') + env.Replace(LINKCOM = ['$LINK $SOURCES $LINKFLAGS -o $TARGET --map rt-thread.map']) Export('RTT_ROOT') Export('rtconfig') @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32F1xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32f103-fire-arbitrary/SConstruct b/bsp/stm32/stm32f103-fire-arbitrary/SConstruct index 8be268bf1c..e636260b5a 100644 --- a/bsp/stm32/stm32f103-fire-arbitrary/SConstruct +++ b/bsp/stm32/stm32f103-fire-arbitrary/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32F1xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32f103-gizwits-gokitv21/SConstruct b/bsp/stm32/stm32f103-gizwits-gokitv21/SConstruct index 8be268bf1c..e636260b5a 100644 --- a/bsp/stm32/stm32f103-gizwits-gokitv21/SConstruct +++ b/bsp/stm32/stm32f103-gizwits-gokitv21/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32F1xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32f103-hw100k-ibox/SConstruct b/bsp/stm32/stm32f103-hw100k-ibox/SConstruct index 8be268bf1c..e636260b5a 100644 --- a/bsp/stm32/stm32f103-hw100k-ibox/SConstruct +++ b/bsp/stm32/stm32f103-hw100k-ibox/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32F1xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32f103-onenet-nbiot/SConstruct b/bsp/stm32/stm32f103-onenet-nbiot/SConstruct index 8be268bf1c..e636260b5a 100644 --- a/bsp/stm32/stm32f103-onenet-nbiot/SConstruct +++ b/bsp/stm32/stm32f103-onenet-nbiot/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32F1xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32f103-yf-ufun/SConstruct b/bsp/stm32/stm32f103-yf-ufun/SConstruct index 8be268bf1c..e636260b5a 100644 --- a/bsp/stm32/stm32f103-yf-ufun/SConstruct +++ b/bsp/stm32/stm32f103-yf-ufun/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32F1xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32f107-uc-eval/SConstruct b/bsp/stm32/stm32f107-uc-eval/SConstruct index 8be268bf1c..e636260b5a 100644 --- a/bsp/stm32/stm32f107-uc-eval/SConstruct +++ b/bsp/stm32/stm32f107-uc-eval/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32F1xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32f207-st-nucleo/SConstruct b/bsp/stm32/stm32f207-st-nucleo/SConstruct index 9c8aaca2fe..3b4403a7e4 100644 --- a/bsp/stm32/stm32f207-st-nucleo/SConstruct +++ b/bsp/stm32/stm32f207-st-nucleo/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32F2xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32f302-st-nucleo/SConstruct b/bsp/stm32/stm32f302-st-nucleo/SConstruct index 217a62a04a..dfef5be14f 100644 --- a/bsp/stm32/stm32f302-st-nucleo/SConstruct +++ b/bsp/stm32/stm32f302-st-nucleo/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32F3xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32f401-st-nucleo/SConstruct b/bsp/stm32/stm32f401-st-nucleo/SConstruct index 2e6891d41f..fe44ee0b8a 100644 --- a/bsp/stm32/stm32f401-st-nucleo/SConstruct +++ b/bsp/stm32/stm32f401-st-nucleo/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32F4xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32f405-smdz-breadfruit/SConstruct b/bsp/stm32/stm32f405-smdz-breadfruit/SConstruct index 2e6891d41f..761a4751f2 100644 --- a/bsp/stm32/stm32f405-smdz-breadfruit/SConstruct +++ b/bsp/stm32/stm32f405-smdz-breadfruit/SConstruct @@ -29,7 +29,7 @@ env.PrependENVPath('PATH', rtconfig.EXEC_PATH) if rtconfig.PLATFORM == 'iar': env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES']) env.Replace(ARFLAGS = ['']) - env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') + env.Replace(LINKCOM = env["LINKCOM"] + ' --map rtthread.map') Export('RTT_ROOT') Export('rtconfig') @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32F4xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32f407-armfly-v5/SConstruct b/bsp/stm32/stm32f407-armfly-v5/SConstruct index 2e6891d41f..fe44ee0b8a 100644 --- a/bsp/stm32/stm32f407-armfly-v5/SConstruct +++ b/bsp/stm32/stm32f407-armfly-v5/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32F4xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32f407-atk-explorer/SConstruct b/bsp/stm32/stm32f407-atk-explorer/SConstruct index 2e6891d41f..fe44ee0b8a 100644 --- a/bsp/stm32/stm32f407-atk-explorer/SConstruct +++ b/bsp/stm32/stm32f407-atk-explorer/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32F4xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32f407-robomaster-c/SConstruct b/bsp/stm32/stm32f407-robomaster-c/SConstruct index 2e6891d41f..fe44ee0b8a 100644 --- a/bsp/stm32/stm32f407-robomaster-c/SConstruct +++ b/bsp/stm32/stm32f407-robomaster-c/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32F4xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32f407-st-discovery/SConstruct b/bsp/stm32/stm32f407-st-discovery/SConstruct index 2e6891d41f..a021b1b3e3 100644 --- a/bsp/stm32/stm32f407-st-discovery/SConstruct +++ b/bsp/stm32/stm32f407-st-discovery/SConstruct @@ -15,7 +15,7 @@ except: print(RTT_ROOT) exit(-1) -TARGET = 'rt-thread.' + rtconfig.TARGET_EXT +TARGET = 'rtthread.' + rtconfig.TARGET_EXT DefaultEnvironment(tools=[]) env = Environment(tools = ['mingw'], @@ -29,7 +29,7 @@ env.PrependENVPath('PATH', rtconfig.EXEC_PATH) if rtconfig.PLATFORM == 'iar': env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES']) env.Replace(ARFLAGS = ['']) - env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') + env.Replace(LINKCOM = env["LINKCOM"] + ' --map rtthread.map') Export('RTT_ROOT') Export('rtconfig') @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32F4xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32f410-st-nucleo/SConstruct b/bsp/stm32/stm32f410-st-nucleo/SConstruct index 2e6891d41f..a021b1b3e3 100644 --- a/bsp/stm32/stm32f410-st-nucleo/SConstruct +++ b/bsp/stm32/stm32f410-st-nucleo/SConstruct @@ -15,7 +15,7 @@ except: print(RTT_ROOT) exit(-1) -TARGET = 'rt-thread.' + rtconfig.TARGET_EXT +TARGET = 'rtthread.' + rtconfig.TARGET_EXT DefaultEnvironment(tools=[]) env = Environment(tools = ['mingw'], @@ -29,7 +29,7 @@ env.PrependENVPath('PATH', rtconfig.EXEC_PATH) if rtconfig.PLATFORM == 'iar': env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES']) env.Replace(ARFLAGS = ['']) - env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') + env.Replace(LINKCOM = env["LINKCOM"] + ' --map rtthread.map') Export('RTT_ROOT') Export('rtconfig') @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32F4xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32f411-atk-nano/SConstruct b/bsp/stm32/stm32f411-atk-nano/SConstruct index 2e6891d41f..fe44ee0b8a 100644 --- a/bsp/stm32/stm32f411-atk-nano/SConstruct +++ b/bsp/stm32/stm32f411-atk-nano/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32F4xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32f411-st-nucleo/SConstruct b/bsp/stm32/stm32f411-st-nucleo/SConstruct index 2e6891d41f..a021b1b3e3 100644 --- a/bsp/stm32/stm32f411-st-nucleo/SConstruct +++ b/bsp/stm32/stm32f411-st-nucleo/SConstruct @@ -15,7 +15,7 @@ except: print(RTT_ROOT) exit(-1) -TARGET = 'rt-thread.' + rtconfig.TARGET_EXT +TARGET = 'rtthread.' + rtconfig.TARGET_EXT DefaultEnvironment(tools=[]) env = Environment(tools = ['mingw'], @@ -29,7 +29,7 @@ env.PrependENVPath('PATH', rtconfig.EXEC_PATH) if rtconfig.PLATFORM == 'iar': env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES']) env.Replace(ARFLAGS = ['']) - env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') + env.Replace(LINKCOM = env["LINKCOM"] + ' --map rtthread.map') Export('RTT_ROOT') Export('rtconfig') @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32F4xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32f411-weact-MiniF4/SConstruct b/bsp/stm32/stm32f411-weact-MiniF4/SConstruct index 2e6891d41f..a021b1b3e3 100644 --- a/bsp/stm32/stm32f411-weact-MiniF4/SConstruct +++ b/bsp/stm32/stm32f411-weact-MiniF4/SConstruct @@ -15,7 +15,7 @@ except: print(RTT_ROOT) exit(-1) -TARGET = 'rt-thread.' + rtconfig.TARGET_EXT +TARGET = 'rtthread.' + rtconfig.TARGET_EXT DefaultEnvironment(tools=[]) env = Environment(tools = ['mingw'], @@ -29,7 +29,7 @@ env.PrependENVPath('PATH', rtconfig.EXEC_PATH) if rtconfig.PLATFORM == 'iar': env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES']) env.Replace(ARFLAGS = ['']) - env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') + env.Replace(LINKCOM = env["LINKCOM"] + ' --map rtthread.map') Export('RTT_ROOT') Export('rtconfig') @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32F4xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32f412-st-nucleo/SConstruct b/bsp/stm32/stm32f412-st-nucleo/SConstruct index 2e6891d41f..fe44ee0b8a 100644 --- a/bsp/stm32/stm32f412-st-nucleo/SConstruct +++ b/bsp/stm32/stm32f412-st-nucleo/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32F4xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32f413-st-nucleo/SConstruct b/bsp/stm32/stm32f413-st-nucleo/SConstruct index 2e6891d41f..fe44ee0b8a 100644 --- a/bsp/stm32/stm32f413-st-nucleo/SConstruct +++ b/bsp/stm32/stm32f413-st-nucleo/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32F4xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32f427-robomaster-a/SConstruct b/bsp/stm32/stm32f427-robomaster-a/SConstruct index 2e6891d41f..fe44ee0b8a 100644 --- a/bsp/stm32/stm32f427-robomaster-a/SConstruct +++ b/bsp/stm32/stm32f427-robomaster-a/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32F4xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32f429-armfly-v6/SConstruct b/bsp/stm32/stm32f429-armfly-v6/SConstruct index 2e6891d41f..fe44ee0b8a 100644 --- a/bsp/stm32/stm32f429-armfly-v6/SConstruct +++ b/bsp/stm32/stm32f429-armfly-v6/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32F4xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32f429-atk-apollo/SConstruct b/bsp/stm32/stm32f429-atk-apollo/SConstruct index 2e6891d41f..fe44ee0b8a 100644 --- a/bsp/stm32/stm32f429-atk-apollo/SConstruct +++ b/bsp/stm32/stm32f429-atk-apollo/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32F4xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32f429-fire-challenger/SConstruct b/bsp/stm32/stm32f429-fire-challenger/SConstruct index 2e6891d41f..fe44ee0b8a 100644 --- a/bsp/stm32/stm32f429-fire-challenger/SConstruct +++ b/bsp/stm32/stm32f429-fire-challenger/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32F4xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32f429-st-disco/SConstruct b/bsp/stm32/stm32f429-st-disco/SConstruct index 2e6891d41f..a021b1b3e3 100644 --- a/bsp/stm32/stm32f429-st-disco/SConstruct +++ b/bsp/stm32/stm32f429-st-disco/SConstruct @@ -15,7 +15,7 @@ except: print(RTT_ROOT) exit(-1) -TARGET = 'rt-thread.' + rtconfig.TARGET_EXT +TARGET = 'rtthread.' + rtconfig.TARGET_EXT DefaultEnvironment(tools=[]) env = Environment(tools = ['mingw'], @@ -29,7 +29,7 @@ env.PrependENVPath('PATH', rtconfig.EXEC_PATH) if rtconfig.PLATFORM == 'iar': env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES']) env.Replace(ARFLAGS = ['']) - env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') + env.Replace(LINKCOM = env["LINKCOM"] + ' --map rtthread.map') Export('RTT_ROOT') Export('rtconfig') @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32F4xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32f446-st-nucleo/SConstruct b/bsp/stm32/stm32f446-st-nucleo/SConstruct index 2e6891d41f..fe44ee0b8a 100644 --- a/bsp/stm32/stm32f446-st-nucleo/SConstruct +++ b/bsp/stm32/stm32f446-st-nucleo/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32F4xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32f469-st-disco/SConstruct b/bsp/stm32/stm32f469-st-disco/SConstruct index 2e6891d41f..f401eae23b 100644 --- a/bsp/stm32/stm32f469-st-disco/SConstruct +++ b/bsp/stm32/stm32f469-st-disco/SConstruct @@ -15,7 +15,7 @@ except: print(RTT_ROOT) exit(-1) -TARGET = 'rt-thread.' + rtconfig.TARGET_EXT +TARGET = 'rtthread.' + rtconfig.TARGET_EXT DefaultEnvironment(tools=[]) env = Environment(tools = ['mingw'], @@ -29,7 +29,7 @@ env.PrependENVPath('PATH', rtconfig.EXEC_PATH) if rtconfig.PLATFORM == 'iar': env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES']) env.Replace(ARFLAGS = ['']) - env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') + env.Replace(LINKCOM = env["LINKCOM"] + ' --map rtthread.map') Export('RTT_ROOT') Export('rtconfig') @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,14 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32F4xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +# include ports +objs.extend(SConscript(os.path.join(os.getcwd(), 'board', 'ports', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32f746-st-disco/SConstruct b/bsp/stm32/stm32f746-st-disco/SConstruct index 7839929ee3..1e20ca63a7 100644 --- a/bsp/stm32/stm32f746-st-disco/SConstruct +++ b/bsp/stm32/stm32f746-st-disco/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32F7xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32f746-st-nucleo/SConstruct b/bsp/stm32/stm32f746-st-nucleo/SConstruct index 7839929ee3..1e20ca63a7 100644 --- a/bsp/stm32/stm32f746-st-nucleo/SConstruct +++ b/bsp/stm32/stm32f746-st-nucleo/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32F7xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32f767-atk-apollo/SConstruct b/bsp/stm32/stm32f767-atk-apollo/SConstruct index 7839929ee3..1e20ca63a7 100644 --- a/bsp/stm32/stm32f767-atk-apollo/SConstruct +++ b/bsp/stm32/stm32f767-atk-apollo/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32F7xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32f767-fire-challenger-v1/SConstruct b/bsp/stm32/stm32f767-fire-challenger-v1/SConstruct index 7839929ee3..1e20ca63a7 100644 --- a/bsp/stm32/stm32f767-fire-challenger-v1/SConstruct +++ b/bsp/stm32/stm32f767-fire-challenger-v1/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32F7xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32f767-st-nucleo/SConstruct b/bsp/stm32/stm32f767-st-nucleo/SConstruct index 7839929ee3..1e20ca63a7 100644 --- a/bsp/stm32/stm32f767-st-nucleo/SConstruct +++ b/bsp/stm32/stm32f767-st-nucleo/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32F7xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32f769-st-disco/SConstruct b/bsp/stm32/stm32f769-st-disco/SConstruct index 7839929ee3..1e20ca63a7 100644 --- a/bsp/stm32/stm32f769-st-disco/SConstruct +++ b/bsp/stm32/stm32f769-st-disco/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32F7xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32g070-st-nucleo/SConstruct b/bsp/stm32/stm32g070-st-nucleo/SConstruct index 1c2797fb67..a52778f267 100644 --- a/bsp/stm32/stm32g070-st-nucleo/SConstruct +++ b/bsp/stm32/stm32g070-st-nucleo/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32G0xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32g071-st-nucleo/SConstruct b/bsp/stm32/stm32g071-st-nucleo/SConstruct index 1c2797fb67..a52778f267 100644 --- a/bsp/stm32/stm32g071-st-nucleo/SConstruct +++ b/bsp/stm32/stm32g071-st-nucleo/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32G0xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32g431-st-nucleo/SConstruct b/bsp/stm32/stm32g431-st-nucleo/SConstruct index 3b7b4bf07e..eea15e2828 100644 --- a/bsp/stm32/stm32g431-st-nucleo/SConstruct +++ b/bsp/stm32/stm32g431-st-nucleo/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32G4xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32g474-st-nucleo/SConstruct b/bsp/stm32/stm32g474-st-nucleo/SConstruct index 3b7b4bf07e..eea15e2828 100644 --- a/bsp/stm32/stm32g474-st-nucleo/SConstruct +++ b/bsp/stm32/stm32g474-st-nucleo/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32G4xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32h743-armfly-V7/SConstruct b/bsp/stm32/stm32h743-armfly-V7/SConstruct index 5f37aeca01..fc6658ebc7 100644 --- a/bsp/stm32/stm32h743-armfly-V7/SConstruct +++ b/bsp/stm32/stm32h743-armfly-V7/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32H7xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - -# include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) - # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +# include libraries +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32h743-atk-apollo/SConstruct b/bsp/stm32/stm32h743-atk-apollo/SConstruct index 5f37aeca01..7adb1878ab 100644 --- a/bsp/stm32/stm32h743-atk-apollo/SConstruct +++ b/bsp/stm32/stm32h743-atk-apollo/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32H7xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32h743-openmv-h7plus/SConstruct b/bsp/stm32/stm32h743-openmv-h7plus/SConstruct index 5f37aeca01..7adb1878ab 100644 --- a/bsp/stm32/stm32h743-openmv-h7plus/SConstruct +++ b/bsp/stm32/stm32h743-openmv-h7plus/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32H7xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32h743-st-nucleo/SConstruct b/bsp/stm32/stm32h743-st-nucleo/SConstruct index 5f37aeca01..fc6658ebc7 100644 --- a/bsp/stm32/stm32h743-st-nucleo/SConstruct +++ b/bsp/stm32/stm32h743-st-nucleo/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32H7xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - -# include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) - # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +# include libraries +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32h747-st-discovery/SConstruct b/bsp/stm32/stm32h747-st-discovery/SConstruct index 5f37aeca01..fc6658ebc7 100644 --- a/bsp/stm32/stm32h747-st-discovery/SConstruct +++ b/bsp/stm32/stm32h747-st-discovery/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32H7xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - -# include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) - # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +# include libraries +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32h750-armfly-h7-tool/SConstruct b/bsp/stm32/stm32h750-armfly-h7-tool/SConstruct index 5f37aeca01..fc6658ebc7 100644 --- a/bsp/stm32/stm32h750-armfly-h7-tool/SConstruct +++ b/bsp/stm32/stm32h750-armfly-h7-tool/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32H7xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - -# include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) - # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +# include libraries +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32h750-artpi-h750/SConstruct b/bsp/stm32/stm32h750-artpi-h750/SConstruct index 5f37aeca01..fc6658ebc7 100644 --- a/bsp/stm32/stm32h750-artpi-h750/SConstruct +++ b/bsp/stm32/stm32h750-artpi-h750/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32H7xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - -# include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) - # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +# include libraries +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32l010-st-nucleo/SConstruct b/bsp/stm32/stm32l010-st-nucleo/SConstruct index 465a4a2ab0..dd9870f2ca 100644 --- a/bsp/stm32/stm32l010-st-nucleo/SConstruct +++ b/bsp/stm32/stm32l010-st-nucleo/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32L0xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32l053-st-nucleo/SConstruct b/bsp/stm32/stm32l053-st-nucleo/SConstruct index 465a4a2ab0..dd9870f2ca 100644 --- a/bsp/stm32/stm32l053-st-nucleo/SConstruct +++ b/bsp/stm32/stm32l053-st-nucleo/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32L0xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32l412-st-nucleo/SConstruct b/bsp/stm32/stm32l412-st-nucleo/SConstruct index a47cac3b41..57568a7bdf 100644 --- a/bsp/stm32/stm32l412-st-nucleo/SConstruct +++ b/bsp/stm32/stm32l412-st-nucleo/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32L4xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32l431-BearPi/SConstruct b/bsp/stm32/stm32l431-BearPi/SConstruct index a47cac3b41..57568a7bdf 100644 --- a/bsp/stm32/stm32l431-BearPi/SConstruct +++ b/bsp/stm32/stm32l431-BearPi/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32L4xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32l432-st-nucleo/SConstruct b/bsp/stm32/stm32l432-st-nucleo/SConstruct index a47cac3b41..57568a7bdf 100644 --- a/bsp/stm32/stm32l432-st-nucleo/SConstruct +++ b/bsp/stm32/stm32l432-st-nucleo/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32L4xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32l433-ali-startkit/SConstruct b/bsp/stm32/stm32l433-ali-startkit/SConstruct index a47cac3b41..57568a7bdf 100644 --- a/bsp/stm32/stm32l433-ali-startkit/SConstruct +++ b/bsp/stm32/stm32l433-ali-startkit/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32L4xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32l433-st-nucleo/SConstruct b/bsp/stm32/stm32l433-st-nucleo/SConstruct index a47cac3b41..57568a7bdf 100644 --- a/bsp/stm32/stm32l433-st-nucleo/SConstruct +++ b/bsp/stm32/stm32l433-st-nucleo/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32L4xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32l452-st-nucleo/SConstruct b/bsp/stm32/stm32l452-st-nucleo/SConstruct index a47cac3b41..57568a7bdf 100644 --- a/bsp/stm32/stm32l452-st-nucleo/SConstruct +++ b/bsp/stm32/stm32l452-st-nucleo/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32L4xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32l475-atk-pandora/SConstruct b/bsp/stm32/stm32l475-atk-pandora/SConstruct index a47cac3b41..dcd7ae2889 100644 --- a/bsp/stm32/stm32l475-atk-pandora/SConstruct +++ b/bsp/stm32/stm32l475-atk-pandora/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,13 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32L4xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(os.getcwd(), 'board', 'ports', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32l475-atk-pandora/board/SConscript b/bsp/stm32/stm32l475-atk-pandora/board/SConscript index bff91b7deb..29efa41d65 100644 --- a/bsp/stm32/stm32l475-atk-pandora/board/SConscript +++ b/bsp/stm32/stm32l475-atk-pandora/board/SConscript @@ -17,7 +17,7 @@ if GetDepend(['BSP_USING_KEY']): if GetDepend(['BSP_USING_QSPI_FLASH']): src += Glob('ports/drv_qspi_flash.c') - + if GetDepend(['BSP_USING_SDCARD']): src += Glob('ports/drv_sdcard.c') @@ -39,7 +39,7 @@ path += [cwd + '/CubeMX_Config/Inc'] if GetDepend(['BSP_USING_AUDIO']): path += [cwd + '/ports/audio'] - + startup_path_prefix = SDK_LIB if rtconfig.CROSS_TOOL == 'gcc': @@ -49,8 +49,7 @@ elif rtconfig.CROSS_TOOL == 'keil': elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/iar/startup_stm32l475xx.s'] -CPPDEFINES = ['STM32L475xx'] +CPPDEFINES = ['STM32L475xx'] group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) Return('group') - diff --git a/bsp/stm32/stm32l475-st-discovery/SConstruct b/bsp/stm32/stm32l475-st-discovery/SConstruct index a47cac3b41..6aa0397a60 100644 --- a/bsp/stm32/stm32l475-st-discovery/SConstruct +++ b/bsp/stm32/stm32l475-st-discovery/SConstruct @@ -15,7 +15,7 @@ except: print(RTT_ROOT) exit(-1) -TARGET = 'rt-thread.' + rtconfig.TARGET_EXT +TARGET = 'rtthread.' + rtconfig.TARGET_EXT DefaultEnvironment(tools=[]) env = Environment(tools = ['mingw'], @@ -29,7 +29,7 @@ env.PrependENVPath('PATH', rtconfig.EXEC_PATH) if rtconfig.PLATFORM == 'iar': env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES']) env.Replace(ARFLAGS = ['']) - env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') + env.Replace(LINKCOM = env["LINKCOM"] + ' --map rtthread.map') Export('RTT_ROOT') Export('rtconfig') @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32L4xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32l476-st-nucleo/SConstruct b/bsp/stm32/stm32l476-st-nucleo/SConstruct index a47cac3b41..57568a7bdf 100644 --- a/bsp/stm32/stm32l476-st-nucleo/SConstruct +++ b/bsp/stm32/stm32l476-st-nucleo/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32L4xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32l496-ali-developer/SConstruct b/bsp/stm32/stm32l496-ali-developer/SConstruct index a47cac3b41..57568a7bdf 100644 --- a/bsp/stm32/stm32l496-ali-developer/SConstruct +++ b/bsp/stm32/stm32l496-ali-developer/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32L4xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32l496-st-nucleo/SConstruct b/bsp/stm32/stm32l496-st-nucleo/SConstruct index a47cac3b41..57568a7bdf 100644 --- a/bsp/stm32/stm32l496-st-nucleo/SConstruct +++ b/bsp/stm32/stm32l496-st-nucleo/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32L4xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32l4r5-st-nucleo/SConstruct b/bsp/stm32/stm32l4r5-st-nucleo/SConstruct index a47cac3b41..b67bee1d00 100644 --- a/bsp/stm32/stm32l4r5-st-nucleo/SConstruct +++ b/bsp/stm32/stm32l4r5-st-nucleo/SConstruct @@ -17,7 +17,6 @@ except: TARGET = 'rt-thread.' + rtconfig.TARGET_EXT -DefaultEnvironment(tools=[]) env = Environment(tools = ['mingw'], AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS, CC = rtconfig.CC, CFLAGS = rtconfig.CFLAGS, @@ -41,9 +40,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +49,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32L4xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32l4r9-st-eval/SConstruct b/bsp/stm32/stm32l4r9-st-eval/SConstruct index a47cac3b41..6aa0397a60 100644 --- a/bsp/stm32/stm32l4r9-st-eval/SConstruct +++ b/bsp/stm32/stm32l4r9-st-eval/SConstruct @@ -15,7 +15,7 @@ except: print(RTT_ROOT) exit(-1) -TARGET = 'rt-thread.' + rtconfig.TARGET_EXT +TARGET = 'rtthread.' + rtconfig.TARGET_EXT DefaultEnvironment(tools=[]) env = Environment(tools = ['mingw'], @@ -29,7 +29,7 @@ env.PrependENVPath('PATH', rtconfig.EXEC_PATH) if rtconfig.PLATFORM == 'iar': env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES']) env.Replace(ARFLAGS = ['']) - env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') + env.Replace(LINKCOM = env["LINKCOM"] + ' --map rtthread.map') Export('RTT_ROOT') Export('rtconfig') @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32L4xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32l4r9-st-sensortile-box/SConstruct b/bsp/stm32/stm32l4r9-st-sensortile-box/SConstruct index a47cac3b41..6aa0397a60 100644 --- a/bsp/stm32/stm32l4r9-st-sensortile-box/SConstruct +++ b/bsp/stm32/stm32l4r9-st-sensortile-box/SConstruct @@ -15,7 +15,7 @@ except: print(RTT_ROOT) exit(-1) -TARGET = 'rt-thread.' + rtconfig.TARGET_EXT +TARGET = 'rtthread.' + rtconfig.TARGET_EXT DefaultEnvironment(tools=[]) env = Environment(tools = ['mingw'], @@ -29,7 +29,7 @@ env.PrependENVPath('PATH', rtconfig.EXEC_PATH) if rtconfig.PLATFORM == 'iar': env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES']) env.Replace(ARFLAGS = ['']) - env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') + env.Replace(LINKCOM = env["LINKCOM"] + ' --map rtthread.map') Export('RTT_ROOT') Export('rtconfig') @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32L4xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32l552-st-nucleo/SConstruct b/bsp/stm32/stm32l552-st-nucleo/SConstruct index f527df6696..6d1acee40b 100644 --- a/bsp/stm32/stm32l552-st-nucleo/SConstruct +++ b/bsp/stm32/stm32l552-st-nucleo/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32L5xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32mp157a-st-discovery/SConstruct b/bsp/stm32/stm32mp157a-st-discovery/SConstruct index 389edc6086..e75b162f9d 100644 --- a/bsp/stm32/stm32mp157a-st-discovery/SConstruct +++ b/bsp/stm32/stm32mp157a-st-discovery/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32MPxx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32mp157a-st-ev1/SConstruct b/bsp/stm32/stm32mp157a-st-ev1/SConstruct index 389edc6086..e75b162f9d 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/SConstruct +++ b/bsp/stm32/stm32mp157a-st-ev1/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32MPxx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32u575-st-nucleo/SConstruct b/bsp/stm32/stm32u575-st-nucleo/SConstruct index 76705c5c95..5d52030247 100644 --- a/bsp/stm32/stm32u575-st-nucleo/SConstruct +++ b/bsp/stm32/stm32u575-st-nucleo/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32U5xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32wb55-st-nucleo/SConstruct b/bsp/stm32/stm32wb55-st-nucleo/SConstruct index fbed954790..6aeca83d9f 100644 --- a/bsp/stm32/stm32wb55-st-nucleo/SConstruct +++ b/bsp/stm32/stm32wb55-st-nucleo/SConstruct @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32WBxx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32wl55-st-nucleo/SConstruct b/bsp/stm32/stm32wl55-st-nucleo/SConstruct index 0ba7f251a0..f3769ce5b6 100644 --- a/bsp/stm32/stm32wl55-st-nucleo/SConstruct +++ b/bsp/stm32/stm32wl55-st-nucleo/SConstruct @@ -17,7 +17,6 @@ except: TARGET = 'rt-thread.' + rtconfig.TARGET_EXT -DefaultEnvironment(tools=[]) env = Environment(tools = ['mingw'], AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS, CC = rtconfig.CC, CFLAGS = rtconfig.CFLAGS, @@ -41,9 +40,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +49,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32WLxx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) diff --git a/bsp/stm32/stm32wle5-yizhilian-lm401/SConstruct b/bsp/stm32/stm32wle5-yizhilian-lm401/SConstruct index 0ba7f251a0..f3769ce5b6 100644 --- a/bsp/stm32/stm32wle5-yizhilian-lm401/SConstruct +++ b/bsp/stm32/stm32wle5-yizhilian-lm401/SConstruct @@ -17,7 +17,6 @@ except: TARGET = 'rt-thread.' + rtconfig.TARGET_EXT -DefaultEnvironment(tools=[]) env = Environment(tools = ['mingw'], AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS, CC = rtconfig.CC, CFLAGS = rtconfig.CFLAGS, @@ -41,9 +40,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +49,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32WLxx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) |