Merge pull request #4047 from yangjie11/dev-11

[SConscript] rename group name

bsp/CME_M7/StdPeriph_Driver/SConscript

@@ -9,6 +9,6 @@ src = Glob('src/*.c')
 
 path = [cwd + '/inc']
 
-group = DefineGroup('StdPeriph_Driver', src, depend = [''], CPPPATH = path)
+group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path)
 
 Return('group')

bsp/allwinner_tina/drivers/spi/SConscript

@@ -4,6 +4,6 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c')
 CPPPATH = [cwd, str(Dir('#'))]
 
-group = DefineGroup('spi', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')

bsp/amebaz/libraries/smartconfig/SConscript

@@ -12,7 +12,7 @@ if rtconfig.CROSS_TOOL == 'gcc':
 elif rtconfig.CROSS_TOOL == 'iar':
     libs += ['libsmartconfig_armcm4_iar']
 
-group = DefineGroup('smartconfig', src, depend = ['RT_USING_SMARTCONFIG_LIB'], CPPPATH = path, LIBS = libs, LIBPATH = libpath)
+group = DefineGroup('Libraries', src, depend = ['RT_USING_SMARTCONFIG_LIB'], CPPPATH = path, LIBS = libs, LIBPATH = libpath)
 
 Return('group')
 

bsp/apollo2/board/SConscript

@@ -9,6 +9,6 @@ CPPPATH = [cwd]
 #remove other no use files
 #SrcRemove(src, '*.c')
 
-group = DefineGroup('Board', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')

bsp/asm9260t/platform/SConscript

@@ -8,5 +8,5 @@ CPPPATH = [cwd]
 # The set of source files associated with this SConscript file.
 src = Glob('*.c')
 
-group = DefineGroup('platform', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')

bsp/at32/Libraries/AT32_Std_Driver/SConscript

@@ -41,6 +41,6 @@ path = [
 
 CPPDEFINES = ['USE_STDPERIPH_DRIVER']
 
-group = DefineGroup('AT32_Lib', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)
+group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)
 
 Return('group')

bsp/at91sam9260/platform/SConscript

@@ -21,6 +21,6 @@ if rtconfig.PLATFORM == 'cl':
 if rtconfig.PLATFORM == 'mingw':
 	src = Glob('*.c')
 
-group = DefineGroup('platform', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('Platform', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')

bsp/at91sam9g45/platform/SConscript

@@ -21,6 +21,6 @@ if rtconfig.PLATFORM == 'cl':
 if rtconfig.PLATFORM == 'mingw':
 	src = Glob('*.c')
 
-group = DefineGroup('platform', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('Platform', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')

bsp/avr32uc3b0/SOFTWARE_FRAMEWORK/SConscript

@@ -25,6 +25,6 @@ CPPPATH = [
     cwd + '/DRIVERS/USART',
 ]
 
-group = DefineGroup('Startup', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')

bsp/ck802/libraries/SConscript

@@ -43,6 +43,6 @@ path = [cwd + '/include',
     cwd + '/common/wdt'
 ]
 
-group = DefineGroup('libraries', src, depend = [''], CPPPATH = path)
+group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path)
 
 Return('group')

bsp/dm365/drivers/SConscript

@@ -26,6 +26,6 @@ if GetDepend('RT_USING_SPI_CONTROL'):
 if GetDepend('RT_USING_EMAC'):
 	src += ['davinci_emac.c']
 
-group = DefineGroup('Startup', src, depend = [''], CPPPATH = path)
+group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path)
 
 Return('group')

bsp/efm32/Libraries/SConscript

@@ -72,6 +72,6 @@ path = [cwd + '/emlib/inc',
 
 CPPDEFINES = [rtconfig.EFM32_TYPE]
 #group = DefineGroup('EFM32_StdPeriph', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES, LINKFLAGS = linker_scripts[rtconfig.EFM32_FAMILY])
-group = DefineGroup('EFM32_StdPeriph', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)
+group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)
 
 Return('group')

bsp/fh8620/drivers/SConscript

@@ -4,6 +4,6 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c')
 CPPPATH = [cwd]
 
-group = DefineGroup('drivers', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')

bsp/fh8620/platform/common/SConscript

@@ -3,6 +3,6 @@ from building import *
 cwd = GetCurrentDir()
 src = Glob('*.c')
 
-group = DefineGroup('Platform', src, depend = [''])
+group = DefineGroup('Drivers', src, depend = [''])
 
 Return('group')

bsp/fh8620/platform/fh8620/iot_cam/SConscript

@@ -4,6 +4,6 @@ cwd = GetCurrentDir()
 src = Glob('*.c')
 path = [cwd, cwd + '/..']
 
-group = DefineGroup('Platform', src, depend = ['CONFIG_BOARD_IOTCAM', 'CONFIG_CHIP_FH8620'], CPPPATH = path)
+group = DefineGroup('Drivers', src, depend = ['CONFIG_BOARD_IOTCAM', 'CONFIG_CHIP_FH8620'], CPPPATH = path)
 
 Return('group')

bsp/fh8620/platform/plat-v2/SConscript

@@ -8,6 +8,6 @@ src = Glob('*.c')
 
 path = [cwd, cwd + '/..']
 
-group = DefineGroup('Platform', src, depend = ['CONFIG_PLAT_V2'], CPPPATH = path)
+group = DefineGroup('Drivers', src, depend = ['CONFIG_PLAT_V2'], CPPPATH = path)
 
 Return('group')

bsp/frdm-k64f/board/SConscript

@@ -18,6 +18,6 @@ if GetDepend('RT_USING_LWIP'):
 
 CPPPATH = [cwd]
 
-group = DefineGroup('Board', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')

bsp/frdm-k64f/device/SConscript

@@ -21,7 +21,7 @@ elif rtconfig.CROSS_TOOL == 'keil':
 
 CPPDEFINES = ['CPU_MK64FN1M0VLL12']
 
-group = DefineGroup('Device', src, depend = [''], CPPPATH = path, CPPDEFINES=CPPDEFINES)
+group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES=CPPDEFINES)
 #CPPDEFINES = CPPDEFINES)
 
 Return('group')

bsp/gd32303e-eval/Libraries/SConscript

@@ -28,6 +28,6 @@ if GetDepend(['RT_USING_BSP_USB']):
 
 CPPDEFINES = ['USE_STDPERIPH_DRIVER', 'GD32F30X_HD']
 
-group = DefineGroup('GD32_Lib', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)
+group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)
 
 Return('group')

bsp/gd32450z-eval/Libraries/SConscript

@@ -28,6 +28,6 @@ if GetDepend(['RT_USING_BSP_USB']):
 
 CPPDEFINES = ['USE_STDPERIPH_DRIVER', 'GD32F4XX']
 
-group = DefineGroup('GD32_Lib', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)
+group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)
 
 Return('group')

bsp/gd32e230k-start/Libraries/SConscript

@@ -22,6 +22,6 @@ path = [
 
 CPPDEFINES = ['GD32E230']
 
-group = DefineGroup('GD32_Lib', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)
+group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)
 
 Return('group')

bsp/gkipc/armv6/SConscript

@@ -5,6 +5,6 @@ src	= Glob('*.c')
 src += Glob('*.s')
 path = [cwd, cwd + '../../../include', cwd + '/../libraries/inc', cwd + '/../drivers']
 
-group = DefineGroup('armv6', src, depend = [''], CPPPATH = path)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = path)
 
 Return('group')

bsp/gkipc/drivers/SConscript

@@ -19,6 +19,6 @@ path += [cwd + '/../platform']
 
 libcwd = str(Dir('#'))
 
-group = DefineGroup('drivers', src, depend = [''], CPPPATH = path)
+group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path)
 
 Return('group')

bsp/gkipc/libraries/drv/7102C/gd/SConscript

@@ -7,7 +7,7 @@ path = [cwd + '/inc']
 libcwd = str(Dir('#'))
 libinspath = libcwd + '/libraries/lib'
 
-group = DefineGroup('gd', src, depend = [''], CPPPATH = path, LIBINSPATH = libinspath)
+group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, LIBINSPATH = libinspath)
 
 list = os.listdir(cwd)
 for d in list:

bsp/gkipc/libraries/drv/7102C/gd/src/SConscript

@@ -39,6 +39,6 @@ src	+= ['wdog/gd_wdog.c']
 
 path = [cwd, cwd + '/../inc']
 
-group = DefineGroup('gd', src, depend = [''], CPPPATH = path)
+group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path)
 
 Return('group')

bsp/gkipc/libraries/drv/7102C/gh/SConscript

@@ -9,7 +9,7 @@ libinspath = libcwd + '/libraries/lib'
 
 CPPDEFINES = ['-DDEBUG']
 
-group = DefineGroup('gh', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES, LIBINSPATH = libinspath)
+group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES, LIBINSPATH = libinspath)
 
 list = os.listdir(cwd)
 for d in list:

bsp/gkipc/libraries/drv/7102C/gh/src/SConscript

@@ -4,6 +4,6 @@ cwd = GetCurrentDir()
 src	= Glob('*.c')
 path = [cwd + '/../inc']
 
-group = DefineGroup('gh', src, depend = [''], CPPPATH = path)
+group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path)
 
 Return('group')

bsp/gkipc/libraries/drv/710X/gd/SConscript

@@ -7,7 +7,7 @@ path = [cwd + '/inc']
 libcwd = str(Dir('#'))
 libinspath = libcwd + '/libraries/lib'
 
-group = DefineGroup('gd', src, depend = [''], CPPPATH = path, LIBINSPATH = libinspath)
+group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, LIBINSPATH = libinspath)
 
 list = os.listdir(cwd)
 for d in list:

bsp/gkipc/libraries/drv/710X/gd/src/SConscript

@@ -40,6 +40,6 @@ src	+= ['wdog/gd_wdog.c']
 
 path = [cwd, cwd + '/../inc', cwd + '/..']
 
-group = DefineGroup('gd', src, depend = [''], CPPPATH = path)
+group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path)
 
 Return('group')

bsp/gkipc/libraries/drv/710X/gh/SConscript

@@ -7,7 +7,7 @@ path = [cwd + '/inc']
 libcwd = str(Dir('#'))
 libinspath = libcwd + '/libraries/lib'
 
-group = DefineGroup('gh', src, depend = [''], CPPPATH = path, LIBINSPATH = libinspath)
+group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, LIBINSPATH = libinspath)
 
 list = os.listdir(cwd)
 for d in list:

bsp/gkipc/libraries/drv/710X/gh/src/SConscript

@@ -4,6 +4,6 @@ cwd = GetCurrentDir()
 src	= Glob('*.c')
 path = [cwd + '/..', cwd + '/../inc', cwd + '/../../inc']
 
-group = DefineGroup('gh', src, depend = [''], CPPPATH = path)
+group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path)
 
 Return('group')

bsp/gkipc/libraries/drv/710XS/gd/SConscript

@@ -7,7 +7,7 @@ path = [cwd + '/inc']
 libcwd = str(Dir('#'))
 libinspath = libcwd + '/libraries/lib'
 
-group = DefineGroup('gd', src, depend = [''], CPPPATH = path, LIBINSPATH = libinspath)
+group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, LIBINSPATH = libinspath)
 
 list = os.listdir(cwd)
 for d in list:

bsp/gkipc/libraries/drv/710XS/gd/src/SConscript

@@ -40,6 +40,6 @@ src	+= ['wdog/gd_wdog.c']
 
 path = [cwd, cwd + '/../inc', cwd + '/..']
 
-group = DefineGroup('gd', src, depend = [''], CPPPATH = path)
+group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path)
 
 Return('group')

bsp/gkipc/libraries/drv/710XS/gh/SConscript

@@ -7,7 +7,7 @@ path = [cwd + '/inc']
 libcwd = str(Dir('#'))
 libinspath = libcwd + '/libraries/lib'
 
-group = DefineGroup('gh', src, depend = [''], CPPPATH = path, LIBINSPATH = libinspath)
+group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, LIBINSPATH = libinspath)
 
 list = os.listdir(cwd)
 for d in list:

bsp/gkipc/libraries/drv/710XS/gh/src/SConscript

@@ -4,6 +4,6 @@ cwd = GetCurrentDir()
 src	= Glob('*.c')
 path = [cwd + '/..', cwd + '/../inc', cwd + '/../../inc']
 
-group = DefineGroup('gh', src, depend = [''], CPPPATH = path)
+group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path)
 
 Return('group')

bsp/gkipc/libraries/drv/gnu_c/SConscript

@@ -8,6 +8,6 @@ path = [cwd]
 libcwd = str(Dir('#'))
 libinspath = libcwd + '/libraries/lib'
 
-group = DefineGroup('gnu_c', src, depend = [''], CPPPATH = path, LIBINSPATH = libinspath)
+group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, LIBINSPATH = libinspath)
 
 Return('group')

bsp/gkipc/platform/SConscript

@@ -18,6 +18,6 @@ elif GetDepend('BOARD_GK7102S_HZD_JXH42'):
 elif GetDepend('BOARD_GK7102C_JH'):
     CPPDEFINES += ['-DGK7102C_JH']
           
-group = DefineGroup('platform', src, depend = [''], CPPDEFINES = CPPDEFINES)
+group = DefineGroup('Drivers', src, depend = [''], CPPDEFINES = CPPDEFINES)
 
 Return('group')

bsp/imx6sx/cortex-a9/cpu/SConscript

@@ -12,6 +12,6 @@ elif rtconfig.PLATFORM == 'gcc':
 elif rtconfig.PLATFORM == 'armcc':
         src += Glob('*_rvds.S')
 
-group = DefineGroup('AM335x', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')

bsp/imxrt/libraries/peripherals/SConscript

@@ -11,6 +11,6 @@ if GetDepend('BSP_USING_PHY') and GetDepend('PHY_USING_KSZ8081'):
 
 path = [cwd]
 
-group = DefineGroup('Peripherals', src, depend = [''], CPPPATH = path, CPPDEFINES=CPPDEFINES)
+group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES=CPPDEFINES)
 
 Return('group')

bsp/k210/driver/camera/SConscript

@@ -4,6 +4,6 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c') + Glob('*.cpp')
 CPPPATH = [cwd]
 
-group = DefineGroup('camera', src, depend = ['BSP_USING_CAMERA'], CPPPATH = CPPPATH)
+group = DefineGroup('Drivers', src, depend = ['BSP_USING_CAMERA'], CPPPATH = CPPPATH)
 
 Return('group')

bsp/nrf51822/Libraries/SConscript

@@ -22,6 +22,6 @@ path = [cwd + '/CMSIS/Include',
         cwd + '/nrf51822/Include']
 
 CPPDEFINES = ['USE_STDPERIPH_DRIVER', 'NRF51']
-group = DefineGroup('Startup Code', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)
+group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)
 
 Return('group')

bsp/nuvoton/libraries/m480/Device/SConscript

@@ -20,6 +20,6 @@ elif rtconfig.CROSS_TOOL == 'iar':
 
 path = [cwd + '/Nuvoton/M480/Include',]
 
-group = DefineGroup('m480_device', src, depend = [''], CPPPATH = path)
+group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path)
 
 Return('group')

bsp/nuvoton/libraries/m480/StdDriver/SConscript

@@ -20,9 +20,9 @@ if not GetDepend('BSP_USE_STDDRIVER_SOURCE'):
 		libs += ['libstddriver_iar']    
 
 if not libs:
-	group = DefineGroup('m480_stddriver', src, depend = [''], CPPPATH = cpppath)
+	group = DefineGroup('Libraries', src, depend = [''], CPPPATH = cpppath)
 else:
 	src = []
-	group = DefineGroup('m480_stddriver', src, depend = [''], CPPPATH = cpppath, LIBS = libs, LIBPATH = libpath)
+	group = DefineGroup('Libraries', src, depend = [''], CPPPATH = cpppath, LIBS = libs, LIBPATH = libpath)
 
 Return('group')

bsp/nuvoton/libraries/m480/rtt_port/SConscript

@@ -30,6 +30,6 @@ elif GetDepend('BOARD_USING_HSOTG') and ( GetDepend('BSP_USING_USBD') or GetDepe
     print '[Hint] You already select BOARD_USING_HSOTG. Please de-select BSP_USING_USBD and BSP_USING_USBH options.'
     sys.exit(1)
 else:
-    group = DefineGroup('m480_rttport', src, depend = [''], CPPPATH = CPPPATH)
+    group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')

bsp/nuvoton/numaker-iot-m487/board/SConscript

@@ -15,6 +15,6 @@ NuPinConfig/nutool_pincfg.c
 src += Glob('*.c') + Glob('*.cpp')
 CPPPATH = [cwd, cwd + '/NuClockConfig', cwd + '/NuPinConfig']
 
-group = DefineGroup('board', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')

bsp/nuvoton/numaker-pfm-m487/board/SConscript

@@ -15,6 +15,6 @@ NuPinConfig/nutool_pincfg.c
 src += Glob('*.c') + Glob('*.cpp')
 CPPPATH = [cwd, cwd + '/NuClockConfig', cwd + '/NuPinConfig']
 
-group = DefineGroup('board', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')

bsp/nv32f100x/lib/SConscript

@@ -11,6 +11,6 @@ path = [cwd + '/inc'
 
 CPPDEFINES = ['NV32', 'KEIL']
 
-group = DefineGroup('Lib', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)
+group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)
 
 Return('group')

bsp/qemu-vexpress-a9/drivers/audio/SConscript

@@ -4,6 +4,6 @@ cwd = GetCurrentDir()
 src = Glob('*.c') + Glob('*.S')
 CPPPATH = [cwd]
 
-group = DefineGroup('drv_audio', src, depend = ['BSP_DRV_AUDIO'], CPPPATH = CPPPATH)
+group = DefineGroup('Drivers', src, depend = ['BSP_DRV_AUDIO'], CPPPATH = CPPPATH)
 
 Return('group')

bsp/qemu-vexpress-gemini/cpu/SConscript

@@ -12,6 +12,6 @@ elif rtconfig.PLATFORM == 'gcc':
 elif rtconfig.PLATFORM == 'armcc':
         src += Glob('*_rvds.S')
 
-group = DefineGroup('AM335x', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')

bsp/raspberry-pi/raspi2/cpu/SConscript

@@ -4,6 +4,6 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
 CPPPATH = [cwd]
 
-group = DefineGroup('cpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')

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('cpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')

bsp/raspberry-pi/raspi4-32/driver/SConscript

@@ -14,7 +14,7 @@ if not GetDepend('BSP_USING_WDT'):
 if not GetDepend('BSP_USING_BULETOOTH'):
     SrcRemove(src, ['drv_bluetooth.c'])
 
-group = DefineGroup('driver', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH)
 
 # build for sub-directory
 list = os.listdir(cwd)

bsp/samd21/applications/SConscript

@@ -9,6 +9,6 @@ CPPPATH = [cwd, str(Dir('#'))]
 #remove other no use files
 #SrcRemove(src, '*.c')
 
-group = DefineGroup('Application', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')

bsp/samd21/board/SConscript

@@ -15,6 +15,6 @@ if rtconfig.DEVICE_SERIES == 'SAMD20':
 elif rtconfig.DEVICE_SERIES == 'SAMD21':
 	path += [cwd + '/../asflib_config', cwd + '/../asflib_config/clock_samd21_r21_da_ha1']
 
-group = DefineGroup('Board', src, depend = [''], CPPPATH = path)
+group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path)
 
 Return('group')

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')

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')

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')

bsp/stm32/libraries/STM32F4xx_HAL/SConscript

@@ -113,6 +113,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')

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')
 

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')

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')

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')
 

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')

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')

bsp/stm32/libraries/STM32L4xx_HAL/SConscript

@@ -117,6 +117,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')

bsp/stm32/libraries/STM32MPxx_HAL/SConscript

@@ -125,6 +125,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')

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')

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')

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')

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')

bsp/stm32f20x/Libraries/SConscript

@@ -64,6 +64,6 @@ if GetDepend('RT_USING_LWIP') == True:
 	
 
 CPPDEFINES = ['USE_STDPERIPH_DRIVER']
-group = DefineGroup('STM32_StdPeriph', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)
+group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)
 
 Return('group')

bsp/tm4c123bsp/libraries/TivaWare_C_series/SConscript

@@ -68,6 +68,6 @@ path = [cwd + '/tm4c123_driverlib',
     cwd + '/tm4c123_driverlib/driverlib',
     cwd + '/tm4c123_driverlib/driverlib/inc']
 
-group = DefineGroup('TM4C123_HAL', src, depend = [''], CPPPATH = path)
+group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path)
 
 Return('group')

components/drivers/sensors/SConscript

@@ -7,7 +7,7 @@ src = ['sensor.c']
 CPPPATH = [cwd, cwd + '/../include']
 
 if GetDepend('RT_USING_SENSOR_CMD'):
-    src += ['sensor_cmd.c'];
+    src += ['sensor_cmd.c']
 
 group = DefineGroup('Sensors', src, depend = ['RT_USING_SENSOR', 'RT_USING_DEVICE'], CPPPATH = CPPPATH)
 

components/drivers/touch/SConscript

@@ -6,6 +6,6 @@ cwd = GetCurrentDir()
 src = ['touch.c']
 CPPPATH = [cwd, cwd + '/../include']
 
-group = DefineGroup('Touch', src, depend = ['RT_USING_TOUCH', 'RT_USING_DEVICE'], CPPPATH = CPPPATH)
+group = DefineGroup('DeviceDrivers', src, depend = ['RT_USING_TOUCH', 'RT_USING_DEVICE'], CPPPATH = CPPPATH)
 
 Return('group')

components/libc/aio/SConscript

@@ -6,6 +6,6 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c') + Glob('*.cpp')
 CPPPATH = [cwd]
 
-group = DefineGroup('aio', src, depend = ['RT_USING_POSIX', 'RT_USING_POSIX_AIO'], CPPPATH = CPPPATH)
+group = DefineGroup('libc', src, depend = ['RT_USING_POSIX', 'RT_USING_POSIX_AIO'], CPPPATH = CPPPATH)
 
 Return('group')

components/libc/compilers/dlib/SConscript

@@ -20,7 +20,7 @@ if rtconfig.PLATFORM == 'iar':
         if LooseVersion(IARVersion()) < LooseVersion("8.20.1"):
             CPPDEFINES = CPPDEFINES + ['_DLIB_THREAD_SUPPORT']
 
-    group = DefineGroup('dlib', src, depend = ['RT_USING_LIBC'], 
+    group = DefineGroup('libc', src, depend = ['RT_USING_LIBC'], 
         CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES)
 
 Return('group')

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('libc', src, depend = ['RT_USING_LIBC'], 
         CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES, LIBS = LIBS)
 
 Return('group')

components/libc/pthreads/SConscript

@@ -16,7 +16,7 @@ try:
 except :
     pass
 
-group = DefineGroup('pthreads', src, 
+group = DefineGroup('libc', src, 
     depend = ['RT_USING_PTHREADS', 'RT_USING_LIBC'], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES)
 
 Return('group')

components/libc/time/SConscript

@@ -6,7 +6,7 @@ cwd = GetCurrentDir()
 src = Glob('*.c') + Glob('*.cpp')
 CPPPATH = [cwd]
 
-group = DefineGroup('pthreads', src, 
+group = DefineGroup('libc', src, 
     depend = ['RT_USING_PTHREADS'], CPPPATH = CPPPATH)
 
 Return('group')

components/net/lwip-1.4.1/SConscript

@@ -82,6 +82,6 @@ if GetDepend(['RT_LWIP_PPP']):
 if GetDepend(['RT_LWIP_USING_PING']):
     src += Glob('src/apps/ping/ping.c')
 
-group = DefineGroup('LwIP', src, depend = ['RT_USING_LWIP', 'RT_USING_LWIP141'], CPPPATH = path)
+group = DefineGroup('lwIP', src, depend = ['RT_USING_LWIP', 'RT_USING_LWIP141'], CPPPATH = path)
 
 Return('group')

components/net/lwip_nat/SConscript

@@ -5,6 +5,6 @@ src = Glob('*.c')
 
 CPPPATH = [cwd]
 
-group = DefineGroup('LwIP', src, depend = ['RT_USING_LWIP', 'LWIP_USING_NAT'], CPPPATH = CPPPATH)
+group = DefineGroup('lwIP', src, depend = ['RT_USING_LWIP', 'LWIP_USING_NAT'], CPPPATH = CPPPATH)
 
 Return('group')

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('SAL', src, depend = ['RT_USING_NETDEV'], CPPPATH = CPPPATH)
 
 Return('group')

components/utilities/utest/SConscript

@@ -3,6 +3,6 @@ from building import *
 cwd     = GetCurrentDir()
 src     = Glob('*.c')
 CPPPATH = [cwd]
-group   = DefineGroup('utest', src, depend = ['RT_USING_UTEST'], CPPPATH = CPPPATH)
+group   = DefineGroup('UTest', src, depend = ['RT_USING_UTEST'], CPPPATH = CPPPATH)
 
 Return('group')

examples/kernel/SConscript

@@ -34,7 +34,7 @@ memp_simple.c
 tc_sample.c
 """)
 
-group = DefineGroup('examples', src,
+group = DefineGroup('Examples', src,
                     depend = ['RT_USING_TC'],
                     CPPPATH=[GetCurrentDir()])
 

examples/libc/SConscript

@@ -1,6 +1,6 @@
 from building import *
 
 src   = Glob('*.c')
-group = DefineGroup('libc_test', src, depend = ['RT_USING_NEWLIB', 'RT_USING_PTHREADS'])
+group = DefineGroup('UTest', src, depend = ['RT_USING_NEWLIB', 'RT_USING_PTHREADS'])
 
 Return('group')

libcpu/aarch64/common/SConscript

@@ -8,7 +8,7 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c') + Glob('*.cpp') + Glob('*.S')
 CPPPATH = [cwd]
 
-group = DefineGroup('common', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 # build for sub-directory
 list = os.listdir(cwd)

libcpu/aarch64/cortex-a53/SConscript

@@ -8,6 +8,6 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c') + Glob('*.cpp') + Glob('*.S')
 CPPPATH = [cwd]
 
-group = DefineGroup('common', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')

libcpu/aarch64/cortex-a72/SConscript

@@ -8,6 +8,6 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c') + Glob('*.cpp') + Glob('*.S')
 CPPPATH = [cwd]
 
-group = DefineGroup('common', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')

libcpu/arc/common/SConscript

@@ -5,6 +5,6 @@ src     = Glob('*.c')
 CPPPATH = [cwd]
 
 
-group = DefineGroup('cpu', src, depend = [], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [], CPPPATH = CPPPATH)
 
 Return('group')

libcpu/arc/em/SConscript

@@ -10,6 +10,6 @@ CPPPATH = [cwd]
 
 src += Glob('*.S')
 
-group = DefineGroup('cpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')

libcpu/arm/AT91SAM7S/SConscript

@@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc':
 if rtconfig.PLATFORM == 'iar':
     src += Glob('*_iar.S')
 
-group = DefineGroup('cpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')

libcpu/arm/AT91SAM7X/SConscript

@@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc':
 if rtconfig.PLATFORM == 'iar':
     src += Glob('*_iar.S')
 
-group = DefineGroup('cpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')

libcpu/arm/am335x/SConscript

@@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc':
 if rtconfig.PLATFORM == 'iar':
     src += Glob('*_iar.S')
 
-group = DefineGroup('cpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')

libcpu/arm/arm926/SConscript

@@ -20,6 +20,6 @@ if rtconfig.PLATFORM == 'gcc':
 if rtconfig.PLATFORM == 'iar':
     src += Glob('*_iar.S')
 
-group = DefineGroup('cpu', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
 
 Return('group')

libcpu/arm/armv6/SConscript

@@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc':
 if rtconfig.PLATFORM == 'iar':
     src += Glob('*_iar.S')
 
-group = DefineGroup('cpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')

libcpu/arm/common/SConscript

@@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc':
 if rtconfig.PLATFORM == 'iar':
     src += Glob('*_iar.S')
 
-group = DefineGroup('cpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')

libcpu/arm/cortex-a/SConscript

@@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc':
 if rtconfig.PLATFORM == 'iar':
     src += Glob('*_iar.S')
 
-group = DefineGroup('cpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')

libcpu/arm/cortex-m0/SConscript

@@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc':
 if rtconfig.PLATFORM == 'iar':
     src += Glob('*_iar.S')
 
-group = DefineGroup('cpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')

libcpu/arm/cortex-m23/SConscript

@@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc':
 if rtconfig.PLATFORM == 'iar':
     src += Glob('*_iar.S')
 
-group = DefineGroup('cpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')

libcpu/arm/cortex-m3/SConscript

@@ -18,6 +18,6 @@ if rtconfig.PLATFORM == 'gcc':
 if rtconfig.PLATFORM == 'iar':
     src += Glob('*_iar.S')
 
-group = DefineGroup('cpu', src, depend = [''], CPPPATH = CPPPATH)
+group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')