From 91261e25b90d6258073f620ae14c003dae9eb16e Mon Sep 17 00:00:00 2001 From: yangjie11 Date: Fri, 20 Nov 2020 13:38:11 +0800 Subject: [SConscript]rename group name --- bsp/stm32/libraries/STM32F0xx_HAL/SConscript | 2 +- bsp/stm32/libraries/STM32F1xx_HAL/SConscript | 2 +- bsp/stm32/libraries/STM32F2xx_HAL/SConscript | 2 +- bsp/stm32/libraries/STM32F4xx_HAL/SConscript | 2 +- bsp/stm32/libraries/STM32F7xx_HAL/SConscript | 2 +- bsp/stm32/libraries/STM32G0xx_HAL/SConscript | 2 +- bsp/stm32/libraries/STM32G4xx_HAL/SConscript | 2 +- bsp/stm32/libraries/STM32H7xx_HAL/SConscript | 2 +- bsp/stm32/libraries/STM32L0xx_HAL/SConscript | 2 +- bsp/stm32/libraries/STM32L1xx_HAL/SConscript | 2 +- bsp/stm32/libraries/STM32L4xx_HAL/SConscript | 2 +- bsp/stm32/libraries/STM32MPxx_HAL/SConscript | 2 +- bsp/stm32/libraries/STM32WBxx_HAL/SConscript | 2 +- bsp/stm32/stm32f429-st-disco/board/ports/touch/SConscript | 2 +- bsp/stm32/stm32f469-st-disco/board/ports/touch/SConscript | 2 +- bsp/stm32/stm32l475-atk-pandora/board/ports/fal/SConscript | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) (limited to 'bsp/stm32') diff --git a/bsp/stm32/libraries/STM32F0xx_HAL/SConscript b/bsp/stm32/libraries/STM32F0xx_HAL/SConscript index 0149cd46f2..83a63eae5e 100644 --- a/bsp/stm32/libraries/STM32F0xx_HAL/SConscript +++ b/bsp/stm32/libraries/STM32F0xx_HAL/SConscript @@ -81,6 +81,6 @@ path = [cwd + '/CMSIS/Device/ST/STM32F0xx/Include', cwd + '/CMSIS/Include'] CPPDEFINES = ['USE_HAL_DRIVER'] -group = DefineGroup('STM32_HAL', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) Return('group') diff --git a/bsp/stm32/libraries/STM32F1xx_HAL/SConscript b/bsp/stm32/libraries/STM32F1xx_HAL/SConscript index ff87a4aa25..36c204e860 100644 --- a/bsp/stm32/libraries/STM32F1xx_HAL/SConscript +++ b/bsp/stm32/libraries/STM32F1xx_HAL/SConscript @@ -87,6 +87,6 @@ path = [cwd + '/CMSIS/Device/ST/STM32F1xx/Include', cwd + '/CMSIS/Include'] CPPDEFINES = ['USE_HAL_DRIVER'] -group = DefineGroup('STM32_HAL', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) Return('group') diff --git a/bsp/stm32/libraries/STM32F2xx_HAL/SConscript b/bsp/stm32/libraries/STM32F2xx_HAL/SConscript index b69484d566..37aee93257 100644 --- a/bsp/stm32/libraries/STM32F2xx_HAL/SConscript +++ b/bsp/stm32/libraries/STM32F2xx_HAL/SConscript @@ -82,6 +82,6 @@ path = [cwd + '/CMSIS/Device/ST/STM32F2xx/Include', cwd + '/CMSIS/Include'] CPPDEFINES = ['USE_HAL_DRIVER'] -group = DefineGroup('STM32_HAL', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) Return('group') diff --git a/bsp/stm32/libraries/STM32F4xx_HAL/SConscript b/bsp/stm32/libraries/STM32F4xx_HAL/SConscript index 87c000ae18..cb9fcd81c7 100644 --- a/bsp/stm32/libraries/STM32F4xx_HAL/SConscript +++ b/bsp/stm32/libraries/STM32F4xx_HAL/SConscript @@ -109,6 +109,6 @@ path = [cwd + '/STM32F4xx_HAL_Driver/Inc', cwd + '/CMSIS/Include'] CPPDEFINES = ['USE_HAL_DRIVER'] -group = DefineGroup('STM32_HAL', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) Return('group') diff --git a/bsp/stm32/libraries/STM32F7xx_HAL/SConscript b/bsp/stm32/libraries/STM32F7xx_HAL/SConscript index 096cba78c7..50ec582b66 100644 --- a/bsp/stm32/libraries/STM32F7xx_HAL/SConscript +++ b/bsp/stm32/libraries/STM32F7xx_HAL/SConscript @@ -105,7 +105,7 @@ path = [cwd + '/STM32F7xx_HAL_Driver/Inc', cwd + '/CMSIS/Include'] CPPDEFINES = ['USE_HAL_DRIVER'] -group = DefineGroup('STM32_HAL', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) Return('group') diff --git a/bsp/stm32/libraries/STM32G0xx_HAL/SConscript b/bsp/stm32/libraries/STM32G0xx_HAL/SConscript index 3d712c5d0b..c2ffc079f7 100644 --- a/bsp/stm32/libraries/STM32G0xx_HAL/SConscript +++ b/bsp/stm32/libraries/STM32G0xx_HAL/SConscript @@ -60,6 +60,6 @@ path = [cwd + '/STM32G0xx_HAL_Driver/Inc', cwd + '/CMSIS/Include'] CPPDEFINES = ['USE_HAL_DRIVER'] -group = DefineGroup('STM32_HAL', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) Return('group') diff --git a/bsp/stm32/libraries/STM32G4xx_HAL/SConscript b/bsp/stm32/libraries/STM32G4xx_HAL/SConscript index d367a99fc3..025acb8c57 100644 --- a/bsp/stm32/libraries/STM32G4xx_HAL/SConscript +++ b/bsp/stm32/libraries/STM32G4xx_HAL/SConscript @@ -110,6 +110,6 @@ path = [cwd + '/STM32G4xx_HAL_Driver/Inc', cwd + '/CMSIS/Include'] CPPDEFINES = ['USE_HAL_DRIVER'] -group = DefineGroup('STM32_HAL', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) Return('group') diff --git a/bsp/stm32/libraries/STM32H7xx_HAL/SConscript b/bsp/stm32/libraries/STM32H7xx_HAL/SConscript index 7e4817c62a..52b622b25e 100644 --- a/bsp/stm32/libraries/STM32H7xx_HAL/SConscript +++ b/bsp/stm32/libraries/STM32H7xx_HAL/SConscript @@ -109,7 +109,7 @@ path = [cwd + '/STM32H7xx_HAL_Driver/Inc', cwd + '/CMSIS/Include'] CPPDEFINES = ['USE_HAL_DRIVER'] -group = DefineGroup('STM32_HAL', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) Return('group') diff --git a/bsp/stm32/libraries/STM32L0xx_HAL/SConscript b/bsp/stm32/libraries/STM32L0xx_HAL/SConscript index 84d5daca28..4da0214df9 100644 --- a/bsp/stm32/libraries/STM32L0xx_HAL/SConscript +++ b/bsp/stm32/libraries/STM32L0xx_HAL/SConscript @@ -88,6 +88,6 @@ path = [cwd + '/STM32L0xx_HAL_Driver/Inc', cwd + '/CMSIS/Include'] CPPDEFINES = ['USE_HAL_DRIVER'] -group = DefineGroup('STM32_HAL', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) Return('group') diff --git a/bsp/stm32/libraries/STM32L1xx_HAL/SConscript b/bsp/stm32/libraries/STM32L1xx_HAL/SConscript index 199d58696d..4dcd76b906 100644 --- a/bsp/stm32/libraries/STM32L1xx_HAL/SConscript +++ b/bsp/stm32/libraries/STM32L1xx_HAL/SConscript @@ -77,6 +77,6 @@ path = [cwd + '/CMSIS/Device/ST/STM32L1xx/Include', cwd + '/CMSIS/Include'] CPPDEFINES = ['USE_HAL_DRIVER'] -group = DefineGroup('STM32_HAL', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) Return('group') diff --git a/bsp/stm32/libraries/STM32L4xx_HAL/SConscript b/bsp/stm32/libraries/STM32L4xx_HAL/SConscript index 037f91893e..2055b3558f 100644 --- a/bsp/stm32/libraries/STM32L4xx_HAL/SConscript +++ b/bsp/stm32/libraries/STM32L4xx_HAL/SConscript @@ -113,6 +113,6 @@ path = [cwd + '/STM32L4xx_HAL_Driver/Inc', cwd + '/CMSIS/Include'] CPPDEFINES = ['USE_HAL_DRIVER'] -group = DefineGroup('STM32_HAL', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) Return('group') diff --git a/bsp/stm32/libraries/STM32MPxx_HAL/SConscript b/bsp/stm32/libraries/STM32MPxx_HAL/SConscript index 427cc65ac6..32ac00af16 100644 --- a/bsp/stm32/libraries/STM32MPxx_HAL/SConscript +++ b/bsp/stm32/libraries/STM32MPxx_HAL/SConscript @@ -108,6 +108,6 @@ path = [cwd + '/STM32MP1xx_HAL_Driver/Inc', cwd + '/CMSIS/Include'] CPPDEFINES = ['USE_HAL_DRIVER'] -group = DefineGroup('STM32_HAL', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) Return('group') diff --git a/bsp/stm32/libraries/STM32WBxx_HAL/SConscript b/bsp/stm32/libraries/STM32WBxx_HAL/SConscript index d2f47a473d..e4fe5d3259 100644 --- a/bsp/stm32/libraries/STM32WBxx_HAL/SConscript +++ b/bsp/stm32/libraries/STM32WBxx_HAL/SConscript @@ -84,6 +84,6 @@ path = [cwd + '/STM32WBxx_HAL_Driver/Inc', cwd + '/CMSIS/Include'] CPPDEFINES = ['USE_HAL_DRIVER'] -group = DefineGroup('STM32_HAL', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) Return('group') diff --git a/bsp/stm32/stm32f429-st-disco/board/ports/touch/SConscript b/bsp/stm32/stm32f429-st-disco/board/ports/touch/SConscript index f65574f8c4..280e1cd6d1 100644 --- a/bsp/stm32/stm32f429-st-disco/board/ports/touch/SConscript +++ b/bsp/stm32/stm32f429-st-disco/board/ports/touch/SConscript @@ -4,6 +4,6 @@ cwd = GetCurrentDir() src = Glob('*.c') CPPPATH = [cwd, str(Dir('#'))] -group = DefineGroup('touch', src, depend = ['BSP_USING_TOUCH'], CPPPATH = CPPPATH) +group = DefineGroup('Touch', src, depend = ['BSP_USING_TOUCH'], CPPPATH = CPPPATH) Return('group') diff --git a/bsp/stm32/stm32f469-st-disco/board/ports/touch/SConscript b/bsp/stm32/stm32f469-st-disco/board/ports/touch/SConscript index f65574f8c4..280e1cd6d1 100644 --- a/bsp/stm32/stm32f469-st-disco/board/ports/touch/SConscript +++ b/bsp/stm32/stm32f469-st-disco/board/ports/touch/SConscript @@ -4,6 +4,6 @@ cwd = GetCurrentDir() src = Glob('*.c') CPPPATH = [cwd, str(Dir('#'))] -group = DefineGroup('touch', src, depend = ['BSP_USING_TOUCH'], CPPPATH = CPPPATH) +group = DefineGroup('Touch', src, depend = ['BSP_USING_TOUCH'], CPPPATH = CPPPATH) Return('group') diff --git a/bsp/stm32/stm32l475-atk-pandora/board/ports/fal/SConscript b/bsp/stm32/stm32l475-atk-pandora/board/ports/fal/SConscript index 51c6e3b601..3d5802831b 100644 --- a/bsp/stm32/stm32l475-atk-pandora/board/ports/fal/SConscript +++ b/bsp/stm32/stm32l475-atk-pandora/board/ports/fal/SConscript @@ -15,6 +15,6 @@ if rtconfig.CROSS_TOOL == 'gcc': elif rtconfig.CROSS_TOOL == 'keil': LOCAL_CCFLAGS += ' --c99' -group = DefineGroup('fal', src, depend = ['PKG_USING_FAL'], CPPPATH = CPPPATH, LOCAL_CCFLAGS = LOCAL_CCFLAGS) +group = DefineGroup('Fal', src, depend = ['PKG_USING_FAL'], CPPPATH = CPPPATH, LOCAL_CCFLAGS = LOCAL_CCFLAGS) Return('group') -- cgit v1.3.1 From bec364385c6509210dc17f15fde0885b4ce9491d Mon Sep 17 00:00:00 2001 From: yangjie11 Date: Sat, 21 Nov 2020 14:25:22 +0800 Subject: [SConscript]rename group name --- bsp/stm32/stm32f429-st-disco/board/ports/touch/SConscript | 2 +- bsp/stm32/stm32f469-st-disco/board/ports/touch/SConscript | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'bsp/stm32') diff --git a/bsp/stm32/stm32f429-st-disco/board/ports/touch/SConscript b/bsp/stm32/stm32f429-st-disco/board/ports/touch/SConscript index 280e1cd6d1..618e45d87a 100644 --- a/bsp/stm32/stm32f429-st-disco/board/ports/touch/SConscript +++ b/bsp/stm32/stm32f429-st-disco/board/ports/touch/SConscript @@ -4,6 +4,6 @@ cwd = GetCurrentDir() src = Glob('*.c') CPPPATH = [cwd, str(Dir('#'))] -group = DefineGroup('Touch', src, depend = ['BSP_USING_TOUCH'], CPPPATH = CPPPATH) +group = DefineGroup('Drivers', src, depend = ['BSP_USING_TOUCH'], CPPPATH = CPPPATH) Return('group') diff --git a/bsp/stm32/stm32f469-st-disco/board/ports/touch/SConscript b/bsp/stm32/stm32f469-st-disco/board/ports/touch/SConscript index 280e1cd6d1..618e45d87a 100644 --- a/bsp/stm32/stm32f469-st-disco/board/ports/touch/SConscript +++ b/bsp/stm32/stm32f469-st-disco/board/ports/touch/SConscript @@ -4,6 +4,6 @@ cwd = GetCurrentDir() src = Glob('*.c') CPPPATH = [cwd, str(Dir('#'))] -group = DefineGroup('Touch', src, depend = ['BSP_USING_TOUCH'], CPPPATH = CPPPATH) +group = DefineGroup('Drivers', src, depend = ['BSP_USING_TOUCH'], CPPPATH = CPPPATH) Return('group') -- cgit v1.3.1 From ba83ddc3c4e2fc16865b43f87081ab403a4941a9 Mon Sep 17 00:00:00 2001 From: yangjie11 Date: Mon, 30 Nov 2020 15:45:58 +0800 Subject: [SConscript] change libcpu to LIBARCH,and correcte letter case --- bsp/allwinner_tina/libcpu/SConscript | 2 +- bsp/raspberry-pi/raspi2/cpu/SConscript | 2 +- bsp/raspberry-pi/raspi3-32/cpu/SConscript | 2 +- bsp/stm32/stm32l475-atk-pandora/board/ports/fal/SConscript | 2 +- components/dfs/SConscript | 2 +- components/dfs/filesystems/devfs/SConscript | 2 +- components/dfs/filesystems/elmfat/SConscript | 2 +- components/dfs/filesystems/jffs2/SConscript | 2 +- components/dfs/filesystems/nfs/SConscript | 2 +- components/dfs/filesystems/ramfs/SConscript | 2 +- components/dfs/filesystems/romfs/SConscript | 2 +- components/dfs/filesystems/uffs/SConscript | 2 +- components/finsh/SConscript | 2 +- components/libc/compilers/armlibc/SConscript | 2 +- components/libc/compilers/common/SConscript | 2 +- components/libc/compilers/minilibc/SConscript | 2 +- components/libc/compilers/newlib/SConscript | 2 +- components/libc/getline/SConscript | 2 +- components/libc/libdl/SConscript | 2 +- components/libc/mmap/SConscript | 2 +- components/libc/signal/SConscript | 2 +- components/libc/termios/SConscript | 2 +- components/net/netdev/SConscript | 2 +- examples/libc/SConscript | 2 +- libcpu/aarch64/common/SConscript | 2 +- libcpu/aarch64/cortex-a53/SConscript | 2 +- libcpu/aarch64/cortex-a72/SConscript | 2 +- libcpu/arc/common/SConscript | 2 +- libcpu/arc/em/SConscript | 2 +- libcpu/arm/AT91SAM7S/SConscript | 2 +- libcpu/arm/AT91SAM7X/SConscript | 2 +- libcpu/arm/am335x/SConscript | 2 +- libcpu/arm/arm926/SConscript | 2 +- libcpu/arm/armv6/SConscript | 2 +- libcpu/arm/common/SConscript | 2 +- libcpu/arm/cortex-a/SConscript | 2 +- libcpu/arm/cortex-m0/SConscript | 2 +- libcpu/arm/cortex-m23/SConscript | 2 +- libcpu/arm/cortex-m3/SConscript | 2 +- libcpu/arm/cortex-m33/SConscript | 2 +- libcpu/arm/cortex-m4/SConscript | 2 +- libcpu/arm/cortex-m7/SConscript | 2 +- libcpu/arm/cortex-r4/SConscript | 2 +- libcpu/arm/dm36x/SConscript | 2 +- libcpu/arm/lpc214x/SConscript | 2 +- libcpu/arm/lpc24xx/SConscript | 2 +- libcpu/arm/realview-a8-vmm/SConscript | 2 +- libcpu/arm/s3c24x0/SConscript | 2 +- libcpu/arm/s3c44b0/SConscript | 2 +- libcpu/arm/sep4020/SConscript | 2 +- libcpu/arm/zynq7000/SConscript | 2 +- libcpu/avr32/uc3/SConscript | 2 +- libcpu/blackfin/bf53x/SConscript | 2 +- libcpu/c-sky/ck802/SConscript | 2 +- libcpu/c-sky/common/SConscript | 2 +- libcpu/ia32/SConscript | 2 +- libcpu/m16c/m16c62p/SConscript | 2 +- libcpu/mips/common/SConscript | 2 +- libcpu/mips/gs232/SConscript | 2 +- libcpu/mips/gs264/SConscript | 2 +- libcpu/mips/pic32/SConscript | 2 +- libcpu/nios/nios_ii/SConscript | 2 +- libcpu/ppc/common/SConscript | 2 +- libcpu/ppc/ppc405/SConscript | 2 +- libcpu/risc-v/bumblebee/SConscript | 2 +- libcpu/risc-v/common/SConscript | 2 +- libcpu/risc-v/e310/SConscript | 2 +- libcpu/risc-v/k210/SConscript | 2 +- libcpu/risc-v/nuclei/SConscript | 2 +- libcpu/risc-v/rv32m1/SConscript | 2 +- libcpu/risc-v/t-head/e906/SConscript | 2 +- libcpu/rx/SConscript | 2 +- libcpu/sim/posix/SConscript | 2 +- libcpu/sim/win32/SConscript | 2 +- libcpu/sparc-v8/bm3803/SConscript | 2 +- libcpu/sparc-v8/common/SConscript | 2 +- libcpu/ti-dsp/c28x/SConscript | 2 +- libcpu/unicore32/sep6200/SConscript | 2 +- libcpu/v850/70f34/SConscript | 2 +- libcpu/xilinx/microblaze/SConscript | 2 +- 80 files changed, 80 insertions(+), 80 deletions(-) (limited to 'bsp/stm32') diff --git a/bsp/allwinner_tina/libcpu/SConscript b/bsp/allwinner_tina/libcpu/SConscript index 7fd3011498..d41ab0ba74 100644 --- a/bsp/allwinner_tina/libcpu/SConscript +++ b/bsp/allwinner_tina/libcpu/SConscript @@ -8,6 +8,6 @@ CPPPATH = [cwd] if rtconfig.PLATFORM == 'gcc': src += Glob('*_gcc.S') -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/bsp/raspberry-pi/raspi2/cpu/SConscript b/bsp/raspberry-pi/raspi2/cpu/SConscript index 748b06eeb1..2a8b3869a4 100644 --- a/bsp/raspberry-pi/raspi2/cpu/SConscript +++ b/bsp/raspberry-pi/raspi2/cpu/SConscript @@ -4,6 +4,6 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/bsp/raspberry-pi/raspi3-32/cpu/SConscript b/bsp/raspberry-pi/raspi3-32/cpu/SConscript index 748b06eeb1..2a8b3869a4 100644 --- a/bsp/raspberry-pi/raspi3-32/cpu/SConscript +++ b/bsp/raspberry-pi/raspi3-32/cpu/SConscript @@ -4,6 +4,6 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/bsp/stm32/stm32l475-atk-pandora/board/ports/fal/SConscript b/bsp/stm32/stm32l475-atk-pandora/board/ports/fal/SConscript index 3d5802831b..e57bdc9e77 100644 --- a/bsp/stm32/stm32l475-atk-pandora/board/ports/fal/SConscript +++ b/bsp/stm32/stm32l475-atk-pandora/board/ports/fal/SConscript @@ -15,6 +15,6 @@ if rtconfig.CROSS_TOOL == 'gcc': elif rtconfig.CROSS_TOOL == 'keil': LOCAL_CCFLAGS += ' --c99' -group = DefineGroup('Fal', src, depend = ['PKG_USING_FAL'], CPPPATH = CPPPATH, LOCAL_CCFLAGS = LOCAL_CCFLAGS) +group = DefineGroup('FAL', src, depend = ['PKG_USING_FAL'], CPPPATH = CPPPATH, LOCAL_CCFLAGS = LOCAL_CCFLAGS) Return('group') diff --git a/components/dfs/SConscript b/components/dfs/SConscript index 3ccaeb1080..edfd4e42b5 100644 --- a/components/dfs/SConscript +++ b/components/dfs/SConscript @@ -13,7 +13,7 @@ CPPPATH = [cwd + "/include"] if GetDepend('RT_USING_POSIX'): src += ['src/poll.c', 'src/select.c'] -group = DefineGroup('Filesystem', src, depend = ['RT_USING_DFS'], CPPPATH = CPPPATH) +group = DefineGroup('FileSystem', src, depend = ['RT_USING_DFS'], CPPPATH = CPPPATH) if GetDepend('RT_USING_DFS'): # search in the file system implementation diff --git a/components/dfs/filesystems/devfs/SConscript b/components/dfs/filesystems/devfs/SConscript index 898b04a234..a2c0d843f0 100644 --- a/components/dfs/filesystems/devfs/SConscript +++ b/components/dfs/filesystems/devfs/SConscript @@ -6,6 +6,6 @@ cwd = GetCurrentDir() src = Glob('*.c') CPPPATH = [cwd] -group = DefineGroup('Filesystem', src, depend = ['RT_USING_DFS', 'RT_USING_DFS_DEVFS'], CPPPATH = CPPPATH) +group = DefineGroup('FileSystem', src, depend = ['RT_USING_DFS', 'RT_USING_DFS_DEVFS'], CPPPATH = CPPPATH) Return('group') diff --git a/components/dfs/filesystems/elmfat/SConscript b/components/dfs/filesystems/elmfat/SConscript index 8b7ec02d43..173c0a9d65 100644 --- a/components/dfs/filesystems/elmfat/SConscript +++ b/components/dfs/filesystems/elmfat/SConscript @@ -21,6 +21,6 @@ if GetDepend('RT_DFS_ELM_USE_LFN'): else: src += ['option/ccsbcs.c'] -group = DefineGroup('Filesystem', src, depend = ['RT_USING_DFS', 'RT_USING_DFS_ELMFAT'], CPPPATH = CPPPATH) +group = DefineGroup('FileSystem', src, depend = ['RT_USING_DFS', 'RT_USING_DFS_ELMFAT'], CPPPATH = CPPPATH) Return('group') diff --git a/components/dfs/filesystems/jffs2/SConscript b/components/dfs/filesystems/jffs2/SConscript index 47854393e3..85d3a4d8d2 100644 --- a/components/dfs/filesystems/jffs2/SConscript +++ b/components/dfs/filesystems/jffs2/SConscript @@ -45,6 +45,6 @@ src/write.c CPPPATH = [cwd, cwd + '/include', cwd + '/src', cwd + '/cyg', cwd + '/kernel', cwd + '/cyg/compress'] -group = DefineGroup('Filesystem', src, depend = ['RT_USING_DFS', 'RT_USING_DFS_JFFS2'], CPPPATH = CPPPATH) +group = DefineGroup('FileSystem', src, depend = ['RT_USING_DFS', 'RT_USING_DFS_JFFS2'], CPPPATH = CPPPATH) Return('group') diff --git a/components/dfs/filesystems/nfs/SConscript b/components/dfs/filesystems/nfs/SConscript index f830dfc754..b340d36de2 100644 --- a/components/dfs/filesystems/nfs/SConscript +++ b/components/dfs/filesystems/nfs/SConscript @@ -8,6 +8,6 @@ CPPPATH = [cwd] SrcRemove(src, ['rpc/auth_none.c']) -group = DefineGroup('Filesystem', src, depend = ['RT_USING_DFS', 'RT_USING_DFS_NFS'], CPPPATH = CPPPATH) +group = DefineGroup('FileSystem', src, depend = ['RT_USING_DFS', 'RT_USING_DFS_NFS'], CPPPATH = CPPPATH) Return('group') diff --git a/components/dfs/filesystems/ramfs/SConscript b/components/dfs/filesystems/ramfs/SConscript index 1304f59629..12977adf53 100644 --- a/components/dfs/filesystems/ramfs/SConscript +++ b/components/dfs/filesystems/ramfs/SConscript @@ -4,6 +4,6 @@ cwd = GetCurrentDir() src = Glob('*.c') CPPPATH = [cwd] -group = DefineGroup('Filesystem', src, depend = ['RT_USING_DFS', 'RT_USING_MEMHEAP', 'RT_USING_DFS_RAMFS'], CPPPATH = CPPPATH) +group = DefineGroup('FileSystem', src, depend = ['RT_USING_DFS', 'RT_USING_MEMHEAP', 'RT_USING_DFS_RAMFS'], CPPPATH = CPPPATH) Return('group') diff --git a/components/dfs/filesystems/romfs/SConscript b/components/dfs/filesystems/romfs/SConscript index bfd633ce91..d31941eb8a 100644 --- a/components/dfs/filesystems/romfs/SConscript +++ b/components/dfs/filesystems/romfs/SConscript @@ -10,6 +10,6 @@ if GetDepend('DFS_ROMFS_ROOT'): # A new ROMFS root has been defined, we should remove the romfs.c SrcRemove(src, ['romfs.c']) -group = DefineGroup('Filesystem', src, depend = ['RT_USING_DFS','RT_USING_DFS_ROMFS'], CPPPATH = CPPPATH) +group = DefineGroup('FileSystem', src, depend = ['RT_USING_DFS','RT_USING_DFS_ROMFS'], CPPPATH = CPPPATH) Return('group') diff --git a/components/dfs/filesystems/uffs/SConscript b/components/dfs/filesystems/uffs/SConscript index 53f7713fc2..1ccd4a6869 100644 --- a/components/dfs/filesystems/uffs/SConscript +++ b/components/dfs/filesystems/uffs/SConscript @@ -33,6 +33,6 @@ src = src + uffs CPPPATH = [cwd, cwd + '/src/inc'] -group = DefineGroup('Filesystem', src , depend = ['RT_USING_DFS', 'RT_USING_DFS_UFFS'], CPPPATH = CPPPATH) +group = DefineGroup('FileSystem', src , depend = ['RT_USING_DFS', 'RT_USING_DFS_UFFS'], CPPPATH = CPPPATH) Return('group') diff --git a/components/finsh/SConscript b/components/finsh/SConscript index 88d4713d58..706165a47e 100644 --- a/components/finsh/SConscript +++ b/components/finsh/SConscript @@ -34,6 +34,6 @@ if not GetDepend('FINSH_USING_MSH_ONLY'): CPPPATH = [cwd] -group = DefineGroup('Finsh', src, depend = ['RT_USING_FINSH'], CPPPATH = CPPPATH) +group = DefineGroup('FinSH', src, depend = ['RT_USING_FINSH'], CPPPATH = CPPPATH) Return('group') diff --git a/components/libc/compilers/armlibc/SConscript b/components/libc/compilers/armlibc/SConscript index 2d366901c4..5f8f65a563 100644 --- a/components/libc/compilers/armlibc/SConscript +++ b/components/libc/compilers/armlibc/SConscript @@ -15,7 +15,7 @@ if GetDepend('RT_USING_MODULE') == False: SrcRemove(src, ['libc_syms.c']) if rtconfig.PLATFORM == 'armcc' or rtconfig.PLATFORM == 'armclang': - group = DefineGroup('Libc', src, depend = ['RT_USING_LIBC'], + group = DefineGroup('LIBC', src, depend = ['RT_USING_LIBC'], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES) Return('group') diff --git a/components/libc/compilers/common/SConscript b/components/libc/compilers/common/SConscript index 21a49d9c57..f661a1ee0d 100644 --- a/components/libc/compilers/common/SConscript +++ b/components/libc/compilers/common/SConscript @@ -17,6 +17,6 @@ if GetDepend('RT_USING_POSIX') == False: SrcRemove(src, ['unistd.c']) if not GetDepend('RT_USING_MINILIBC') and (GetDepend('RT_USING_LIBC') or GetDepend('RT_LIBC_USING_TIME')): - group = DefineGroup('Libc', src, depend = [''], CPPPATH = CPPPATH) + group = DefineGroup('LIBC', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/components/libc/compilers/minilibc/SConscript b/components/libc/compilers/minilibc/SConscript index efdcf5d097..cdaf9ec32b 100644 --- a/components/libc/compilers/minilibc/SConscript +++ b/components/libc/compilers/minilibc/SConscript @@ -9,7 +9,7 @@ CPPPATH = [cwd] CPPDEFINES = ['RT_USING_MINILIBC'] if rtconfig.PLATFORM == 'gcc' and rtconfig.ARCH != 'sim' and not GetDepend('RT_USING_LIBC') and GetDepend('RT_USING_MINILIBC'): - group = DefineGroup('Libc', src, depend = [''], + group = DefineGroup('LIBC', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES) Return('group') diff --git a/components/libc/compilers/newlib/SConscript b/components/libc/compilers/newlib/SConscript index bd444ab732..11de59bec4 100644 --- a/components/libc/compilers/newlib/SConscript +++ b/components/libc/compilers/newlib/SConscript @@ -15,7 +15,7 @@ CPPDEFINES = ['RT_USING_NEWLIB'] LIBS = ['c', 'm'] if rtconfig.PLATFORM == 'gcc': - group = DefineGroup('Newlib', src, depend = ['RT_USING_LIBC'], + group = DefineGroup('NewLIB', src, depend = ['RT_USING_LIBC'], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES, LIBS = LIBS) Return('group') diff --git a/components/libc/getline/SConscript b/components/libc/getline/SConscript index f85843dada..6c9a2a164c 100644 --- a/components/libc/getline/SConscript +++ b/components/libc/getline/SConscript @@ -6,7 +6,7 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] -group = DefineGroup('Libc', src, +group = DefineGroup('LIBC', src, depend = ['RT_USING_LIBC', 'RT_USING_POSIX','RT_USING_POSIX_GETLINE'], CPPPATH = CPPPATH) diff --git a/components/libc/libdl/SConscript b/components/libc/libdl/SConscript index 05efab351c..28265521f6 100644 --- a/components/libc/libdl/SConscript +++ b/components/libc/libdl/SConscript @@ -7,7 +7,7 @@ group = [] CPPPATH = [cwd] if rtconfig.PLATFORM == 'gcc': - group = DefineGroup('Libc', src, + group = DefineGroup('LIBC', src, depend = ['RT_USING_MODULE'], CPPPATH = CPPPATH) diff --git a/components/libc/mmap/SConscript b/components/libc/mmap/SConscript index 0b84003241..53036ad436 100644 --- a/components/libc/mmap/SConscript +++ b/components/libc/mmap/SConscript @@ -6,7 +6,7 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] -group = DefineGroup('Libc', src, +group = DefineGroup('LIBC', src, depend = ['RT_USING_DFS', 'RT_USING_POSIX_MMAP'], CPPPATH = CPPPATH) diff --git a/components/libc/signal/SConscript b/components/libc/signal/SConscript index 407d60c728..f32a1221ea 100644 --- a/components/libc/signal/SConscript +++ b/components/libc/signal/SConscript @@ -6,7 +6,7 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] -group = DefineGroup('Libc', src, +group = DefineGroup('LIBC', src, depend = ['RT_USING_SIGNALS', 'RT_USING_PTHREADS', 'RT_USING_LIBC'], CPPPATH = CPPPATH) diff --git a/components/libc/termios/SConscript b/components/libc/termios/SConscript index 977ff7e0a2..4bd0a42eb8 100644 --- a/components/libc/termios/SConscript +++ b/components/libc/termios/SConscript @@ -6,7 +6,7 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] -group = DefineGroup('Libc', src, +group = DefineGroup('LIBC', src, depend = ['RT_USING_LIBC', 'RT_USING_POSIX', 'RT_USING_POSIX_TERMIOS'], CPPPATH = CPPPATH) diff --git a/components/net/netdev/SConscript b/components/net/netdev/SConscript index 5fa858e968..0db486b2de 100644 --- a/components/net/netdev/SConscript +++ b/components/net/netdev/SConscript @@ -8,6 +8,6 @@ src = Glob('src/*.c') CPPPATH = [cwd + '/include'] -group = DefineGroup('Netdev', src, depend = ['RT_USING_NETDEV'], CPPPATH = CPPPATH) +group = DefineGroup('NetDev', src, depend = ['RT_USING_NETDEV'], CPPPATH = CPPPATH) Return('group') diff --git a/examples/libc/SConscript b/examples/libc/SConscript index 601acd22a1..547dd215b1 100644 --- a/examples/libc/SConscript +++ b/examples/libc/SConscript @@ -1,6 +1,6 @@ from building import * src = Glob('*.c') -group = DefineGroup('LibcTest', src, depend = ['RT_USING_NEWLIB', 'RT_USING_PTHREADS']) +group = DefineGroup('LIBCTest', src, depend = ['RT_USING_NEWLIB', 'RT_USING_PTHREADS']) Return('group') diff --git a/libcpu/aarch64/common/SConscript b/libcpu/aarch64/common/SConscript index e44dd04b5b..59378636fa 100644 --- a/libcpu/aarch64/common/SConscript +++ b/libcpu/aarch64/common/SConscript @@ -8,7 +8,7 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') + Glob('*.S') CPPPATH = [cwd] -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) # build for sub-directory list = os.listdir(cwd) diff --git a/libcpu/aarch64/cortex-a53/SConscript b/libcpu/aarch64/cortex-a53/SConscript index 1dfa9022c5..5f509fbf5b 100644 --- a/libcpu/aarch64/cortex-a53/SConscript +++ b/libcpu/aarch64/cortex-a53/SConscript @@ -8,6 +8,6 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') + Glob('*.S') CPPPATH = [cwd] -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/aarch64/cortex-a72/SConscript b/libcpu/aarch64/cortex-a72/SConscript index 1dfa9022c5..5f509fbf5b 100644 --- a/libcpu/aarch64/cortex-a72/SConscript +++ b/libcpu/aarch64/cortex-a72/SConscript @@ -8,6 +8,6 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') + Glob('*.S') CPPPATH = [cwd] -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arc/common/SConscript b/libcpu/arc/common/SConscript index 1962dec615..19604861f2 100644 --- a/libcpu/arc/common/SConscript +++ b/libcpu/arc/common/SConscript @@ -5,6 +5,6 @@ src = Glob('*.c') CPPPATH = [cwd] -group = DefineGroup('Libcpu', src, depend = [], CPPPATH = CPPPATH) +group = DefineGroup('LIBARCH', src, depend = [], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arc/em/SConscript b/libcpu/arc/em/SConscript index 2210cba597..215749bea4 100644 --- a/libcpu/arc/em/SConscript +++ b/libcpu/arc/em/SConscript @@ -10,6 +10,6 @@ CPPPATH = [cwd] src += Glob('*.S') -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/AT91SAM7S/SConscript b/libcpu/arm/AT91SAM7S/SConscript index 729d9c03df..990f753abd 100644 --- a/libcpu/arm/AT91SAM7S/SConscript +++ b/libcpu/arm/AT91SAM7S/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc': if rtconfig.PLATFORM == 'iar': src += Glob('*_iar.S') -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/AT91SAM7X/SConscript b/libcpu/arm/AT91SAM7X/SConscript index 729d9c03df..990f753abd 100644 --- a/libcpu/arm/AT91SAM7X/SConscript +++ b/libcpu/arm/AT91SAM7X/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc': if rtconfig.PLATFORM == 'iar': src += Glob('*_iar.S') -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/am335x/SConscript b/libcpu/arm/am335x/SConscript index 729d9c03df..990f753abd 100644 --- a/libcpu/arm/am335x/SConscript +++ b/libcpu/arm/am335x/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc': if rtconfig.PLATFORM == 'iar': src += Glob('*_iar.S') -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/arm926/SConscript b/libcpu/arm/arm926/SConscript index 705307f210..9bd0ddaf0a 100644 --- a/libcpu/arm/arm926/SConscript +++ b/libcpu/arm/arm926/SConscript @@ -20,6 +20,6 @@ if rtconfig.PLATFORM == 'gcc': if rtconfig.PLATFORM == 'iar': src += Glob('*_iar.S') -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/arm/armv6/SConscript b/libcpu/arm/armv6/SConscript index 729d9c03df..990f753abd 100644 --- a/libcpu/arm/armv6/SConscript +++ b/libcpu/arm/armv6/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc': if rtconfig.PLATFORM == 'iar': src += Glob('*_iar.S') -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/common/SConscript b/libcpu/arm/common/SConscript index 729d9c03df..990f753abd 100644 --- a/libcpu/arm/common/SConscript +++ b/libcpu/arm/common/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc': if rtconfig.PLATFORM == 'iar': src += Glob('*_iar.S') -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/cortex-a/SConscript b/libcpu/arm/cortex-a/SConscript index 729d9c03df..990f753abd 100644 --- a/libcpu/arm/cortex-a/SConscript +++ b/libcpu/arm/cortex-a/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc': if rtconfig.PLATFORM == 'iar': src += Glob('*_iar.S') -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/cortex-m0/SConscript b/libcpu/arm/cortex-m0/SConscript index 729d9c03df..990f753abd 100644 --- a/libcpu/arm/cortex-m0/SConscript +++ b/libcpu/arm/cortex-m0/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc': if rtconfig.PLATFORM == 'iar': src += Glob('*_iar.S') -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/cortex-m23/SConscript b/libcpu/arm/cortex-m23/SConscript index 729d9c03df..990f753abd 100644 --- a/libcpu/arm/cortex-m23/SConscript +++ b/libcpu/arm/cortex-m23/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc': if rtconfig.PLATFORM == 'iar': src += Glob('*_iar.S') -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/cortex-m3/SConscript b/libcpu/arm/cortex-m3/SConscript index 729d9c03df..990f753abd 100644 --- a/libcpu/arm/cortex-m3/SConscript +++ b/libcpu/arm/cortex-m3/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc': if rtconfig.PLATFORM == 'iar': src += Glob('*_iar.S') -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/cortex-m33/SConscript b/libcpu/arm/cortex-m33/SConscript index 729d9c03df..990f753abd 100644 --- a/libcpu/arm/cortex-m33/SConscript +++ b/libcpu/arm/cortex-m33/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc': if rtconfig.PLATFORM == 'iar': src += Glob('*_iar.S') -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/cortex-m4/SConscript b/libcpu/arm/cortex-m4/SConscript index 729d9c03df..990f753abd 100644 --- a/libcpu/arm/cortex-m4/SConscript +++ b/libcpu/arm/cortex-m4/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc': if rtconfig.PLATFORM == 'iar': src += Glob('*_iar.S') -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/cortex-m7/SConscript b/libcpu/arm/cortex-m7/SConscript index 729d9c03df..990f753abd 100644 --- a/libcpu/arm/cortex-m7/SConscript +++ b/libcpu/arm/cortex-m7/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc': if rtconfig.PLATFORM == 'iar': src += Glob('*_iar.S') -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/cortex-r4/SConscript b/libcpu/arm/cortex-r4/SConscript index 729d9c03df..990f753abd 100644 --- a/libcpu/arm/cortex-r4/SConscript +++ b/libcpu/arm/cortex-r4/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc': if rtconfig.PLATFORM == 'iar': src += Glob('*_iar.S') -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/dm36x/SConscript b/libcpu/arm/dm36x/SConscript index 729d9c03df..990f753abd 100644 --- a/libcpu/arm/dm36x/SConscript +++ b/libcpu/arm/dm36x/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc': if rtconfig.PLATFORM == 'iar': src += Glob('*_iar.S') -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/lpc214x/SConscript b/libcpu/arm/lpc214x/SConscript index 729d9c03df..990f753abd 100644 --- a/libcpu/arm/lpc214x/SConscript +++ b/libcpu/arm/lpc214x/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc': if rtconfig.PLATFORM == 'iar': src += Glob('*_iar.S') -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/lpc24xx/SConscript b/libcpu/arm/lpc24xx/SConscript index 729d9c03df..990f753abd 100644 --- a/libcpu/arm/lpc24xx/SConscript +++ b/libcpu/arm/lpc24xx/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc': if rtconfig.PLATFORM == 'iar': src += Glob('*_iar.S') -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/realview-a8-vmm/SConscript b/libcpu/arm/realview-a8-vmm/SConscript index 729d9c03df..990f753abd 100644 --- a/libcpu/arm/realview-a8-vmm/SConscript +++ b/libcpu/arm/realview-a8-vmm/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc': if rtconfig.PLATFORM == 'iar': src += Glob('*_iar.S') -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/s3c24x0/SConscript b/libcpu/arm/s3c24x0/SConscript index 729d9c03df..990f753abd 100644 --- a/libcpu/arm/s3c24x0/SConscript +++ b/libcpu/arm/s3c24x0/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc': if rtconfig.PLATFORM == 'iar': src += Glob('*_iar.S') -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/s3c44b0/SConscript b/libcpu/arm/s3c44b0/SConscript index 729d9c03df..990f753abd 100644 --- a/libcpu/arm/s3c44b0/SConscript +++ b/libcpu/arm/s3c44b0/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc': if rtconfig.PLATFORM == 'iar': src += Glob('*_iar.S') -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/sep4020/SConscript b/libcpu/arm/sep4020/SConscript index 729d9c03df..990f753abd 100644 --- a/libcpu/arm/sep4020/SConscript +++ b/libcpu/arm/sep4020/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc': if rtconfig.PLATFORM == 'iar': src += Glob('*_iar.S') -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/zynq7000/SConscript b/libcpu/arm/zynq7000/SConscript index 729d9c03df..990f753abd 100644 --- a/libcpu/arm/zynq7000/SConscript +++ b/libcpu/arm/zynq7000/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc': if rtconfig.PLATFORM == 'iar': src += Glob('*_iar.S') -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/avr32/uc3/SConscript b/libcpu/avr32/uc3/SConscript index fa3e28e56a..da76d51366 100644 --- a/libcpu/avr32/uc3/SConscript +++ b/libcpu/avr32/uc3/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/blackfin/bf53x/SConscript b/libcpu/blackfin/bf53x/SConscript index 86d5d3973d..5908a24142 100644 --- a/libcpu/blackfin/bf53x/SConscript +++ b/libcpu/blackfin/bf53x/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_vdsp.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/c-sky/ck802/SConscript b/libcpu/c-sky/ck802/SConscript index fa3e28e56a..da76d51366 100644 --- a/libcpu/c-sky/ck802/SConscript +++ b/libcpu/c-sky/ck802/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/c-sky/common/SConscript b/libcpu/c-sky/common/SConscript index fa3e28e56a..da76d51366 100644 --- a/libcpu/c-sky/common/SConscript +++ b/libcpu/c-sky/common/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/ia32/SConscript b/libcpu/ia32/SConscript index fa3e28e56a..da76d51366 100644 --- a/libcpu/ia32/SConscript +++ b/libcpu/ia32/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/m16c/m16c62p/SConscript b/libcpu/m16c/m16c62p/SConscript index fa3e28e56a..da76d51366 100644 --- a/libcpu/m16c/m16c62p/SConscript +++ b/libcpu/m16c/m16c62p/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/mips/common/SConscript b/libcpu/mips/common/SConscript index fa3e28e56a..da76d51366 100644 --- a/libcpu/mips/common/SConscript +++ b/libcpu/mips/common/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/mips/gs232/SConscript b/libcpu/mips/gs232/SConscript index fa3e28e56a..da76d51366 100644 --- a/libcpu/mips/gs232/SConscript +++ b/libcpu/mips/gs232/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/mips/gs264/SConscript b/libcpu/mips/gs264/SConscript index fa3e28e56a..da76d51366 100644 --- a/libcpu/mips/gs264/SConscript +++ b/libcpu/mips/gs264/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/mips/pic32/SConscript b/libcpu/mips/pic32/SConscript index fa3e28e56a..da76d51366 100644 --- a/libcpu/mips/pic32/SConscript +++ b/libcpu/mips/pic32/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/nios/nios_ii/SConscript b/libcpu/nios/nios_ii/SConscript index fa3e28e56a..da76d51366 100644 --- a/libcpu/nios/nios_ii/SConscript +++ b/libcpu/nios/nios_ii/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/ppc/common/SConscript b/libcpu/ppc/common/SConscript index fa3e28e56a..da76d51366 100644 --- a/libcpu/ppc/common/SConscript +++ b/libcpu/ppc/common/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/ppc/ppc405/SConscript b/libcpu/ppc/ppc405/SConscript index fa3e28e56a..da76d51366 100644 --- a/libcpu/ppc/ppc405/SConscript +++ b/libcpu/ppc/ppc405/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/risc-v/bumblebee/SConscript b/libcpu/risc-v/bumblebee/SConscript index fa3e28e56a..da76d51366 100644 --- a/libcpu/risc-v/bumblebee/SConscript +++ b/libcpu/risc-v/bumblebee/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/risc-v/common/SConscript b/libcpu/risc-v/common/SConscript index 6d6f2fca51..08a1215daf 100644 --- a/libcpu/risc-v/common/SConscript +++ b/libcpu/risc-v/common/SConscript @@ -7,6 +7,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/risc-v/e310/SConscript b/libcpu/risc-v/e310/SConscript index fa3e28e56a..da76d51366 100644 --- a/libcpu/risc-v/e310/SConscript +++ b/libcpu/risc-v/e310/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/risc-v/k210/SConscript b/libcpu/risc-v/k210/SConscript index fa3e28e56a..da76d51366 100644 --- a/libcpu/risc-v/k210/SConscript +++ b/libcpu/risc-v/k210/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/risc-v/nuclei/SConscript b/libcpu/risc-v/nuclei/SConscript index fa3e28e56a..da76d51366 100644 --- a/libcpu/risc-v/nuclei/SConscript +++ b/libcpu/risc-v/nuclei/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/risc-v/rv32m1/SConscript b/libcpu/risc-v/rv32m1/SConscript index fa3e28e56a..da76d51366 100644 --- a/libcpu/risc-v/rv32m1/SConscript +++ b/libcpu/risc-v/rv32m1/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/risc-v/t-head/e906/SConscript b/libcpu/risc-v/t-head/e906/SConscript index 6d6f2fca51..08a1215daf 100644 --- a/libcpu/risc-v/t-head/e906/SConscript +++ b/libcpu/risc-v/t-head/e906/SConscript @@ -7,6 +7,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/rx/SConscript b/libcpu/rx/SConscript index 37ea22c449..57ad8ba965 100644 --- a/libcpu/rx/SConscript +++ b/libcpu/rx/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_iar.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/sim/posix/SConscript b/libcpu/sim/posix/SConscript index fa3e28e56a..da76d51366 100644 --- a/libcpu/sim/posix/SConscript +++ b/libcpu/sim/posix/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/sim/win32/SConscript b/libcpu/sim/win32/SConscript index 91589d8f5c..4488a0dbb5 100644 --- a/libcpu/sim/win32/SConscript +++ b/libcpu/sim/win32/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/sparc-v8/bm3803/SConscript b/libcpu/sparc-v8/bm3803/SConscript index e80809d85b..62648f9eeb 100644 --- a/libcpu/sparc-v8/bm3803/SConscript +++ b/libcpu/sparc-v8/bm3803/SConscript @@ -12,6 +12,6 @@ if rtconfig.PLATFORM == 'gcc': src += Glob('*_init.S') src += Glob('*_gcc.S') -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/sparc-v8/common/SConscript b/libcpu/sparc-v8/common/SConscript index e80809d85b..62648f9eeb 100644 --- a/libcpu/sparc-v8/common/SConscript +++ b/libcpu/sparc-v8/common/SConscript @@ -12,6 +12,6 @@ if rtconfig.PLATFORM == 'gcc': src += Glob('*_init.S') src += Glob('*_gcc.S') -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/ti-dsp/c28x/SConscript b/libcpu/ti-dsp/c28x/SConscript index 7690eb5960..2265bf3bee 100644 --- a/libcpu/ti-dsp/c28x/SConscript +++ b/libcpu/ti-dsp/c28x/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*.s') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/unicore32/sep6200/SConscript b/libcpu/unicore32/sep6200/SConscript index fa3e28e56a..da76d51366 100644 --- a/libcpu/unicore32/sep6200/SConscript +++ b/libcpu/unicore32/sep6200/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/v850/70f34/SConscript b/libcpu/v850/70f34/SConscript index fa3e28e56a..da76d51366 100644 --- a/libcpu/v850/70f34/SConscript +++ b/libcpu/v850/70f34/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/xilinx/microblaze/SConscript b/libcpu/xilinx/microblaze/SConscript index fa3e28e56a..da76d51366 100644 --- a/libcpu/xilinx/microblaze/SConscript +++ b/libcpu/xilinx/microblaze/SConscript @@ -9,6 +9,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] ASFLAGS = '' -group = DefineGroup('Libcpu', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('LIBARCH', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') -- cgit v1.3.1 From a85193fc759ae1b7e692025f12ae59637232a730 Mon Sep 17 00:00:00 2001 From: WKJay <1931048074@qq.com> Date: Fri, 11 Dec 2020 14:58:20 +0800 Subject: [FIX] fix build problem in drv_crypto.c --- bsp/stm32/libraries/HAL_Drivers/drv_crypto.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'bsp/stm32') diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_crypto.c b/bsp/stm32/libraries/HAL_Drivers/drv_crypto.c index a6723f8a70..b093516ca5 100644 --- a/bsp/stm32/libraries/HAL_Drivers/drv_crypto.c +++ b/bsp/stm32/libraries/HAL_Drivers/drv_crypto.c @@ -9,6 +9,7 @@ * 2020-10-14 Dozingfiretruck Porting for stm32wbxx * 2020-11-26 thread-liu add hash * 2020-11-26 thread-liu add cryp + * 2020-12-11 WKJay fix build problem */ #include @@ -628,6 +629,7 @@ static void _crypto_reset(struct rt_hwcrypto_ctx *ctx) } } +#if defined(HASH2_IN_DMA_INSTANCE) void HASH2_DMA_IN_IRQHandler(void) { extern DMA_HandleTypeDef hdma_hash_in; @@ -640,7 +642,9 @@ void HASH2_DMA_IN_IRQHandler(void) /* leave interrupt */ rt_interrupt_leave(); } +#endif +#if defined(CRYP2_IN_DMA_INSTANCE) void CRYP2_DMA_IN_IRQHandler(void) { extern DMA_HandleTypeDef hdma_cryp_in; @@ -653,7 +657,9 @@ void CRYP2_DMA_IN_IRQHandler(void) /* leave interrupt */ rt_interrupt_leave(); } +#endif +#if defined (CRYP2_OUT_DMA_INSTANCE) void CRYP2_DMA_OUT_IRQHandler(void) { extern DMA_HandleTypeDef hdma_cryp_out; @@ -666,6 +672,7 @@ void CRYP2_DMA_OUT_IRQHandler(void) /* leave interrupt */ rt_interrupt_leave(); } +#endif static const struct rt_hwcrypto_ops _ops = { -- cgit v1.3.1 From f549c7926926e8ac855105b2fe60688f33699bf0 Mon Sep 17 00:00:00 2001 From: thread-liu Date: Thu, 17 Dec 2020 09:27:19 +0800 Subject: [update] stm32mp1 mdk link script file. --- bsp/stm32/libraries/STM32MPxx_HAL/SConscript | 4 ---- .../CubeMX_Config/CM4/Src/stm32mp1xx_hal_msp.c | 8 ++++---- bsp/stm32/stm32mp157a-st-discovery/board/board.h | 19 +++++++---------- .../board/linker_scripts/link.sct | 24 ++++++++-------------- bsp/stm32/stm32mp157a-st-discovery/template.uvoptx | 4 ++-- .../stm32mp157a-st-discovery/template.uvprojx | 11 +++------- .../CubeMX_Config/CM4/Src/stm32mp1xx_hal_msp.c | 9 ++++---- bsp/stm32/stm32mp157a-st-ev1/board/Kconfig | 2 +- .../board/linker_scripts/link.sct | 16 +++++++-------- bsp/stm32/stm32mp157a-st-ev1/template.uvoptx | 4 ++-- bsp/stm32/stm32mp157a-st-ev1/template.uvprojx | 13 ++++-------- 11 files changed, 44 insertions(+), 70 deletions(-) (limited to 'bsp/stm32') diff --git a/bsp/stm32/libraries/STM32MPxx_HAL/SConscript b/bsp/stm32/libraries/STM32MPxx_HAL/SConscript index 9e1d85e005..447ecaaa1f 100644 --- a/bsp/stm32/libraries/STM32MPxx_HAL/SConscript +++ b/bsp/stm32/libraries/STM32MPxx_HAL/SConscript @@ -104,10 +104,6 @@ if GetDepend(['BSP_USING_DFSDM']): src += ['STM32MP1xx_HAL_Driver/Src/stm32mp1xx_hal_dfsdm.c'] src += ['STM32MP1xx_HAL_Driver/Src/stm32mp1xx_hal_dfsdm_ex.c'] -if GetDepend(['BSP_USING_SDMMC']): - src += ['STM32MP1xx_HAL_Driver/Src/stm32mp1xx_ll_sdmmc.c'] - src += ['STM32MP1xx_HAL_Driver/Src/stm32mp1xx_hal_sd.c'] - if GetDepend(['BSP_USING_HASH']): src += ['STM32MP1xx_HAL_Driver/Src/stm32mp1xx_hal_hash.c'] src += ['STM32MP1xx_HAL_Driver/Src/stm32mp1xx_hal_hash_ex.c'] diff --git a/bsp/stm32/stm32mp157a-st-discovery/board/CubeMX_Config/CM4/Src/stm32mp1xx_hal_msp.c b/bsp/stm32/stm32mp157a-st-discovery/board/CubeMX_Config/CM4/Src/stm32mp1xx_hal_msp.c index 2ddf367caa..3a6fac25d7 100644 --- a/bsp/stm32/stm32mp157a-st-discovery/board/CubeMX_Config/CM4/Src/stm32mp1xx_hal_msp.c +++ b/bsp/stm32/stm32mp157a-st-discovery/board/CubeMX_Config/CM4/Src/stm32mp1xx_hal_msp.c @@ -74,10 +74,10 @@ void HAL_MspInit(void) /* System interrupt init*/ /* USER CODE BEGIN MspInit 1 */ -#if !defined(BSP_USING_OPENAMP) - __HAL_RCC_SYSRAM_CLK_ENABLE(); - __HAL_RCC_RETRAM_CLK_ENABLE(); -#endif + if (IS_ENGINEERING_BOOT_MODE()) + { + __HAL_RCC_SYSRAM_CLK_ENABLE(); + } HAL_NVIC_SetPriority(RCC_WAKEUP_IRQn, 0, 0); HAL_NVIC_EnableIRQ(RCC_WAKEUP_IRQn); diff --git a/bsp/stm32/stm32mp157a-st-discovery/board/board.h b/bsp/stm32/stm32mp157a-st-discovery/board/board.h index 18cab2141c..715f66e8a2 100644 --- a/bsp/stm32/stm32mp157a-st-discovery/board/board.h +++ b/bsp/stm32/stm32mp157a-st-discovery/board/board.h @@ -23,20 +23,15 @@ extern "C" { #endif #define STM32_FLASH_START_ADRESS ((uint32_t)0x10000000) -#if defined(BSP_USING_OPENAMP) -#define STM32_FLASH_SIZE (64 * 1024) -#else -#define STM32_FLASH_SIZE (256 * 1024) -#endif +#define STM32_FLASH_SIZE (192 * 1024) #define STM32_FLASH_END_ADDRESS ((uint32_t)(STM32_FLASH_START_ADRESS + STM32_FLASH_SIZE)) - - -#if defined(BSP_USING_OPENAMP) -#define STM32_SRAM_BEGIN (uint32_t)0x10030000 -#else -#define STM32_SRAM_BEGIN (uint32_t)0x2FFF0000 + +#if defined(BSP_USING_OPENAMP) +#define STM32_SRAM_BEGIN (uint32_t)0x10030000 +#else +#define STM32_SRAM_BEGIN (uint32_t)0x2FFF0000 #endif -#define STM32_SRAM_SIZE (64) +#define STM32_SRAM_SIZE (64) #define STM32_SRAM_END (STM32_SRAM_BEGIN + (STM32_SRAM_SIZE * 1024)) #define HEAP_BEGIN STM32_SRAM_BEGIN diff --git a/bsp/stm32/stm32mp157a-st-discovery/board/linker_scripts/link.sct b/bsp/stm32/stm32mp157a-st-discovery/board/linker_scripts/link.sct index df7bcadf06..a64b8cc98b 100644 --- a/bsp/stm32/stm32mp157a-st-discovery/board/linker_scripts/link.sct +++ b/bsp/stm32/stm32mp157a-st-discovery/board/linker_scripts/link.sct @@ -8,28 +8,20 @@ LR_VECTORS 0x00000000 0x00000400 { ; load region size_region } } -LR_IROM1 0x10000000 0x00020000 { ; load region size_region - ER_IROM1 0x10000000 0x00020000 { ; load address = execution address +LR_IROM1 0x10000000 0x00030000 { ; load region size_region + ER_IROM1 0x10000000 0x00030000 { ; load address = execution address *(InRoot$$Sections) .ANY (+RO) .ANY (+XO) } - RW_IRAM1 0x10020000 0x00050000 { ; RW data + RW_IRAM1 0x10030000 0x00010000 { ; RW data .ANY (+RW +ZI) } -; RW_IRAM2 0x10020000 0x00020000 { ; RW data -; .ANY (+RW +ZI) -; } -; RW_IRAM3 0x10040000 0x00010000 { ; RW data -; .ANY (+RW +ZI) -; } -; RW_IRAM4 0x10050000 0x00010000 { ; RW data -; .ANY (+RW +ZI) -; } -; ***** To uncomment these 4 lines if OPENAMP used ***** -; *** Create region for OPENAMP *** + + +; ***** Create region for OPENAMP ***** +; *** These 4 lines can be commented if OPENAMP is not used ***** .resource_table +0 ALIGN 4 { ; resource table *(.resource_table) - } - __OpenAMP_SHMEM__ 0x10050000 EMPTY 0x8000 {} ; Shared Memory area used by OpenAMP + } __OpenAMP_SHMEM__ 0x10040000 EMPTY 0x8000 {} ; Shared Memory area used by OpenAMP } diff --git a/bsp/stm32/stm32mp157a-st-discovery/template.uvoptx b/bsp/stm32/stm32mp157a-st-discovery/template.uvoptx index cd7d5cc09b..b43797349c 100644 --- a/bsp/stm32/stm32mp157a-st-discovery/template.uvoptx +++ b/bsp/stm32/stm32mp157a-st-discovery/template.uvoptx @@ -10,7 +10,7 @@ *.s*; *.src; *.a* *.obj; *.o *.lib - *.txt; *.h; *.inc + *.txt; *.h; *.inc; *.md *.plm *.cpp 0 @@ -125,7 +125,7 @@ 0 ST-LINKIII-KEIL_SWO - -U066DFF343339415043182234 -O206 -SF10000 -C0 -A2 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP (ARM Core") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD10020000 -FC1000 -FN0 + -U0666FF343339415043182420 -O206 -SF10000 -C0 -A2 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD10030000 -FC1000 -FN0 diff --git a/bsp/stm32/stm32mp157a-st-discovery/template.uvprojx b/bsp/stm32/stm32mp157a-st-discovery/template.uvprojx index bc7e6847ac..8c076e73ef 100644 --- a/bsp/stm32/stm32mp157a-st-discovery/template.uvprojx +++ b/bsp/stm32/stm32mp157a-st-discovery/template.uvprojx @@ -276,7 +276,7 @@ 1 0x10000000 - 0x20000 + 0x30000 1 @@ -300,8 +300,8 @@ 0 - 0x10020000 - 0x20000 + 0x10030000 + 0x10000 0 @@ -397,11 +397,6 @@ <Project Info> - - - - - 0 1 diff --git a/bsp/stm32/stm32mp157a-st-ev1/board/CubeMX_Config/CM4/Src/stm32mp1xx_hal_msp.c b/bsp/stm32/stm32mp157a-st-ev1/board/CubeMX_Config/CM4/Src/stm32mp1xx_hal_msp.c index 6442f98075..e82a89791b 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/board/CubeMX_Config/CM4/Src/stm32mp1xx_hal_msp.c +++ b/bsp/stm32/stm32mp157a-st-ev1/board/CubeMX_Config/CM4/Src/stm32mp1xx_hal_msp.c @@ -81,10 +81,11 @@ void HAL_MspInit(void) /* System interrupt init*/ /* USER CODE BEGIN MspInit 1 */ -#if !defined(BSP_USING_OPENAMP) - __HAL_RCC_SYSRAM_CLK_ENABLE(); - __HAL_RCC_RETRAM_CLK_ENABLE(); -#endif + if (IS_ENGINEERING_BOOT_MODE()) + { + __HAL_RCC_SYSRAM_CLK_ENABLE(); + __HAL_RCC_RETRAM_CLK_ENABLE(); + } HAL_NVIC_SetPriority(RCC_WAKEUP_IRQn, 0, 0); HAL_NVIC_EnableIRQ(RCC_WAKEUP_IRQn); diff --git a/bsp/stm32/stm32mp157a-st-ev1/board/Kconfig b/bsp/stm32/stm32mp157a-st-ev1/board/Kconfig index d049daa951..34fec1bea5 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/board/Kconfig +++ b/bsp/stm32/stm32mp157a-st-ev1/board/Kconfig @@ -77,7 +77,7 @@ menu "Onboard Peripheral Drivers" if BSP_USING_EMMC config EMMC_USING_DFS bool "emmc card fatfs" - default n + default y endif endif diff --git a/bsp/stm32/stm32mp157a-st-ev1/board/linker_scripts/link.sct b/bsp/stm32/stm32mp157a-st-ev1/board/linker_scripts/link.sct index 40d9679d17..a64b8cc98b 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/board/linker_scripts/link.sct +++ b/bsp/stm32/stm32mp157a-st-ev1/board/linker_scripts/link.sct @@ -8,20 +8,20 @@ LR_VECTORS 0x00000000 0x00000400 { ; load region size_region } } -LR_IROM1 0x10000000 0x00040000 { ; load region size_region - ER_IROM1 0x10000000 0x00040000 { ; load address = execution address +LR_IROM1 0x10000000 0x00030000 { ; load region size_region + ER_IROM1 0x10000000 0x00030000 { ; load address = execution address *(InRoot$$Sections) .ANY (+RO) .ANY (+XO) } - RW_IRAM1 0x10050000 0x00010000 { ; RW data + RW_IRAM1 0x10030000 0x00010000 { ; RW data .ANY (+RW +ZI) } -;; ***** Create region for OPENAMP ***** -;; *** These 4 lines can be commented if OPENAMP is not used ***** -; .resource_table +0 ALIGN 4 { ; resource table -; *(.resource_table) -; } __OpenAMP_SHMEM__ 0x10040000 EMPTY 0x8000 {} ; Shared Memory area used by OpenAMP +; ***** Create region for OPENAMP ***** +; *** These 4 lines can be commented if OPENAMP is not used ***** + .resource_table +0 ALIGN 4 { ; resource table + *(.resource_table) + } __OpenAMP_SHMEM__ 0x10040000 EMPTY 0x8000 {} ; Shared Memory area used by OpenAMP } diff --git a/bsp/stm32/stm32mp157a-st-ev1/template.uvoptx b/bsp/stm32/stm32mp157a-st-ev1/template.uvoptx index e3a94d45ec..69cfe32b14 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/template.uvoptx +++ b/bsp/stm32/stm32mp157a-st-ev1/template.uvoptx @@ -10,7 +10,7 @@ *.s*; *.src; *.a* *.obj; *.o *.lib - *.txt; *.h; *.inc + *.txt; *.h; *.inc; *.md *.plm *.cpp 0 @@ -125,7 +125,7 @@ 0 ST-LINKIII-KEIL_SWO - -U066BFF343339415043223048 -O206 -SF10000 -C0 -A2 -I0 -HNlocalhost -HP7184 -P1 -N00("") -D00(00000000) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8000 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD10050000 -FC1000 -FN0 + -U0666FF343339415043182420 -O206 -SF10000 -C0 -A2 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8000 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD10030000 -FC1000 -FN0 diff --git a/bsp/stm32/stm32mp157a-st-ev1/template.uvprojx b/bsp/stm32/stm32mp157a-st-ev1/template.uvprojx index fc88195dc1..db224b3468 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/template.uvprojx +++ b/bsp/stm32/stm32mp157a-st-ev1/template.uvprojx @@ -276,7 +276,7 @@ 1 0x10000000 - 0x40000 + 0x30000 1 @@ -300,13 +300,13 @@ 0 - 0x10050000 + 0x10030000 0x10000 0 - 0x0 - 0x0 + 0x10040000 + 0x20000 @@ -397,11 +397,6 @@ <Project Info> - - - - - 0 1 -- cgit v1.3.1 From 0b5c69ef6946739f0181d1624ea8ee802b004179 Mon Sep 17 00:00:00 2001 From: thread-liu Date: Thu, 17 Dec 2020 10:31:22 +0800 Subject: [update] stm32mp1 heap address. --- bsp/stm32/stm32mp157a-st-discovery/board/board.h | 21 ++++++++++++--------- .../CubeMX_Config/CM4/Src/stm32mp1xx_hal_msp.c | 1 - bsp/stm32/stm32mp157a-st-ev1/board/board.c | 7 +++++++ bsp/stm32/stm32mp157a-st-ev1/board/board.h | 22 +++++++++++++--------- 4 files changed, 32 insertions(+), 19 deletions(-) (limited to 'bsp/stm32') diff --git a/bsp/stm32/stm32mp157a-st-discovery/board/board.h b/bsp/stm32/stm32mp157a-st-discovery/board/board.h index 715f66e8a2..2472d96400 100644 --- a/bsp/stm32/stm32mp157a-st-discovery/board/board.h +++ b/bsp/stm32/stm32mp157a-st-discovery/board/board.h @@ -26,15 +26,19 @@ extern "C" { #define STM32_FLASH_SIZE (192 * 1024) #define STM32_FLASH_END_ADDRESS ((uint32_t)(STM32_FLASH_START_ADRESS + STM32_FLASH_SIZE)) -#if defined(BSP_USING_OPENAMP) -#define STM32_SRAM_BEGIN (uint32_t)0x10030000 -#else -#define STM32_SRAM_BEGIN (uint32_t)0x2FFF0000 +#define STM32_SRAM_SIZE (64) +#define STM32_SRAM_END (0x10030000 + 64 * 1024) + +#if defined(__CC_ARM) || defined(__CLANG_ARM) +extern int Image$$RW_IRAM1$$ZI$$Limit; +#define HEAP_BEGIN (&Image$$RW_IRAM1$$ZI$$Limit) +#elif __ICCARM__ +#pragma section="CSTACK" +#define HEAP_BEGIN (__segment_end("CSTACK")) +#else +extern int __bss_end; +#define HEAP_BEGIN (&__bss_end) #endif -#define STM32_SRAM_SIZE (64) -#define STM32_SRAM_END (STM32_SRAM_BEGIN + (STM32_SRAM_SIZE * 1024)) - -#define HEAP_BEGIN STM32_SRAM_BEGIN #define HEAP_END STM32_SRAM_END void SystemClock_Config(void); @@ -46,4 +50,3 @@ extern void _Error_Handler(char *s, int num); #endif #endif - diff --git a/bsp/stm32/stm32mp157a-st-ev1/board/CubeMX_Config/CM4/Src/stm32mp1xx_hal_msp.c b/bsp/stm32/stm32mp157a-st-ev1/board/CubeMX_Config/CM4/Src/stm32mp1xx_hal_msp.c index e82a89791b..20f6aa2d63 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/board/CubeMX_Config/CM4/Src/stm32mp1xx_hal_msp.c +++ b/bsp/stm32/stm32mp157a-st-ev1/board/CubeMX_Config/CM4/Src/stm32mp1xx_hal_msp.c @@ -84,7 +84,6 @@ void HAL_MspInit(void) if (IS_ENGINEERING_BOOT_MODE()) { __HAL_RCC_SYSRAM_CLK_ENABLE(); - __HAL_RCC_RETRAM_CLK_ENABLE(); } HAL_NVIC_SetPriority(RCC_WAKEUP_IRQn, 0, 0); diff --git a/bsp/stm32/stm32mp157a-st-ev1/board/board.c b/bsp/stm32/stm32mp157a-st-ev1/board/board.c index 0a7bda208a..362250de22 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/board/board.c +++ b/bsp/stm32/stm32mp157a-st-ev1/board/board.c @@ -12,6 +12,7 @@ #include "board.h" +void PeriphCommonClock_Config(void); /** * @brief System Clock Configuration * @retval None @@ -124,6 +125,12 @@ void SystemClock_Config(void) /**Set the HSE division factor for RTC clock */ __HAL_RCC_RTC_HSEDIV(24); + + /* Configure the peripherals common clocks */ + if(IS_ENGINEERING_BOOT_MODE()) + { + PeriphCommonClock_Config(); + } } diff --git a/bsp/stm32/stm32mp157a-st-ev1/board/board.h b/bsp/stm32/stm32mp157a-st-ev1/board/board.h index 81cdaa92fb..334eea4f5c 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/board/board.h +++ b/bsp/stm32/stm32mp157a-st-ev1/board/board.h @@ -23,18 +23,23 @@ extern "C" { #endif #define STM32_FLASH_START_ADRESS ((uint32_t)0x10000000) -#define STM32_FLASH_SIZE (191 * 1024) +#define STM32_FLASH_SIZE (192 * 1024) #define STM32_FLASH_END_ADDRESS ((uint32_t)(STM32_FLASH_START_ADRESS + STM32_FLASH_SIZE)) -#if defined(BSP_USING_OPENAMP) -#define STM32_SRAM_BEGIN (uint32_t)0x10030000 + +#define STM32_SRAM_SIZE (64) +#define STM32_SRAM_END (0x10030000 + 64 * 1024) + +#if defined(__CC_ARM) || defined(__CLANG_ARM) +extern int Image$$RW_IRAM1$$ZI$$Limit; +#define HEAP_BEGIN (&Image$$RW_IRAM1$$ZI$$Limit) +#elif __ICCARM__ +#pragma section="CSTACK" +#define HEAP_BEGIN (__segment_end("CSTACK")) #else -#define STM32_SRAM_BEGIN (uint32_t)0x2FFF0000 +extern int __bss_end; +#define HEAP_BEGIN (&__bss_end) #endif -#define STM32_SRAM_SIZE (64) -#define STM32_SRAM_END (STM32_SRAM_BEGIN + (STM32_SRAM_SIZE * 1024)) - -#define HEAP_BEGIN STM32_SRAM_BEGIN #define HEAP_END STM32_SRAM_END void SystemClock_Config(void); @@ -46,4 +51,3 @@ extern void _Error_Handler(char *s, int num); #endif #endif - -- cgit v1.3.1 From 9626515787f0f7adf26f807f96a241777adba232 Mon Sep 17 00:00:00 2001 From: DUXin-ece Date: Wed, 23 Dec 2020 14:50:47 +0800 Subject: 修正stm32f746-disco和FPU相关的flag错误 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bsp/stm32/stm32f746-st-disco/rtconfig.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bsp/stm32') diff --git a/bsp/stm32/stm32f746-st-disco/rtconfig.py b/bsp/stm32/stm32f746-st-disco/rtconfig.py index 32cb0dd9d4..de934eeac7 100644 --- a/bsp/stm32/stm32f746-st-disco/rtconfig.py +++ b/bsp/stm32/stm32f746-st-disco/rtconfig.py @@ -42,7 +42,7 @@ if PLATFORM == 'gcc': OBJCPY = PREFIX + 'objcopy' STRIP = PREFIX + 'strip' - DEVICE = ' -mcpu=' + CPU + ' -mthumb -mfpu=fpv5-d16 -mfloat-abi=hard -ffunction-sections -fdata-sections' + DEVICE = ' -mcpu=' + CPU + ' -mthumb -mfpu=fpv5-sp-d16 -mfloat-abi=hard -ffunction-sections -fdata-sections' CFLAGS = DEVICE + ' -g -Wall' AFLAGS = ' -c' + DEVICE + ' -x assembler-with-cpp -Wa,-mimplicit-it=thumb ' LFLAGS = DEVICE + ' -Wl,--gc-sections,-Map=rtthread.map,-cref,-u,Reset_Handler -T board/linker_scripts/link.lds' -- cgit v1.3.1 From 534239b8c14931e96707288e155e64a21df4931a Mon Sep 17 00:00:00 2001 From: thread-liu Date: Thu, 24 Dec 2020 14:48:04 +0800 Subject: [update] add keyword __no_init to disable IAR from initializing specified memory. --- bsp/stm32/stm32mp157a-st-ev1/board/Kconfig | 14 ++++++----- bsp/stm32/stm32mp157a-st-ev1/board/SConscript | 2 +- .../stm32mp157a-st-ev1/board/ports/drv_dfsdm.c | 28 +++++++++++----------- .../stm32mp157a-st-ev1/board/ports/drv_emmc.c | 13 +++++----- .../stm32mp157a-st-ev1/board/ports/drv_ov5640.c | 13 +++++----- .../stm32mp157a-st-ev1/board/ports/drv_sdcard.c | 13 +++++----- .../stm32mp157a-st-ev1/board/ports/drv_sound.c | 12 ++++------ .../stm32mp157a-st-ev1/board/ports/eth/drv_eth.c | 20 ++++++++-------- 8 files changed, 57 insertions(+), 58 deletions(-) (limited to 'bsp/stm32') diff --git a/bsp/stm32/stm32mp157a-st-ev1/board/Kconfig b/bsp/stm32/stm32mp157a-st-ev1/board/Kconfig index 34fec1bea5..6745682708 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/board/Kconfig +++ b/bsp/stm32/stm32mp157a-st-ev1/board/Kconfig @@ -60,13 +60,13 @@ menu "Onboard Peripheral Drivers" select RT_USING_SDIO select RT_USING_DFS select RT_USING_DFS_ELMFAT - select BSP_USING_PMIC if BSP_USING_SDMMC - menuconfig BSP_USING_SD_CARD + menuconfig BSP_USING_SDCARD bool "Enable sd card" + select BSP_USING_PMIC default n - if BSP_USING_SD_CARD - config SD_USING_DFS + if BSP_USING_SDCARD + config BSP_USING_SDCARD_FS bool "sd card fatfs" default y endif @@ -75,7 +75,7 @@ menu "Onboard Peripheral Drivers" bool "Enable eMMC (32 Gbits)" default n if BSP_USING_EMMC - config EMMC_USING_DFS + config BSP_USING_EMMC_FS bool "emmc card fatfs" default y endif @@ -86,7 +86,7 @@ menu "Onboard Peripheral Drivers" select RT_USING_AUDIO select BSP_USING_PMIC select BSP_USING_SDMMC - select BSP_USING_SD_CARD + select BSP_USING_SDCARD select SD_USING_DFS select BSP_USING_I2C select BSP_USING_I2C2 @@ -96,6 +96,8 @@ menu "Onboard Peripheral Drivers" bool "Enable CAMERA (ov5640)" select BSP_USING_MFX select BSP_USING_PMIC + select BSP_USING_SDMMC + select BSP_USING_SDCARD select BSP_USING_I2C select BSP_USING_I2C2 default n diff --git a/bsp/stm32/stm32mp157a-st-ev1/board/SConscript b/bsp/stm32/stm32mp157a-st-ev1/board/SConscript index 0082bddaae..61c1a8029c 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/board/SConscript +++ b/bsp/stm32/stm32mp157a-st-ev1/board/SConscript @@ -25,7 +25,7 @@ if GetDepend(['BSP_USING_NAND']): if GetDepend(['BSP_USING_GBE']): src += Glob('ports/eth/drv_eth.c') -if GetDepend(['BSP_USING_SD_CARD']): +if GetDepend(['BSP_USING_SDCARD']): src += Glob('ports/drv_sdcard.c') if GetDepend(['BSP_USING_EMMC']): diff --git a/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_dfsdm.c b/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_dfsdm.c index c348751881..38678dbdce 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_dfsdm.c +++ b/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_dfsdm.c @@ -18,34 +18,34 @@ #define LOG_TAG "drv.dfsdm" #include -#define FILTER_FIFO_SIZE (1024) +#define FILTER_FIFO_SIZE (1024) #if defined(__CC_ARM) || defined(__CLANG_ARM) -__attribute__((at(0x2FFC8000))) +__attribute__((at(0x2FFC8000))) static rt_int32_t FILTER0_FIFO[FILTER_FIFO_SIZE]; #elif defined ( __GNUC__ ) -__attribute__((at(0x2FFC8000))) +static rt_int32_t FILTER0_FIFO[FILTER_FIFO_SIZE] __attribute__((section(".Filter0Section"))); #elif defined(__ICCARM__) #pragma location = 0x2FFC8000 +__no_init static rt_int32_t FILTER0_FIFO[FILTER_FIFO_SIZE]; #endif -rt_int32_t FILTER0_FIFO[FILTER_FIFO_SIZE]; -#define PALY_SIZE 2048 #if defined(__CC_ARM) || defined(__CLANG_ARM) -__attribute__((at(0x2FFCA000))) +__attribute__((at(0x2FFC9000))) static rt_int32_t FILTER0_FIFO[FILTER_FIFO_SIZE]; #elif defined ( __GNUC__ ) -__attribute__((at(0x2FFCA000))) +static rt_int32_t FILTER0_FIFO[FILTER_FIFO_SIZE] __attribute__((section(".Filter1Section"))); #elif defined(__ICCARM__) -#pragma location = 0x2FFCA000 +#pragma location = 0x2FFC9000 +__no_init static rt_int32_t FILTER1_FIFO[FILTER_FIFO_SIZE]; #endif -static rt_int16_t PLAY_BUF[PALY_SIZE]; - + +#define PALY_SIZE 2048 #if defined(__CC_ARM) || defined(__CLANG_ARM) -__attribute__((at(0x2FFC9000))) +__attribute__((at(0x2FFCA000))) static rt_int16_t PLAY_BUF[PALY_SIZE]; #elif defined ( __GNUC__ ) -__attribute__((at(0x2FFC9000))) +__attribute__((at(0x2FFCA000))) __attribute__((section(".DfsdmSection"))); #elif defined(__ICCARM__) -#pragma location = 0x2FFC9000 +#pragma location = 0x2FFCA000 + __no_init static rt_int16_t PLAY_BUF[PALY_SIZE]; #endif -rt_int32_t FILTER1_FIFO[FILTER_FIFO_SIZE]; static volatile rt_uint8_t DmaLeftRecBuffCplt = 0; static volatile rt_uint8_t DmaRightRecBuffCplt = 0; diff --git a/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_emmc.c b/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_emmc.c index f7d4eeffc2..54af52e5e0 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_emmc.c +++ b/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_emmc.c @@ -49,13 +49,14 @@ struct rthw_sdio }; #define EMMC_BUFF_SIZE 4096 +#define EMMC_BUFF_ADDR 0x2FFCB000 #if defined(__CC_ARM) || defined(__CLANG_ARM) -rt_uint8_t cache_buf[SDIO_BUFF_SIZE] __attribute__((at(0x2FFCB000))); -#elif defined(__ICCARM__) -#pragma location = 0x2FFCB000 -rt_uint8_t cache_buf[EMMC_BUFF_SIZE]; +__attribute__((at(EMMC_BUFF_ADDR))) static rt_uint8_t cache_buf[EMMC_BUFF_SIZE]; #elif defined ( __GNUC__ ) -rt_uint8_t cache_buf[SDIO_BUFF_SIZE] __attribute__((at(0x2FFCB000))); +static rt_uint8_t cache_buf[EMMC_BUFF_SIZE] __attribute__((section(".eMMCSection"))); +#elif defined(__ICCARM__) +#pragma location = EMMC_BUFF_ADDR +__no_init static rt_uint8_t cache_buf[EMMC_BUFF_SIZE]; #endif #if defined(EMMC_RX_DUMP) || defined(EMMC_TX_DUMP) @@ -558,7 +559,7 @@ int rt_hw_sdio_init(void) } INIT_DEVICE_EXPORT(rt_hw_sdio_init); -#if defined(EMMC_USING_DFS) +#if defined(BSP_USING_EMMC_FS) int mnt_init(void) { rt_device_t sd = RT_NULL; diff --git a/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_ov5640.c b/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_ov5640.c index b8dada9d5a..30eb0e4ad7 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_ov5640.c +++ b/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_ov5640.c @@ -28,23 +28,22 @@ #define JPEG_LINE_SIZE 1 * 1024 #if defined(__CC_ARM) || defined(__CLANG_ARM) -__attribute__((at(0x2FFCC000))) +__attribute__((at(0x2FFCC000))) static rt_int32_t JPEG_DATA_BUF[JPEG_BUF_SIZE]; #elif defined(__GNUC__) -__attribute__((at(0x2FFCC000))) +static rt_int32_t JPEG_DATA_BUF[JPEG_BUF_SIZE] __attribute__((section(".Dcmi0Section"))); #elif defined(__ICCARM__) #pragma location = 0x2FFCC000 +__no_init static rt_int32_t JPEG_DATA_BUF[JPEG_BUF_SIZE]; #endif -static rt_int32_t JPEG_DATA_BUF[JPEG_BUF_SIZE]; #if defined(__CC_ARM) || defined(__CLANG_ARM) -__attribute__((at(0x2FFDC000))) +__attribute__((at(0x2FFDC000))) static rt_int32_t JPEG_LINE_BUF[2][JPEG_LINE_SIZE]; #elif defined(__GNUC__) -__attribute__((at(0x2FFDC000))) +static rt_int32_t JPEG_LINE_BUF[2][JPEG_LINE_SIZE] __attribute__((section(".Dcmi1Section"))); #elif defined(__ICCARM__) #pragma location = 0x2FFDC000 +__no_init static rt_int32_t JPEG_LINE_BUF[2][JPEG_LINE_SIZE]; #endif -static rt_int32_t JPEG_LINE_BUF[2][JPEG_LINE_SIZE]; - volatile rt_uint32_t jpeg_data_len = 0; volatile rt_uint8_t jpeg_data_ok = 0; diff --git a/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_sdcard.c b/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_sdcard.c index ca79b806d7..3ef28f4e85 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_sdcard.c +++ b/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_sdcard.c @@ -10,7 +10,7 @@ #include "board.h" -#if defined(BSP_USING_SD_CARD) +#if defined(BSP_USING_SDCARD) #include #define DRV_DEBUG @@ -41,14 +41,15 @@ struct rt_completion rx_comp; /* SYSRAM SDMMC1/2 accesses */ #define SDIO_BUFF_SIZE 512 +#define SDCARD_ADDR 0x2FFC0000 #if defined(__CC_ARM) || defined(__CLANG_ARM) -__attribute__((at(0x2FFC0000))) +__attribute__((at(SDCARD_ADDR))) static rt_uint32_t cache_buf[SDIO_BUFF_SIZE]; #elif defined ( __GNUC__ ) -__attribute__((at(0x2FFC0000))) +static rt_uint32_t cache_buf[SDIO_BUFF_SIZE] __attribute__((section(".SdCardSection"))); #elif defined(__ICCARM__) -#pragma location = 0x2FFC0000 +#pragma location = SDCARD_ADDR +__no_init static rt_uint32_t cache_buf[SDIO_BUFF_SIZE]; #endif -static rt_uint32_t cache_buf[SDIO_BUFF_SIZE]; #if defined(SDMMC_RX_DUMP) || defined(SDMMC_TX_DUMP) #define __is_print(ch) ((unsigned int)((ch) - ' ') < 127u - ' ') @@ -378,7 +379,7 @@ int rt_hw_sdcard_init(void) } INIT_DEVICE_EXPORT(rt_hw_sdcard_init); -#if defined(SD_USING_DFS) +#if defined(BSP_USING_SDCARD_FS) int mnt_init(void) { rt_device_t sd_dev = RT_NULL; diff --git a/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_sound.c b/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_sound.c index b9cfae9fb2..14efc094e5 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_sound.c +++ b/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_sound.c @@ -23,13 +23,13 @@ #define TX_FIFO_SIZE (4096) #if defined(__CC_ARM) || defined(__CLANG_ARM) -__attribute__((at(0x2FFC2000))) +__attribute__((at(0x2FFC2000))) static rt_uint8_t AUDIO_TX_FIFO[TX_FIFO_SIZE]; #elif defined ( __GNUC__ ) -__attribute__((at(0x2FFC2000))) +static rt_uint8_t AUDIO_TX_FIFO[TX_FIFO_SIZE] __attribute__((section(".AudioSection"))); #elif defined(__ICCARM__) #pragma location = 0x2FFC2000 +__no_init static rt_uint8_t AUDIO_TX_FIFO[TX_FIFO_SIZE]; #endif -static rt_uint8_t AUDIO_TX_FIFO[TX_FIFO_SIZE]; struct sound_device { @@ -348,7 +348,7 @@ static rt_err_t sound_start(struct rt_audio_device *audio, int stream) RT_ASSERT(audio != RT_NULL); snd_dev = (struct sound_device *)audio->parent.user_data; - + if (stream == AUDIO_STREAM_REPLAY) { LOG_D("open sound device"); @@ -367,15 +367,11 @@ static rt_err_t sound_start(struct rt_audio_device *audio, int stream) static rt_err_t sound_stop(struct rt_audio_device *audio, int stream) { - struct sound_device *device; RT_ASSERT(audio != RT_NULL); - device = (struct sound_device *)audio->parent.user_data; if (stream == AUDIO_STREAM_REPLAY) { HAL_SAI_DMAStop(&hsai_BlockA2); - - rt_device_close(device->decoder); LOG_D("close sound device"); } diff --git a/bsp/stm32/stm32mp157a-st-ev1/board/ports/eth/drv_eth.c b/bsp/stm32/stm32mp157a-st-ev1/board/ports/eth/drv_eth.c index 802014ee4c..42aec448f8 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/board/ports/eth/drv_eth.c +++ b/bsp/stm32/stm32mp157a-st-ev1/board/ports/eth/drv_eth.c @@ -33,22 +33,22 @@ rt_base_t level; #if defined(__ICCARM__) /* transmit buffer */ #pragma location = TX_ADD_BASE -static uint8_t txBuffer[ETH_TXBUFNB][ETH_TX_BUF_SIZE]; +__no_init static rt_uint8_t txBuffer[ETH_TXBUFNB][ETH_TX_BUF_SIZE]; /* Receive buffer */ #pragma location = RX_ADD_BASE -static uint8_t rxBuffer[ETH_RXBUFNB][ETH_RX_BUF_SIZE]; +__no_init static rt_uint8_t rxBuffer[ETH_RXBUFNB][ETH_RX_BUF_SIZE]; /* Transmit DMA descriptors */ #pragma location = TX_DMA_ADD_BASE -static TxDmaDesc txDmaDesc[ETH_TXBUFNB]; +__no_init static TxDmaDesc txDmaDesc[ETH_TXBUFNB]; /* Receive DMA descriptors */ #pragma location = RX_DMA_ADD_BASE -static RxDmaDesc rxDmaDesc[ETH_RXBUFNB]; +__no_init static RxDmaDesc rxDmaDesc[ETH_RXBUFNB]; #elif defined(__CC_ARM) || defined(__CLANG_ARM) /* transmit buffer */ -static uint8_t txBuffer[ETH_TXBUFNB][ETH_TX_BUF_SIZE] __attribute__((at(TX_ADD_BASE))); +static rt_uint8_t txBuffer[ETH_TXBUFNB][ETH_TX_BUF_SIZE] __attribute__((at(TX_ADD_BASE))); /* Receive buffer */ -static uint8_t rxBuffer[ETH_RXBUFNB][ETH_RX_BUF_SIZE] __attribute__((at(RX_ADD_BASE))); +static rt_uint8_t rxBuffer[ETH_RXBUFNB][ETH_RX_BUF_SIZE] __attribute__((at(RX_ADD_BASE))); /* Transmit DMA descriptors */ static TxDmaDesc txDmaDesc[ETH_TXBUFNB] __attribute__((at(TX_DMA_ADD_BASE))); /* Receive DMA descriptors */ @@ -56,13 +56,13 @@ static RxDmaDesc rxDmaDesc[ETH_RXBUFNB] __attribute__((at(RX_DMA_ADD_BASE))); #elif defined ( __GNUC__ ) /* transmit buffer */ -static uint8_t txBuffer[ETH_TXBUFNB][ETH_TX_BUF_SIZE] __attribute__((at(TX_ADD_BASE))); +static rt_uint8_t txBuffer[ETH_TXBUFNB][ETH_TX_BUF_SIZE] __attribute__((section(".TxArraySection"))); /* Receive buffer */ -static uint8_t rxBuffer[ETH_RXBUFNB][ETH_RX_BUF_SIZE] __attribute__((at(RX_ADD_BASE))); +static rt_uint8_t rxBuffer[ETH_RXBUFNB][ETH_RX_BUF_SIZE] __attribute__((section(".RxArraySection"))); /* Transmit DMA descriptors */ -static TxDmaDesc txDmaDesc[ETH_TXBUFNB] __attribute__((at(TX_DMA_ADD_BASE))); +static TxDmaDesc txDmaDesc[ETH_TXBUFNB] __attribute__((section(".TxDecripSection"))); /* Receive DMA descriptors */ -static RxDmaDesc rxDmaDesc[ETH_RXBUFNB] __attribute__((at(RX_DMA_ADD_BASE))); +static RxDmaDesc rxDmaDesc[ETH_RXBUFNB] __attribute__((section(".RxDecripSection"))); #endif //Current transmit descriptor -- cgit v1.3.1