From 88cf258cad25fc59212a587eb1c087972fce1a02 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 11 Nov 2025 20:52:10 +0000 Subject: [PATCH 1/4] Initial plan From d32301c76006bf3c80cfa1c12214ab654a9c7fde Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 11 Nov 2025 20:56:33 +0000 Subject: [PATCH 2/4] =?UTF-8?q?Change=20Group=20names:=20klibc=E2=86=92Lib?= =?UTF-8?q?c,=20mm=E2=86=92Memm,=20libcpu=E2=86=92CPU,=20POSIX=E2=86=92Lib?= =?UTF-8?q?c,=20Compiler=E2=86=92Libc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: BernardXiong <1241087+BernardXiong@users.noreply.github.com> --- components/libc/compilers/armlibc/SConscript | 2 +- components/libc/compilers/common/SConscript | 2 +- components/libc/compilers/common/extension/SConscript | 2 +- .../libc/compilers/common/extension/fcntl/msvc/SConscript | 2 +- .../libc/compilers/common/extension/fcntl/octal/SConscript | 2 +- components/libc/compilers/dlib/SConscript | 2 +- components/libc/compilers/musl/SConscript | 2 +- components/libc/compilers/newlib/SConscript | 2 +- components/libc/compilers/picolibc/SConscript | 2 +- components/libc/posix/delay/SConscript | 2 +- components/libc/posix/io/aio/SConscript | 2 +- components/libc/posix/io/epoll/SConscript | 2 +- components/libc/posix/io/eventfd/SConscript | 2 +- components/libc/posix/io/mman/SConscript | 2 +- components/libc/posix/io/poll/SConscript | 2 +- components/libc/posix/io/signalfd/SConscript | 2 +- components/libc/posix/io/stdio/SConscript | 2 +- components/libc/posix/io/termios/SConscript | 2 +- components/libc/posix/io/timerfd/SConscript | 2 +- components/libc/posix/ipc/SConscript | 2 +- components/libc/posix/libdl/SConscript | 2 +- components/libc/posix/pthreads/SConscript | 2 +- components/libc/posix/signal/SConscript | 2 +- components/libc/posix/tls/SConscript | 2 +- components/mm/SConscript | 2 +- libcpu/aarch64/common/SConscript | 2 +- libcpu/aarch64/cortex-a/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-m85/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/s3c24x0/SConscript | 2 +- libcpu/arm/s3c44b0/SConscript | 2 +- libcpu/arm/sep4020/SConscript | 2 +- libcpu/arm/zynqmp-r5/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/common/SConscript | 2 +- libcpu/risc-v/common64/SConscript | 2 +- libcpu/risc-v/rv64/SConscript | 2 +- libcpu/risc-v/t-head/c906/SConscript | 2 +- libcpu/risc-v/t-head/c908/SConscript | 2 +- libcpu/risc-v/vector/SConscript | 2 +- libcpu/risc-v/virt64/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/ti-dsp/c6x/SConscript | 2 +- libcpu/unicore32/sep6200/SConscript | 2 +- libcpu/v850/70f34/SConscript | 2 +- libcpu/xilinx/microblaze/SConscript | 2 +- src/klibc/SConscript | 2 +- 82 files changed, 82 insertions(+), 82 deletions(-) diff --git a/components/libc/compilers/armlibc/SConscript b/components/libc/compilers/armlibc/SConscript index 4304deecac4..50fab1dfd9a 100644 --- a/components/libc/compilers/armlibc/SConscript +++ b/components/libc/compilers/armlibc/SConscript @@ -7,6 +7,6 @@ group = [] if rtconfig.PLATFORM in ['armcc', 'armclang']: CPPDEFINES = ['RT_USING_ARMLIBC', 'RT_USING_LIBC', '__STDC_LIMIT_MACROS'] AddDepend(['RT_USING_ARMLIBC', 'RT_USING_LIBC']) - group = DefineGroup('Compiler', src, depend = [''], CPPDEFINES = CPPDEFINES) + group = DefineGroup('Libc', src, depend = [''], CPPDEFINES = CPPDEFINES) Return('group') diff --git a/components/libc/compilers/common/SConscript b/components/libc/compilers/common/SConscript index bb1abae5d5c..362a2644ac0 100644 --- a/components/libc/compilers/common/SConscript +++ b/components/libc/compilers/common/SConscript @@ -16,7 +16,7 @@ elif rtconfig.PLATFORM in ['gcc'] and rtconfig.CPU in ['posix']: src += Glob('*.c') -group = DefineGroup('Compiler', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES) +group = DefineGroup('Libc', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES) list = os.listdir(cwd) for item in list: diff --git a/components/libc/compilers/common/extension/SConscript b/components/libc/compilers/common/extension/SConscript index 58e43dd62e6..ed632efac2b 100644 --- a/components/libc/compilers/common/extension/SConscript +++ b/components/libc/compilers/common/extension/SConscript @@ -10,7 +10,7 @@ group = [] src += Glob('*.c') if rtconfig.PLATFORM not in ['gcc', 'llvm-arm']: - group = DefineGroup('Compiler', src, depend = [''], CPPPATH = CPPPATH) + group = DefineGroup('Libc', src, depend = [''], CPPPATH = CPPPATH) list = os.listdir(cwd) for d in list: diff --git a/components/libc/compilers/common/extension/fcntl/msvc/SConscript b/components/libc/compilers/common/extension/fcntl/msvc/SConscript index bb1682d1bc2..e87326ff862 100644 --- a/components/libc/compilers/common/extension/fcntl/msvc/SConscript +++ b/components/libc/compilers/common/extension/fcntl/msvc/SConscript @@ -7,5 +7,5 @@ CPPPATH = [cwd] group = [] if rtconfig.CROSS_TOOL == 'msvc': - group = DefineGroup('Compiler', src, depend = [''], CPPPATH = CPPPATH) + group = DefineGroup('Libc', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/components/libc/compilers/common/extension/fcntl/octal/SConscript b/components/libc/compilers/common/extension/fcntl/octal/SConscript index ed9289b8250..771e213c8ea 100644 --- a/components/libc/compilers/common/extension/fcntl/octal/SConscript +++ b/components/libc/compilers/common/extension/fcntl/octal/SConscript @@ -7,5 +7,5 @@ CPPPATH = [cwd] group = [] if rtconfig.PLATFORM in ['armcc', 'armclang', 'iccarm']: - group = DefineGroup('Compiler', src, depend = [''], CPPPATH = CPPPATH) + group = DefineGroup('Libc', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/components/libc/compilers/dlib/SConscript b/components/libc/compilers/dlib/SConscript index 8a7bf8533ff..7fa3fef3fb0 100644 --- a/components/libc/compilers/dlib/SConscript +++ b/components/libc/compilers/dlib/SConscript @@ -17,6 +17,6 @@ if rtconfig.PLATFORM in ['iccarm']: if iar_version != LooseVersion("0.0") and iar_version < LooseVersion("8.20.1"): CPPDEFINES = CPPDEFINES + ['_DLIB_THREAD_SUPPORT'] - group = DefineGroup('Compiler', src, depend = [''], CPPDEFINES = CPPDEFINES) + group = DefineGroup('Libc', src, depend = [''], CPPDEFINES = CPPDEFINES) Return('group') diff --git a/components/libc/compilers/musl/SConscript b/components/libc/compilers/musl/SConscript index 8c5d0448ae3..2b152cb38ae 100644 --- a/components/libc/compilers/musl/SConscript +++ b/components/libc/compilers/musl/SConscript @@ -19,7 +19,7 @@ if musllibc_version: LINKFLAGS = ' --specs=kernel.specs' AddDepend(['RT_USING_MUSLLIBC', 'RT_USING_LIBC']) - group = group + DefineGroup('Compiler', src, depend = [''], CPPPATH = CPPPATH, LINKFLAGS = LINKFLAGS, CPPDEFINES = CPPDEFINES, LIBS = LIBS) + group = group + DefineGroup('Libc', src, depend = [''], CPPPATH = CPPPATH, LINKFLAGS = LINKFLAGS, CPPDEFINES = CPPDEFINES, LIBS = LIBS) list = os.listdir(cwd) for d in list: diff --git a/components/libc/compilers/newlib/SConscript b/components/libc/compilers/newlib/SConscript index 518fee8775a..87b1f3345fb 100644 --- a/components/libc/compilers/newlib/SConscript +++ b/components/libc/compilers/newlib/SConscript @@ -18,7 +18,7 @@ if newlib_version and not GetDepend('RT_USING_EXTERNAL_LIBC'): LIBS = ['c', 'm'] # link libc and libm AddDepend(['RT_USING_NEWLIBC', 'RT_USING_LIBC']) - group = group + DefineGroup('Compiler', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES, LIBS = LIBS) + group = group + DefineGroup('Libc', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES, LIBS = LIBS) list = os.listdir(cwd) for d in list: diff --git a/components/libc/compilers/picolibc/SConscript b/components/libc/compilers/picolibc/SConscript index c0de465a2f1..e5665b7acf8 100644 --- a/components/libc/compilers/picolibc/SConscript +++ b/components/libc/compilers/picolibc/SConscript @@ -24,7 +24,7 @@ if picolibc_version and not GetDepend('RT_USING_EXTERNAL_LIBC'): # LIBS = ['c', 'm'] # link libc and libm AddDepend(['RT_USING_PICOLIBC', 'RT_USING_LIBC']) - group = group + DefineGroup('Compiler', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES)#, LIBS = LIBS) + group = group + DefineGroup('Libc', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES)#, LIBS = LIBS) list = os.listdir(cwd) for d in list: diff --git a/components/libc/posix/delay/SConscript b/components/libc/posix/delay/SConscript index f587f2dd643..816d417a581 100644 --- a/components/libc/posix/delay/SConscript +++ b/components/libc/posix/delay/SConscript @@ -6,6 +6,6 @@ cwd = GetCurrentDir() src = Glob('*.c') CPPPATH = [cwd] -group = DefineGroup('POSIX', src, depend = ['RT_USING_POSIX_DELAY'], CPPPATH = CPPPATH) +group = DefineGroup('Libc', src, depend = ['RT_USING_POSIX_DELAY'], CPPPATH = CPPPATH) Return('group') diff --git a/components/libc/posix/io/aio/SConscript b/components/libc/posix/io/aio/SConscript index 6d4014311c0..bcef4d8a717 100644 --- a/components/libc/posix/io/aio/SConscript +++ b/components/libc/posix/io/aio/SConscript @@ -6,6 +6,6 @@ cwd = GetCurrentDir() src = ['aio.c'] CPPPATH = [cwd] -group = DefineGroup('POSIX', src, depend = ['RT_USING_POSIX_AIO'], CPPPATH = CPPPATH) +group = DefineGroup('Libc', src, depend = ['RT_USING_POSIX_AIO'], CPPPATH = CPPPATH) Return('group') diff --git a/components/libc/posix/io/epoll/SConscript b/components/libc/posix/io/epoll/SConscript index cef3fff8a05..0f765f38da9 100644 --- a/components/libc/posix/io/epoll/SConscript +++ b/components/libc/posix/io/epoll/SConscript @@ -9,6 +9,6 @@ CPPPATH = [cwd] if GetDepend('RT_USING_POSIX_EPOLL'): src += ['epoll.c'] -group = DefineGroup('POSIX', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('Libc', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/components/libc/posix/io/eventfd/SConscript b/components/libc/posix/io/eventfd/SConscript index b4becfce4b7..481f332ac58 100644 --- a/components/libc/posix/io/eventfd/SConscript +++ b/components/libc/posix/io/eventfd/SConscript @@ -9,6 +9,6 @@ CPPPATH = [cwd] if GetDepend('RT_USING_POSIX_EVENTFD'): src += ['eventfd.c'] -group = DefineGroup('POSIX', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('Libc', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/components/libc/posix/io/mman/SConscript b/components/libc/posix/io/mman/SConscript index 7dd096c9980..1041c5e2409 100644 --- a/components/libc/posix/io/mman/SConscript +++ b/components/libc/posix/io/mman/SConscript @@ -6,6 +6,6 @@ cwd = GetCurrentDir() src = ['mman.c'] CPPPATH = [cwd] -group = DefineGroup('POSIX', src, depend = ['RT_USING_POSIX_MMAN'], CPPPATH = CPPPATH) +group = DefineGroup('Libc', src, depend = ['RT_USING_POSIX_MMAN'], CPPPATH = CPPPATH) Return('group') diff --git a/components/libc/posix/io/poll/SConscript b/components/libc/posix/io/poll/SConscript index 7e7c0f55f79..9ccc5425c12 100644 --- a/components/libc/posix/io/poll/SConscript +++ b/components/libc/posix/io/poll/SConscript @@ -12,6 +12,6 @@ if GetDepend('RT_USING_POSIX_POLL'): if GetDepend('RT_USING_POSIX_SELECT'): src += ['select.c'] -group = DefineGroup('POSIX', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('Libc', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/components/libc/posix/io/signalfd/SConscript b/components/libc/posix/io/signalfd/SConscript index 724453b0996..9651a118e69 100644 --- a/components/libc/posix/io/signalfd/SConscript +++ b/components/libc/posix/io/signalfd/SConscript @@ -9,6 +9,6 @@ CPPPATH = [cwd] if GetDepend('RT_USING_POSIX_SIGNALFD'): src += ['signalfd.c'] -group = DefineGroup('POSIX', src, depend = ['RT_USING_SMART','RT_USING_POSIX_SIGNALFD'], CPPPATH = CPPPATH) +group = DefineGroup('Libc', src, depend = ['RT_USING_SMART','RT_USING_POSIX_SIGNALFD'], CPPPATH = CPPPATH) Return('group') diff --git a/components/libc/posix/io/stdio/SConscript b/components/libc/posix/io/stdio/SConscript index 8180c9b0b8c..f57164ff43f 100644 --- a/components/libc/posix/io/stdio/SConscript +++ b/components/libc/posix/io/stdio/SConscript @@ -1,6 +1,6 @@ from building import * src = ['stdio.c'] -group = DefineGroup('POSIX', src, depend = ['RT_USING_POSIX_STDIO'], CPPPATH = [GetCurrentDir()]) +group = DefineGroup('Libc', src, depend = ['RT_USING_POSIX_STDIO'], CPPPATH = [GetCurrentDir()]) Return('group') diff --git a/components/libc/posix/io/termios/SConscript b/components/libc/posix/io/termios/SConscript index 68bd9d81c9f..14116b27377 100644 --- a/components/libc/posix/io/termios/SConscript +++ b/components/libc/posix/io/termios/SConscript @@ -6,6 +6,6 @@ cwd = GetCurrentDir() src = ['termios.c'] CPPPATH = [cwd] -group = DefineGroup('POSIX', src, depend = ['RT_USING_POSIX_TERMIOS'], CPPPATH = CPPPATH) +group = DefineGroup('Libc', src, depend = ['RT_USING_POSIX_TERMIOS'], CPPPATH = CPPPATH) Return('group') diff --git a/components/libc/posix/io/timerfd/SConscript b/components/libc/posix/io/timerfd/SConscript index 561d00c13cd..ca9c641e713 100644 --- a/components/libc/posix/io/timerfd/SConscript +++ b/components/libc/posix/io/timerfd/SConscript @@ -9,6 +9,6 @@ CPPPATH = [cwd] if GetDepend('RT_USING_DFS'): src += ['timerfd.c'] -group = DefineGroup('POSIX', src, depend = ['RT_USING_POSIX_TIMERFD'], CPPPATH = CPPPATH) +group = DefineGroup('Libc', src, depend = ['RT_USING_POSIX_TIMERFD'], CPPPATH = CPPPATH) Return('group') diff --git a/components/libc/posix/ipc/SConscript b/components/libc/posix/ipc/SConscript index bee46adf194..7ffac84bb96 100644 --- a/components/libc/posix/ipc/SConscript +++ b/components/libc/posix/ipc/SConscript @@ -15,6 +15,6 @@ if GetDepend(['RT_USING_POSIX_MESSAGE_QUEUE', 'RT_USING_DFS_MQUEUE']): if GetDepend('RT_USING_POSIX_MESSAGE_SEMAPHORE'): src += ['semaphore.c'] -group = DefineGroup('POSIX', src, depend = [''], CPPPATH = inc) +group = DefineGroup('Libc', src, depend = [''], CPPPATH = inc) Return('group') diff --git a/components/libc/posix/libdl/SConscript b/components/libc/posix/libdl/SConscript index 146253909f2..cf6648a4a97 100644 --- a/components/libc/posix/libdl/SConscript +++ b/components/libc/posix/libdl/SConscript @@ -7,6 +7,6 @@ group = [] CPPPATH = [cwd] if rtconfig.PLATFORM in ['gcc']: - group = DefineGroup('POSIX', src, depend = ['RT_USING_MODULE'], CPPPATH = CPPPATH) + group = DefineGroup('Libc', src, depend = ['RT_USING_MODULE'], CPPPATH = CPPPATH) Return('group') diff --git a/components/libc/posix/pthreads/SConscript b/components/libc/posix/pthreads/SConscript index adcd07ee496..6306da467f2 100644 --- a/components/libc/posix/pthreads/SConscript +++ b/components/libc/posix/pthreads/SConscript @@ -4,6 +4,6 @@ cwd = GetCurrentDir() src = Glob('*.c') CPPPATH = [cwd] -group = DefineGroup('POSIX', src, depend = ['RT_USING_PTHREADS'], CPPPATH = CPPPATH) +group = DefineGroup('Libc', src, depend = ['RT_USING_PTHREADS'], CPPPATH = CPPPATH) Return('group') diff --git a/components/libc/posix/signal/SConscript b/components/libc/posix/signal/SConscript index eb0b103bafb..d4089df6ddb 100644 --- a/components/libc/posix/signal/SConscript +++ b/components/libc/posix/signal/SConscript @@ -6,7 +6,7 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] -group = DefineGroup('POSIX', src, +group = DefineGroup('Libc', src, depend = ['RT_USING_SIGNALS', 'RT_USING_PTHREADS'], CPPPATH = CPPPATH) diff --git a/components/libc/posix/tls/SConscript b/components/libc/posix/tls/SConscript index adcd07ee496..6306da467f2 100644 --- a/components/libc/posix/tls/SConscript +++ b/components/libc/posix/tls/SConscript @@ -4,6 +4,6 @@ cwd = GetCurrentDir() src = Glob('*.c') CPPPATH = [cwd] -group = DefineGroup('POSIX', src, depend = ['RT_USING_PTHREADS'], CPPPATH = CPPPATH) +group = DefineGroup('Libc', src, depend = ['RT_USING_PTHREADS'], CPPPATH = CPPPATH) Return('group') diff --git a/components/mm/SConscript b/components/mm/SConscript index d1f5372551f..39e4f6bbcfa 100644 --- a/components/mm/SConscript +++ b/components/mm/SConscript @@ -11,6 +11,6 @@ if GetDepend('ARCH_ARM_CORTEX_A') or GetDepend('ARCH_ARMV8') or GetDepend('ARCH_ CPPPATH = [cwd] - group = DefineGroup('mm', src, depend = ['ARCH_MM_MMU'], CPPPATH = CPPPATH) + group = DefineGroup('Memm', src, depend = ['ARCH_MM_MMU'], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/aarch64/common/SConscript b/libcpu/aarch64/common/SConscript index 2041098f142..13e5f2fdb02 100644 --- a/libcpu/aarch64/common/SConscript +++ b/libcpu/aarch64/common/SConscript @@ -24,7 +24,7 @@ if GetDepend('RT_USING_PIC') == True: if GetDepend('RT_HWTIMER_ARM_ARCH') == True: SrcRemove(src, ['gtimer.c']) -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) # build for sub-directory list = os.listdir(cwd) diff --git a/libcpu/aarch64/cortex-a/SConscript b/libcpu/aarch64/cortex-a/SConscript index 03af8fdbc67..0b74223c6f5 100644 --- a/libcpu/aarch64/cortex-a/SConscript +++ b/libcpu/aarch64/cortex-a/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('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arc/common/SConscript b/libcpu/arc/common/SConscript index 695881db42e..7ec6fa0b32f 100644 --- a/libcpu/arc/common/SConscript +++ b/libcpu/arc/common/SConscript @@ -4,6 +4,6 @@ cwd = GetCurrentDir() src = Glob('*.c') CPPPATH = [cwd] -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arc/em/SConscript b/libcpu/arc/em/SConscript index 3c7a28a6401..a52aa9b1e4f 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('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/AT91SAM7S/SConscript b/libcpu/arm/AT91SAM7S/SConscript index f582c789f8b..b259a94c946 100644 --- a/libcpu/arm/AT91SAM7S/SConscript +++ b/libcpu/arm/AT91SAM7S/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM in ['gcc']: if rtconfig.PLATFORM in ['iccarm']: src += Glob('*_iar.S') -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/AT91SAM7X/SConscript b/libcpu/arm/AT91SAM7X/SConscript index f582c789f8b..b259a94c946 100644 --- a/libcpu/arm/AT91SAM7X/SConscript +++ b/libcpu/arm/AT91SAM7X/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM in ['gcc']: if rtconfig.PLATFORM in ['iccarm']: src += Glob('*_iar.S') -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/am335x/SConscript b/libcpu/arm/am335x/SConscript index f582c789f8b..b259a94c946 100644 --- a/libcpu/arm/am335x/SConscript +++ b/libcpu/arm/am335x/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM in ['gcc']: if rtconfig.PLATFORM in ['iccarm']: src += Glob('*_iar.S') -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/arm926/SConscript b/libcpu/arm/arm926/SConscript index 83cd39c0d85..3760ab5ea12 100644 --- a/libcpu/arm/arm926/SConscript +++ b/libcpu/arm/arm926/SConscript @@ -20,6 +20,6 @@ if rtconfig.PLATFORM in ['gcc']: if rtconfig.PLATFORM in ['iccarm']: src += Glob('*_iar.S') -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/arm/armv6/SConscript b/libcpu/arm/armv6/SConscript index f582c789f8b..b259a94c946 100644 --- a/libcpu/arm/armv6/SConscript +++ b/libcpu/arm/armv6/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM in ['gcc']: if rtconfig.PLATFORM in ['iccarm']: src += Glob('*_iar.S') -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/common/SConscript b/libcpu/arm/common/SConscript index 598ae5deb4b..9333c8de74a 100644 --- a/libcpu/arm/common/SConscript +++ b/libcpu/arm/common/SConscript @@ -21,6 +21,6 @@ if rtconfig.PLATFORM in ['iccarm']: if not GetDepend('RT_USING_HW_ATOMIC'): SrcRemove(src, 'atomic_arm.c') -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/cortex-a/SConscript b/libcpu/arm/cortex-a/SConscript index 4eb763baa11..562c6ffa4fd 100644 --- a/libcpu/arm/cortex-a/SConscript +++ b/libcpu/arm/cortex-a/SConscript @@ -39,6 +39,6 @@ if rtconfig.PLATFORM in ['iccarm']: if rtconfig.PLATFORM in ['iccarm']: src += Glob('*_iar.S') -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/cortex-m0/SConscript b/libcpu/arm/cortex-m0/SConscript index f582c789f8b..b259a94c946 100644 --- a/libcpu/arm/cortex-m0/SConscript +++ b/libcpu/arm/cortex-m0/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM in ['gcc']: if rtconfig.PLATFORM in ['iccarm']: src += Glob('*_iar.S') -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/cortex-m23/SConscript b/libcpu/arm/cortex-m23/SConscript index f582c789f8b..b259a94c946 100644 --- a/libcpu/arm/cortex-m23/SConscript +++ b/libcpu/arm/cortex-m23/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM in ['gcc']: if rtconfig.PLATFORM in ['iccarm']: src += Glob('*_iar.S') -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/cortex-m3/SConscript b/libcpu/arm/cortex-m3/SConscript index f582c789f8b..b259a94c946 100644 --- a/libcpu/arm/cortex-m3/SConscript +++ b/libcpu/arm/cortex-m3/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM in ['gcc']: if rtconfig.PLATFORM in ['iccarm']: src += Glob('*_iar.S') -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/cortex-m33/SConscript b/libcpu/arm/cortex-m33/SConscript index e0021565ce2..8e6881ce06c 100644 --- a/libcpu/arm/cortex-m33/SConscript +++ b/libcpu/arm/cortex-m33/SConscript @@ -21,6 +21,6 @@ if rtconfig.PLATFORM in ['iccarm']: if not GetDepend('RT_USING_MEM_PROTECTION') and not GetDepend('RT_USING_HW_STACK_GUARD'): SrcRemove(src, 'mpu.c') -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/cortex-m4/SConscript b/libcpu/arm/cortex-m4/SConscript index e25dad6fe88..3ecbea8de35 100644 --- a/libcpu/arm/cortex-m4/SConscript +++ b/libcpu/arm/cortex-m4/SConscript @@ -21,6 +21,6 @@ if rtconfig.PLATFORM in ['gcc', 'llvm-arm']: if rtconfig.PLATFORM in ['iccarm']: src += Glob('*_iar.S') -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/cortex-m7/SConscript b/libcpu/arm/cortex-m7/SConscript index e0021565ce2..8e6881ce06c 100644 --- a/libcpu/arm/cortex-m7/SConscript +++ b/libcpu/arm/cortex-m7/SConscript @@ -21,6 +21,6 @@ if rtconfig.PLATFORM in ['iccarm']: if not GetDepend('RT_USING_MEM_PROTECTION') and not GetDepend('RT_USING_HW_STACK_GUARD'): SrcRemove(src, 'mpu.c') -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/cortex-m85/SConscript b/libcpu/arm/cortex-m85/SConscript index d4e490c7e46..cba7937a793 100644 --- a/libcpu/arm/cortex-m85/SConscript +++ b/libcpu/arm/cortex-m85/SConscript @@ -11,6 +11,6 @@ CPPPATH = [cwd] if rtconfig.PLATFORM in ['gcc', 'armclang', 'llvm-arm']: src += Glob('*context_gcc.S') -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/cortex-r4/SConscript b/libcpu/arm/cortex-r4/SConscript index f582c789f8b..b259a94c946 100644 --- a/libcpu/arm/cortex-r4/SConscript +++ b/libcpu/arm/cortex-r4/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM in ['gcc']: if rtconfig.PLATFORM in ['iccarm']: src += Glob('*_iar.S') -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/dm36x/SConscript b/libcpu/arm/dm36x/SConscript index f582c789f8b..b259a94c946 100644 --- a/libcpu/arm/dm36x/SConscript +++ b/libcpu/arm/dm36x/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM in ['gcc']: if rtconfig.PLATFORM in ['iccarm']: src += Glob('*_iar.S') -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/lpc214x/SConscript b/libcpu/arm/lpc214x/SConscript index f582c789f8b..b259a94c946 100644 --- a/libcpu/arm/lpc214x/SConscript +++ b/libcpu/arm/lpc214x/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM in ['gcc']: if rtconfig.PLATFORM in ['iccarm']: src += Glob('*_iar.S') -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/lpc24xx/SConscript b/libcpu/arm/lpc24xx/SConscript index f582c789f8b..b259a94c946 100644 --- a/libcpu/arm/lpc24xx/SConscript +++ b/libcpu/arm/lpc24xx/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM in ['gcc']: if rtconfig.PLATFORM in ['iccarm']: src += Glob('*_iar.S') -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/s3c24x0/SConscript b/libcpu/arm/s3c24x0/SConscript index f582c789f8b..b259a94c946 100644 --- a/libcpu/arm/s3c24x0/SConscript +++ b/libcpu/arm/s3c24x0/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM in ['gcc']: if rtconfig.PLATFORM in ['iccarm']: src += Glob('*_iar.S') -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/s3c44b0/SConscript b/libcpu/arm/s3c44b0/SConscript index f582c789f8b..b259a94c946 100644 --- a/libcpu/arm/s3c44b0/SConscript +++ b/libcpu/arm/s3c44b0/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM in ['gcc']: if rtconfig.PLATFORM in ['iccarm']: src += Glob('*_iar.S') -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/sep4020/SConscript b/libcpu/arm/sep4020/SConscript index f582c789f8b..b259a94c946 100644 --- a/libcpu/arm/sep4020/SConscript +++ b/libcpu/arm/sep4020/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM in ['gcc']: if rtconfig.PLATFORM in ['iccarm']: src += Glob('*_iar.S') -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/arm/zynqmp-r5/SConscript b/libcpu/arm/zynqmp-r5/SConscript index f582c789f8b..b259a94c946 100644 --- a/libcpu/arm/zynqmp-r5/SConscript +++ b/libcpu/arm/zynqmp-r5/SConscript @@ -18,6 +18,6 @@ if rtconfig.PLATFORM in ['gcc']: if rtconfig.PLATFORM in ['iccarm']: src += Glob('*_iar.S') -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/avr32/uc3/SConscript b/libcpu/avr32/uc3/SConscript index a8f142f505f..39497d94d12 100644 --- a/libcpu/avr32/uc3/SConscript +++ b/libcpu/avr32/uc3/SConscript @@ -8,6 +8,6 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/blackfin/bf53x/SConscript b/libcpu/blackfin/bf53x/SConscript index ecd21c4fe38..9319d879899 100644 --- a/libcpu/blackfin/bf53x/SConscript +++ b/libcpu/blackfin/bf53x/SConscript @@ -8,6 +8,6 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') + Glob('*_vdsp.S') CPPPATH = [cwd] -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/c-sky/ck802/SConscript b/libcpu/c-sky/ck802/SConscript index a8f142f505f..39497d94d12 100644 --- a/libcpu/c-sky/ck802/SConscript +++ b/libcpu/c-sky/ck802/SConscript @@ -8,6 +8,6 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/c-sky/common/SConscript b/libcpu/c-sky/common/SConscript index a8f142f505f..39497d94d12 100644 --- a/libcpu/c-sky/common/SConscript +++ b/libcpu/c-sky/common/SConscript @@ -8,6 +8,6 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/ia32/SConscript b/libcpu/ia32/SConscript index a8f142f505f..39497d94d12 100644 --- a/libcpu/ia32/SConscript +++ b/libcpu/ia32/SConscript @@ -8,6 +8,6 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/m16c/m16c62p/SConscript b/libcpu/m16c/m16c62p/SConscript index a8f142f505f..39497d94d12 100644 --- a/libcpu/m16c/m16c62p/SConscript +++ b/libcpu/m16c/m16c62p/SConscript @@ -8,6 +8,6 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/mips/common/SConscript b/libcpu/mips/common/SConscript index a8f142f505f..39497d94d12 100644 --- a/libcpu/mips/common/SConscript +++ b/libcpu/mips/common/SConscript @@ -8,6 +8,6 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/mips/gs232/SConscript b/libcpu/mips/gs232/SConscript index a8f142f505f..39497d94d12 100644 --- a/libcpu/mips/gs232/SConscript +++ b/libcpu/mips/gs232/SConscript @@ -8,6 +8,6 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/mips/gs264/SConscript b/libcpu/mips/gs264/SConscript index a8f142f505f..39497d94d12 100644 --- a/libcpu/mips/gs264/SConscript +++ b/libcpu/mips/gs264/SConscript @@ -8,6 +8,6 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/mips/pic32/SConscript b/libcpu/mips/pic32/SConscript index a8f142f505f..39497d94d12 100644 --- a/libcpu/mips/pic32/SConscript +++ b/libcpu/mips/pic32/SConscript @@ -8,6 +8,6 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/nios/nios_ii/SConscript b/libcpu/nios/nios_ii/SConscript index a8f142f505f..39497d94d12 100644 --- a/libcpu/nios/nios_ii/SConscript +++ b/libcpu/nios/nios_ii/SConscript @@ -8,6 +8,6 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/ppc/common/SConscript b/libcpu/ppc/common/SConscript index a8f142f505f..39497d94d12 100644 --- a/libcpu/ppc/common/SConscript +++ b/libcpu/ppc/common/SConscript @@ -8,6 +8,6 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/ppc/ppc405/SConscript b/libcpu/ppc/ppc405/SConscript index a8f142f505f..39497d94d12 100644 --- a/libcpu/ppc/ppc405/SConscript +++ b/libcpu/ppc/ppc405/SConscript @@ -8,6 +8,6 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/risc-v/common/SConscript b/libcpu/risc-v/common/SConscript index deaa2907c56..814cfb01d5d 100644 --- a/libcpu/risc-v/common/SConscript +++ b/libcpu/risc-v/common/SConscript @@ -10,6 +10,6 @@ ASFLAGS = ' -I ' + cwd if not GetDepend('RT_USING_HW_ATOMIC'): SrcRemove(src, 'atomic_riscv.c') -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/risc-v/common64/SConscript b/libcpu/risc-v/common64/SConscript index 08acc79944a..216a5fc7116 100644 --- a/libcpu/risc-v/common64/SConscript +++ b/libcpu/risc-v/common64/SConscript @@ -7,6 +7,6 @@ CPPPATH = [cwd] if not GetDepend('ARCH_USING_ASID'): SrcRemove(src, ['asid.c']) -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/risc-v/rv64/SConscript b/libcpu/risc-v/rv64/SConscript index 05c70ba1b96..ccd26ae518c 100755 --- a/libcpu/risc-v/rv64/SConscript +++ b/libcpu/risc-v/rv64/SConscript @@ -7,6 +7,6 @@ src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] ASFLAGS = ' -I ' + cwd -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) Return('group') diff --git a/libcpu/risc-v/t-head/c906/SConscript b/libcpu/risc-v/t-head/c906/SConscript index 5f750ad65f4..e8d49aadb23 100644 --- a/libcpu/risc-v/t-head/c906/SConscript +++ b/libcpu/risc-v/t-head/c906/SConscript @@ -8,6 +8,6 @@ CPPPATH = [cwd] if not GetDepend('ARCH_USING_ASID'): SrcRemove(src, ['asid.c']) -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/risc-v/t-head/c908/SConscript b/libcpu/risc-v/t-head/c908/SConscript index 0e2b4366234..1562b9c14f2 100644 --- a/libcpu/risc-v/t-head/c908/SConscript +++ b/libcpu/risc-v/t-head/c908/SConscript @@ -5,6 +5,6 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/risc-v/vector/SConscript b/libcpu/risc-v/vector/SConscript index 69e8318e5ca..9ec03146d0c 100644 --- a/libcpu/risc-v/vector/SConscript +++ b/libcpu/risc-v/vector/SConscript @@ -7,6 +7,6 @@ CPPPATH = [] CPPPATH += [cwd + '/rvv-1.0'] -group = DefineGroup('libcpu', src, depend = ['ARCH_RISCV_VECTOR'], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = ['ARCH_RISCV_VECTOR'], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/risc-v/virt64/SConscript b/libcpu/risc-v/virt64/SConscript index 0e2b4366234..1562b9c14f2 100644 --- a/libcpu/risc-v/virt64/SConscript +++ b/libcpu/risc-v/virt64/SConscript @@ -5,6 +5,6 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/rx/SConscript b/libcpu/rx/SConscript index 9b84f36dce9..d517feb7582 100644 --- a/libcpu/rx/SConscript +++ b/libcpu/rx/SConscript @@ -8,6 +8,6 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') + Glob('*_iar.S') CPPPATH = [cwd] -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/sim/posix/SConscript b/libcpu/sim/posix/SConscript index a8f142f505f..39497d94d12 100644 --- a/libcpu/sim/posix/SConscript +++ b/libcpu/sim/posix/SConscript @@ -8,6 +8,6 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/sim/win32/SConscript b/libcpu/sim/win32/SConscript index 68bb9bb4a12..8c45a32e34e 100644 --- a/libcpu/sim/win32/SConscript +++ b/libcpu/sim/win32/SConscript @@ -8,6 +8,6 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/sparc-v8/bm3803/SConscript b/libcpu/sparc-v8/bm3803/SConscript index a9b33dee846..95df0b4b353 100644 --- a/libcpu/sparc-v8/bm3803/SConscript +++ b/libcpu/sparc-v8/bm3803/SConscript @@ -12,6 +12,6 @@ if rtconfig.PLATFORM in ['gcc']: src += Glob('*_init.S') src += Glob('*_gcc.S') -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/sparc-v8/common/SConscript b/libcpu/sparc-v8/common/SConscript index a9b33dee846..95df0b4b353 100644 --- a/libcpu/sparc-v8/common/SConscript +++ b/libcpu/sparc-v8/common/SConscript @@ -12,6 +12,6 @@ if rtconfig.PLATFORM in ['gcc']: src += Glob('*_init.S') src += Glob('*_gcc.S') -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/ti-dsp/c28x/SConscript b/libcpu/ti-dsp/c28x/SConscript index bd62f9cfe57..8ff40c24bd5 100644 --- a/libcpu/ti-dsp/c28x/SConscript +++ b/libcpu/ti-dsp/c28x/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('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/ti-dsp/c6x/SConscript b/libcpu/ti-dsp/c6x/SConscript index 91c755df2dd..31720136bb4 100644 --- a/libcpu/ti-dsp/c6x/SConscript +++ b/libcpu/ti-dsp/c6x/SConscript @@ -8,6 +8,6 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') + Glob('*.asm') CPPPATH = [cwd] -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/unicore32/sep6200/SConscript b/libcpu/unicore32/sep6200/SConscript index a8f142f505f..39497d94d12 100644 --- a/libcpu/unicore32/sep6200/SConscript +++ b/libcpu/unicore32/sep6200/SConscript @@ -8,6 +8,6 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/v850/70f34/SConscript b/libcpu/v850/70f34/SConscript index a8f142f505f..39497d94d12 100644 --- a/libcpu/v850/70f34/SConscript +++ b/libcpu/v850/70f34/SConscript @@ -8,6 +8,6 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/libcpu/xilinx/microblaze/SConscript b/libcpu/xilinx/microblaze/SConscript index a8f142f505f..39497d94d12 100644 --- a/libcpu/xilinx/microblaze/SConscript +++ b/libcpu/xilinx/microblaze/SConscript @@ -8,6 +8,6 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S') CPPPATH = [cwd] -group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/src/klibc/SConscript b/src/klibc/SConscript index eb629ef7250..ce214ad1059 100644 --- a/src/klibc/SConscript +++ b/src/klibc/SConscript @@ -13,7 +13,7 @@ if not GetDepend(['RT_KLIBC_USING_LIBC_VSNPRINTF']): if not GetDepend(['RT_KLIBC_USING_LIBC_VSSCANF']): src += ['rt_vsscanf.c'] -group = DefineGroup('klibc', src, depend = ['']) +group = DefineGroup('Libc', src, depend = ['']) list = os.listdir(cwd) for item in list: From ebb88c770e05e2471ed07eae6bd847f6963492e6 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 11 Nov 2025 20:57:14 +0000 Subject: [PATCH 3/4] Unify ktime and CherryUSB groups to DeviceDrivers Co-authored-by: BernardXiong <1241087+BernardXiong@users.noreply.github.com> --- components/drivers/ktime/SConscript | 2 +- components/drivers/usb/cherryusb/SConscript | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/drivers/ktime/SConscript b/components/drivers/ktime/SConscript index 3fb3139025a..20a02957191 100644 --- a/components/drivers/ktime/SConscript +++ b/components/drivers/ktime/SConscript @@ -19,6 +19,6 @@ if rtconfig.PLATFORM in ['gcc', 'armclang']: elif rtconfig.PLATFORM in ['armcc']: LOCAL_CCFLAGS += ' --c99 --gnu' -group = DefineGroup('ktime', src, depend=['RT_USING_KTIME'], CPPPATH=CPPPATH, LOCAL_CCFLAGS = LOCAL_CCFLAGS) +group = DefineGroup('DeviceDrivers', src, depend=['RT_USING_KTIME'], CPPPATH=CPPPATH, LOCAL_CCFLAGS = LOCAL_CCFLAGS) Return('group') diff --git a/components/drivers/usb/cherryusb/SConscript b/components/drivers/usb/cherryusb/SConscript index a3a5156d151..bf4fbc3b5bf 100644 --- a/components/drivers/usb/cherryusb/SConscript +++ b/components/drivers/usb/cherryusb/SConscript @@ -320,7 +320,7 @@ if GetDepend(['RT_CHERRYUSB_HOST']): src += Glob('platform/rtthread/usb_msh.c') src += Glob('platform/rtthread/usb_check.c') -group = DefineGroup('CherryUSB', src, depend = ['RT_USING_CHERRYUSB'], LIBS = LIBS, LIBPATH=LIBPATH, CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('DeviceDrivers', src, depend = ['RT_USING_CHERRYUSB'], LIBS = LIBS, LIBPATH=LIBPATH, CPPPATH = path, CPPDEFINES = CPPDEFINES) Return('group') From bb1688f105a4c5e3470975e16aca68d893573dbe Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 11 Nov 2025 21:11:36 +0000 Subject: [PATCH 4/4] Change CherryUSB group to UsbStack Co-authored-by: BernardXiong <1241087+BernardXiong@users.noreply.github.com> --- components/drivers/usb/cherryusb/SConscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/drivers/usb/cherryusb/SConscript b/components/drivers/usb/cherryusb/SConscript index bf4fbc3b5bf..a2a80fdc375 100644 --- a/components/drivers/usb/cherryusb/SConscript +++ b/components/drivers/usb/cherryusb/SConscript @@ -320,7 +320,7 @@ if GetDepend(['RT_CHERRYUSB_HOST']): src += Glob('platform/rtthread/usb_msh.c') src += Glob('platform/rtthread/usb_check.c') -group = DefineGroup('DeviceDrivers', src, depend = ['RT_USING_CHERRYUSB'], LIBS = LIBS, LIBPATH=LIBPATH, CPPPATH = path, CPPDEFINES = CPPDEFINES) +group = DefineGroup('UsbStack', src, depend = ['RT_USING_CHERRYUSB'], LIBS = LIBS, LIBPATH=LIBPATH, CPPPATH = path, CPPDEFINES = CPPDEFINES) Return('group')