diff --git a/bsp/stm32/stm32f072-st-nucleo/SConscript b/bsp/stm32/stm32f072-st-nucleo/SConscript index 20f7689c53c..3250730b656 100644 --- a/bsp/stm32/stm32f072-st-nucleo/SConscript +++ b/bsp/stm32/stm32f072-st-nucleo/SConscript @@ -1,12 +1,21 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +# STM32F030x6 || STM32F030x8 || STM32F031x6 +# STM32F038xx || STM32F042x6 || STM32F048xx +# STM32F070x6 || STM32F051x8 || STM32F058xx +# STM32F071xB || STM32F072xB || STM32F078xx +# STM32F070xB || STM32F091xC || STM32F098xx || STM32F030xC +# You can select chips from the list above +env.Append(CPPDEFINES = ['STM32F072xB']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f072-st-nucleo/board/SConscript b/bsp/stm32/stm32f072-st-nucleo/board/SConscript index 1fe8a84546e..c0700a730f6 100644 --- a/bsp/stm32/stm32f072-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f072-st-nucleo/board/SConscript @@ -13,14 +13,7 @@ path = [cwd] path += [os.path.join(cwd, 'CubeMX_Config', 'Inc')] -# STM32F030x6 || STM32F030x8 || STM32F031x6 -# STM32F038xx || STM32F042x6 || STM32F048xx -# STM32F070x6 || STM32F051x8 || STM32F058xx -# STM32F071xB || STM32F072xB || STM32F078xx -# STM32F070xB || STM32F091xC || STM32F098xx || STM32F030xC -# You can select chips from the list above -CPPDEFINES = ['STM32F072xB'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) # if os.path.isfile(os.path.join(cwd, "ports", 'SConscript')): # group = group + SConscript(os.path.join("ports", 'SConscript')) diff --git a/bsp/stm32/stm32f091-st-nucleo/SConscript b/bsp/stm32/stm32f091-st-nucleo/SConscript index 20f7689c53c..c803fa33179 100644 --- a/bsp/stm32/stm32f091-st-nucleo/SConscript +++ b/bsp/stm32/stm32f091-st-nucleo/SConscript @@ -1,12 +1,21 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +# STM32F030x6 || STM32F030x8 || STM32F031x6 +# STM32F038xx || STM32F042x6 || STM32F048xx +# STM32F070x6 || STM32F051x8 || STM32F058xx +# STM32F071xB || STM32F072xB || STM32F078xx +# STM32F070xB || STM32F091xC || STM32F098xx || STM32F030xC +# You can select chips from the list above +env.Append(CPPDEFINES=['STM32F091xC']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f091-st-nucleo/board/SConscript b/bsp/stm32/stm32f091-st-nucleo/board/SConscript index b7b0981f37a..c0700a730f6 100644 --- a/bsp/stm32/stm32f091-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f091-st-nucleo/board/SConscript @@ -13,14 +13,7 @@ path = [cwd] path += [os.path.join(cwd, 'CubeMX_Config', 'Inc')] -# STM32F030x6 || STM32F030x8 || STM32F031x6 -# STM32F038xx || STM32F042x6 || STM32F048xx -# STM32F070x6 || STM32F051x8 || STM32F058xx -# STM32F071xB || STM32F072xB || STM32F078xx -# STM32F070xB || STM32F091xC || STM32F098xx || STM32F030xC -# You can select chips from the list above -CPPDEFINES = ['STM32F091xC'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) # if os.path.isfile(os.path.join(cwd, "ports", 'SConscript')): # group = group + SConscript(os.path.join("ports", 'SConscript')) diff --git a/bsp/stm32/stm32f103-100ask-mini/SConscript b/bsp/stm32/stm32f103-100ask-mini/SConscript index 20f7689c53c..b4c0daf3388 100644 --- a/bsp/stm32/stm32f103-100ask-mini/SConscript +++ b/bsp/stm32/stm32f103-100ask-mini/SConscript @@ -1,12 +1,21 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +# STM32F100xB || STM32F100xE || STM32F101x6 +# STM32F101xB || STM32F101xE || STM32F101xG +# STM32F102x6 || STM32F102xB || STM32F103x6 +# STM32F103xB || STM32F103xE || STM32F103xG +# STM32F105xC || STM32F107xC) +# You can select chips from the list above +env.Append(CPPDEFINES = ['STM32F103xB']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f103-100ask-mini/SConstruct b/bsp/stm32/stm32f103-100ask-mini/SConstruct index 2c06ce2b62e..624d7385482 100644 --- a/bsp/stm32/stm32f103-100ask-mini/SConstruct +++ b/bsp/stm32/stm32f103-100ask-mini/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32f103-100ask-mini/board/SConscript b/bsp/stm32/stm32f103-100ask-mini/board/SConscript index 53480c712e0..a1e644e9d10 100644 --- a/bsp/stm32/stm32f103-100ask-mini/board/SConscript +++ b/bsp/stm32/stm32f103-100ask-mini/board/SConscript @@ -28,12 +28,5 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/iar/startup_stm32f103xb.s'] -# STM32F100xB || STM32F100xE || STM32F101x6 -# STM32F101xB || STM32F101xE || STM32F101xG -# STM32F102x6 || STM32F102xB || STM32F103x6 -# STM32F103xB || STM32F103xE || STM32F103xG -# STM32F105xC || STM32F107xC) -# You can select chips from the list above -CPPDEFINES = ['STM32F103xB'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32f103-100ask-pro/SConscript b/bsp/stm32/stm32f103-100ask-pro/SConscript index 20f7689c53c..223d1412034 100644 --- a/bsp/stm32/stm32f103-100ask-pro/SConscript +++ b/bsp/stm32/stm32f103-100ask-pro/SConscript @@ -1,12 +1,21 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +# STM32F100xB || STM32F100xE || STM32F101x6 +# STM32F101xB || STM32F101xE || STM32F101xG +# STM32F102x6 || STM32F102xB || STM32F103x6 +# STM32F103xB || STM32F103xE || STM32F103xG +# STM32F105xC || STM32F107xC) +# You can select chips from the list above +env.Append(CPPDEFINES = ['STM32F103xE']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f103-100ask-pro/SConstruct b/bsp/stm32/stm32f103-100ask-pro/SConstruct index 2c06ce2b62e..624d7385482 100644 --- a/bsp/stm32/stm32f103-100ask-pro/SConstruct +++ b/bsp/stm32/stm32f103-100ask-pro/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32f103-100ask-pro/board/SConscript b/bsp/stm32/stm32f103-100ask-pro/board/SConscript index a0fae4da0ba..772584040df 100644 --- a/bsp/stm32/stm32f103-100ask-pro/board/SConscript +++ b/bsp/stm32/stm32f103-100ask-pro/board/SConscript @@ -31,12 +31,5 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/iar/startup_stm32f103xe.s'] -# STM32F100xB || STM32F100xE || STM32F101x6 -# STM32F101xB || STM32F101xE || STM32F101xG -# STM32F102x6 || STM32F102xB || STM32F103x6 -# STM32F103xB || STM32F103xE || STM32F103xG -# STM32F105xC || STM32F107xC) -# You can select chips from the list above -CPPDEFINES = ['STM32F103xE'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32f103-atk-nano/SConscript b/bsp/stm32/stm32f103-atk-nano/SConscript index 20f7689c53c..d0f274f6d28 100644 --- a/bsp/stm32/stm32f103-atk-nano/SConscript +++ b/bsp/stm32/stm32f103-atk-nano/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32F103xB']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f103-atk-nano/SConstruct b/bsp/stm32/stm32f103-atk-nano/SConstruct index 2c06ce2b62e..624d7385482 100644 --- a/bsp/stm32/stm32f103-atk-nano/SConstruct +++ b/bsp/stm32/stm32f103-atk-nano/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32f103-atk-nano/board/SConscript b/bsp/stm32/stm32f103-atk-nano/board/SConscript index c96005d9ddb..f1fda336224 100644 --- a/bsp/stm32/stm32f103-atk-nano/board/SConscript +++ b/bsp/stm32/stm32f103-atk-nano/board/SConscript @@ -28,6 +28,5 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/iar/startup_stm32f103xb.s'] -CPPDEFINES = ['STM32F103xB'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32f103-atk-warshipv3/SConscript b/bsp/stm32/stm32f103-atk-warshipv3/SConscript index 20f7689c53c..223d1412034 100644 --- a/bsp/stm32/stm32f103-atk-warshipv3/SConscript +++ b/bsp/stm32/stm32f103-atk-warshipv3/SConscript @@ -1,12 +1,21 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +# STM32F100xB || STM32F100xE || STM32F101x6 +# STM32F101xB || STM32F101xE || STM32F101xG +# STM32F102x6 || STM32F102xB || STM32F103x6 +# STM32F103xB || STM32F103xE || STM32F103xG +# STM32F105xC || STM32F107xC) +# You can select chips from the list above +env.Append(CPPDEFINES = ['STM32F103xE']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f103-atk-warshipv3/SConstruct b/bsp/stm32/stm32f103-atk-warshipv3/SConstruct index 2c06ce2b62e..624d7385482 100644 --- a/bsp/stm32/stm32f103-atk-warshipv3/SConstruct +++ b/bsp/stm32/stm32f103-atk-warshipv3/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32f103-atk-warshipv3/board/SConscript b/bsp/stm32/stm32f103-atk-warshipv3/board/SConscript index c7f9c448d29..81b4035371a 100644 --- a/bsp/stm32/stm32f103-atk-warshipv3/board/SConscript +++ b/bsp/stm32/stm32f103-atk-warshipv3/board/SConscript @@ -31,12 +31,5 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/iar/startup_stm32f103xe.s'] -# STM32F100xB || STM32F100xE || STM32F101x6 -# STM32F101xB || STM32F101xE || STM32F101xG -# STM32F102x6 || STM32F102xB || STM32F103x6 -# STM32F103xB || STM32F103xE || STM32F103xG -# STM32F105xC || STM32F107xC) -# You can select chips from the list above -CPPDEFINES = ['STM32F103xE'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32f103-blue-pill/SConscript b/bsp/stm32/stm32f103-blue-pill/SConscript index 20f7689c53c..b4c0daf3388 100644 --- a/bsp/stm32/stm32f103-blue-pill/SConscript +++ b/bsp/stm32/stm32f103-blue-pill/SConscript @@ -1,12 +1,21 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +# STM32F100xB || STM32F100xE || STM32F101x6 +# STM32F101xB || STM32F101xE || STM32F101xG +# STM32F102x6 || STM32F102xB || STM32F103x6 +# STM32F103xB || STM32F103xE || STM32F103xG +# STM32F105xC || STM32F107xC) +# You can select chips from the list above +env.Append(CPPDEFINES = ['STM32F103xB']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f103-blue-pill/SConstruct b/bsp/stm32/stm32f103-blue-pill/SConstruct index 2c06ce2b62e..624d7385482 100644 --- a/bsp/stm32/stm32f103-blue-pill/SConstruct +++ b/bsp/stm32/stm32f103-blue-pill/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32f103-blue-pill/board/SConscript b/bsp/stm32/stm32f103-blue-pill/board/SConscript index ed630f8b21f..fe556a6577d 100644 --- a/bsp/stm32/stm32f103-blue-pill/board/SConscript +++ b/bsp/stm32/stm32f103-blue-pill/board/SConscript @@ -24,12 +24,5 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/iar/startup_stm32f103xb.s'] -# STM32F100xB || STM32F100xE || STM32F101x6 -# STM32F101xB || STM32F101xE || STM32F101xG -# STM32F102x6 || STM32F102xB || STM32F103x6 -# STM32F103xB || STM32F103xE || STM32F103xG -# STM32F105xC || STM32F107xC) -# You can select chips from the list above -CPPDEFINES = ['STM32F103xB'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32f103-dofly-M3S/SConscript b/bsp/stm32/stm32f103-dofly-M3S/SConscript index 20f7689c53c..223d1412034 100644 --- a/bsp/stm32/stm32f103-dofly-M3S/SConscript +++ b/bsp/stm32/stm32f103-dofly-M3S/SConscript @@ -1,12 +1,21 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +# STM32F100xB || STM32F100xE || STM32F101x6 +# STM32F101xB || STM32F101xE || STM32F101xG +# STM32F102x6 || STM32F102xB || STM32F103x6 +# STM32F103xB || STM32F103xE || STM32F103xG +# STM32F105xC || STM32F107xC) +# You can select chips from the list above +env.Append(CPPDEFINES = ['STM32F103xE']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f103-dofly-M3S/SConstruct b/bsp/stm32/stm32f103-dofly-M3S/SConstruct index 81c7a351ce0..99e0291b76e 100644 --- a/bsp/stm32/stm32f103-dofly-M3S/SConstruct +++ b/bsp/stm32/stm32f103-dofly-M3S/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rtthread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32f103-dofly-M3S/board/SConscript b/bsp/stm32/stm32f103-dofly-M3S/board/SConscript index 40d5f6764f8..d5ad189b0a1 100644 --- a/bsp/stm32/stm32f103-dofly-M3S/board/SConscript +++ b/bsp/stm32/stm32f103-dofly-M3S/board/SConscript @@ -34,12 +34,5 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/iar/startup_stm32f103xe.s'] -# STM32F100xB || STM32F100xE || STM32F101x6 -# STM32F101xB || STM32F101xE || STM32F101xG -# STM32F102x6 || STM32F102xB || STM32F103x6 -# STM32F103xB || STM32F103xE || STM32F103xG -# STM32F105xC || STM32F107xC) -# You can select chips from the list above -CPPDEFINES = ['STM32F103xE'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32f103-dofly-lyc8/SConscript b/bsp/stm32/stm32f103-dofly-lyc8/SConscript index 20f7689c53c..b4c0daf3388 100644 --- a/bsp/stm32/stm32f103-dofly-lyc8/SConscript +++ b/bsp/stm32/stm32f103-dofly-lyc8/SConscript @@ -1,12 +1,21 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +# STM32F100xB || STM32F100xE || STM32F101x6 +# STM32F101xB || STM32F101xE || STM32F101xG +# STM32F102x6 || STM32F102xB || STM32F103x6 +# STM32F103xB || STM32F103xE || STM32F103xG +# STM32F105xC || STM32F107xC) +# You can select chips from the list above +env.Append(CPPDEFINES = ['STM32F103xB']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f103-dofly-lyc8/SConstruct b/bsp/stm32/stm32f103-dofly-lyc8/SConstruct index be1b1b2b1d0..c4f0994d1c9 100644 --- a/bsp/stm32/stm32f103-dofly-lyc8/SConstruct +++ b/bsp/stm32/stm32f103-dofly-lyc8/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = ['$LINK $SOURCES $LINKFLAGS -o $TARGET --map rt-thread.map']) +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32f103-dofly-lyc8/board/SConscript b/bsp/stm32/stm32f103-dofly-lyc8/board/SConscript index ed630f8b21f..fe556a6577d 100644 --- a/bsp/stm32/stm32f103-dofly-lyc8/board/SConscript +++ b/bsp/stm32/stm32f103-dofly-lyc8/board/SConscript @@ -24,12 +24,5 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/iar/startup_stm32f103xb.s'] -# STM32F100xB || STM32F100xE || STM32F101x6 -# STM32F101xB || STM32F101xE || STM32F101xG -# STM32F102x6 || STM32F102xB || STM32F103x6 -# STM32F103xB || STM32F103xE || STM32F103xG -# STM32F105xC || STM32F107xC) -# You can select chips from the list above -CPPDEFINES = ['STM32F103xB'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32f103-fire-arbitrary/SConscript b/bsp/stm32/stm32f103-fire-arbitrary/SConscript index 20f7689c53c..fd7413e878d 100644 --- a/bsp/stm32/stm32f103-fire-arbitrary/SConscript +++ b/bsp/stm32/stm32f103-fire-arbitrary/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32F103xE']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f103-fire-arbitrary/SConstruct b/bsp/stm32/stm32f103-fire-arbitrary/SConstruct index 2c06ce2b62e..624d7385482 100644 --- a/bsp/stm32/stm32f103-fire-arbitrary/SConstruct +++ b/bsp/stm32/stm32f103-fire-arbitrary/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32f103-fire-arbitrary/board/SConscript b/bsp/stm32/stm32f103-fire-arbitrary/board/SConscript index 34ee25d52b2..585d4506a2c 100644 --- a/bsp/stm32/stm32f103-fire-arbitrary/board/SConscript +++ b/bsp/stm32/stm32f103-fire-arbitrary/board/SConscript @@ -34,6 +34,5 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/iar/startup_stm32f103xe.s'] -CPPDEFINES = ['STM32F103xE'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32f103-gizwits-gokitv21/SConscript b/bsp/stm32/stm32f103-gizwits-gokitv21/SConscript index 20f7689c53c..b4c0daf3388 100644 --- a/bsp/stm32/stm32f103-gizwits-gokitv21/SConscript +++ b/bsp/stm32/stm32f103-gizwits-gokitv21/SConscript @@ -1,12 +1,21 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +# STM32F100xB || STM32F100xE || STM32F101x6 +# STM32F101xB || STM32F101xE || STM32F101xG +# STM32F102x6 || STM32F102xB || STM32F103x6 +# STM32F103xB || STM32F103xE || STM32F103xG +# STM32F105xC || STM32F107xC) +# You can select chips from the list above +env.Append(CPPDEFINES = ['STM32F103xB']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f103-gizwits-gokitv21/SConstruct b/bsp/stm32/stm32f103-gizwits-gokitv21/SConstruct index 2c06ce2b62e..624d7385482 100644 --- a/bsp/stm32/stm32f103-gizwits-gokitv21/SConstruct +++ b/bsp/stm32/stm32f103-gizwits-gokitv21/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32f103-gizwits-gokitv21/board/SConscript b/bsp/stm32/stm32f103-gizwits-gokitv21/board/SConscript index ed630f8b21f..be9c8ec58eb 100644 --- a/bsp/stm32/stm32f103-gizwits-gokitv21/board/SConscript +++ b/bsp/stm32/stm32f103-gizwits-gokitv21/board/SConscript @@ -24,12 +24,6 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/iar/startup_stm32f103xb.s'] -# STM32F100xB || STM32F100xE || STM32F101x6 -# STM32F101xB || STM32F101xE || STM32F101xG -# STM32F102x6 || STM32F102xB || STM32F103x6 -# STM32F103xB || STM32F103xE || STM32F103xG -# STM32F105xC || STM32F107xC) -# You can select chips from the list above -CPPDEFINES = ['STM32F103xB'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) + +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32f103-hw100k-ibox/SConscript b/bsp/stm32/stm32f103-hw100k-ibox/SConscript index 20f7689c53c..223d1412034 100644 --- a/bsp/stm32/stm32f103-hw100k-ibox/SConscript +++ b/bsp/stm32/stm32f103-hw100k-ibox/SConscript @@ -1,12 +1,21 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +# STM32F100xB || STM32F100xE || STM32F101x6 +# STM32F101xB || STM32F101xE || STM32F101xG +# STM32F102x6 || STM32F102xB || STM32F103x6 +# STM32F103xB || STM32F103xE || STM32F103xG +# STM32F105xC || STM32F107xC) +# You can select chips from the list above +env.Append(CPPDEFINES = ['STM32F103xE']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f103-hw100k-ibox/SConstruct b/bsp/stm32/stm32f103-hw100k-ibox/SConstruct index 2c06ce2b62e..624d7385482 100644 --- a/bsp/stm32/stm32f103-hw100k-ibox/SConstruct +++ b/bsp/stm32/stm32f103-hw100k-ibox/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32f103-hw100k-ibox/board/SConscript b/bsp/stm32/stm32f103-hw100k-ibox/board/SConscript index 13f739b069f..2066d1c0b79 100644 --- a/bsp/stm32/stm32f103-hw100k-ibox/board/SConscript +++ b/bsp/stm32/stm32f103-hw100k-ibox/board/SConscript @@ -32,12 +32,6 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/iar/startup_stm32f103xe.s'] -# STM32F100xB || STM32F100xE || STM32F101x6 -# STM32F101xB || STM32F101xE || STM32F101xG -# STM32F102x6 || STM32F102xB || STM32F103x6 -# STM32F103xB || STM32F103xE || STM32F103xG -# STM32F105xC || STM32F107xC) -# You can select chips from the list above -CPPDEFINES = ['STM32F103xE'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) + +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32f103-onenet-nbiot/SConscript b/bsp/stm32/stm32f103-onenet-nbiot/SConscript index 20f7689c53c..fd7413e878d 100644 --- a/bsp/stm32/stm32f103-onenet-nbiot/SConscript +++ b/bsp/stm32/stm32f103-onenet-nbiot/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32F103xE']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f103-onenet-nbiot/SConstruct b/bsp/stm32/stm32f103-onenet-nbiot/SConstruct index 2c06ce2b62e..624d7385482 100644 --- a/bsp/stm32/stm32f103-onenet-nbiot/SConstruct +++ b/bsp/stm32/stm32f103-onenet-nbiot/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32f103-onenet-nbiot/board/SConscript b/bsp/stm32/stm32f103-onenet-nbiot/board/SConscript index 21d385d7d9f..d6ea4fdffc6 100644 --- a/bsp/stm32/stm32f103-onenet-nbiot/board/SConscript +++ b/bsp/stm32/stm32f103-onenet-nbiot/board/SConscript @@ -27,6 +27,5 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/iar/startup_stm32f103xe.s'] -CPPDEFINES = ['STM32F103xE'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32f103-yf-ufun/SConscript b/bsp/stm32/stm32f103-yf-ufun/SConscript index 20f7689c53c..223d1412034 100644 --- a/bsp/stm32/stm32f103-yf-ufun/SConscript +++ b/bsp/stm32/stm32f103-yf-ufun/SConscript @@ -1,12 +1,21 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +# STM32F100xB || STM32F100xE || STM32F101x6 +# STM32F101xB || STM32F101xE || STM32F101xG +# STM32F102x6 || STM32F102xB || STM32F103x6 +# STM32F103xB || STM32F103xE || STM32F103xG +# STM32F105xC || STM32F107xC) +# You can select chips from the list above +env.Append(CPPDEFINES = ['STM32F103xE']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f103-yf-ufun/SConstruct b/bsp/stm32/stm32f103-yf-ufun/SConstruct index 2c06ce2b62e..624d7385482 100644 --- a/bsp/stm32/stm32f103-yf-ufun/SConstruct +++ b/bsp/stm32/stm32f103-yf-ufun/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32f103-yf-ufun/board/SConscript b/bsp/stm32/stm32f103-yf-ufun/board/SConscript index 2610c2e3abb..b5c497626dc 100644 --- a/bsp/stm32/stm32f103-yf-ufun/board/SConscript +++ b/bsp/stm32/stm32f103-yf-ufun/board/SConscript @@ -24,12 +24,5 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/iar/startup_stm32f103xe.s'] -# STM32F100xB || STM32F100xE || STM32F101x6 -# STM32F101xB || STM32F101xE || STM32F101xG -# STM32F102x6 || STM32F102xB || STM32F103x6 -# STM32F103xB || STM32F103xE || STM32F103xG -# STM32F105xC || STM32F107xC) -# You can select chips from the list above -CPPDEFINES = ['STM32F103xE'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32f103-ys-f1pro/SConscript b/bsp/stm32/stm32f103-ys-f1pro/SConscript index 20f7689c53c..223d1412034 100644 --- a/bsp/stm32/stm32f103-ys-f1pro/SConscript +++ b/bsp/stm32/stm32f103-ys-f1pro/SConscript @@ -1,12 +1,21 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +# STM32F100xB || STM32F100xE || STM32F101x6 +# STM32F101xB || STM32F101xE || STM32F101xG +# STM32F102x6 || STM32F102xB || STM32F103x6 +# STM32F103xB || STM32F103xE || STM32F103xG +# STM32F105xC || STM32F107xC) +# You can select chips from the list above +env.Append(CPPDEFINES = ['STM32F103xE']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f103-ys-f1pro/SConstruct b/bsp/stm32/stm32f103-ys-f1pro/SConstruct index 2c06ce2b62e..624d7385482 100644 --- a/bsp/stm32/stm32f103-ys-f1pro/SConstruct +++ b/bsp/stm32/stm32f103-ys-f1pro/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32f103-ys-f1pro/board/SConscript b/bsp/stm32/stm32f103-ys-f1pro/board/SConscript index 2610c2e3abb..b5c497626dc 100644 --- a/bsp/stm32/stm32f103-ys-f1pro/board/SConscript +++ b/bsp/stm32/stm32f103-ys-f1pro/board/SConscript @@ -24,12 +24,5 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/iar/startup_stm32f103xe.s'] -# STM32F100xB || STM32F100xE || STM32F101x6 -# STM32F101xB || STM32F101xE || STM32F101xG -# STM32F102x6 || STM32F102xB || STM32F103x6 -# STM32F103xB || STM32F103xE || STM32F103xG -# STM32F105xC || STM32F107xC) -# You can select chips from the list above -CPPDEFINES = ['STM32F103xE'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32f107-uc-eval/SConscript b/bsp/stm32/stm32f107-uc-eval/SConscript index 20f7689c53c..9ab824e7e11 100644 --- a/bsp/stm32/stm32f107-uc-eval/SConscript +++ b/bsp/stm32/stm32f107-uc-eval/SConscript @@ -1,12 +1,21 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +# STM32F100xB || STM32F100xE || STM32F101x6 +# STM32F101xB || STM32F101xE || STM32F101xG +# STM32F102x6 || STM32F102xB || STM32F103x6 +# STM32F103xB || STM32F103xE || STM32F103xG +# STM32F105xC || STM32F107xC) +# You can select chips from the list above +env.Append(CPPDEFINES = ['STM32F107xC']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f107-uc-eval/SConstruct b/bsp/stm32/stm32f107-uc-eval/SConstruct index 2c06ce2b62e..624d7385482 100644 --- a/bsp/stm32/stm32f107-uc-eval/SConstruct +++ b/bsp/stm32/stm32f107-uc-eval/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32f107-uc-eval/board/SConscript b/bsp/stm32/stm32f107-uc-eval/board/SConscript index 2caf5e4c6b6..00c00b57bcc 100644 --- a/bsp/stm32/stm32f107-uc-eval/board/SConscript +++ b/bsp/stm32/stm32f107-uc-eval/board/SConscript @@ -24,12 +24,5 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/iar/startup_stm32f107xc.s'] -# STM32F100xB || STM32F100xE || STM32F101x6 -# STM32F101xB || STM32F101xE || STM32F101xG -# STM32F102x6 || STM32F102xB || STM32F103x6 -# STM32F103xB || STM32F103xE || STM32F103xG -# STM32F105xC || STM32F107xC) -# You can select chips from the list above -CPPDEFINES = ['STM32F107xC'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32f207-st-nucleo/SConscript b/bsp/stm32/stm32f207-st-nucleo/SConscript index 20f7689c53c..145a021ecf1 100644 --- a/bsp/stm32/stm32f207-st-nucleo/SConscript +++ b/bsp/stm32/stm32f207-st-nucleo/SConscript @@ -1,12 +1,18 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +# STM32F205xx || STM32F207xx || STM32F215xx +# STM32F217xx +# You can select chips from the list above +env.Append(CPPDEFINES = ['STM32F207xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f207-st-nucleo/SConstruct b/bsp/stm32/stm32f207-st-nucleo/SConstruct index 00e3996b8ff..634b52233a8 100644 --- a/bsp/stm32/stm32f207-st-nucleo/SConstruct +++ b/bsp/stm32/stm32f207-st-nucleo/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32f207-st-nucleo/board/SConscript b/bsp/stm32/stm32f207-st-nucleo/board/SConscript index 5c6f42ae45f..53a33c9ef27 100644 --- a/bsp/stm32/stm32f207-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f207-st-nucleo/board/SConscript @@ -24,9 +24,5 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F2xx_HAL/CMSIS/Device/ST/STM32F2xx/Source/Templates/iar/startup_stm32f207xx.s'] -# STM32F205xx || STM32F207xx || STM32F215xx -# STM32F217xx -# You can select chips from the list above -CPPDEFINES = ['STM32F207xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32f302-st-nucleo/SConscript b/bsp/stm32/stm32f302-st-nucleo/SConscript index 20f7689c53c..3be2b7b9617 100644 --- a/bsp/stm32/stm32f302-st-nucleo/SConscript +++ b/bsp/stm32/stm32f302-st-nucleo/SConscript @@ -1,12 +1,21 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +# (STM32F301x8) || (STM32F302x8) || (STM32F318xx) +# (STM32F302xC) || (STM32F303xC) || (STM32F358xx) +# (STM32F303x8) || (STM32F334x8) || (STM32F328xx) +# (STM32F302xE) || (STM32F303xE) || (STM32F398xx) +# (STM32F373xC) || (STM32F378xx) +# You can select chips from the list above +env.Append(CPPDEFINES = ['STM32F302x8']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f302-st-nucleo/SConstruct b/bsp/stm32/stm32f302-st-nucleo/SConstruct index bd081c25437..b75d4164def 100644 --- a/bsp/stm32/stm32f302-st-nucleo/SConstruct +++ b/bsp/stm32/stm32f302-st-nucleo/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32f302-st-nucleo/board/SConscript b/bsp/stm32/stm32f302-st-nucleo/board/SConscript index b1ae4b014ad..accadeb4593 100644 --- a/bsp/stm32/stm32f302-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f302-st-nucleo/board/SConscript @@ -24,13 +24,6 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F3xx_HAL/CMSIS/Device/ST/STM32F3xx/Source/Templates/iar/startup_stm32f302x8.s'] -# (STM32F301x8) || (STM32F302x8) || (STM32F318xx) -# (STM32F302xC) || (STM32F303xC) || (STM32F358xx) -# (STM32F303x8) || (STM32F334x8) || (STM32F328xx) -# (STM32F302xE) || (STM32F303xE) || (STM32F398xx) -# (STM32F373xC) || (STM32F378xx) -# You can select chips from the list above -CPPDEFINES = ['STM32F302x8'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32f334-st-nucleo/SConscript b/bsp/stm32/stm32f334-st-nucleo/SConscript index 20f7689c53c..8449f65a782 100644 --- a/bsp/stm32/stm32f334-st-nucleo/SConscript +++ b/bsp/stm32/stm32f334-st-nucleo/SConscript @@ -1,12 +1,21 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +# (STM32F301x8) || (STM32F302x8) || (STM32F318xx) +# (STM32F302xC) || (STM32F303xC) || (STM32F358xx) +# (STM32F303x8) || (STM32F334x8) || (STM32F328xx) +# (STM32F302xE) || (STM32F303xE) || (STM32F398xx) +# (STM32F373xC) || (STM32F378xx) +# You can select chips from the list above +env.Append(CPPDEFINES = ['STM32F334x8']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f334-st-nucleo/SConstruct b/bsp/stm32/stm32f334-st-nucleo/SConstruct index 854b5c11679..bb06de96922 100644 --- a/bsp/stm32/stm32f334-st-nucleo/SConstruct +++ b/bsp/stm32/stm32f334-st-nucleo/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32f334-st-nucleo/board/SConscript b/bsp/stm32/stm32f334-st-nucleo/board/SConscript index 36d8832431a..85846e376f2 100644 --- a/bsp/stm32/stm32f334-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f334-st-nucleo/board/SConscript @@ -24,13 +24,6 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F3xx_HAL/CMSIS/Device/ST/STM32F3xx/Source/Templates/iar/startup_stm32f334x8.s'] -# (STM32F301x8) || (STM32F302x8) || (STM32F318xx) -# (STM32F302xC) || (STM32F303xC) || (STM32F358xx) -# (STM32F303x8) || (STM32F334x8) || (STM32F328xx) -# (STM32F302xE) || (STM32F303xE) || (STM32F398xx) -# (STM32F373xC) || (STM32F378xx) -# You can select chips from the list above -CPPDEFINES = ['STM32F334x8'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32f401-st-nucleo/SConscript b/bsp/stm32/stm32f401-st-nucleo/SConscript index 20f7689c53c..61b801f1909 100644 --- a/bsp/stm32/stm32f401-st-nucleo/SConscript +++ b/bsp/stm32/stm32f401-st-nucleo/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32F401xE']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f401-st-nucleo/board/SConscript b/bsp/stm32/stm32f401-st-nucleo/board/SConscript index c0a4332e261..704b05a6c35 100644 --- a/bsp/stm32/stm32f401-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f401-st-nucleo/board/SConscript @@ -11,8 +11,7 @@ CubeMX_Config/Src/stm32f4xx_hal_msp.c path = [cwd] path += [os.path.join(cwd, 'CubeMX_Config', 'Inc')] -CPPDEFINES = ['STM32F401xE'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) # if os.path.isfile(os.path.join(cwd, "ports", 'SConscript')): diff --git a/bsp/stm32/stm32f401-weact-blackpill/SConscript b/bsp/stm32/stm32f401-weact-blackpill/SConscript index 20f7689c53c..8bfb7539641 100644 --- a/bsp/stm32/stm32f401-weact-blackpill/SConscript +++ b/bsp/stm32/stm32f401-weact-blackpill/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32F401xC']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f401-weact-blackpill/board/SConscript b/bsp/stm32/stm32f401-weact-blackpill/board/SConscript index 5d076391920..20d0767c4f9 100644 --- a/bsp/stm32/stm32f401-weact-blackpill/board/SConscript +++ b/bsp/stm32/stm32f401-weact-blackpill/board/SConscript @@ -12,8 +12,7 @@ path = [cwd] path += [os.path.join(cwd, 'CubeMX_Config', 'Inc')] -CPPDEFINES = ['STM32F401xC'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) # if os.path.isfile(os.path.join(cwd, "ports", 'SConscript')): diff --git a/bsp/stm32/stm32f405-smdz-breadfruit/SConscript b/bsp/stm32/stm32f405-smdz-breadfruit/SConscript index 20f7689c53c..67da5463c4e 100644 --- a/bsp/stm32/stm32f405-smdz-breadfruit/SConscript +++ b/bsp/stm32/stm32f405-smdz-breadfruit/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32F405xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f405-smdz-breadfruit/board/SConscript b/bsp/stm32/stm32f405-smdz-breadfruit/board/SConscript index af64fa112f3..70636ff83df 100644 --- a/bsp/stm32/stm32f405-smdz-breadfruit/board/SConscript +++ b/bsp/stm32/stm32f405-smdz-breadfruit/board/SConscript @@ -13,8 +13,7 @@ path = [cwd] path += [os.path.join(cwd, 'CubeMX_Config', 'Inc')] -CPPDEFINES = ['STM32F405xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) # if os.path.isfile(os.path.join(cwd, "ports", 'SConscript')): diff --git a/bsp/stm32/stm32f405zg-mini-template/SConscript b/bsp/stm32/stm32f405zg-mini-template/SConscript index 20f7689c53c..67da5463c4e 100644 --- a/bsp/stm32/stm32f405zg-mini-template/SConscript +++ b/bsp/stm32/stm32f405zg-mini-template/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32F405xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f405zg-mini-template/board/SConscript b/bsp/stm32/stm32f405zg-mini-template/board/SConscript index 99029de0166..20d0767c4f9 100644 --- a/bsp/stm32/stm32f405zg-mini-template/board/SConscript +++ b/bsp/stm32/stm32f405zg-mini-template/board/SConscript @@ -11,8 +11,8 @@ CubeMX_Config/Src/stm32f4xx_hal_msp.c path = [cwd] path += [os.path.join(cwd, 'CubeMX_Config', 'Inc')] -CPPDEFINES = ['STM32F405xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) + +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) # if os.path.isfile(os.path.join(cwd, "ports", 'SConscript')): diff --git a/bsp/stm32/stm32f407-armfly-v5/SConscript b/bsp/stm32/stm32f407-armfly-v5/SConscript index 20f7689c53c..8b60e68b22d 100644 --- a/bsp/stm32/stm32f407-armfly-v5/SConscript +++ b/bsp/stm32/stm32f407-armfly-v5/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32F407xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f407-armfly-v5/board/SConscript b/bsp/stm32/stm32f407-armfly-v5/board/SConscript index 256f5d728f0..704b05a6c35 100644 --- a/bsp/stm32/stm32f407-armfly-v5/board/SConscript +++ b/bsp/stm32/stm32f407-armfly-v5/board/SConscript @@ -11,8 +11,7 @@ CubeMX_Config/Src/stm32f4xx_hal_msp.c path = [cwd] path += [os.path.join(cwd, 'CubeMX_Config', 'Inc')] -CPPDEFINES = ['STM32F407xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) # if os.path.isfile(os.path.join(cwd, "ports", 'SConscript')): diff --git a/bsp/stm32/stm32f407-atk-explorer/SConscript b/bsp/stm32/stm32f407-atk-explorer/SConscript index 20f7689c53c..8b60e68b22d 100644 --- a/bsp/stm32/stm32f407-atk-explorer/SConscript +++ b/bsp/stm32/stm32f407-atk-explorer/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32F407xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f407-atk-explorer/board/SConscript b/bsp/stm32/stm32f407-atk-explorer/board/SConscript index 256f5d728f0..704b05a6c35 100644 --- a/bsp/stm32/stm32f407-atk-explorer/board/SConscript +++ b/bsp/stm32/stm32f407-atk-explorer/board/SConscript @@ -11,8 +11,7 @@ CubeMX_Config/Src/stm32f4xx_hal_msp.c path = [cwd] path += [os.path.join(cwd, 'CubeMX_Config', 'Inc')] -CPPDEFINES = ['STM32F407xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) # if os.path.isfile(os.path.join(cwd, "ports", 'SConscript')): diff --git a/bsp/stm32/stm32f407-fk407m2-zgt6/SConscript b/bsp/stm32/stm32f407-fk407m2-zgt6/SConscript index 20f7689c53c..8b60e68b22d 100644 --- a/bsp/stm32/stm32f407-fk407m2-zgt6/SConscript +++ b/bsp/stm32/stm32f407-fk407m2-zgt6/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32F407xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f407-fk407m2-zgt6/board/SConscript b/bsp/stm32/stm32f407-fk407m2-zgt6/board/SConscript index 256f5d728f0..704b05a6c35 100644 --- a/bsp/stm32/stm32f407-fk407m2-zgt6/board/SConscript +++ b/bsp/stm32/stm32f407-fk407m2-zgt6/board/SConscript @@ -11,8 +11,7 @@ CubeMX_Config/Src/stm32f4xx_hal_msp.c path = [cwd] path += [os.path.join(cwd, 'CubeMX_Config', 'Inc')] -CPPDEFINES = ['STM32F407xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) # if os.path.isfile(os.path.join(cwd, "ports", 'SConscript')): diff --git a/bsp/stm32/stm32f407-lckfb-skystar/SConscript b/bsp/stm32/stm32f407-lckfb-skystar/SConscript index 20f7689c53c..8b60e68b22d 100644 --- a/bsp/stm32/stm32f407-lckfb-skystar/SConscript +++ b/bsp/stm32/stm32f407-lckfb-skystar/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32F407xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f407-lckfb-skystar/board/SConscript b/bsp/stm32/stm32f407-lckfb-skystar/board/SConscript index 256f5d728f0..704b05a6c35 100644 --- a/bsp/stm32/stm32f407-lckfb-skystar/board/SConscript +++ b/bsp/stm32/stm32f407-lckfb-skystar/board/SConscript @@ -11,8 +11,7 @@ CubeMX_Config/Src/stm32f4xx_hal_msp.c path = [cwd] path += [os.path.join(cwd, 'CubeMX_Config', 'Inc')] -CPPDEFINES = ['STM32F407xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) # if os.path.isfile(os.path.join(cwd, "ports", 'SConscript')): diff --git a/bsp/stm32/stm32f407-robomaster-c/SConscript b/bsp/stm32/stm32f407-robomaster-c/SConscript index 20f7689c53c..8b60e68b22d 100644 --- a/bsp/stm32/stm32f407-robomaster-c/SConscript +++ b/bsp/stm32/stm32f407-robomaster-c/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32F407xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f407-robomaster-c/board/SConscript b/bsp/stm32/stm32f407-robomaster-c/board/SConscript index 256f5d728f0..704b05a6c35 100644 --- a/bsp/stm32/stm32f407-robomaster-c/board/SConscript +++ b/bsp/stm32/stm32f407-robomaster-c/board/SConscript @@ -11,8 +11,7 @@ CubeMX_Config/Src/stm32f4xx_hal_msp.c path = [cwd] path += [os.path.join(cwd, 'CubeMX_Config', 'Inc')] -CPPDEFINES = ['STM32F407xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) # if os.path.isfile(os.path.join(cwd, "ports", 'SConscript')): diff --git a/bsp/stm32/stm32f407-rt-spark/SConscript b/bsp/stm32/stm32f407-rt-spark/SConscript index 20f7689c53c..6d6add679fc 100644 --- a/bsp/stm32/stm32f407-rt-spark/SConscript +++ b/bsp/stm32/stm32f407-rt-spark/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES=['STM32F407xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f407-st-discovery/SConscript b/bsp/stm32/stm32f407-st-discovery/SConscript index 20f7689c53c..8b60e68b22d 100644 --- a/bsp/stm32/stm32f407-st-discovery/SConscript +++ b/bsp/stm32/stm32f407-st-discovery/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32F407xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f407-st-discovery/board/SConscript b/bsp/stm32/stm32f407-st-discovery/board/SConscript index 9e93bfd2f54..48396d0bde9 100644 --- a/bsp/stm32/stm32f407-st-discovery/board/SConscript +++ b/bsp/stm32/stm32f407-st-discovery/board/SConscript @@ -12,8 +12,7 @@ CubeMX_Config/Src/stm32f4xx_hal_msp.c path = [cwd] path += [os.path.join(cwd, 'CubeMX_Config', 'Inc')] -CPPDEFINES = ['STM32F407xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) # if os.path.isfile(os.path.join(cwd, "ports", 'SConscript')): diff --git a/bsp/stm32/stm32f410-st-nucleo/SConscript b/bsp/stm32/stm32f410-st-nucleo/SConscript index 20f7689c53c..becd3db8005 100644 --- a/bsp/stm32/stm32f410-st-nucleo/SConscript +++ b/bsp/stm32/stm32f410-st-nucleo/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32F410Rx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f410-st-nucleo/board/SConscript b/bsp/stm32/stm32f410-st-nucleo/board/SConscript index 080dca60bc1..704b05a6c35 100644 --- a/bsp/stm32/stm32f410-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f410-st-nucleo/board/SConscript @@ -11,8 +11,7 @@ CubeMX_Config/Src/stm32f4xx_hal_msp.c path = [cwd] path += [os.path.join(cwd, 'CubeMX_Config', 'Inc')] -CPPDEFINES = ['STM32F410Rx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) # if os.path.isfile(os.path.join(cwd, "ports", 'SConscript')): diff --git a/bsp/stm32/stm32f411-atk-nano/SConscript b/bsp/stm32/stm32f411-atk-nano/SConscript index 20f7689c53c..78f4ac01b68 100644 --- a/bsp/stm32/stm32f411-atk-nano/SConscript +++ b/bsp/stm32/stm32f411-atk-nano/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32F411xE']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f411-atk-nano/board/SConscript b/bsp/stm32/stm32f411-atk-nano/board/SConscript index 59eb0f7777f..704b05a6c35 100644 --- a/bsp/stm32/stm32f411-atk-nano/board/SConscript +++ b/bsp/stm32/stm32f411-atk-nano/board/SConscript @@ -11,8 +11,7 @@ CubeMX_Config/Src/stm32f4xx_hal_msp.c path = [cwd] path += [os.path.join(cwd, 'CubeMX_Config', 'Inc')] -CPPDEFINES = ['STM32F411xE'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) # if os.path.isfile(os.path.join(cwd, "ports", 'SConscript')): diff --git a/bsp/stm32/stm32f411-st-nucleo/SConscript b/bsp/stm32/stm32f411-st-nucleo/SConscript index 20f7689c53c..78f4ac01b68 100644 --- a/bsp/stm32/stm32f411-st-nucleo/SConscript +++ b/bsp/stm32/stm32f411-st-nucleo/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32F411xE']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f411-st-nucleo/board/SConscript b/bsp/stm32/stm32f411-st-nucleo/board/SConscript index e4198980ec0..20d0767c4f9 100644 --- a/bsp/stm32/stm32f411-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f411-st-nucleo/board/SConscript @@ -12,8 +12,7 @@ path = [cwd] path += [os.path.join(cwd, 'CubeMX_Config', 'Inc')] -CPPDEFINES = ['STM32F411xE'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) # if os.path.isfile(os.path.join(cwd, "ports", 'SConscript')): diff --git a/bsp/stm32/stm32f411-weact-blackpill/SConscript b/bsp/stm32/stm32f411-weact-blackpill/SConscript index 20f7689c53c..78f4ac01b68 100644 --- a/bsp/stm32/stm32f411-weact-blackpill/SConscript +++ b/bsp/stm32/stm32f411-weact-blackpill/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32F411xE']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f411-weact-blackpill/board/SConscript b/bsp/stm32/stm32f411-weact-blackpill/board/SConscript index e4198980ec0..704b05a6c35 100644 --- a/bsp/stm32/stm32f411-weact-blackpill/board/SConscript +++ b/bsp/stm32/stm32f411-weact-blackpill/board/SConscript @@ -11,9 +11,7 @@ CubeMX_Config/Src/stm32f4xx_hal_msp.c path = [cwd] path += [os.path.join(cwd, 'CubeMX_Config', 'Inc')] - -CPPDEFINES = ['STM32F411xE'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) # if os.path.isfile(os.path.join(cwd, "ports", 'SConscript')): diff --git a/bsp/stm32/stm32f412-st-nucleo/SConscript b/bsp/stm32/stm32f412-st-nucleo/SConscript index 20f7689c53c..f0c3858a243 100644 --- a/bsp/stm32/stm32f412-st-nucleo/SConscript +++ b/bsp/stm32/stm32f412-st-nucleo/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32F412Zx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f412-st-nucleo/board/SConscript b/bsp/stm32/stm32f412-st-nucleo/board/SConscript index 033eaabb4ce..0d0e3bb7ebf 100644 --- a/bsp/stm32/stm32f412-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f412-st-nucleo/board/SConscript @@ -12,8 +12,8 @@ path = [cwd] path += [os.path.join(cwd, 'CubeMX_Config', 'Inc')] -CPPDEFINES = ['STM32F412Zx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) + +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) # if os.path.isfile(os.path.join(cwd, "ports", 'SConscript')): diff --git a/bsp/stm32/stm32f413-st-nucleo/SConscript b/bsp/stm32/stm32f413-st-nucleo/SConscript index 20f7689c53c..6b7428bdc43 100644 --- a/bsp/stm32/stm32f413-st-nucleo/SConscript +++ b/bsp/stm32/stm32f413-st-nucleo/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32F413xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f413-st-nucleo/board/SConscript b/bsp/stm32/stm32f413-st-nucleo/board/SConscript index 2858b20342b..20d0767c4f9 100644 --- a/bsp/stm32/stm32f413-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f413-st-nucleo/board/SConscript @@ -12,8 +12,7 @@ path = [cwd] path += [os.path.join(cwd, 'CubeMX_Config', 'Inc')] -CPPDEFINES = ['STM32F413xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) # if os.path.isfile(os.path.join(cwd, "ports", 'SConscript')): diff --git a/bsp/stm32/stm32f427-robomaster-a/SConscript b/bsp/stm32/stm32f427-robomaster-a/SConscript index 20f7689c53c..89458b6aba8 100644 --- a/bsp/stm32/stm32f427-robomaster-a/SConscript +++ b/bsp/stm32/stm32f427-robomaster-a/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32F427xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f427-robomaster-a/board/SConscript b/bsp/stm32/stm32f427-robomaster-a/board/SConscript index 948d480c6c8..20d0767c4f9 100644 --- a/bsp/stm32/stm32f427-robomaster-a/board/SConscript +++ b/bsp/stm32/stm32f427-robomaster-a/board/SConscript @@ -12,8 +12,7 @@ path = [cwd] path += [os.path.join(cwd, 'CubeMX_Config', 'Inc')] -CPPDEFINES = ['STM32F427xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) # if os.path.isfile(os.path.join(cwd, "ports", 'SConscript')): diff --git a/bsp/stm32/stm32f429-armfly-v6/SConscript b/bsp/stm32/stm32f429-armfly-v6/SConscript index 20f7689c53c..c43dd39772c 100644 --- a/bsp/stm32/stm32f429-armfly-v6/SConscript +++ b/bsp/stm32/stm32f429-armfly-v6/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32F429xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f429-armfly-v6/board/SConscript b/bsp/stm32/stm32f429-armfly-v6/board/SConscript index 23c8ecb0b06..9a00f3fa7e7 100644 --- a/bsp/stm32/stm32f429-armfly-v6/board/SConscript +++ b/bsp/stm32/stm32f429-armfly-v6/board/SConscript @@ -11,7 +11,6 @@ CubeMX_Config/Src/stm32f4xx_hal_msp.c path = [cwd] path += [os.path.join(cwd, 'CubeMX_Config', 'Inc')] -CPPDEFINES = ['STM32F429xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32f429-atk-apollo/SConscript b/bsp/stm32/stm32f429-atk-apollo/SConscript index 20f7689c53c..c43dd39772c 100644 --- a/bsp/stm32/stm32f429-atk-apollo/SConscript +++ b/bsp/stm32/stm32f429-atk-apollo/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32F429xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f429-atk-apollo/board/SConscript b/bsp/stm32/stm32f429-atk-apollo/board/SConscript index 2aea8842433..bf5a2e05ae2 100644 --- a/bsp/stm32/stm32f429-atk-apollo/board/SConscript +++ b/bsp/stm32/stm32f429-atk-apollo/board/SConscript @@ -11,8 +11,7 @@ CubeMX_Config/Src/stm32f4xx_hal_msp.c path = [cwd] path += [os.path.join(cwd, 'CubeMX_Config', 'Inc')] -CPPDEFINES = ['STM32F429xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) # if os.path.isfile(os.path.join(cwd, "ports", 'SConscript')): # group = group + SConscript(os.path.join("ports", 'SConscript')) diff --git a/bsp/stm32/stm32f429-fire-challenger/SConscript b/bsp/stm32/stm32f429-fire-challenger/SConscript index 20f7689c53c..c43dd39772c 100644 --- a/bsp/stm32/stm32f429-fire-challenger/SConscript +++ b/bsp/stm32/stm32f429-fire-challenger/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32F429xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f429-fire-challenger/board/SConscript b/bsp/stm32/stm32f429-fire-challenger/board/SConscript index 9157b466ed0..191b75a3091 100644 --- a/bsp/stm32/stm32f429-fire-challenger/board/SConscript +++ b/bsp/stm32/stm32f429-fire-challenger/board/SConscript @@ -12,8 +12,7 @@ CubeMX_Config/Src/stm32f4xx_hal_msp.c path = [cwd] path += [os.path.join(cwd, 'CubeMX_Config', 'Inc')] -CPPDEFINES = ['STM32F429xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) # if os.path.isfile(os.path.join(cwd, "ports", 'SConscript')): # group = group + SConscript(os.path.join("ports", 'SConscript')) diff --git a/bsp/stm32/stm32f429-st-disco/SConscript b/bsp/stm32/stm32f429-st-disco/SConscript index 20f7689c53c..c43dd39772c 100644 --- a/bsp/stm32/stm32f429-st-disco/SConscript +++ b/bsp/stm32/stm32f429-st-disco/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32F429xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f429-st-disco/board/SConscript b/bsp/stm32/stm32f429-st-disco/board/SConscript index df8b106fd23..ef508d39a8e 100644 --- a/bsp/stm32/stm32f429-st-disco/board/SConscript +++ b/bsp/stm32/stm32f429-st-disco/board/SConscript @@ -12,8 +12,7 @@ path = [cwd] path += [os.path.join(cwd, 'CubeMX_Config', 'Inc')] -CPPDEFINES = ['STM32F429xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) # if os.path.isfile(os.path.join(cwd, "ports", 'SConscript')): # group = group + SConscript(os.path.join("ports", 'SConscript')) diff --git a/bsp/stm32/stm32f446-st-nucleo/SConscript b/bsp/stm32/stm32f446-st-nucleo/SConscript index 20f7689c53c..a2d6991903f 100644 --- a/bsp/stm32/stm32f446-st-nucleo/SConscript +++ b/bsp/stm32/stm32f446-st-nucleo/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32F446xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f446-st-nucleo/board/SConscript b/bsp/stm32/stm32f446-st-nucleo/board/SConscript index ee911afbac7..ef508d39a8e 100644 --- a/bsp/stm32/stm32f446-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f446-st-nucleo/board/SConscript @@ -12,8 +12,7 @@ path = [cwd] path += [os.path.join(cwd, 'CubeMX_Config', 'Inc')] -CPPDEFINES = ['STM32F446xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) # if os.path.isfile(os.path.join(cwd, "ports", 'SConscript')): # group = group + SConscript(os.path.join("ports", 'SConscript')) diff --git a/bsp/stm32/stm32f469-st-disco/SConscript b/bsp/stm32/stm32f469-st-disco/SConscript index 20f7689c53c..5eed18be832 100644 --- a/bsp/stm32/stm32f469-st-disco/SConscript +++ b/bsp/stm32/stm32f469-st-disco/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32F469xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f469-st-disco/board/SConscript b/bsp/stm32/stm32f469-st-disco/board/SConscript index f0c297c6994..bf5a2e05ae2 100644 --- a/bsp/stm32/stm32f469-st-disco/board/SConscript +++ b/bsp/stm32/stm32f469-st-disco/board/SConscript @@ -11,8 +11,7 @@ CubeMX_Config/Src/stm32f4xx_hal_msp.c path = [cwd] path += [os.path.join(cwd, 'CubeMX_Config', 'Inc')] -CPPDEFINES = ['STM32F469xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) # if os.path.isfile(os.path.join(cwd, "ports", 'SConscript')): # group = group + SConscript(os.path.join("ports", 'SConscript')) diff --git a/bsp/stm32/stm32f723-st-disco/SConscript b/bsp/stm32/stm32f723-st-disco/SConscript index 20f7689c53c..1c9f9a8d24f 100644 --- a/bsp/stm32/stm32f723-st-disco/SConscript +++ b/bsp/stm32/stm32f723-st-disco/SConscript @@ -1,12 +1,19 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +# STM32F756xx || STM32F746xx || STM32F745xx || STM32F767xx || +# STM32F769xx || STM32F777xx || STM32F779xx || STM32F722xx || +# STM32F723xx || STM32F732xx || STM32F733xx || STM32F730xx || STM32F750xx +# You can select chips from the list above +env.Append(CPPDEFINES = ['STM32F723xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f723-st-disco/SConstruct b/bsp/stm32/stm32f723-st-disco/SConstruct index 6d05480e483..18916aa55c2 100644 --- a/bsp/stm32/stm32f723-st-disco/SConstruct +++ b/bsp/stm32/stm32f723-st-disco/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32f723-st-disco/board/SConscript b/bsp/stm32/stm32f723-st-disco/board/SConscript index b050910c60b..d36aec371d8 100644 --- a/bsp/stm32/stm32f723-st-disco/board/SConscript +++ b/bsp/stm32/stm32f723-st-disco/board/SConscript @@ -22,11 +22,6 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/iar/startup_stm32f723xx.s'] -# STM32F756xx || STM32F746xx || STM32F745xx || STM32F767xx || -# STM32F769xx || STM32F777xx || STM32F779xx || STM32F722xx || -# STM32F723xx || STM32F732xx || STM32F733xx || STM32F730xx || STM32F750xx -# You can select chips from the list above -CPPDEFINES = ['STM32F723xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32f746-st-disco/SConscript b/bsp/stm32/stm32f746-st-disco/SConscript index 20f7689c53c..40a1c5e3dd7 100644 --- a/bsp/stm32/stm32f746-st-disco/SConscript +++ b/bsp/stm32/stm32f746-st-disco/SConscript @@ -1,12 +1,19 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +# STM32F756xx || STM32F746xx || STM32F745xx || STM32F767xx || +# STM32F769xx || STM32F777xx || STM32F779xx || STM32F722xx || +# STM32F723xx || STM32F732xx || STM32F733xx || STM32F730xx || STM32F750xx +# You can select chips from the list above +env.Append(CPPDEFINES = ['STM32F746xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f746-st-disco/SConstruct b/bsp/stm32/stm32f746-st-disco/SConstruct index 6d05480e483..18916aa55c2 100644 --- a/bsp/stm32/stm32f746-st-disco/SConstruct +++ b/bsp/stm32/stm32f746-st-disco/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32f746-st-disco/board/SConscript b/bsp/stm32/stm32f746-st-disco/board/SConscript index 81f55fb0af4..dfbd76f338a 100644 --- a/bsp/stm32/stm32f746-st-disco/board/SConscript +++ b/bsp/stm32/stm32f746-st-disco/board/SConscript @@ -31,11 +31,6 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/iar/startup_stm32f746xx.s'] -# STM32F756xx || STM32F746xx || STM32F745xx || STM32F767xx || -# STM32F769xx || STM32F777xx || STM32F779xx || STM32F722xx || -# STM32F723xx || STM32F732xx || STM32F733xx || STM32F730xx || STM32F750xx -# You can select chips from the list above -CPPDEFINES = ['STM32F746xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32f746-st-nucleo/SConscript b/bsp/stm32/stm32f746-st-nucleo/SConscript index 20f7689c53c..40a1c5e3dd7 100644 --- a/bsp/stm32/stm32f746-st-nucleo/SConscript +++ b/bsp/stm32/stm32f746-st-nucleo/SConscript @@ -1,12 +1,19 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +# STM32F756xx || STM32F746xx || STM32F745xx || STM32F767xx || +# STM32F769xx || STM32F777xx || STM32F779xx || STM32F722xx || +# STM32F723xx || STM32F732xx || STM32F733xx || STM32F730xx || STM32F750xx +# You can select chips from the list above +env.Append(CPPDEFINES = ['STM32F746xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f746-st-nucleo/SConstruct b/bsp/stm32/stm32f746-st-nucleo/SConstruct index 6d05480e483..18916aa55c2 100644 --- a/bsp/stm32/stm32f746-st-nucleo/SConstruct +++ b/bsp/stm32/stm32f746-st-nucleo/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32f746-st-nucleo/board/SConscript b/bsp/stm32/stm32f746-st-nucleo/board/SConscript index 9ae63d75b33..b7b968f93de 100644 --- a/bsp/stm32/stm32f746-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f746-st-nucleo/board/SConscript @@ -26,10 +26,5 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/iar/startup_stm32f746xx.s'] -# STM32F756xx || STM32F746xx || STM32F745xx || STM32F767xx || -# STM32F769xx || STM32F777xx || STM32F779xx || STM32F722xx || -# STM32F723xx || STM32F732xx || STM32F733xx || STM32F730xx || STM32F750xx -# You can select chips from the list above -CPPDEFINES = ['STM32F746xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32f767-atk-apollo/SConscript b/bsp/stm32/stm32f767-atk-apollo/SConscript index 20f7689c53c..83d2b3875e1 100644 --- a/bsp/stm32/stm32f767-atk-apollo/SConscript +++ b/bsp/stm32/stm32f767-atk-apollo/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32F767xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f767-atk-apollo/SConstruct b/bsp/stm32/stm32f767-atk-apollo/SConstruct index 6d05480e483..18916aa55c2 100644 --- a/bsp/stm32/stm32f767-atk-apollo/SConstruct +++ b/bsp/stm32/stm32f767-atk-apollo/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32f767-atk-apollo/board/SConscript b/bsp/stm32/stm32f767-atk-apollo/board/SConscript index 064e826fc62..91638d69911 100644 --- a/bsp/stm32/stm32f767-atk-apollo/board/SConscript +++ b/bsp/stm32/stm32f767-atk-apollo/board/SConscript @@ -34,7 +34,6 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/iar/startup_stm32f767xx.s'] -CPPDEFINES = ['STM32F767xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32f767-fire-challenger-v1/SConscript b/bsp/stm32/stm32f767-fire-challenger-v1/SConscript index 20f7689c53c..83d2b3875e1 100644 --- a/bsp/stm32/stm32f767-fire-challenger-v1/SConscript +++ b/bsp/stm32/stm32f767-fire-challenger-v1/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32F767xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f767-fire-challenger-v1/SConstruct b/bsp/stm32/stm32f767-fire-challenger-v1/SConstruct index 6d05480e483..18916aa55c2 100644 --- a/bsp/stm32/stm32f767-fire-challenger-v1/SConstruct +++ b/bsp/stm32/stm32f767-fire-challenger-v1/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32f767-fire-challenger-v1/board/SConscript b/bsp/stm32/stm32f767-fire-challenger-v1/board/SConscript index 064e826fc62..f812cd141ca 100644 --- a/bsp/stm32/stm32f767-fire-challenger-v1/board/SConscript +++ b/bsp/stm32/stm32f767-fire-challenger-v1/board/SConscript @@ -34,7 +34,7 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/iar/startup_stm32f767xx.s'] -CPPDEFINES = ['STM32F767xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) + +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32f767-st-nucleo/SConscript b/bsp/stm32/stm32f767-st-nucleo/SConscript index 20f7689c53c..ef510f9d5e2 100644 --- a/bsp/stm32/stm32f767-st-nucleo/SConscript +++ b/bsp/stm32/stm32f767-st-nucleo/SConscript @@ -1,12 +1,19 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +# STM32F756xx || STM32F746xx || STM32F745xx || STM32F767xx || +# STM32F769xx || STM32F777xx || STM32F779xx || STM32F722xx || +# STM32F723xx || STM32F732xx || STM32F733xx || STM32F730xx || STM32F750xx +# You can select chips from the list above +env.Append(CPPDEFINES = ['STM32F767xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f767-st-nucleo/SConstruct b/bsp/stm32/stm32f767-st-nucleo/SConstruct index 6d05480e483..18916aa55c2 100644 --- a/bsp/stm32/stm32f767-st-nucleo/SConstruct +++ b/bsp/stm32/stm32f767-st-nucleo/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32f767-st-nucleo/board/SConscript b/bsp/stm32/stm32f767-st-nucleo/board/SConscript index 5c9cd14927d..53952e80266 100644 --- a/bsp/stm32/stm32f767-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f767-st-nucleo/board/SConscript @@ -26,10 +26,5 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/iar/startup_stm32f767xx.s'] -# STM32F756xx || STM32F746xx || STM32F745xx || STM32F767xx || -# STM32F769xx || STM32F777xx || STM32F779xx || STM32F722xx || -# STM32F723xx || STM32F732xx || STM32F733xx || STM32F730xx || STM32F750xx -# You can select chips from the list above -CPPDEFINES = ['STM32F767xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32f769-st-disco/SConscript b/bsp/stm32/stm32f769-st-disco/SConscript index 20f7689c53c..7fdb96e2fb4 100644 --- a/bsp/stm32/stm32f769-st-disco/SConscript +++ b/bsp/stm32/stm32f769-st-disco/SConscript @@ -1,12 +1,19 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +# STM32F756xx || STM32F746xx || STM32F745xx || STM32F767xx || +# STM32F769xx || STM32F777xx || STM32F779xx || STM32F722xx || +# STM32F723xx || STM32F732xx || STM32F733xx || STM32F730xx || STM32F750xx +# You can select chips from the list above +env.Append(CPPDEFINES = ['STM32F769xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32f769-st-disco/SConstruct b/bsp/stm32/stm32f769-st-disco/SConstruct index 6d05480e483..18916aa55c2 100644 --- a/bsp/stm32/stm32f769-st-disco/SConstruct +++ b/bsp/stm32/stm32f769-st-disco/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32f769-st-disco/board/SConscript b/bsp/stm32/stm32f769-st-disco/board/SConscript index 02eb6d0b9eb..87ad452d3c1 100644 --- a/bsp/stm32/stm32f769-st-disco/board/SConscript +++ b/bsp/stm32/stm32f769-st-disco/board/SConscript @@ -24,11 +24,6 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/iar/startup_stm32f767xx.s'] -# STM32F756xx || STM32F746xx || STM32F745xx || STM32F767xx || -# STM32F769xx || STM32F777xx || STM32F779xx || STM32F722xx || -# STM32F723xx || STM32F732xx || STM32F733xx || STM32F730xx || STM32F750xx -# You can select chips from the list above -CPPDEFINES = ['STM32F769xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32g030-tiny-board/SConscript b/bsp/stm32/stm32g030-tiny-board/SConscript index c7ef7659ece..dd75d27ec0f 100644 --- a/bsp/stm32/stm32g030-tiny-board/SConscript +++ b/bsp/stm32/stm32g030-tiny-board/SConscript @@ -1,11 +1,14 @@ # for module compiling import os +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32G030xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32g030-tiny-board/SConstruct b/bsp/stm32/stm32g030-tiny-board/SConstruct index eab92b6e1c6..56211e9146f 100644 --- a/bsp/stm32/stm32g030-tiny-board/SConstruct +++ b/bsp/stm32/stm32g030-tiny-board/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32g030-tiny-board/board/SConscript b/bsp/stm32/stm32g030-tiny-board/board/SConscript index 1732158f094..8ea8b8b0081 100644 --- a/bsp/stm32/stm32g030-tiny-board/board/SConscript +++ b/bsp/stm32/stm32g030-tiny-board/board/SConscript @@ -24,6 +24,5 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32G0xx_HAL/CMSIS/Device/ST/STM32G0xx/Source/Templates/iar/startup_stm32g030xx.s'] -CPPDEFINES = ['STM32G030xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32g070-st-nucleo/SConscript b/bsp/stm32/stm32g070-st-nucleo/SConscript index 20f7689c53c..884e893808a 100644 --- a/bsp/stm32/stm32g070-st-nucleo/SConscript +++ b/bsp/stm32/stm32g070-st-nucleo/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32G070xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32g070-st-nucleo/SConstruct b/bsp/stm32/stm32g070-st-nucleo/SConstruct index eab92b6e1c6..56211e9146f 100644 --- a/bsp/stm32/stm32g070-st-nucleo/SConstruct +++ b/bsp/stm32/stm32g070-st-nucleo/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32g070-st-nucleo/board/SConscript b/bsp/stm32/stm32g070-st-nucleo/board/SConscript index b04739f7092..24cac45fe9d 100644 --- a/bsp/stm32/stm32g070-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32g070-st-nucleo/board/SConscript @@ -25,6 +25,5 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32G0xx_HAL/CMSIS/Device/ST/STM32G0xx/Source/Templates/iar/startup_stm32g070xx.s'] -CPPDEFINES = ['STM32G070xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32g071-st-nucleo/SConscript b/bsp/stm32/stm32g071-st-nucleo/SConscript index 20f7689c53c..adaf51f025c 100644 --- a/bsp/stm32/stm32g071-st-nucleo/SConscript +++ b/bsp/stm32/stm32g071-st-nucleo/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32G071xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32g071-st-nucleo/SConstruct b/bsp/stm32/stm32g071-st-nucleo/SConstruct index eab92b6e1c6..56211e9146f 100644 --- a/bsp/stm32/stm32g071-st-nucleo/SConstruct +++ b/bsp/stm32/stm32g071-st-nucleo/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32g071-st-nucleo/board/SConscript b/bsp/stm32/stm32g071-st-nucleo/board/SConscript index 0eefb11b2be..9a30fdb0868 100644 --- a/bsp/stm32/stm32g071-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32g071-st-nucleo/board/SConscript @@ -24,6 +24,5 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32G0xx_HAL/CMSIS/Device/ST/STM32G0xx/Source/Templates/iar/startup_stm32g071xx.s'] -CPPDEFINES = ['STM32G071xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32g431-st-nucleo/SConscript b/bsp/stm32/stm32g431-st-nucleo/SConscript index 20f7689c53c..8cc55dc008d 100644 --- a/bsp/stm32/stm32g431-st-nucleo/SConscript +++ b/bsp/stm32/stm32g431-st-nucleo/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32G431xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32g431-st-nucleo/SConstruct b/bsp/stm32/stm32g431-st-nucleo/SConstruct index 98b47d05297..66a8bd45f94 100644 --- a/bsp/stm32/stm32g431-st-nucleo/SConstruct +++ b/bsp/stm32/stm32g431-st-nucleo/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32g431-st-nucleo/board/SConscript b/bsp/stm32/stm32g431-st-nucleo/board/SConscript index 3ad9bb099d8..843824fdd5f 100644 --- a/bsp/stm32/stm32g431-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32g431-st-nucleo/board/SConscript @@ -24,7 +24,6 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32G4xx_HAL/CMSIS/Device/ST/STM32G4xx/Source/Templates/iar/startup_stm32g431xx.s'] -CPPDEFINES = ['STM32G431xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32g474-st-nucleo/SConscript b/bsp/stm32/stm32g474-st-nucleo/SConscript index 20f7689c53c..dbee44aa462 100644 --- a/bsp/stm32/stm32g474-st-nucleo/SConscript +++ b/bsp/stm32/stm32g474-st-nucleo/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32G474xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32g474-st-nucleo/SConstruct b/bsp/stm32/stm32g474-st-nucleo/SConstruct index 98b47d05297..66a8bd45f94 100644 --- a/bsp/stm32/stm32g474-st-nucleo/SConstruct +++ b/bsp/stm32/stm32g474-st-nucleo/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32g474-st-nucleo/board/SConscript b/bsp/stm32/stm32g474-st-nucleo/board/SConscript index e171b274e2f..a2c6c7a8c7b 100644 --- a/bsp/stm32/stm32g474-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32g474-st-nucleo/board/SConscript @@ -24,7 +24,6 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32G4xx_HAL/CMSIS/Device/ST/STM32G4xx/Source/Templates/iar/startup_stm32g474xx.s'] -CPPDEFINES = ['STM32G474xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32g491-st-nucleo/SConscript b/bsp/stm32/stm32g491-st-nucleo/SConscript index 20f7689c53c..39f579d1c1b 100644 --- a/bsp/stm32/stm32g491-st-nucleo/SConscript +++ b/bsp/stm32/stm32g491-st-nucleo/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32G491xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32g491-st-nucleo/SConstruct b/bsp/stm32/stm32g491-st-nucleo/SConstruct index 98b47d05297..66a8bd45f94 100644 --- a/bsp/stm32/stm32g491-st-nucleo/SConstruct +++ b/bsp/stm32/stm32g491-st-nucleo/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32g491-st-nucleo/board/SConscript b/bsp/stm32/stm32g491-st-nucleo/board/SConscript index 4fba7bdba8f..1dfc7bee585 100644 --- a/bsp/stm32/stm32g491-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32g491-st-nucleo/board/SConscript @@ -24,7 +24,6 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32G4xx_HAL/CMSIS/Device/ST/STM32G4xx/Source/Templates/iar/startup_stm32g491xx.s'] -CPPDEFINES = ['STM32G491xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32h503-st-nucleo/SConscript b/bsp/stm32/stm32h503-st-nucleo/SConscript index 20f7689c53c..19981e5d50e 100644 --- a/bsp/stm32/stm32h503-st-nucleo/SConscript +++ b/bsp/stm32/stm32h503-st-nucleo/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32H503xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32h503-st-nucleo/SConstruct b/bsp/stm32/stm32h503-st-nucleo/SConstruct index a96d69cbe11..b1086793253 100644 --- a/bsp/stm32/stm32h503-st-nucleo/SConstruct +++ b/bsp/stm32/stm32h503-st-nucleo/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32h503-st-nucleo/board/SConscript b/bsp/stm32/stm32h503-st-nucleo/board/SConscript index bba7835ce58..a9cb3ecd6b5 100644 --- a/bsp/stm32/stm32h503-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32h503-st-nucleo/board/SConscript @@ -24,9 +24,7 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32H5xx_HAL/CMSIS/Device/ST/STM32H5xx/Source/Templates/iar/startup_stm32h503xx.s'] -# You can select chips from the list above -CPPDEFINES = ['STM32H503xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32h563-st-nucleo/SConscript b/bsp/stm32/stm32h563-st-nucleo/SConscript index 20f7689c53c..03450322172 100644 --- a/bsp/stm32/stm32h563-st-nucleo/SConscript +++ b/bsp/stm32/stm32h563-st-nucleo/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32H563xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32h563-st-nucleo/SConstruct b/bsp/stm32/stm32h563-st-nucleo/SConstruct index a96d69cbe11..b1086793253 100644 --- a/bsp/stm32/stm32h563-st-nucleo/SConstruct +++ b/bsp/stm32/stm32h563-st-nucleo/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32h563-st-nucleo/board/SConscript b/bsp/stm32/stm32h563-st-nucleo/board/SConscript index b1772de703b..1b7bef01ad9 100644 --- a/bsp/stm32/stm32h563-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32h563-st-nucleo/board/SConscript @@ -30,9 +30,7 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32H5xx_HAL/CMSIS/Device/ST/STM32H5xx/Source/Templates/iar/startup_stm32h563xx.s'] -# You can select chips from the list above -CPPDEFINES = ['STM32H563xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32h723-st-nucleo/SConscript b/bsp/stm32/stm32h723-st-nucleo/SConscript index c7ef7659ece..8c1ff213741 100644 --- a/bsp/stm32/stm32h723-st-nucleo/SConscript +++ b/bsp/stm32/stm32h723-st-nucleo/SConscript @@ -1,11 +1,16 @@ # for module compiling import os +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +# STM32H743xx || STM32H750xx || STM32F753xx || STM32H723xx +# You can select chips from the list above +env.Append(CPPDEFINES = ['STM32H723xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32h723-st-nucleo/SConstruct b/bsp/stm32/stm32h723-st-nucleo/SConstruct index 02c0e78cd2d..a5d248faa09 100644 --- a/bsp/stm32/stm32h723-st-nucleo/SConstruct +++ b/bsp/stm32/stm32h723-st-nucleo/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32h723-st-nucleo/board/SConscript b/bsp/stm32/stm32h723-st-nucleo/board/SConscript index ed1f5def43e..041c2a7240c 100644 --- a/bsp/stm32/stm32h723-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32h723-st-nucleo/board/SConscript @@ -21,9 +21,6 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/iar/startup_stm32h723xx.s'] -# STM32H743xx || STM32H750xx || STM32F753xx || STM32H723xx -# You can select chips from the list above -CPPDEFINES = ['STM32H723xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32h730-esphosted-evb/SConscript b/bsp/stm32/stm32h730-esphosted-evb/SConscript index c7ef7659ece..5ca92c615fb 100644 --- a/bsp/stm32/stm32h730-esphosted-evb/SConscript +++ b/bsp/stm32/stm32h730-esphosted-evb/SConscript @@ -1,11 +1,17 @@ # for module compiling import os +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) + +# STM32H743xx || STM32H750xx || STM32F753xx +# You can select chips from the list above +env.Append(CPPDEFINES = ['STM32H730xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32h730-esphosted-evb/SConstruct b/bsp/stm32/stm32h730-esphosted-evb/SConstruct index 02c0e78cd2d..a5d248faa09 100644 --- a/bsp/stm32/stm32h730-esphosted-evb/SConstruct +++ b/bsp/stm32/stm32h730-esphosted-evb/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32h730-esphosted-evb/board/SConscript b/bsp/stm32/stm32h730-esphosted-evb/board/SConscript index 32281541cba..91b1b7caa75 100644 --- a/bsp/stm32/stm32h730-esphosted-evb/board/SConscript +++ b/bsp/stm32/stm32h730-esphosted-evb/board/SConscript @@ -21,9 +21,6 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/iar/startup_stm32h730xx.s'] -# STM32H743xx || STM32H750xx || STM32F753xx -# You can select chips from the list above -CPPDEFINES = ['STM32H730xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32h743-armfly-v7/SConscript b/bsp/stm32/stm32h743-armfly-v7/SConscript index c7ef7659ece..7971e21ff82 100644 --- a/bsp/stm32/stm32h743-armfly-v7/SConscript +++ b/bsp/stm32/stm32h743-armfly-v7/SConscript @@ -1,11 +1,16 @@ # for module compiling import os +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +# STM32H743xx || STM32H750xx || STM32F753xx +# You can select chips from the list above +env.Append(CPPDEFINES = ['STM32H743xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32h743-armfly-v7/SConstruct b/bsp/stm32/stm32h743-armfly-v7/SConstruct index 02c0e78cd2d..a5d248faa09 100644 --- a/bsp/stm32/stm32h743-armfly-v7/SConstruct +++ b/bsp/stm32/stm32h743-armfly-v7/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32h743-armfly-v7/board/SConscript b/bsp/stm32/stm32h743-armfly-v7/board/SConscript index 2ed225df9de..a4fc424dc47 100644 --- a/bsp/stm32/stm32h743-armfly-v7/board/SConscript +++ b/bsp/stm32/stm32h743-armfly-v7/board/SConscript @@ -21,9 +21,6 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/iar/startup_stm32h743xx.s'] -# STM32H743xx || STM32H750xx || STM32F753xx -# You can select chips from the list above -CPPDEFINES = ['STM32H743xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32h743-atk-apollo/SConscript b/bsp/stm32/stm32h743-atk-apollo/SConscript index c7ef7659ece..2418b7a269f 100644 --- a/bsp/stm32/stm32h743-atk-apollo/SConscript +++ b/bsp/stm32/stm32h743-atk-apollo/SConscript @@ -1,11 +1,17 @@ # for module compiling import os +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) + +# STM32H743xx || STM32H750xx || STM32F753xx +# You can select chips from the list above +env.Append(CPPDEFINES = ['STM32H743xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32h743-atk-apollo/SConstruct b/bsp/stm32/stm32h743-atk-apollo/SConstruct index 44fbddb854c..838ed65912d 100644 --- a/bsp/stm32/stm32h743-atk-apollo/SConstruct +++ b/bsp/stm32/stm32h743-atk-apollo/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32h743-atk-apollo/board/SConscript b/bsp/stm32/stm32h743-atk-apollo/board/SConscript index 53187099b70..031f918b2c6 100644 --- a/bsp/stm32/stm32h743-atk-apollo/board/SConscript +++ b/bsp/stm32/stm32h743-atk-apollo/board/SConscript @@ -35,9 +35,6 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/iar/startup_stm32h743xx.s'] -# STM32H743xx || STM32H750xx || STM32F753xx -# You can select chips from the list above -CPPDEFINES = ['STM32H743xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32h743-openmv-h7plus/SConscript b/bsp/stm32/stm32h743-openmv-h7plus/SConscript index 20f7689c53c..fb473baa8df 100644 --- a/bsp/stm32/stm32h743-openmv-h7plus/SConscript +++ b/bsp/stm32/stm32h743-openmv-h7plus/SConscript @@ -1,12 +1,16 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) + +env.Append(CPPDEFINES = ['STM32H743xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32h743-openmv-h7plus/SConstruct b/bsp/stm32/stm32h743-openmv-h7plus/SConstruct index 44fbddb854c..838ed65912d 100644 --- a/bsp/stm32/stm32h743-openmv-h7plus/SConstruct +++ b/bsp/stm32/stm32h743-openmv-h7plus/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32h743-openmv-h7plus/board/SConscript b/bsp/stm32/stm32h743-openmv-h7plus/board/SConscript index b7b186597f5..c75a9100c9c 100644 --- a/bsp/stm32/stm32h743-openmv-h7plus/board/SConscript +++ b/bsp/stm32/stm32h743-openmv-h7plus/board/SConscript @@ -33,7 +33,6 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/iar/startup_stm32h743xx.s'] -CPPDEFINES = ['STM32H743xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32h743-st-nucleo/SConscript b/bsp/stm32/stm32h743-st-nucleo/SConscript index c7ef7659ece..7971e21ff82 100644 --- a/bsp/stm32/stm32h743-st-nucleo/SConscript +++ b/bsp/stm32/stm32h743-st-nucleo/SConscript @@ -1,11 +1,16 @@ # for module compiling import os +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +# STM32H743xx || STM32H750xx || STM32F753xx +# You can select chips from the list above +env.Append(CPPDEFINES = ['STM32H743xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32h743-st-nucleo/SConstruct b/bsp/stm32/stm32h743-st-nucleo/SConstruct index 02c0e78cd2d..a5d248faa09 100644 --- a/bsp/stm32/stm32h743-st-nucleo/SConstruct +++ b/bsp/stm32/stm32h743-st-nucleo/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32h743-st-nucleo/board/SConscript b/bsp/stm32/stm32h743-st-nucleo/board/SConscript index 2ed225df9de..a4fc424dc47 100644 --- a/bsp/stm32/stm32h743-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32h743-st-nucleo/board/SConscript @@ -21,9 +21,6 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/iar/startup_stm32h743xx.s'] -# STM32H743xx || STM32H750xx || STM32F753xx -# You can select chips from the list above -CPPDEFINES = ['STM32H743xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32h747-st-discovery/SConscript b/bsp/stm32/stm32h747-st-discovery/SConscript index c7ef7659ece..a35e1674c3c 100644 --- a/bsp/stm32/stm32h747-st-discovery/SConscript +++ b/bsp/stm32/stm32h747-st-discovery/SConscript @@ -1,11 +1,16 @@ # for module compiling import os +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +# STM32H743xx || STM32H750xx || STM32F753xx +# You can select chips from the list above +env.Append(CPPDEFINES = ['STM32H747xx', 'CORE_CM7']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32h747-st-discovery/SConstruct b/bsp/stm32/stm32h747-st-discovery/SConstruct index 02c0e78cd2d..a5d248faa09 100644 --- a/bsp/stm32/stm32h747-st-discovery/SConstruct +++ b/bsp/stm32/stm32h747-st-discovery/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32h747-st-discovery/board/SConscript b/bsp/stm32/stm32h747-st-discovery/board/SConscript index 41968a76f55..760f55a4b4b 100644 --- a/bsp/stm32/stm32h747-st-discovery/board/SConscript +++ b/bsp/stm32/stm32h747-st-discovery/board/SConscript @@ -21,9 +21,6 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/iar/startup_stm32h747xx.s'] -# STM32H743xx || STM32H750xx || STM32F753xx -# You can select chips from the list above -CPPDEFINES = ['STM32H747xx', 'CORE_CM7'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32h750-armfly-h7-tool/SConscript b/bsp/stm32/stm32h750-armfly-h7-tool/SConscript index c7ef7659ece..7564dcef9ad 100644 --- a/bsp/stm32/stm32h750-armfly-h7-tool/SConscript +++ b/bsp/stm32/stm32h750-armfly-h7-tool/SConscript @@ -1,11 +1,16 @@ # for module compiling import os +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +# STM32H743xx || STM32H750xx || STM32F753xx +# You can select chips from the list above +env.Append(CPPDEFINES = ['STM32H750xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32h750-armfly-h7-tool/SConstruct b/bsp/stm32/stm32h750-armfly-h7-tool/SConstruct index 02c0e78cd2d..a5d248faa09 100644 --- a/bsp/stm32/stm32h750-armfly-h7-tool/SConstruct +++ b/bsp/stm32/stm32h750-armfly-h7-tool/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32h750-armfly-h7-tool/board/SConscript b/bsp/stm32/stm32h750-armfly-h7-tool/board/SConscript index 84af31306ee..0a6ca79c452 100644 --- a/bsp/stm32/stm32h750-armfly-h7-tool/board/SConscript +++ b/bsp/stm32/stm32h750-armfly-h7-tool/board/SConscript @@ -23,9 +23,6 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [cwd + '/../../libraries/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/iar/startup_stm32h750xx.s'] -# STM32H743xx || STM32H750xx || STM32F753xx -# You can select chips from the list above -CPPDEFINES = ['STM32H750xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32h750-artpi/SConscript b/bsp/stm32/stm32h750-artpi/SConscript index c7ef7659ece..7564dcef9ad 100644 --- a/bsp/stm32/stm32h750-artpi/SConscript +++ b/bsp/stm32/stm32h750-artpi/SConscript @@ -1,11 +1,16 @@ # for module compiling import os +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +# STM32H743xx || STM32H750xx || STM32F753xx +# You can select chips from the list above +env.Append(CPPDEFINES = ['STM32H750xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32h750-artpi/SConstruct b/bsp/stm32/stm32h750-artpi/SConstruct index 02c0e78cd2d..a5d248faa09 100644 --- a/bsp/stm32/stm32h750-artpi/SConstruct +++ b/bsp/stm32/stm32h750-artpi/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32h750-artpi/board/SConscript b/bsp/stm32/stm32h750-artpi/board/SConscript index e66666eee04..f9ed2c3100e 100644 --- a/bsp/stm32/stm32h750-artpi/board/SConscript +++ b/bsp/stm32/stm32h750-artpi/board/SConscript @@ -56,9 +56,6 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/iar/startup_stm32h750xx.s'] -# STM32H743xx || STM32H750xx || STM32F753xx -# You can select chips from the list above -CPPDEFINES = ['STM32H750xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32h750-fk750m1-vbt6/SConscript b/bsp/stm32/stm32h750-fk750m1-vbt6/SConscript index c7ef7659ece..7564dcef9ad 100644 --- a/bsp/stm32/stm32h750-fk750m1-vbt6/SConscript +++ b/bsp/stm32/stm32h750-fk750m1-vbt6/SConscript @@ -1,11 +1,16 @@ # for module compiling import os +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +# STM32H743xx || STM32H750xx || STM32F753xx +# You can select chips from the list above +env.Append(CPPDEFINES = ['STM32H750xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32h750-fk750m1-vbt6/SConstruct b/bsp/stm32/stm32h750-fk750m1-vbt6/SConstruct index 02c0e78cd2d..a5d248faa09 100644 --- a/bsp/stm32/stm32h750-fk750m1-vbt6/SConstruct +++ b/bsp/stm32/stm32h750-fk750m1-vbt6/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32h750-fk750m1-vbt6/board/SConscript b/bsp/stm32/stm32h750-fk750m1-vbt6/board/SConscript index 5936b5165ad..5c8d02c9f3d 100644 --- a/bsp/stm32/stm32h750-fk750m1-vbt6/board/SConscript +++ b/bsp/stm32/stm32h750-fk750m1-vbt6/board/SConscript @@ -50,9 +50,6 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/iar/startup_stm32h750xx.s'] -# STM32H743xx || STM32H750xx || STM32F753xx -# You can select chips from the list above -CPPDEFINES = ['STM32H750xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32h750-weact-ministm32h7xx/SConscript b/bsp/stm32/stm32h750-weact-ministm32h7xx/SConscript index c7ef7659ece..7564dcef9ad 100644 --- a/bsp/stm32/stm32h750-weact-ministm32h7xx/SConscript +++ b/bsp/stm32/stm32h750-weact-ministm32h7xx/SConscript @@ -1,11 +1,16 @@ # for module compiling import os +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +# STM32H743xx || STM32H750xx || STM32F753xx +# You can select chips from the list above +env.Append(CPPDEFINES = ['STM32H750xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32h750-weact-ministm32h7xx/SConstruct b/bsp/stm32/stm32h750-weact-ministm32h7xx/SConstruct index 02c0e78cd2d..a5d248faa09 100644 --- a/bsp/stm32/stm32h750-weact-ministm32h7xx/SConstruct +++ b/bsp/stm32/stm32h750-weact-ministm32h7xx/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32h750-weact-ministm32h7xx/board/SConscript b/bsp/stm32/stm32h750-weact-ministm32h7xx/board/SConscript index 8c572b084b7..1503a82a7f7 100644 --- a/bsp/stm32/stm32h750-weact-ministm32h7xx/board/SConscript +++ b/bsp/stm32/stm32h750-weact-ministm32h7xx/board/SConscript @@ -43,9 +43,6 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/iar/startup_stm32h750xx.s'] -# STM32H743xx || STM32H750xx || STM32F753xx -# You can select chips from the list above -CPPDEFINES = ['STM32H750xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32h7s7-st-disco/SConscript b/bsp/stm32/stm32h7s7-st-disco/SConscript index c7ef7659ece..03a0ec572b5 100644 --- a/bsp/stm32/stm32h7s7-st-disco/SConscript +++ b/bsp/stm32/stm32h7s7-st-disco/SConscript @@ -1,11 +1,14 @@ # for module compiling import os +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32H7S7xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32h7s7-st-disco/SConstruct b/bsp/stm32/stm32h7s7-st-disco/SConstruct index 53e0186e1dd..63f51f85984 100644 --- a/bsp/stm32/stm32h7s7-st-disco/SConstruct +++ b/bsp/stm32/stm32h7s7-st-disco/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32h7s7-st-disco/board/SConscript b/bsp/stm32/stm32h7s7-st-disco/board/SConscript index fdfc9bbe500..13b34d0288b 100644 --- a/bsp/stm32/stm32h7s7-st-disco/board/SConscript +++ b/bsp/stm32/stm32h7s7-st-disco/board/SConscript @@ -32,7 +32,7 @@ elif rtconfig.CROSS_TOOL == 'keil': elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32H7RSxx_HAL/CMSIS/Device/ST/STM32H7RSxx/Source/Templates/iar/startup_stm32h7s7xx.s'] -CPPDEFINES = ['STM32H7S7xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) + +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32l010-st-nucleo/SConscript b/bsp/stm32/stm32l010-st-nucleo/SConscript index 20f7689c53c..f7926c89aa2 100644 --- a/bsp/stm32/stm32l010-st-nucleo/SConscript +++ b/bsp/stm32/stm32l010-st-nucleo/SConscript @@ -1,12 +1,19 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +# STM32L052xx || STM32L053xx || STM32L062xx +# STM32L063xx || STM32L072xx || STM32L073xx +# STM32L082xx || STM32L083xx +# You can select chips from the list above +env.Append(CPPDEFINES = ['STM32L053xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32l010-st-nucleo/SConstruct b/bsp/stm32/stm32l010-st-nucleo/SConstruct index fced604182a..d7ad786f039 100644 --- a/bsp/stm32/stm32l010-st-nucleo/SConstruct +++ b/bsp/stm32/stm32l010-st-nucleo/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32l010-st-nucleo/board/SConscript b/bsp/stm32/stm32l010-st-nucleo/board/SConscript index 0c600b33d2b..563c041422c 100644 --- a/bsp/stm32/stm32l010-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32l010-st-nucleo/board/SConscript @@ -24,11 +24,6 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32L0xx_HAL/CMSIS/Device/ST/STM32L0xx/Source/Templates/iar/startup_stm32l053xx.s'] -# STM32L052xx || STM32L053xx || STM32L062xx -# STM32L063xx || STM32L072xx || STM32L073xx -# STM32L082xx || STM32L083xx -# You can select chips from the list above -CPPDEFINES = ['STM32L053xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32l053-st-nucleo/SConscript b/bsp/stm32/stm32l053-st-nucleo/SConscript index 20f7689c53c..f7926c89aa2 100644 --- a/bsp/stm32/stm32l053-st-nucleo/SConscript +++ b/bsp/stm32/stm32l053-st-nucleo/SConscript @@ -1,12 +1,19 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +# STM32L052xx || STM32L053xx || STM32L062xx +# STM32L063xx || STM32L072xx || STM32L073xx +# STM32L082xx || STM32L083xx +# You can select chips from the list above +env.Append(CPPDEFINES = ['STM32L053xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32l053-st-nucleo/SConstruct b/bsp/stm32/stm32l053-st-nucleo/SConstruct index fced604182a..d7ad786f039 100644 --- a/bsp/stm32/stm32l053-st-nucleo/SConstruct +++ b/bsp/stm32/stm32l053-st-nucleo/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32l053-st-nucleo/board/SConscript b/bsp/stm32/stm32l053-st-nucleo/board/SConscript index 0c600b33d2b..563c041422c 100644 --- a/bsp/stm32/stm32l053-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32l053-st-nucleo/board/SConscript @@ -24,11 +24,6 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32L0xx_HAL/CMSIS/Device/ST/STM32L0xx/Source/Templates/iar/startup_stm32l053xx.s'] -# STM32L052xx || STM32L053xx || STM32L062xx -# STM32L063xx || STM32L072xx || STM32L073xx -# STM32L082xx || STM32L083xx -# You can select chips from the list above -CPPDEFINES = ['STM32L053xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32l412-st-nucleo/SConscript b/bsp/stm32/stm32l412-st-nucleo/SConscript index 20f7689c53c..37a0ca12c5c 100644 --- a/bsp/stm32/stm32l412-st-nucleo/SConscript +++ b/bsp/stm32/stm32l412-st-nucleo/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32L412xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32l412-st-nucleo/board/SConscript b/bsp/stm32/stm32l412-st-nucleo/board/SConscript index 2b75e25daf7..0ab6041c9a7 100644 --- a/bsp/stm32/stm32l412-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32l412-st-nucleo/board/SConscript @@ -11,8 +11,7 @@ CubeMX_Config/Src/stm32l4xx_hal_msp.c path = [cwd] path += [cwd + '/CubeMX_Config/Inc'] -CPPDEFINES = ['STM32L412xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32l431-BearPi/SConscript b/bsp/stm32/stm32l431-BearPi/SConscript index 20f7689c53c..edd03a9e63d 100644 --- a/bsp/stm32/stm32l431-BearPi/SConscript +++ b/bsp/stm32/stm32l431-BearPi/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32L431xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32l431-BearPi/board/SConscript b/bsp/stm32/stm32l431-BearPi/board/SConscript index 5c52c0a3fb9..f08070412c0 100644 --- a/bsp/stm32/stm32l431-BearPi/board/SConscript +++ b/bsp/stm32/stm32l431-BearPi/board/SConscript @@ -18,8 +18,7 @@ path = [cwd] path += [cwd + '/CubeMX_Config/Inc'] path += [cwd + '/ports/lcd'] -CPPDEFINES = ['STM32L431xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32l431-tencentos-tiny-EVB_MX+/SConscript b/bsp/stm32/stm32l431-tencentos-tiny-EVB_MX+/SConscript index 20f7689c53c..edd03a9e63d 100644 --- a/bsp/stm32/stm32l431-tencentos-tiny-EVB_MX+/SConscript +++ b/bsp/stm32/stm32l431-tencentos-tiny-EVB_MX+/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32L431xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32l431-tencentos-tiny-EVB_MX+/board/SConscript b/bsp/stm32/stm32l431-tencentos-tiny-EVB_MX+/board/SConscript index 5bb0f75a5c5..32da0b7d8d3 100644 --- a/bsp/stm32/stm32l431-tencentos-tiny-EVB_MX+/board/SConscript +++ b/bsp/stm32/stm32l431-tencentos-tiny-EVB_MX+/board/SConscript @@ -11,9 +11,7 @@ CubeMX_Config/Core/Src/stm32l4xx_hal_msp.c path = [cwd] path += [cwd + '/CubeMX_Config/Core/Inc'] -CPPDEFINES = ['STM32L431xx'] - -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32l432-st-nucleo/SConscript b/bsp/stm32/stm32l432-st-nucleo/SConscript index 20f7689c53c..9d17df25f40 100644 --- a/bsp/stm32/stm32l432-st-nucleo/SConscript +++ b/bsp/stm32/stm32l432-st-nucleo/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32L432xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32l432-st-nucleo/board/SConscript b/bsp/stm32/stm32l432-st-nucleo/board/SConscript index faff6d3069d..41a2374b3ab 100644 --- a/bsp/stm32/stm32l432-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32l432-st-nucleo/board/SConscript @@ -11,8 +11,6 @@ CubeMX_Config/Src/stm32l4xx_hal_msp.c path = [cwd] path += [cwd + '/CubeMX_Config/Inc'] -CPPDEFINES = ['STM32L432xx'] - -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32l433-ali-startkit/SConscript b/bsp/stm32/stm32l433-ali-startkit/SConscript index 20f7689c53c..149a677e7f5 100644 --- a/bsp/stm32/stm32l433-ali-startkit/SConscript +++ b/bsp/stm32/stm32l433-ali-startkit/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32L433xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32l433-ali-startkit/board/SConscript b/bsp/stm32/stm32l433-ali-startkit/board/SConscript index 2679aa97b88..a259c92f75a 100644 --- a/bsp/stm32/stm32l433-ali-startkit/board/SConscript +++ b/bsp/stm32/stm32l433-ali-startkit/board/SConscript @@ -11,8 +11,6 @@ CubeMX_Config/Core/Src/stm32l4xx_hal_msp.c path = [cwd] path += [cwd + '/CubeMX_Config/Core/Inc'] -CPPDEFINES = ['STM32L433xx'] - -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32l433-st-nucleo/SConscript b/bsp/stm32/stm32l433-st-nucleo/SConscript index 20f7689c53c..149a677e7f5 100644 --- a/bsp/stm32/stm32l433-st-nucleo/SConscript +++ b/bsp/stm32/stm32l433-st-nucleo/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32L433xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32l433-st-nucleo/board/SConscript b/bsp/stm32/stm32l433-st-nucleo/board/SConscript index 4a96cbe3b7e..41a2374b3ab 100644 --- a/bsp/stm32/stm32l433-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32l433-st-nucleo/board/SConscript @@ -11,8 +11,6 @@ CubeMX_Config/Src/stm32l4xx_hal_msp.c path = [cwd] path += [cwd + '/CubeMX_Config/Inc'] -CPPDEFINES = ['STM32L433xx'] - -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32l452-st-nucleo/SConscript b/bsp/stm32/stm32l452-st-nucleo/SConscript index 20f7689c53c..32da0f847f9 100644 --- a/bsp/stm32/stm32l452-st-nucleo/SConscript +++ b/bsp/stm32/stm32l452-st-nucleo/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32L452xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32l452-st-nucleo/board/SConscript b/bsp/stm32/stm32l452-st-nucleo/board/SConscript index d1f4d4e0b62..9398555df37 100644 --- a/bsp/stm32/stm32l452-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32l452-st-nucleo/board/SConscript @@ -12,9 +12,7 @@ path = [cwd] path += [cwd + '/CubeMX_Config/Inc'] path += [cwd + '/ports'] -CPPDEFINES = ['STM32L452xx'] - -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32l475-atk-pandora/SConscript b/bsp/stm32/stm32l475-atk-pandora/SConscript index 20f7689c53c..ccc359b1b22 100644 --- a/bsp/stm32/stm32l475-atk-pandora/SConscript +++ b/bsp/stm32/stm32l475-atk-pandora/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32L475xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32l475-atk-pandora/board/SConscript b/bsp/stm32/stm32l475-atk-pandora/board/SConscript index 5dd6c3c21f1..de61b73f81c 100644 --- a/bsp/stm32/stm32l475-atk-pandora/board/SConscript +++ b/bsp/stm32/stm32l475-atk-pandora/board/SConscript @@ -41,8 +41,6 @@ if not GetDepend(['RT_USING_NANO']): if GetDepend(['BSP_USING_AUDIO']): path += [os.path.join(cwd, 'ports', 'audio')] -CPPDEFINES = ['STM32L475xx'] - -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32l475-st-discovery/SConscript b/bsp/stm32/stm32l475-st-discovery/SConscript index 20f7689c53c..ccc359b1b22 100644 --- a/bsp/stm32/stm32l475-st-discovery/SConscript +++ b/bsp/stm32/stm32l475-st-discovery/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32L475xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32l475-st-discovery/board/SConscript b/bsp/stm32/stm32l475-st-discovery/board/SConscript index 9822bafe3a2..bf987c82e5f 100644 --- a/bsp/stm32/stm32l475-st-discovery/board/SConscript +++ b/bsp/stm32/stm32l475-st-discovery/board/SConscript @@ -17,9 +17,7 @@ path = [cwd] path += [cwd + '/CubeMX_Config/Inc'] path += [cwd + '/ports'] -CPPDEFINES = ['STM32L475xx'] - -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32l476-st-nucleo/SConscript b/bsp/stm32/stm32l476-st-nucleo/SConscript index c6932b3c6f4..dce3298747e 100644 --- a/bsp/stm32/stm32l476-st-nucleo/SConscript +++ b/bsp/stm32/stm32l476-st-nucleo/SConscript @@ -1,11 +1,14 @@ # RT-Thread scons bridge import os +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32L476xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32l476-st-nucleo/board/SConscript b/bsp/stm32/stm32l476-st-nucleo/board/SConscript index 98836de93ac..a13f0363b89 100644 --- a/bsp/stm32/stm32l476-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32l476-st-nucleo/board/SConscript @@ -18,8 +18,6 @@ path = [cwd] path += [cwd + '/CubeMX_Config/Inc'] path += [cwd + '/ports'] -CPPDEFINES = ['STM32L476xx'] - -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32l496-ali-developer/SConscript b/bsp/stm32/stm32l496-ali-developer/SConscript index 20f7689c53c..4c4bfec1f4c 100644 --- a/bsp/stm32/stm32l496-ali-developer/SConscript +++ b/bsp/stm32/stm32l496-ali-developer/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32L496xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32l496-ali-developer/board/SConscript b/bsp/stm32/stm32l496-ali-developer/board/SConscript index 09a570325d2..272b8c5df56 100644 --- a/bsp/stm32/stm32l496-ali-developer/board/SConscript +++ b/bsp/stm32/stm32l496-ali-developer/board/SConscript @@ -21,8 +21,6 @@ path = [cwd] path += [cwd + '/CubeMX_Config/Inc'] path += [cwd + '/ports'] -CPPDEFINES = ['STM32L496xx'] - -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32l496-st-discovery/SConscript b/bsp/stm32/stm32l496-st-discovery/SConscript index 20f7689c53c..4c4bfec1f4c 100644 --- a/bsp/stm32/stm32l496-st-discovery/SConscript +++ b/bsp/stm32/stm32l496-st-discovery/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32L496xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32l496-st-discovery/board/SConscript b/bsp/stm32/stm32l496-st-discovery/board/SConscript index 32040bd020f..b64c6a85401 100644 --- a/bsp/stm32/stm32l496-st-discovery/board/SConscript +++ b/bsp/stm32/stm32l496-st-discovery/board/SConscript @@ -11,9 +11,7 @@ CubeMX_Config/Src/stm32l4xx_hal_msp.c path = [cwd] path += [cwd + '/CubeMX_Config/Inc'] -CPPDEFINES = ['STM32L496xx'] - -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32l496-st-nucleo/SConscript b/bsp/stm32/stm32l496-st-nucleo/SConscript index 20f7689c53c..4c4bfec1f4c 100644 --- a/bsp/stm32/stm32l496-st-nucleo/SConscript +++ b/bsp/stm32/stm32l496-st-nucleo/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32L496xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32l496-st-nucleo/board/SConscript b/bsp/stm32/stm32l496-st-nucleo/board/SConscript index 05654a9f9ca..27a5c5bf653 100644 --- a/bsp/stm32/stm32l496-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32l496-st-nucleo/board/SConscript @@ -15,9 +15,7 @@ path = [cwd] path += [cwd + '/CubeMX_Config/Inc'] path += [cwd + '/ports'] -CPPDEFINES = ['STM32L496xx'] - -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) list = os.listdir(cwd) for item in list: diff --git a/bsp/stm32/stm32l4r5-st-nucleo/SConscript b/bsp/stm32/stm32l4r5-st-nucleo/SConscript index 20f7689c53c..76458701f1e 100644 --- a/bsp/stm32/stm32l4r5-st-nucleo/SConscript +++ b/bsp/stm32/stm32l4r5-st-nucleo/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32L4R5xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32l4r5-st-nucleo/board/SConscript b/bsp/stm32/stm32l4r5-st-nucleo/board/SConscript index c047dbd0a7a..82f860ae6bd 100644 --- a/bsp/stm32/stm32l4r5-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32l4r5-st-nucleo/board/SConscript @@ -11,9 +11,8 @@ CubeMX_Config/Src/stm32l4xx_hal_msp.c path = [cwd] path += [cwd + '/CubeMX_Config/Inc'] -CPPDEFINES = ['STM32L4R5xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32l4r9-st-eval/SConscript b/bsp/stm32/stm32l4r9-st-eval/SConscript index 20f7689c53c..c6fe98593cf 100644 --- a/bsp/stm32/stm32l4r9-st-eval/SConscript +++ b/bsp/stm32/stm32l4r9-st-eval/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32L4R9xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32l4r9-st-eval/board/SConscript b/bsp/stm32/stm32l4r9-st-eval/board/SConscript index 8e10404da07..d67ba57356a 100644 --- a/bsp/stm32/stm32l4r9-st-eval/board/SConscript +++ b/bsp/stm32/stm32l4r9-st-eval/board/SConscript @@ -22,9 +22,8 @@ path = [cwd] path += [cwd + '/CubeMX_Config/Inc'] path += [cwd + '/ports/include'] -CPPDEFINES = ['STM32L4R9xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32l4r9-st-sensortile-box/SConscript b/bsp/stm32/stm32l4r9-st-sensortile-box/SConscript index 20f7689c53c..c6fe98593cf 100644 --- a/bsp/stm32/stm32l4r9-st-sensortile-box/SConscript +++ b/bsp/stm32/stm32l4r9-st-sensortile-box/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32L4R9xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32l4r9-st-sensortile-box/board/SConscript b/bsp/stm32/stm32l4r9-st-sensortile-box/board/SConscript index a349780f658..a69ac3b3c63 100644 --- a/bsp/stm32/stm32l4r9-st-sensortile-box/board/SConscript +++ b/bsp/stm32/stm32l4r9-st-sensortile-box/board/SConscript @@ -12,9 +12,7 @@ CubeMX_Config/Core/Src/stm32l4xx_hal_msp.c path = [cwd] path += [cwd + '/CubeMX_Config/Core/Inc'] -CPPDEFINES = ['STM32L4R9xx'] - -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32l552-st-nucleo/SConscript b/bsp/stm32/stm32l552-st-nucleo/SConscript index 20f7689c53c..dcb7cf0e773 100644 --- a/bsp/stm32/stm32l552-st-nucleo/SConscript +++ b/bsp/stm32/stm32l552-st-nucleo/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32L552xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32l552-st-nucleo/SConstruct b/bsp/stm32/stm32l552-st-nucleo/SConstruct index 9bd06d2103c..a4694775531 100644 --- a/bsp/stm32/stm32l552-st-nucleo/SConstruct +++ b/bsp/stm32/stm32l552-st-nucleo/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32l552-st-nucleo/board/SConscript b/bsp/stm32/stm32l552-st-nucleo/board/SConscript index 0ca1f7c912a..6ba48bfecdd 100644 --- a/bsp/stm32/stm32l552-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32l552-st-nucleo/board/SConscript @@ -24,9 +24,8 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32L5xx_HAL/CMSIS/Device/ST/STM32L5xx/Source/Templates/iar/startup_stm32l552xx.s'] -# You can select chips from the list above -CPPDEFINES = ['STM32L552xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) + +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32mp157a-st-discovery/SConscript b/bsp/stm32/stm32mp157a-st-discovery/SConscript index 20f7689c53c..2984829a653 100644 --- a/bsp/stm32/stm32mp157a-st-discovery/SConscript +++ b/bsp/stm32/stm32mp157a-st-discovery/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['CORE_CM4','NO_ATOMIC_64_SUPPORT','METAL_INTERNAL','METAL_MAX_DEVICE_REGIONS=2','VIRTIO_SLAVE_ONLY','STM32MP157Axx','__LOG_TRACE_IO_']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32mp157a-st-discovery/SConstruct b/bsp/stm32/stm32mp157a-st-discovery/SConstruct index 4251a612d93..98d021cdbb6 100644 --- a/bsp/stm32/stm32mp157a-st-discovery/SConstruct +++ b/bsp/stm32/stm32mp157a-st-discovery/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32mp157a-st-discovery/board/SConscript b/bsp/stm32/stm32mp157a-st-discovery/board/SConscript index 46a3634f707..bafd3da393a 100644 --- a/bsp/stm32/stm32mp157a-st-discovery/board/SConscript +++ b/bsp/stm32/stm32mp157a-st-discovery/board/SConscript @@ -93,8 +93,6 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32MPxx_HAL/CMSIS/Device/ST/STM32MP1xx/Source/Templates/iar/startup_stm32mp15xx.s'] -CPPDEFINES = ['CORE_CM4','NO_ATOMIC_64_SUPPORT','METAL_INTERNAL','METAL_MAX_DEVICE_REGIONS=2','VIRTIO_SLAVE_ONLY','STM32MP157Axx','__LOG_TRACE_IO_'] - -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32mp157a-st-ev1/SConscript b/bsp/stm32/stm32mp157a-st-ev1/SConscript index 20f7689c53c..2984829a653 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/SConscript +++ b/bsp/stm32/stm32mp157a-st-ev1/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['CORE_CM4','NO_ATOMIC_64_SUPPORT','METAL_INTERNAL','METAL_MAX_DEVICE_REGIONS=2','VIRTIO_SLAVE_ONLY','STM32MP157Axx','__LOG_TRACE_IO_']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32mp157a-st-ev1/SConstruct b/bsp/stm32/stm32mp157a-st-ev1/SConstruct index 4251a612d93..98d021cdbb6 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/SConstruct +++ b/bsp/stm32/stm32mp157a-st-ev1/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32mp157a-st-ev1/board/SConscript b/bsp/stm32/stm32mp157a-st-ev1/board/SConscript index 2894a63bf50..f550e385524 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/board/SConscript +++ b/bsp/stm32/stm32mp157a-st-ev1/board/SConscript @@ -119,8 +119,6 @@ elif rtconfig.PLATFORM in ['iccarm']: src = list(set(src)) -CPPDEFINES = ['CORE_CM4','NO_ATOMIC_64_SUPPORT','METAL_INTERNAL','METAL_MAX_DEVICE_REGIONS=2','VIRTIO_SLAVE_ONLY','STM32MP157Axx','__LOG_TRACE_IO_'] - -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32u575-st-nucleo/SConscript b/bsp/stm32/stm32u575-st-nucleo/SConscript index 20f7689c53c..9b0759e6a96 100644 --- a/bsp/stm32/stm32u575-st-nucleo/SConscript +++ b/bsp/stm32/stm32u575-st-nucleo/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32U575xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32u575-st-nucleo/board/SConscript b/bsp/stm32/stm32u575-st-nucleo/board/SConscript index 1dafb6c2360..334494c3990 100644 --- a/bsp/stm32/stm32u575-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32u575-st-nucleo/board/SConscript @@ -13,9 +13,7 @@ CubeMX_Config/Src/stm32u5xx_hal_msp.c path = [cwd] path += [cwd + '/CubeMX_Config/Inc'] -# You can select chips from the list above -CPPDEFINES = ['STM32U575xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) # if os.path.isfile(os.path.join(cwd, "ports", 'SConscript')): # group = group + SConscript(os.path.join("ports", 'SConscript')) diff --git a/bsp/stm32/stm32u585-iot02a/SConscript b/bsp/stm32/stm32u585-iot02a/SConscript index 20f7689c53c..9b0759e6a96 100644 --- a/bsp/stm32/stm32u585-iot02a/SConscript +++ b/bsp/stm32/stm32u585-iot02a/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32U575xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32u585-iot02a/board/SConscript b/bsp/stm32/stm32u585-iot02a/board/SConscript index 33d9cb2a95d..bafb8c7cafb 100644 --- a/bsp/stm32/stm32u585-iot02a/board/SConscript +++ b/bsp/stm32/stm32u585-iot02a/board/SConscript @@ -13,9 +13,7 @@ CubeMX_Config/Src/stm32u5xx_hal_msp.c path = [cwd] path += [cwd + '/CubeMX_Config/Inc'] -# You can select chips from the list above -CPPDEFINES = ['STM32U585xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32wb55-st-nucleo/SConscript b/bsp/stm32/stm32wb55-st-nucleo/SConscript index 20f7689c53c..cdd41dbc4bb 100644 --- a/bsp/stm32/stm32wb55-st-nucleo/SConscript +++ b/bsp/stm32/stm32wb55-st-nucleo/SConscript @@ -1,12 +1,15 @@ # for module compiling import os Import('RTT_ROOT') +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32WB55xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32wb55-st-nucleo/SConstruct b/bsp/stm32/stm32wb55-st-nucleo/SConstruct index 27ef1acf35b..e9c941dbab6 100644 --- a/bsp/stm32/stm32wb55-st-nucleo/SConstruct +++ b/bsp/stm32/stm32wb55-st-nucleo/SConstruct @@ -31,6 +31,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32wb55-st-nucleo/board/SConscript b/bsp/stm32/stm32wb55-st-nucleo/board/SConscript index 7f5ca6d437e..a93b914c1e5 100644 --- a/bsp/stm32/stm32wb55-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32wb55-st-nucleo/board/SConscript @@ -25,9 +25,7 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32WBxx_HAL/CMSIS/Device/ST/STM32WBxx/Source/Templates/iar/startup_stm32wb55xx_cm4.s'] -# You can select chips from the list above -CPPDEFINES = ['STM32WB55xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32wl55-st-nucleo/SConscript b/bsp/stm32/stm32wl55-st-nucleo/SConscript index c6932b3c6f4..a35368f8d4c 100644 --- a/bsp/stm32/stm32wl55-st-nucleo/SConscript +++ b/bsp/stm32/stm32wl55-st-nucleo/SConscript @@ -1,11 +1,14 @@ # RT-Thread scons bridge import os +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32WL55xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32wl55-st-nucleo/SConstruct b/bsp/stm32/stm32wl55-st-nucleo/SConstruct index d529d96a915..5eabf4fd31c 100644 --- a/bsp/stm32/stm32wl55-st-nucleo/SConstruct +++ b/bsp/stm32/stm32wl55-st-nucleo/SConstruct @@ -30,6 +30,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32wl55-st-nucleo/board/SConscript b/bsp/stm32/stm32wl55-st-nucleo/board/SConscript index 8913497b4b6..7fe5339643e 100644 --- a/bsp/stm32/stm32wl55-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32wl55-st-nucleo/board/SConscript @@ -25,7 +25,6 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32WLxx_HAL/CMSIS/Device/ST/STM32WLxx/Source/Templates/iar/startup_stm32wle5xx.s'] -CPPDEFINES = ['STM32WL55xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32wle5-yizhilian-lm401/SConscript b/bsp/stm32/stm32wle5-yizhilian-lm401/SConscript index c6932b3c6f4..2661a995528 100644 --- a/bsp/stm32/stm32wle5-yizhilian-lm401/SConscript +++ b/bsp/stm32/stm32wle5-yizhilian-lm401/SConscript @@ -1,11 +1,14 @@ # RT-Thread scons bridge import os +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32WLE5xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32wle5-yizhilian-lm401/SConstruct b/bsp/stm32/stm32wle5-yizhilian-lm401/SConstruct index bc3611c00cc..6f3f67d009f 100644 --- a/bsp/stm32/stm32wle5-yizhilian-lm401/SConstruct +++ b/bsp/stm32/stm32wle5-yizhilian-lm401/SConstruct @@ -30,6 +30,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32wle5-yizhilian-lm401/board/SConscript b/bsp/stm32/stm32wle5-yizhilian-lm401/board/SConscript index 1138e4d56cf..7fe5339643e 100644 --- a/bsp/stm32/stm32wle5-yizhilian-lm401/board/SConscript +++ b/bsp/stm32/stm32wle5-yizhilian-lm401/board/SConscript @@ -25,7 +25,6 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32WLxx_HAL/CMSIS/Device/ST/STM32WLxx/Source/Templates/iar/startup_stm32wle5xx.s'] -CPPDEFINES = ['STM32WLE5xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group') diff --git a/bsp/stm32/stm32wle5-yizhilian-lm402/SConscript b/bsp/stm32/stm32wle5-yizhilian-lm402/SConscript index c6932b3c6f4..2661a995528 100644 --- a/bsp/stm32/stm32wle5-yizhilian-lm402/SConscript +++ b/bsp/stm32/stm32wle5-yizhilian-lm402/SConscript @@ -1,11 +1,14 @@ # RT-Thread scons bridge import os +Import('env') from building import * cwd = GetCurrentDir() objs = [] list = os.listdir(cwd) +env.Append(CPPDEFINES = ['STM32WLE5xx']) + for d in list: path = os.path.join(cwd, d) if os.path.isfile(os.path.join(path, 'SConscript')): diff --git a/bsp/stm32/stm32wle5-yizhilian-lm402/SConstruct b/bsp/stm32/stm32wle5-yizhilian-lm402/SConstruct index bc3611c00cc..6f3f67d009f 100644 --- a/bsp/stm32/stm32wle5-yizhilian-lm402/SConstruct +++ b/bsp/stm32/stm32wle5-yizhilian-lm402/SConstruct @@ -30,6 +30,7 @@ if rtconfig.PLATFORM in ['iccarm']: env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') +Export('env') Export('RTT_ROOT') Export('rtconfig') diff --git a/bsp/stm32/stm32wle5-yizhilian-lm402/board/SConscript b/bsp/stm32/stm32wle5-yizhilian-lm402/board/SConscript index 1138e4d56cf..7fe5339643e 100644 --- a/bsp/stm32/stm32wle5-yizhilian-lm402/board/SConscript +++ b/bsp/stm32/stm32wle5-yizhilian-lm402/board/SConscript @@ -25,7 +25,6 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32WLxx_HAL/CMSIS/Device/ST/STM32WLxx/Source/Templates/iar/startup_stm32wle5xx.s'] -CPPDEFINES = ['STM32WLE5xx'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path) Return('group')