diff --git a/.github/workflows/bsp_buildings.yml b/.github/workflows/bsp_buildings.yml index f06cb88243..fcdcff93b5 100644 --- a/.github/workflows/bsp_buildings.yml +++ b/.github/workflows/bsp_buildings.yml @@ -50,8 +50,8 @@ jobs: - "at91/at91sam9260" - "wch/arm/ch32f103c8-core" - "wch/arm/ch32f203r-evt" - - "synwit/swm320" - - "synwit/swm341" + - "synwit/swm320-mini" + - "synwit/swm341-mini" - "beaglebone" - "zynqmp-r5-axu4ev" - "at32/at32f402-start" diff --git a/.github/workflows/manual_trigger_scons_except_STM32_all.yml b/.github/workflows/manual_trigger_scons_except_STM32_all.yml index 0ea43c8a26..66152955fb 100644 --- a/.github/workflows/manual_trigger_scons_except_STM32_all.yml +++ b/.github/workflows/manual_trigger_scons_except_STM32_all.yml @@ -238,8 +238,8 @@ jobs: - {RTT_BSP_NAME: "smartfusion2", RTT_TOOL_CHAIN: "sourcery-arm", RTT_BSP: "smartfusion2"} - {RTT_BSP_NAME: "sparkfun-redv", RTT_TOOL_CHAIN: "sourcery-riscv64-unknown-elf", RTT_BSP: "sparkfun-redv"} #- {RTT_BSP_NAME: "synopsys_boards", RTT_TOOL_CHAIN: "sourcery-arm", RTT_BSP: "synopsys/boards"} #不支持的toolchain - - {RTT_BSP_NAME: "synwit_swm320", RTT_TOOL_CHAIN: "sourcery-arm", RTT_BSP: "synwit/swm320"} - - {RTT_BSP_NAME: "synwit_swm341", RTT_TOOL_CHAIN: "sourcery-arm", RTT_BSP: "synwit/swm341"} + - {RTT_BSP_NAME: "synwit_swm320-mini", RTT_TOOL_CHAIN: "sourcery-arm", RTT_BSP: "synwit/swm320-mini"} + - {RTT_BSP_NAME: "synwit_swm341-mini", RTT_TOOL_CHAIN: "sourcery-arm", RTT_BSP: "synwit/swm341-mini"} #- {RTT_BSP_NAME: "tae32f5300", RTT_TOOL_CHAIN: "sourcery-arm", RTT_BSP: "tae32f5300"} #musl toolchain 未支持 #- {RTT_BSP_NAME: "taihu", RTT_TOOL_CHAIN: "sourcery-arm", RTT_BSP: "taihu"} #powerpc-eabi-gcc 未支持 #- {RTT_BSP_NAME: "thead-smart", RTT_TOOL_CHAIN: "sourcery-riscv64-unknown-elf", RTT_BSP: "thead-smart"} #menuconfig有问题 diff --git a/bsp/synwit/swm320/libraries/CMSIS/CoreSupport/arm_common_tables.h b/bsp/synwit/libraries/SWM320_CSL/CMSIS/CoreSupport/arm_common_tables.h similarity index 100% rename from bsp/synwit/swm320/libraries/CMSIS/CoreSupport/arm_common_tables.h rename to bsp/synwit/libraries/SWM320_CSL/CMSIS/CoreSupport/arm_common_tables.h diff --git a/bsp/synwit/swm320/libraries/CMSIS/CoreSupport/arm_const_structs.h b/bsp/synwit/libraries/SWM320_CSL/CMSIS/CoreSupport/arm_const_structs.h similarity index 100% rename from bsp/synwit/swm320/libraries/CMSIS/CoreSupport/arm_const_structs.h rename to bsp/synwit/libraries/SWM320_CSL/CMSIS/CoreSupport/arm_const_structs.h diff --git a/bsp/synwit/swm320/libraries/CMSIS/CoreSupport/arm_math.h b/bsp/synwit/libraries/SWM320_CSL/CMSIS/CoreSupport/arm_math.h similarity index 100% rename from bsp/synwit/swm320/libraries/CMSIS/CoreSupport/arm_math.h rename to bsp/synwit/libraries/SWM320_CSL/CMSIS/CoreSupport/arm_math.h diff --git a/bsp/synwit/swm320/libraries/CMSIS/CoreSupport/core_cm0.h b/bsp/synwit/libraries/SWM320_CSL/CMSIS/CoreSupport/core_cm0.h similarity index 100% rename from bsp/synwit/swm320/libraries/CMSIS/CoreSupport/core_cm0.h rename to bsp/synwit/libraries/SWM320_CSL/CMSIS/CoreSupport/core_cm0.h diff --git a/bsp/synwit/swm320/libraries/CMSIS/CoreSupport/core_cm0plus.h b/bsp/synwit/libraries/SWM320_CSL/CMSIS/CoreSupport/core_cm0plus.h similarity index 100% rename from bsp/synwit/swm320/libraries/CMSIS/CoreSupport/core_cm0plus.h rename to bsp/synwit/libraries/SWM320_CSL/CMSIS/CoreSupport/core_cm0plus.h diff --git a/bsp/synwit/swm320/libraries/CMSIS/CoreSupport/core_cm3.h b/bsp/synwit/libraries/SWM320_CSL/CMSIS/CoreSupport/core_cm3.h similarity index 100% rename from bsp/synwit/swm320/libraries/CMSIS/CoreSupport/core_cm3.h rename to bsp/synwit/libraries/SWM320_CSL/CMSIS/CoreSupport/core_cm3.h diff --git a/bsp/synwit/swm320/libraries/CMSIS/CoreSupport/core_cm4.h b/bsp/synwit/libraries/SWM320_CSL/CMSIS/CoreSupport/core_cm4.h similarity index 100% rename from bsp/synwit/swm320/libraries/CMSIS/CoreSupport/core_cm4.h rename to bsp/synwit/libraries/SWM320_CSL/CMSIS/CoreSupport/core_cm4.h diff --git a/bsp/synwit/swm320/libraries/CMSIS/CoreSupport/core_cm7.h b/bsp/synwit/libraries/SWM320_CSL/CMSIS/CoreSupport/core_cm7.h similarity index 100% rename from bsp/synwit/swm320/libraries/CMSIS/CoreSupport/core_cm7.h rename to bsp/synwit/libraries/SWM320_CSL/CMSIS/CoreSupport/core_cm7.h diff --git a/bsp/synwit/swm320/libraries/CMSIS/CoreSupport/core_cmFunc.h b/bsp/synwit/libraries/SWM320_CSL/CMSIS/CoreSupport/core_cmFunc.h similarity index 100% rename from bsp/synwit/swm320/libraries/CMSIS/CoreSupport/core_cmFunc.h rename to bsp/synwit/libraries/SWM320_CSL/CMSIS/CoreSupport/core_cmFunc.h diff --git a/bsp/synwit/swm320/libraries/CMSIS/CoreSupport/core_cmInstr.h b/bsp/synwit/libraries/SWM320_CSL/CMSIS/CoreSupport/core_cmInstr.h similarity index 100% rename from bsp/synwit/swm320/libraries/CMSIS/CoreSupport/core_cmInstr.h rename to bsp/synwit/libraries/SWM320_CSL/CMSIS/CoreSupport/core_cmInstr.h diff --git a/bsp/synwit/swm320/libraries/CMSIS/CoreSupport/core_cmSimd.h b/bsp/synwit/libraries/SWM320_CSL/CMSIS/CoreSupport/core_cmSimd.h similarity index 100% rename from bsp/synwit/swm320/libraries/CMSIS/CoreSupport/core_cmSimd.h rename to bsp/synwit/libraries/SWM320_CSL/CMSIS/CoreSupport/core_cmSimd.h diff --git a/bsp/synwit/swm320/libraries/CMSIS/DeviceSupport/SWM320.h b/bsp/synwit/libraries/SWM320_CSL/CMSIS/DeviceSupport/SWM320.h similarity index 100% rename from bsp/synwit/swm320/libraries/CMSIS/DeviceSupport/SWM320.h rename to bsp/synwit/libraries/SWM320_CSL/CMSIS/DeviceSupport/SWM320.h diff --git a/bsp/synwit/swm320/libraries/CMSIS/DeviceSupport/startup/arm/startup_SWM320.s b/bsp/synwit/libraries/SWM320_CSL/CMSIS/DeviceSupport/startup/arm/startup_SWM320.s similarity index 100% rename from bsp/synwit/swm320/libraries/CMSIS/DeviceSupport/startup/arm/startup_SWM320.s rename to bsp/synwit/libraries/SWM320_CSL/CMSIS/DeviceSupport/startup/arm/startup_SWM320.s diff --git a/bsp/synwit/swm320/libraries/CMSIS/DeviceSupport/startup/gcc/startup_SWM320.s b/bsp/synwit/libraries/SWM320_CSL/CMSIS/DeviceSupport/startup/gcc/startup_SWM320.s similarity index 100% rename from bsp/synwit/swm320/libraries/CMSIS/DeviceSupport/startup/gcc/startup_SWM320.s rename to bsp/synwit/libraries/SWM320_CSL/CMSIS/DeviceSupport/startup/gcc/startup_SWM320.s diff --git a/bsp/synwit/swm320/libraries/CMSIS/DeviceSupport/startup/iar/startup_SWM320.s b/bsp/synwit/libraries/SWM320_CSL/CMSIS/DeviceSupport/startup/iar/startup_SWM320.s similarity index 100% rename from bsp/synwit/swm320/libraries/CMSIS/DeviceSupport/startup/iar/startup_SWM320.s rename to bsp/synwit/libraries/SWM320_CSL/CMSIS/DeviceSupport/startup/iar/startup_SWM320.s diff --git a/bsp/synwit/swm320/libraries/CMSIS/DeviceSupport/system_SWM320.c b/bsp/synwit/libraries/SWM320_CSL/CMSIS/DeviceSupport/system_SWM320.c similarity index 100% rename from bsp/synwit/swm320/libraries/CMSIS/DeviceSupport/system_SWM320.c rename to bsp/synwit/libraries/SWM320_CSL/CMSIS/DeviceSupport/system_SWM320.c diff --git a/bsp/synwit/swm320/libraries/CMSIS/DeviceSupport/system_SWM320.h b/bsp/synwit/libraries/SWM320_CSL/CMSIS/DeviceSupport/system_SWM320.h similarity index 100% rename from bsp/synwit/swm320/libraries/CMSIS/DeviceSupport/system_SWM320.h rename to bsp/synwit/libraries/SWM320_CSL/CMSIS/DeviceSupport/system_SWM320.h diff --git a/bsp/synwit/swm320/libraries/SConscript b/bsp/synwit/libraries/SWM320_CSL/SConscript similarity index 62% rename from bsp/synwit/swm320/libraries/SConscript rename to bsp/synwit/libraries/SWM320_CSL/SConscript index f84fbe6bb5..1c0ffe9698 100644 --- a/bsp/synwit/swm320/libraries/SConscript +++ b/bsp/synwit/libraries/SWM320_CSL/SConscript @@ -1,9 +1,9 @@ from building import * import rtconfig -cwd = GetCurrentDir() -src = Glob('CMSIS/DeviceSupport/*.c') -CPPPATH = [cwd + '/CMSIS/CoreSupport', cwd + '/CMSIS/DeviceSupport', cwd + '/SWM320_StdPeriph_Driver'] +cwd = GetCurrentDir() + +src = Glob('CMSIS/DeviceSupport/*.c') src += Glob('SWM320_StdPeriph_Driver/*.c') if rtconfig.PLATFORM in ['gcc']: @@ -12,6 +12,12 @@ elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['CMSIS/DeviceSupport/startup/arm/startup_SWM320.s'] elif rtconfig.PLATFORM in ['iccarm']: src += ['CMSIS/DeviceSupport/startup/iar/startup_SWM320.s'] -group = DefineGroup('Libraries', src, depend = [''], CPPPATH = CPPPATH) + +inc = [cwd + '/CMSIS/CoreSupport', + cwd + '/CMSIS/DeviceSupport', + cwd + '/SWM320_StdPeriph_Driver' +] + +group = DefineGroup('Libraries', src, depend = [''], CPPPATH = inc) Return('group') diff --git a/bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_adc.c b/bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_adc.c similarity index 100% rename from bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_adc.c rename to bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_adc.c diff --git a/bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_adc.h b/bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_adc.h similarity index 100% rename from bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_adc.h rename to bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_adc.h diff --git a/bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_can.c b/bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_can.c similarity index 100% rename from bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_can.c rename to bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_can.c diff --git a/bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_can.h b/bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_can.h similarity index 100% rename from bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_can.h rename to bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_can.h diff --git a/bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_crc.c b/bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_crc.c similarity index 100% rename from bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_crc.c rename to bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_crc.c diff --git a/bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_crc.h b/bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_crc.h similarity index 100% rename from bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_crc.h rename to bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_crc.h diff --git a/bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_dma.c b/bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_dma.c similarity index 100% rename from bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_dma.c rename to bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_dma.c diff --git a/bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_dma.h b/bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_dma.h similarity index 100% rename from bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_dma.h rename to bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_dma.h diff --git a/bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_exti.c b/bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_exti.c similarity index 100% rename from bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_exti.c rename to bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_exti.c diff --git a/bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_exti.h b/bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_exti.h similarity index 100% rename from bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_exti.h rename to bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_exti.h diff --git a/bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_flash.c b/bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_flash.c similarity index 100% rename from bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_flash.c rename to bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_flash.c diff --git a/bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_flash.h b/bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_flash.h similarity index 100% rename from bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_flash.h rename to bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_flash.h diff --git a/bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_gpio.c b/bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_gpio.c similarity index 100% rename from bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_gpio.c rename to bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_gpio.c diff --git a/bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_gpio.h b/bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_gpio.h similarity index 100% rename from bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_gpio.h rename to bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_gpio.h diff --git a/bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_i2c.c b/bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_i2c.c similarity index 100% rename from bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_i2c.c rename to bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_i2c.c diff --git a/bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_i2c.h b/bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_i2c.h similarity index 100% rename from bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_i2c.h rename to bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_i2c.h diff --git a/bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_lcd.c b/bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_lcd.c similarity index 100% rename from bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_lcd.c rename to bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_lcd.c diff --git a/bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_lcd.h b/bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_lcd.h similarity index 100% rename from bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_lcd.h rename to bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_lcd.h diff --git a/bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_norflash.c b/bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_norflash.c similarity index 100% rename from bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_norflash.c rename to bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_norflash.c diff --git a/bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_norflash.h b/bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_norflash.h similarity index 100% rename from bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_norflash.h rename to bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_norflash.h diff --git a/bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_port.c b/bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_port.c similarity index 100% rename from bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_port.c rename to bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_port.c diff --git a/bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_port.h b/bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_port.h similarity index 100% rename from bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_port.h rename to bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_port.h diff --git a/bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_pwm.c b/bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_pwm.c similarity index 100% rename from bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_pwm.c rename to bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_pwm.c diff --git a/bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_pwm.h b/bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_pwm.h similarity index 100% rename from bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_pwm.h rename to bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_pwm.h diff --git a/bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_rtc.c b/bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_rtc.c similarity index 100% rename from bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_rtc.c rename to bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_rtc.c diff --git a/bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_rtc.h b/bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_rtc.h similarity index 100% rename from bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_rtc.h rename to bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_rtc.h diff --git a/bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_sdio.c b/bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_sdio.c similarity index 100% rename from bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_sdio.c rename to bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_sdio.c diff --git a/bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_sdio.h b/bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_sdio.h similarity index 100% rename from bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_sdio.h rename to bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_sdio.h diff --git a/bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_sdram.c b/bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_sdram.c similarity index 100% rename from bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_sdram.c rename to bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_sdram.c diff --git a/bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_sdram.h b/bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_sdram.h similarity index 100% rename from bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_sdram.h rename to bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_sdram.h diff --git a/bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_spi.c b/bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_spi.c similarity index 100% rename from bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_spi.c rename to bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_spi.c diff --git a/bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_spi.h b/bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_spi.h similarity index 100% rename from bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_spi.h rename to bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_spi.h diff --git a/bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_sram.c b/bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_sram.c similarity index 100% rename from bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_sram.c rename to bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_sram.c diff --git a/bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_sram.h b/bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_sram.h similarity index 100% rename from bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_sram.h rename to bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_sram.h diff --git a/bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_timr.c b/bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_timr.c similarity index 100% rename from bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_timr.c rename to bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_timr.c diff --git a/bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_timr.h b/bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_timr.h similarity index 100% rename from bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_timr.h rename to bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_timr.h diff --git a/bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_uart.c b/bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_uart.c similarity index 100% rename from bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_uart.c rename to bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_uart.c diff --git a/bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_uart.h b/bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_uart.h similarity index 100% rename from bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_uart.h rename to bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_uart.h diff --git a/bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_wdt.c b/bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_wdt.c similarity index 100% rename from bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_wdt.c rename to bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_wdt.c diff --git a/bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_wdt.h b/bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_wdt.h similarity index 100% rename from bsp/synwit/swm320/libraries/SWM320_StdPeriph_Driver/SWM320_wdt.h rename to bsp/synwit/libraries/SWM320_CSL/SWM320_StdPeriph_Driver/SWM320_wdt.h diff --git a/bsp/synwit/swm320/drivers/SConscript b/bsp/synwit/libraries/SWM320_drivers/SConscript similarity index 82% rename from bsp/synwit/swm320/drivers/SConscript rename to bsp/synwit/libraries/SWM320_drivers/SConscript index cddf8cc0b7..9c20c550a4 100644 --- a/bsp/synwit/swm320/drivers/SConscript +++ b/bsp/synwit/libraries/SWM320_drivers/SConscript @@ -1,12 +1,7 @@ from building import * -cwd = GetCurrentDir() - -CPPPATH = [cwd] - -src = Split(''' - board.c - ''') +cwd = GetCurrentDir() +src = [] if GetDepend(['RT_USING_SERIAL']): src += ['drv_uart.c'] @@ -47,6 +42,6 @@ if GetDepend(['BSP_USING_EXT_SRAM']): if GetDepend(['BSP_USING_NOR_FLASH']): src += ['drv_nor_flash.c'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = [cwd]) Return('group') diff --git a/bsp/synwit/swm320/drivers/drv_adc.c b/bsp/synwit/libraries/SWM320_drivers/drv_adc.c similarity index 100% rename from bsp/synwit/swm320/drivers/drv_adc.c rename to bsp/synwit/libraries/SWM320_drivers/drv_adc.c diff --git a/bsp/synwit/swm320/drivers/drv_adc.h b/bsp/synwit/libraries/SWM320_drivers/drv_adc.h similarity index 100% rename from bsp/synwit/swm320/drivers/drv_adc.h rename to bsp/synwit/libraries/SWM320_drivers/drv_adc.h diff --git a/bsp/synwit/swm320/drivers/drv_crypto.c b/bsp/synwit/libraries/SWM320_drivers/drv_crypto.c similarity index 100% rename from bsp/synwit/swm320/drivers/drv_crypto.c rename to bsp/synwit/libraries/SWM320_drivers/drv_crypto.c diff --git a/bsp/synwit/swm320/drivers/drv_crypto.h b/bsp/synwit/libraries/SWM320_drivers/drv_crypto.h similarity index 100% rename from bsp/synwit/swm320/drivers/drv_crypto.h rename to bsp/synwit/libraries/SWM320_drivers/drv_crypto.h diff --git a/bsp/synwit/swm320/drivers/drv_gpio.c b/bsp/synwit/libraries/SWM320_drivers/drv_gpio.c similarity index 100% rename from bsp/synwit/swm320/drivers/drv_gpio.c rename to bsp/synwit/libraries/SWM320_drivers/drv_gpio.c diff --git a/bsp/synwit/swm320/drivers/drv_gpio.h b/bsp/synwit/libraries/SWM320_drivers/drv_gpio.h similarity index 100% rename from bsp/synwit/swm320/drivers/drv_gpio.h rename to bsp/synwit/libraries/SWM320_drivers/drv_gpio.h diff --git a/bsp/synwit/swm320/drivers/drv_hwtimer.c b/bsp/synwit/libraries/SWM320_drivers/drv_hwtimer.c similarity index 100% rename from bsp/synwit/swm320/drivers/drv_hwtimer.c rename to bsp/synwit/libraries/SWM320_drivers/drv_hwtimer.c diff --git a/bsp/synwit/swm320/drivers/drv_hwtimer.h b/bsp/synwit/libraries/SWM320_drivers/drv_hwtimer.h similarity index 100% rename from bsp/synwit/swm320/drivers/drv_hwtimer.h rename to bsp/synwit/libraries/SWM320_drivers/drv_hwtimer.h diff --git a/bsp/synwit/swm320/drivers/drv_log.h b/bsp/synwit/libraries/SWM320_drivers/drv_log.h similarity index 100% rename from bsp/synwit/swm320/drivers/drv_log.h rename to bsp/synwit/libraries/SWM320_drivers/drv_log.h diff --git a/bsp/synwit/swm320/drivers/drv_nor_flash.c b/bsp/synwit/libraries/SWM320_drivers/drv_nor_flash.c similarity index 100% rename from bsp/synwit/swm320/drivers/drv_nor_flash.c rename to bsp/synwit/libraries/SWM320_drivers/drv_nor_flash.c diff --git a/bsp/synwit/swm320/drivers/drv_nor_flash.h b/bsp/synwit/libraries/SWM320_drivers/drv_nor_flash.h similarity index 100% rename from bsp/synwit/swm320/drivers/drv_nor_flash.h rename to bsp/synwit/libraries/SWM320_drivers/drv_nor_flash.h diff --git a/bsp/synwit/swm320/drivers/drv_pwm.c b/bsp/synwit/libraries/SWM320_drivers/drv_pwm.c similarity index 100% rename from bsp/synwit/swm320/drivers/drv_pwm.c rename to bsp/synwit/libraries/SWM320_drivers/drv_pwm.c diff --git a/bsp/synwit/swm320/drivers/drv_pwm.h b/bsp/synwit/libraries/SWM320_drivers/drv_pwm.h similarity index 100% rename from bsp/synwit/swm320/drivers/drv_pwm.h rename to bsp/synwit/libraries/SWM320_drivers/drv_pwm.h diff --git a/bsp/synwit/swm320/drivers/drv_rtc.c b/bsp/synwit/libraries/SWM320_drivers/drv_rtc.c similarity index 100% rename from bsp/synwit/swm320/drivers/drv_rtc.c rename to bsp/synwit/libraries/SWM320_drivers/drv_rtc.c diff --git a/bsp/synwit/swm320/drivers/drv_rtc.h b/bsp/synwit/libraries/SWM320_drivers/drv_rtc.h similarity index 100% rename from bsp/synwit/swm320/drivers/drv_rtc.h rename to bsp/synwit/libraries/SWM320_drivers/drv_rtc.h diff --git a/bsp/synwit/swm320/drivers/drv_sdio.c b/bsp/synwit/libraries/SWM320_drivers/drv_sdio.c similarity index 100% rename from bsp/synwit/swm320/drivers/drv_sdio.c rename to bsp/synwit/libraries/SWM320_drivers/drv_sdio.c diff --git a/bsp/synwit/swm320/drivers/drv_sdio.h b/bsp/synwit/libraries/SWM320_drivers/drv_sdio.h similarity index 100% rename from bsp/synwit/swm320/drivers/drv_sdio.h rename to bsp/synwit/libraries/SWM320_drivers/drv_sdio.h diff --git a/bsp/synwit/swm320/drivers/drv_soft_i2c.c b/bsp/synwit/libraries/SWM320_drivers/drv_soft_i2c.c similarity index 100% rename from bsp/synwit/swm320/drivers/drv_soft_i2c.c rename to bsp/synwit/libraries/SWM320_drivers/drv_soft_i2c.c diff --git a/bsp/synwit/swm320/drivers/drv_soft_i2c.h b/bsp/synwit/libraries/SWM320_drivers/drv_soft_i2c.h similarity index 100% rename from bsp/synwit/swm320/drivers/drv_soft_i2c.h rename to bsp/synwit/libraries/SWM320_drivers/drv_soft_i2c.h diff --git a/bsp/synwit/swm320/drivers/drv_spi.c b/bsp/synwit/libraries/SWM320_drivers/drv_spi.c similarity index 100% rename from bsp/synwit/swm320/drivers/drv_spi.c rename to bsp/synwit/libraries/SWM320_drivers/drv_spi.c diff --git a/bsp/synwit/swm320/drivers/drv_spi.h b/bsp/synwit/libraries/SWM320_drivers/drv_spi.h similarity index 100% rename from bsp/synwit/swm320/drivers/drv_spi.h rename to bsp/synwit/libraries/SWM320_drivers/drv_spi.h diff --git a/bsp/synwit/swm320/drivers/drv_sram.c b/bsp/synwit/libraries/SWM320_drivers/drv_sram.c similarity index 100% rename from bsp/synwit/swm320/drivers/drv_sram.c rename to bsp/synwit/libraries/SWM320_drivers/drv_sram.c diff --git a/bsp/synwit/swm320/drivers/drv_sram.h b/bsp/synwit/libraries/SWM320_drivers/drv_sram.h similarity index 100% rename from bsp/synwit/swm320/drivers/drv_sram.h rename to bsp/synwit/libraries/SWM320_drivers/drv_sram.h diff --git a/bsp/synwit/swm320/drivers/drv_uart.c b/bsp/synwit/libraries/SWM320_drivers/drv_uart.c similarity index 100% rename from bsp/synwit/swm320/drivers/drv_uart.c rename to bsp/synwit/libraries/SWM320_drivers/drv_uart.c diff --git a/bsp/synwit/swm320/drivers/drv_uart.h b/bsp/synwit/libraries/SWM320_drivers/drv_uart.h similarity index 100% rename from bsp/synwit/swm320/drivers/drv_uart.h rename to bsp/synwit/libraries/SWM320_drivers/drv_uart.h diff --git a/bsp/synwit/swm320/drivers/drv_wdt.c b/bsp/synwit/libraries/SWM320_drivers/drv_wdt.c similarity index 100% rename from bsp/synwit/swm320/drivers/drv_wdt.c rename to bsp/synwit/libraries/SWM320_drivers/drv_wdt.c diff --git a/bsp/synwit/swm320/drivers/drv_wdt.h b/bsp/synwit/libraries/SWM320_drivers/drv_wdt.h similarity index 100% rename from bsp/synwit/swm320/drivers/drv_wdt.h rename to bsp/synwit/libraries/SWM320_drivers/drv_wdt.h diff --git a/bsp/synwit/swm341/libraries/CMSIS/CoreSupport/cachel1_armv7.h b/bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/cachel1_armv7.h similarity index 100% rename from bsp/synwit/swm341/libraries/CMSIS/CoreSupport/cachel1_armv7.h rename to bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/cachel1_armv7.h diff --git a/bsp/synwit/swm341/libraries/CMSIS/CoreSupport/cmsis_armcc.h b/bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/cmsis_armcc.h similarity index 100% rename from bsp/synwit/swm341/libraries/CMSIS/CoreSupport/cmsis_armcc.h rename to bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/cmsis_armcc.h diff --git a/bsp/synwit/swm341/libraries/CMSIS/CoreSupport/cmsis_armclang.h b/bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/cmsis_armclang.h similarity index 100% rename from bsp/synwit/swm341/libraries/CMSIS/CoreSupport/cmsis_armclang.h rename to bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/cmsis_armclang.h diff --git a/bsp/synwit/swm341/libraries/CMSIS/CoreSupport/cmsis_armclang_ltm.h b/bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/cmsis_armclang_ltm.h similarity index 100% rename from bsp/synwit/swm341/libraries/CMSIS/CoreSupport/cmsis_armclang_ltm.h rename to bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/cmsis_armclang_ltm.h diff --git a/bsp/synwit/swm341/libraries/CMSIS/CoreSupport/cmsis_compiler.h b/bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/cmsis_compiler.h similarity index 100% rename from bsp/synwit/swm341/libraries/CMSIS/CoreSupport/cmsis_compiler.h rename to bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/cmsis_compiler.h diff --git a/bsp/synwit/swm341/libraries/CMSIS/CoreSupport/cmsis_gcc.h b/bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/cmsis_gcc.h similarity index 100% rename from bsp/synwit/swm341/libraries/CMSIS/CoreSupport/cmsis_gcc.h rename to bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/cmsis_gcc.h diff --git a/bsp/synwit/swm341/libraries/CMSIS/CoreSupport/cmsis_iccarm.h b/bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/cmsis_iccarm.h similarity index 100% rename from bsp/synwit/swm341/libraries/CMSIS/CoreSupport/cmsis_iccarm.h rename to bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/cmsis_iccarm.h diff --git a/bsp/synwit/swm341/libraries/CMSIS/CoreSupport/cmsis_version.h b/bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/cmsis_version.h similarity index 100% rename from bsp/synwit/swm341/libraries/CMSIS/CoreSupport/cmsis_version.h rename to bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/cmsis_version.h diff --git a/bsp/synwit/swm341/libraries/CMSIS/CoreSupport/core_armv81mml.h b/bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/core_armv81mml.h similarity index 100% rename from bsp/synwit/swm341/libraries/CMSIS/CoreSupport/core_armv81mml.h rename to bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/core_armv81mml.h diff --git a/bsp/synwit/swm341/libraries/CMSIS/CoreSupport/core_armv8mbl.h b/bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/core_armv8mbl.h similarity index 100% rename from bsp/synwit/swm341/libraries/CMSIS/CoreSupport/core_armv8mbl.h rename to bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/core_armv8mbl.h diff --git a/bsp/synwit/swm341/libraries/CMSIS/CoreSupport/core_armv8mml.h b/bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/core_armv8mml.h similarity index 100% rename from bsp/synwit/swm341/libraries/CMSIS/CoreSupport/core_armv8mml.h rename to bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/core_armv8mml.h diff --git a/bsp/synwit/swm341/libraries/CMSIS/CoreSupport/core_cm0.h b/bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/core_cm0.h similarity index 100% rename from bsp/synwit/swm341/libraries/CMSIS/CoreSupport/core_cm0.h rename to bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/core_cm0.h diff --git a/bsp/synwit/swm341/libraries/CMSIS/CoreSupport/core_cm0plus.h b/bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/core_cm0plus.h similarity index 100% rename from bsp/synwit/swm341/libraries/CMSIS/CoreSupport/core_cm0plus.h rename to bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/core_cm0plus.h diff --git a/bsp/synwit/swm341/libraries/CMSIS/CoreSupport/core_cm1.h b/bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/core_cm1.h similarity index 100% rename from bsp/synwit/swm341/libraries/CMSIS/CoreSupport/core_cm1.h rename to bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/core_cm1.h diff --git a/bsp/synwit/swm341/libraries/CMSIS/CoreSupport/core_cm23.h b/bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/core_cm23.h similarity index 100% rename from bsp/synwit/swm341/libraries/CMSIS/CoreSupport/core_cm23.h rename to bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/core_cm23.h diff --git a/bsp/synwit/swm341/libraries/CMSIS/CoreSupport/core_cm3.h b/bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/core_cm3.h similarity index 100% rename from bsp/synwit/swm341/libraries/CMSIS/CoreSupport/core_cm3.h rename to bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/core_cm3.h diff --git a/bsp/synwit/swm341/libraries/CMSIS/CoreSupport/core_cm33.h b/bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/core_cm33.h similarity index 100% rename from bsp/synwit/swm341/libraries/CMSIS/CoreSupport/core_cm33.h rename to bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/core_cm33.h diff --git a/bsp/synwit/swm341/libraries/CMSIS/CoreSupport/core_cm35p.h b/bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/core_cm35p.h similarity index 100% rename from bsp/synwit/swm341/libraries/CMSIS/CoreSupport/core_cm35p.h rename to bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/core_cm35p.h diff --git a/bsp/synwit/swm341/libraries/CMSIS/CoreSupport/core_cm4.h b/bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/core_cm4.h similarity index 100% rename from bsp/synwit/swm341/libraries/CMSIS/CoreSupport/core_cm4.h rename to bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/core_cm4.h diff --git a/bsp/synwit/swm341/libraries/CMSIS/CoreSupport/core_cm55.h b/bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/core_cm55.h similarity index 100% rename from bsp/synwit/swm341/libraries/CMSIS/CoreSupport/core_cm55.h rename to bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/core_cm55.h diff --git a/bsp/synwit/swm341/libraries/CMSIS/CoreSupport/core_cm7.h b/bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/core_cm7.h similarity index 100% rename from bsp/synwit/swm341/libraries/CMSIS/CoreSupport/core_cm7.h rename to bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/core_cm7.h diff --git a/bsp/synwit/swm341/libraries/CMSIS/CoreSupport/core_sc000.h b/bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/core_sc000.h similarity index 100% rename from bsp/synwit/swm341/libraries/CMSIS/CoreSupport/core_sc000.h rename to bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/core_sc000.h diff --git a/bsp/synwit/swm341/libraries/CMSIS/CoreSupport/core_sc300.h b/bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/core_sc300.h similarity index 100% rename from bsp/synwit/swm341/libraries/CMSIS/CoreSupport/core_sc300.h rename to bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/core_sc300.h diff --git a/bsp/synwit/swm341/libraries/CMSIS/CoreSupport/mpu_armv7.h b/bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/mpu_armv7.h similarity index 100% rename from bsp/synwit/swm341/libraries/CMSIS/CoreSupport/mpu_armv7.h rename to bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/mpu_armv7.h diff --git a/bsp/synwit/swm341/libraries/CMSIS/CoreSupport/mpu_armv8.h b/bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/mpu_armv8.h similarity index 100% rename from bsp/synwit/swm341/libraries/CMSIS/CoreSupport/mpu_armv8.h rename to bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/mpu_armv8.h diff --git a/bsp/synwit/swm341/libraries/CMSIS/CoreSupport/pmu_armv8.h b/bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/pmu_armv8.h similarity index 100% rename from bsp/synwit/swm341/libraries/CMSIS/CoreSupport/pmu_armv8.h rename to bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/pmu_armv8.h diff --git a/bsp/synwit/swm341/libraries/CMSIS/CoreSupport/tz_context.h b/bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/tz_context.h similarity index 100% rename from bsp/synwit/swm341/libraries/CMSIS/CoreSupport/tz_context.h rename to bsp/synwit/libraries/SWM341_CSL/CMSIS/CoreSupport/tz_context.h diff --git a/bsp/synwit/swm341/libraries/CMSIS/DeviceSupport/SWM341.h b/bsp/synwit/libraries/SWM341_CSL/CMSIS/DeviceSupport/SWM341.h similarity index 100% rename from bsp/synwit/swm341/libraries/CMSIS/DeviceSupport/SWM341.h rename to bsp/synwit/libraries/SWM341_CSL/CMSIS/DeviceSupport/SWM341.h diff --git a/bsp/synwit/swm341/libraries/CMSIS/DeviceSupport/startup/arm/startup_SWM341.s b/bsp/synwit/libraries/SWM341_CSL/CMSIS/DeviceSupport/startup/arm/startup_SWM341.s similarity index 100% rename from bsp/synwit/swm341/libraries/CMSIS/DeviceSupport/startup/arm/startup_SWM341.s rename to bsp/synwit/libraries/SWM341_CSL/CMSIS/DeviceSupport/startup/arm/startup_SWM341.s diff --git a/bsp/synwit/swm341/libraries/CMSIS/DeviceSupport/startup/gcc/startup_SWM341.s b/bsp/synwit/libraries/SWM341_CSL/CMSIS/DeviceSupport/startup/gcc/startup_SWM341.s similarity index 100% rename from bsp/synwit/swm341/libraries/CMSIS/DeviceSupport/startup/gcc/startup_SWM341.s rename to bsp/synwit/libraries/SWM341_CSL/CMSIS/DeviceSupport/startup/gcc/startup_SWM341.s diff --git a/bsp/synwit/swm341/libraries/CMSIS/DeviceSupport/startup/iar/startup_SWM341.s b/bsp/synwit/libraries/SWM341_CSL/CMSIS/DeviceSupport/startup/iar/startup_SWM341.s similarity index 100% rename from bsp/synwit/swm341/libraries/CMSIS/DeviceSupport/startup/iar/startup_SWM341.s rename to bsp/synwit/libraries/SWM341_CSL/CMSIS/DeviceSupport/startup/iar/startup_SWM341.s diff --git a/bsp/synwit/swm341/libraries/CMSIS/DeviceSupport/system_SWM341.c b/bsp/synwit/libraries/SWM341_CSL/CMSIS/DeviceSupport/system_SWM341.c similarity index 100% rename from bsp/synwit/swm341/libraries/CMSIS/DeviceSupport/system_SWM341.c rename to bsp/synwit/libraries/SWM341_CSL/CMSIS/DeviceSupport/system_SWM341.c diff --git a/bsp/synwit/swm341/libraries/CMSIS/DeviceSupport/system_SWM341.h b/bsp/synwit/libraries/SWM341_CSL/CMSIS/DeviceSupport/system_SWM341.h similarity index 100% rename from bsp/synwit/swm341/libraries/CMSIS/DeviceSupport/system_SWM341.h rename to bsp/synwit/libraries/SWM341_CSL/CMSIS/DeviceSupport/system_SWM341.h diff --git a/bsp/synwit/swm341/libraries/SConscript b/bsp/synwit/libraries/SWM341_CSL/SConscript similarity index 61% rename from bsp/synwit/swm341/libraries/SConscript rename to bsp/synwit/libraries/SWM341_CSL/SConscript index 2f2824c839..c235245d06 100644 --- a/bsp/synwit/swm341/libraries/SConscript +++ b/bsp/synwit/libraries/SWM341_CSL/SConscript @@ -1,9 +1,9 @@ from building import * import rtconfig -cwd = GetCurrentDir() -src = Glob('CMSIS/DeviceSupport/*.c') -CPPPATH = [cwd + '/CMSIS/CoreSupport', cwd + '/CMSIS/DeviceSupport', cwd + '/SWM341_StdPeriph_Driver'] +cwd = GetCurrentDir() + +src = Glob('CMSIS/DeviceSupport/*.c') src += Glob('SWM341_StdPeriph_Driver/*.c') if rtconfig.CROSS_TOOL == 'gcc': @@ -12,6 +12,12 @@ elif rtconfig.CROSS_TOOL == 'keil': src += ['CMSIS/DeviceSupport/startup/arm/startup_SWM341.s'] elif rtconfig.CROSS_TOOL == 'iar': src += ['CMSIS/DeviceSupport/startup/iar/startup_SWM341.s'] -group = DefineGroup('Libraries', src, depend = [''], CPPPATH = CPPPATH) + +inc = [cwd + '/CMSIS/CoreSupport', + cwd + '/CMSIS/DeviceSupport', + cwd + '/SWM341_StdPeriph_Driver' +] + +group = DefineGroup('Libraries', src, depend = [''], CPPPATH = inc) Return('group') diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_adc.c b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_adc.c similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_adc.c rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_adc.c diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_adc.h b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_adc.h similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_adc.h rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_adc.h diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_can.c b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_can.c similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_can.c rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_can.c diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_can.h b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_can.h similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_can.h rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_can.h diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_cordic.c b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_cordic.c similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_cordic.c rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_cordic.c diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_cordic.h b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_cordic.h similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_cordic.h rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_cordic.h diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_crc.c b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_crc.c similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_crc.c rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_crc.c diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_crc.h b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_crc.h similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_crc.h rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_crc.h diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_dac.c b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_dac.c similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_dac.c rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_dac.c diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_dac.h b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_dac.h similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_dac.h rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_dac.h diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_div.c b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_div.c similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_div.c rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_div.c diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_div.h b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_div.h similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_div.h rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_div.h diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_dma.c b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_dma.c similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_dma.c rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_dma.c diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_dma.h b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_dma.h similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_dma.h rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_dma.h diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_dma2d.c b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_dma2d.c similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_dma2d.c rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_dma2d.c diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_dma2d.h b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_dma2d.h similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_dma2d.h rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_dma2d.h diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_exti.c b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_exti.c similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_exti.c rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_exti.c diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_exti.h b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_exti.h similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_exti.h rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_exti.h diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_flash.c b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_flash.c similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_flash.c rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_flash.c diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_flash.h b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_flash.h similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_flash.h rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_flash.h diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_gpio.c b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_gpio.c similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_gpio.c rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_gpio.c diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_gpio.h b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_gpio.h similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_gpio.h rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_gpio.h diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_i2c.c b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_i2c.c similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_i2c.c rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_i2c.c diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_i2c.h b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_i2c.h similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_i2c.h rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_i2c.h diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_iofilt.c b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_iofilt.c similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_iofilt.c rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_iofilt.c diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_iofilt.h b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_iofilt.h similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_iofilt.h rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_iofilt.h diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_jpeg.c b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_jpeg.c similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_jpeg.c rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_jpeg.c diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_jpeg.h b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_jpeg.h similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_jpeg.h rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_jpeg.h diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_lcd.c b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_lcd.c similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_lcd.c rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_lcd.c diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_lcd.h b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_lcd.h similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_lcd.h rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_lcd.h diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_port.c b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_port.c similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_port.c rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_port.c diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_port.h b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_port.h similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_port.h rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_port.h diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_pwm.c b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_pwm.c similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_pwm.c rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_pwm.c diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_pwm.h b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_pwm.h similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_pwm.h rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_pwm.h diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_qei.c b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_qei.c similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_qei.c rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_qei.c diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_qei.h b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_qei.h similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_qei.h rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_qei.h diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_rtc.c b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_rtc.c similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_rtc.c rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_rtc.c diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_rtc.h b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_rtc.h similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_rtc.h rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_rtc.h diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_sdio.c b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_sdio.c similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_sdio.c rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_sdio.c diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_sdio.h b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_sdio.h similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_sdio.h rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_sdio.h diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_sdram.c b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_sdram.c similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_sdram.c rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_sdram.c diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_sdram.h b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_sdram.h similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_sdram.h rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_sdram.h diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_sfc.c b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_sfc.c similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_sfc.c rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_sfc.c diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_sfc.h b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_sfc.h similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_sfc.h rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_sfc.h diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_sleep.c b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_sleep.c similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_sleep.c rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_sleep.c diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_sleep.h b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_sleep.h similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_sleep.h rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_sleep.h diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_spi.c b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_spi.c similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_spi.c rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_spi.c diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_spi.h b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_spi.h similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_spi.h rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_spi.h diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_timr.c b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_timr.c similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_timr.c rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_timr.c diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_timr.h b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_timr.h similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_timr.h rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_timr.h diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_uart.c b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_uart.c similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_uart.c rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_uart.c diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_uart.h b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_uart.h similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_uart.h rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_uart.h diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_usb.h b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_usb.h similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_usb.h rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_usb.h diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_usbd.c b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_usbd.c similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_usbd.c rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_usbd.c diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_usbd.h b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_usbd.h similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_usbd.h rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_usbd.h diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_usbh.c b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_usbh.c similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_usbh.c rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_usbh.c diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_usbh.h b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_usbh.h similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_usbh.h rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_usbh.h diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_wdt.c b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_wdt.c similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_wdt.c rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_wdt.c diff --git a/bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_wdt.h b/bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_wdt.h similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_StdPeriph_Driver/SWM341_wdt.h rename to bsp/synwit/libraries/SWM341_CSL/SWM341_StdPeriph_Driver/SWM341_wdt.h diff --git a/bsp/synwit/swm341/libraries/SWM341_UsbHost_Lib/CDC/usbh_cdc_core.c b/bsp/synwit/libraries/SWM341_CSL/SWM341_UsbHost_Lib/CDC/usbh_cdc_core.c similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_UsbHost_Lib/CDC/usbh_cdc_core.c rename to bsp/synwit/libraries/SWM341_CSL/SWM341_UsbHost_Lib/CDC/usbh_cdc_core.c diff --git a/bsp/synwit/swm341/libraries/SWM341_UsbHost_Lib/CDC/usbh_cdc_core.h b/bsp/synwit/libraries/SWM341_CSL/SWM341_UsbHost_Lib/CDC/usbh_cdc_core.h similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_UsbHost_Lib/CDC/usbh_cdc_core.h rename to bsp/synwit/libraries/SWM341_CSL/SWM341_UsbHost_Lib/CDC/usbh_cdc_core.h diff --git a/bsp/synwit/swm341/libraries/SWM341_UsbHost_Lib/CDC/usbh_cdc_funct.c b/bsp/synwit/libraries/SWM341_CSL/SWM341_UsbHost_Lib/CDC/usbh_cdc_funct.c similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_UsbHost_Lib/CDC/usbh_cdc_funct.c rename to bsp/synwit/libraries/SWM341_CSL/SWM341_UsbHost_Lib/CDC/usbh_cdc_funct.c diff --git a/bsp/synwit/swm341/libraries/SWM341_UsbHost_Lib/CDC/usbh_cdc_funct.h b/bsp/synwit/libraries/SWM341_CSL/SWM341_UsbHost_Lib/CDC/usbh_cdc_funct.h similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_UsbHost_Lib/CDC/usbh_cdc_funct.h rename to bsp/synwit/libraries/SWM341_CSL/SWM341_UsbHost_Lib/CDC/usbh_cdc_funct.h diff --git a/bsp/synwit/swm341/libraries/SWM341_UsbHost_Lib/HID/usbh_hid_core.c b/bsp/synwit/libraries/SWM341_CSL/SWM341_UsbHost_Lib/HID/usbh_hid_core.c similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_UsbHost_Lib/HID/usbh_hid_core.c rename to bsp/synwit/libraries/SWM341_CSL/SWM341_UsbHost_Lib/HID/usbh_hid_core.c diff --git a/bsp/synwit/swm341/libraries/SWM341_UsbHost_Lib/HID/usbh_hid_core.h b/bsp/synwit/libraries/SWM341_CSL/SWM341_UsbHost_Lib/HID/usbh_hid_core.h similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_UsbHost_Lib/HID/usbh_hid_core.h rename to bsp/synwit/libraries/SWM341_CSL/SWM341_UsbHost_Lib/HID/usbh_hid_core.h diff --git a/bsp/synwit/swm341/libraries/SWM341_UsbHost_Lib/HID/usbh_hid_keybd.c b/bsp/synwit/libraries/SWM341_CSL/SWM341_UsbHost_Lib/HID/usbh_hid_keybd.c similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_UsbHost_Lib/HID/usbh_hid_keybd.c rename to bsp/synwit/libraries/SWM341_CSL/SWM341_UsbHost_Lib/HID/usbh_hid_keybd.c diff --git a/bsp/synwit/swm341/libraries/SWM341_UsbHost_Lib/HID/usbh_hid_keybd.h b/bsp/synwit/libraries/SWM341_CSL/SWM341_UsbHost_Lib/HID/usbh_hid_keybd.h similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_UsbHost_Lib/HID/usbh_hid_keybd.h rename to bsp/synwit/libraries/SWM341_CSL/SWM341_UsbHost_Lib/HID/usbh_hid_keybd.h diff --git a/bsp/synwit/swm341/libraries/SWM341_UsbHost_Lib/HID/usbh_hid_mouse.c b/bsp/synwit/libraries/SWM341_CSL/SWM341_UsbHost_Lib/HID/usbh_hid_mouse.c similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_UsbHost_Lib/HID/usbh_hid_mouse.c rename to bsp/synwit/libraries/SWM341_CSL/SWM341_UsbHost_Lib/HID/usbh_hid_mouse.c diff --git a/bsp/synwit/swm341/libraries/SWM341_UsbHost_Lib/HID/usbh_hid_mouse.h b/bsp/synwit/libraries/SWM341_CSL/SWM341_UsbHost_Lib/HID/usbh_hid_mouse.h similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_UsbHost_Lib/HID/usbh_hid_mouse.h rename to bsp/synwit/libraries/SWM341_CSL/SWM341_UsbHost_Lib/HID/usbh_hid_mouse.h diff --git a/bsp/synwit/swm341/libraries/SWM341_UsbHost_Lib/MSC/usbh_msc_bot.c b/bsp/synwit/libraries/SWM341_CSL/SWM341_UsbHost_Lib/MSC/usbh_msc_bot.c similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_UsbHost_Lib/MSC/usbh_msc_bot.c rename to bsp/synwit/libraries/SWM341_CSL/SWM341_UsbHost_Lib/MSC/usbh_msc_bot.c diff --git a/bsp/synwit/swm341/libraries/SWM341_UsbHost_Lib/MSC/usbh_msc_bot.h b/bsp/synwit/libraries/SWM341_CSL/SWM341_UsbHost_Lib/MSC/usbh_msc_bot.h similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_UsbHost_Lib/MSC/usbh_msc_bot.h rename to bsp/synwit/libraries/SWM341_CSL/SWM341_UsbHost_Lib/MSC/usbh_msc_bot.h diff --git a/bsp/synwit/swm341/libraries/SWM341_UsbHost_Lib/MSC/usbh_msc_core.c b/bsp/synwit/libraries/SWM341_CSL/SWM341_UsbHost_Lib/MSC/usbh_msc_core.c similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_UsbHost_Lib/MSC/usbh_msc_core.c rename to bsp/synwit/libraries/SWM341_CSL/SWM341_UsbHost_Lib/MSC/usbh_msc_core.c diff --git a/bsp/synwit/swm341/libraries/SWM341_UsbHost_Lib/MSC/usbh_msc_core.h b/bsp/synwit/libraries/SWM341_CSL/SWM341_UsbHost_Lib/MSC/usbh_msc_core.h similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_UsbHost_Lib/MSC/usbh_msc_core.h rename to bsp/synwit/libraries/SWM341_CSL/SWM341_UsbHost_Lib/MSC/usbh_msc_core.h diff --git a/bsp/synwit/swm341/libraries/SWM341_UsbHost_Lib/MSC/usbh_msc_scsi.c b/bsp/synwit/libraries/SWM341_CSL/SWM341_UsbHost_Lib/MSC/usbh_msc_scsi.c similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_UsbHost_Lib/MSC/usbh_msc_scsi.c rename to bsp/synwit/libraries/SWM341_CSL/SWM341_UsbHost_Lib/MSC/usbh_msc_scsi.c diff --git a/bsp/synwit/swm341/libraries/SWM341_UsbHost_Lib/MSC/usbh_msc_scsi.h b/bsp/synwit/libraries/SWM341_CSL/SWM341_UsbHost_Lib/MSC/usbh_msc_scsi.h similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_UsbHost_Lib/MSC/usbh_msc_scsi.h rename to bsp/synwit/libraries/SWM341_CSL/SWM341_UsbHost_Lib/MSC/usbh_msc_scsi.h diff --git a/bsp/synwit/swm341/libraries/SWM341_UsbHost_Lib/MTP/usbh_mtp.c b/bsp/synwit/libraries/SWM341_CSL/SWM341_UsbHost_Lib/MTP/usbh_mtp.c similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_UsbHost_Lib/MTP/usbh_mtp.c rename to bsp/synwit/libraries/SWM341_CSL/SWM341_UsbHost_Lib/MTP/usbh_mtp.c diff --git a/bsp/synwit/swm341/libraries/SWM341_UsbHost_Lib/MTP/usbh_mtp.h b/bsp/synwit/libraries/SWM341_CSL/SWM341_UsbHost_Lib/MTP/usbh_mtp.h similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_UsbHost_Lib/MTP/usbh_mtp.h rename to bsp/synwit/libraries/SWM341_CSL/SWM341_UsbHost_Lib/MTP/usbh_mtp.h diff --git a/bsp/synwit/swm341/libraries/SWM341_UsbHost_Lib/MTP/usbh_mtp_ptp.c b/bsp/synwit/libraries/SWM341_CSL/SWM341_UsbHost_Lib/MTP/usbh_mtp_ptp.c similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_UsbHost_Lib/MTP/usbh_mtp_ptp.c rename to bsp/synwit/libraries/SWM341_CSL/SWM341_UsbHost_Lib/MTP/usbh_mtp_ptp.c diff --git a/bsp/synwit/swm341/libraries/SWM341_UsbHost_Lib/MTP/usbh_mtp_ptp.h b/bsp/synwit/libraries/SWM341_CSL/SWM341_UsbHost_Lib/MTP/usbh_mtp_ptp.h similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_UsbHost_Lib/MTP/usbh_mtp_ptp.h rename to bsp/synwit/libraries/SWM341_CSL/SWM341_UsbHost_Lib/MTP/usbh_mtp_ptp.h diff --git a/bsp/synwit/swm341/libraries/SWM341_UsbHost_Lib/usbh_core.c b/bsp/synwit/libraries/SWM341_CSL/SWM341_UsbHost_Lib/usbh_core.c similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_UsbHost_Lib/usbh_core.c rename to bsp/synwit/libraries/SWM341_CSL/SWM341_UsbHost_Lib/usbh_core.c diff --git a/bsp/synwit/swm341/libraries/SWM341_UsbHost_Lib/usbh_core.h b/bsp/synwit/libraries/SWM341_CSL/SWM341_UsbHost_Lib/usbh_core.h similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_UsbHost_Lib/usbh_core.h rename to bsp/synwit/libraries/SWM341_CSL/SWM341_UsbHost_Lib/usbh_core.h diff --git a/bsp/synwit/swm341/libraries/SWM341_UsbHost_Lib/usbh_stdreq.c b/bsp/synwit/libraries/SWM341_CSL/SWM341_UsbHost_Lib/usbh_stdreq.c similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_UsbHost_Lib/usbh_stdreq.c rename to bsp/synwit/libraries/SWM341_CSL/SWM341_UsbHost_Lib/usbh_stdreq.c diff --git a/bsp/synwit/swm341/libraries/SWM341_UsbHost_Lib/usbh_stdreq.h b/bsp/synwit/libraries/SWM341_CSL/SWM341_UsbHost_Lib/usbh_stdreq.h similarity index 100% rename from bsp/synwit/swm341/libraries/SWM341_UsbHost_Lib/usbh_stdreq.h rename to bsp/synwit/libraries/SWM341_CSL/SWM341_UsbHost_Lib/usbh_stdreq.h diff --git a/bsp/synwit/swm341/drivers/SConscript b/bsp/synwit/libraries/SWM341_drivers/SConscript similarity index 84% rename from bsp/synwit/swm341/drivers/SConscript rename to bsp/synwit/libraries/SWM341_drivers/SConscript index 7b5dd2220a..8aacb2087f 100644 --- a/bsp/synwit/swm341/drivers/SConscript +++ b/bsp/synwit/libraries/SWM341_drivers/SConscript @@ -1,12 +1,7 @@ from building import * -cwd = GetCurrentDir() - -CPPPATH = [cwd] - -src = Split(''' - board.c - ''') +cwd = GetCurrentDir() +src = [] if GetDepend(['RT_USING_SERIAL']): src += ['drv_uart.c'] @@ -53,6 +48,6 @@ if GetDepend(['BSP_USING_SDRAM']): if GetDepend(['BSP_USING_RGB_LCD']): src += ['drv_rgb_lcd.c'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = [cwd]) Return('group') diff --git a/bsp/synwit/swm341/drivers/drv_adc.c b/bsp/synwit/libraries/SWM341_drivers/drv_adc.c similarity index 100% rename from bsp/synwit/swm341/drivers/drv_adc.c rename to bsp/synwit/libraries/SWM341_drivers/drv_adc.c diff --git a/bsp/synwit/swm341/drivers/drv_adc.h b/bsp/synwit/libraries/SWM341_drivers/drv_adc.h similarity index 100% rename from bsp/synwit/swm341/drivers/drv_adc.h rename to bsp/synwit/libraries/SWM341_drivers/drv_adc.h diff --git a/bsp/synwit/swm341/drivers/drv_can.c b/bsp/synwit/libraries/SWM341_drivers/drv_can.c similarity index 100% rename from bsp/synwit/swm341/drivers/drv_can.c rename to bsp/synwit/libraries/SWM341_drivers/drv_can.c diff --git a/bsp/synwit/swm341/drivers/drv_can.h b/bsp/synwit/libraries/SWM341_drivers/drv_can.h similarity index 100% rename from bsp/synwit/swm341/drivers/drv_can.h rename to bsp/synwit/libraries/SWM341_drivers/drv_can.h diff --git a/bsp/synwit/swm341/drivers/drv_crypto.c b/bsp/synwit/libraries/SWM341_drivers/drv_crypto.c similarity index 100% rename from bsp/synwit/swm341/drivers/drv_crypto.c rename to bsp/synwit/libraries/SWM341_drivers/drv_crypto.c diff --git a/bsp/synwit/swm341/drivers/drv_crypto.h b/bsp/synwit/libraries/SWM341_drivers/drv_crypto.h similarity index 100% rename from bsp/synwit/swm341/drivers/drv_crypto.h rename to bsp/synwit/libraries/SWM341_drivers/drv_crypto.h diff --git a/bsp/synwit/swm341/drivers/drv_dac.c b/bsp/synwit/libraries/SWM341_drivers/drv_dac.c similarity index 100% rename from bsp/synwit/swm341/drivers/drv_dac.c rename to bsp/synwit/libraries/SWM341_drivers/drv_dac.c diff --git a/bsp/synwit/swm341/drivers/drv_dac.h b/bsp/synwit/libraries/SWM341_drivers/drv_dac.h similarity index 100% rename from bsp/synwit/swm341/drivers/drv_dac.h rename to bsp/synwit/libraries/SWM341_drivers/drv_dac.h diff --git a/bsp/synwit/swm341/drivers/drv_gpio.c b/bsp/synwit/libraries/SWM341_drivers/drv_gpio.c similarity index 100% rename from bsp/synwit/swm341/drivers/drv_gpio.c rename to bsp/synwit/libraries/SWM341_drivers/drv_gpio.c diff --git a/bsp/synwit/swm341/drivers/drv_gpio.h b/bsp/synwit/libraries/SWM341_drivers/drv_gpio.h similarity index 100% rename from bsp/synwit/swm341/drivers/drv_gpio.h rename to bsp/synwit/libraries/SWM341_drivers/drv_gpio.h diff --git a/bsp/synwit/swm341/drivers/drv_hwtimer.c b/bsp/synwit/libraries/SWM341_drivers/drv_hwtimer.c similarity index 100% rename from bsp/synwit/swm341/drivers/drv_hwtimer.c rename to bsp/synwit/libraries/SWM341_drivers/drv_hwtimer.c diff --git a/bsp/synwit/swm341/drivers/drv_hwtimer.h b/bsp/synwit/libraries/SWM341_drivers/drv_hwtimer.h similarity index 100% rename from bsp/synwit/swm341/drivers/drv_hwtimer.h rename to bsp/synwit/libraries/SWM341_drivers/drv_hwtimer.h diff --git a/bsp/synwit/swm341/drivers/drv_log.h b/bsp/synwit/libraries/SWM341_drivers/drv_log.h similarity index 100% rename from bsp/synwit/swm341/drivers/drv_log.h rename to bsp/synwit/libraries/SWM341_drivers/drv_log.h diff --git a/bsp/synwit/swm341/drivers/drv_pwm.c b/bsp/synwit/libraries/SWM341_drivers/drv_pwm.c similarity index 100% rename from bsp/synwit/swm341/drivers/drv_pwm.c rename to bsp/synwit/libraries/SWM341_drivers/drv_pwm.c diff --git a/bsp/synwit/swm341/drivers/drv_pwm.h b/bsp/synwit/libraries/SWM341_drivers/drv_pwm.h similarity index 100% rename from bsp/synwit/swm341/drivers/drv_pwm.h rename to bsp/synwit/libraries/SWM341_drivers/drv_pwm.h diff --git a/bsp/synwit/swm341/drivers/drv_rgb_lcd.c b/bsp/synwit/libraries/SWM341_drivers/drv_rgb_lcd.c similarity index 100% rename from bsp/synwit/swm341/drivers/drv_rgb_lcd.c rename to bsp/synwit/libraries/SWM341_drivers/drv_rgb_lcd.c diff --git a/bsp/synwit/swm341/drivers/drv_rgb_lcd.h b/bsp/synwit/libraries/SWM341_drivers/drv_rgb_lcd.h similarity index 100% rename from bsp/synwit/swm341/drivers/drv_rgb_lcd.h rename to bsp/synwit/libraries/SWM341_drivers/drv_rgb_lcd.h diff --git a/bsp/synwit/swm341/drivers/drv_rtc.c b/bsp/synwit/libraries/SWM341_drivers/drv_rtc.c similarity index 100% rename from bsp/synwit/swm341/drivers/drv_rtc.c rename to bsp/synwit/libraries/SWM341_drivers/drv_rtc.c diff --git a/bsp/synwit/swm341/drivers/drv_rtc.h b/bsp/synwit/libraries/SWM341_drivers/drv_rtc.h similarity index 100% rename from bsp/synwit/swm341/drivers/drv_rtc.h rename to bsp/synwit/libraries/SWM341_drivers/drv_rtc.h diff --git a/bsp/synwit/swm341/drivers/drv_sdio.c b/bsp/synwit/libraries/SWM341_drivers/drv_sdio.c similarity index 100% rename from bsp/synwit/swm341/drivers/drv_sdio.c rename to bsp/synwit/libraries/SWM341_drivers/drv_sdio.c diff --git a/bsp/synwit/swm341/drivers/drv_sdio.h b/bsp/synwit/libraries/SWM341_drivers/drv_sdio.h similarity index 100% rename from bsp/synwit/swm341/drivers/drv_sdio.h rename to bsp/synwit/libraries/SWM341_drivers/drv_sdio.h diff --git a/bsp/synwit/swm341/drivers/drv_sdram.c b/bsp/synwit/libraries/SWM341_drivers/drv_sdram.c similarity index 100% rename from bsp/synwit/swm341/drivers/drv_sdram.c rename to bsp/synwit/libraries/SWM341_drivers/drv_sdram.c diff --git a/bsp/synwit/swm341/drivers/drv_sdram.h b/bsp/synwit/libraries/SWM341_drivers/drv_sdram.h similarity index 100% rename from bsp/synwit/swm341/drivers/drv_sdram.h rename to bsp/synwit/libraries/SWM341_drivers/drv_sdram.h diff --git a/bsp/synwit/swm341/drivers/drv_soft_i2c.c b/bsp/synwit/libraries/SWM341_drivers/drv_soft_i2c.c similarity index 100% rename from bsp/synwit/swm341/drivers/drv_soft_i2c.c rename to bsp/synwit/libraries/SWM341_drivers/drv_soft_i2c.c diff --git a/bsp/synwit/swm341/drivers/drv_soft_i2c.h b/bsp/synwit/libraries/SWM341_drivers/drv_soft_i2c.h similarity index 100% rename from bsp/synwit/swm341/drivers/drv_soft_i2c.h rename to bsp/synwit/libraries/SWM341_drivers/drv_soft_i2c.h diff --git a/bsp/synwit/swm341/drivers/drv_spi.c b/bsp/synwit/libraries/SWM341_drivers/drv_spi.c similarity index 100% rename from bsp/synwit/swm341/drivers/drv_spi.c rename to bsp/synwit/libraries/SWM341_drivers/drv_spi.c diff --git a/bsp/synwit/swm341/drivers/drv_spi.h b/bsp/synwit/libraries/SWM341_drivers/drv_spi.h similarity index 100% rename from bsp/synwit/swm341/drivers/drv_spi.h rename to bsp/synwit/libraries/SWM341_drivers/drv_spi.h diff --git a/bsp/synwit/swm341/drivers/drv_uart.c b/bsp/synwit/libraries/SWM341_drivers/drv_uart.c similarity index 100% rename from bsp/synwit/swm341/drivers/drv_uart.c rename to bsp/synwit/libraries/SWM341_drivers/drv_uart.c diff --git a/bsp/synwit/swm341/drivers/drv_uart.h b/bsp/synwit/libraries/SWM341_drivers/drv_uart.h similarity index 100% rename from bsp/synwit/swm341/drivers/drv_uart.h rename to bsp/synwit/libraries/SWM341_drivers/drv_uart.h diff --git a/bsp/synwit/swm341/drivers/drv_wdt.c b/bsp/synwit/libraries/SWM341_drivers/drv_wdt.c similarity index 100% rename from bsp/synwit/swm341/drivers/drv_wdt.c rename to bsp/synwit/libraries/SWM341_drivers/drv_wdt.c diff --git a/bsp/synwit/swm341/drivers/drv_wdt.h b/bsp/synwit/libraries/SWM341_drivers/drv_wdt.h similarity index 100% rename from bsp/synwit/swm341/drivers/drv_wdt.h rename to bsp/synwit/libraries/SWM341_drivers/drv_wdt.h diff --git a/bsp/synwit/swm341/drivers/rgb_lcd_port.h b/bsp/synwit/libraries/SWM341_drivers/rgb_lcd_port.h similarity index 100% rename from bsp/synwit/swm341/drivers/rgb_lcd_port.h rename to bsp/synwit/libraries/SWM341_drivers/rgb_lcd_port.h diff --git a/bsp/synwit/libraries/注意事项.md b/bsp/synwit/libraries/注意事项.md new file mode 100644 index 0000000000..c5c2887166 --- /dev/null +++ b/bsp/synwit/libraries/注意事项.md @@ -0,0 +1,13 @@ +# 以下文件经过修改，替换lib时需要注意 + +## 1 + +SWM341_CSL\CMSIS\DeviceSupport\startup\gcc\startup_SWM341.s 文件经过修改。 + +SWM320_CSL\CMSIS\DeviceSupport\startup\gcc\startup_SWM320.s 文件经过修改。 + +## 2 + +SWM341_CSL\SWM341_StdPeriph_Driver\SWM341_flash.c 中函数 Flash_Param_at_xMHz() 注释掉 \_\_disable_irq() 和 \_\_enable_irq() 语句，避免在调度器启动之前使能全局中断 + +SWM320_CSL\SWM320_StdPeriph_Driver\SWM320_flash.c 中函数 Flash_Param_at_xMHz() 注释掉 \_\_disable_irq() 和 \_\_enable_irq() 语句，避免在调度器启动之前使能全局中断 diff --git a/bsp/synwit/swm320/.config b/bsp/synwit/swm320-mini/.config similarity index 100% rename from bsp/synwit/swm320/.config rename to bsp/synwit/swm320-mini/.config diff --git a/bsp/synwit/swm320/Kconfig b/bsp/synwit/swm320-mini/Kconfig similarity index 76% rename from bsp/synwit/swm320/Kconfig rename to bsp/synwit/swm320-mini/Kconfig index bf5149e7c7..4645aae1e0 100644 --- a/bsp/synwit/swm320/Kconfig +++ b/bsp/synwit/swm320-mini/Kconfig @@ -17,9 +17,4 @@ config PKGS_DIR source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" -source "drivers/Kconfig" - -config SOC_SWM320 - bool - select ARCH_ARM_CORTEX_M4 - default y +source "board/Kconfig" diff --git a/bsp/synwit/swm320/README.md b/bsp/synwit/swm320-mini/README.md similarity index 100% rename from bsp/synwit/swm320/README.md rename to bsp/synwit/swm320-mini/README.md diff --git a/bsp/synwit/swm320-mini/SConscript b/bsp/synwit/swm320-mini/SConscript new file mode 100644 index 0000000000..114efa835c --- /dev/null +++ b/bsp/synwit/swm320-mini/SConscript @@ -0,0 +1,11 @@ +import os +from building import * + +cwd = GetCurrentDir() +objs = [] + +for name in os.listdir(cwd): + if os.path.isfile(os.path.join(cwd, name, 'SConscript')): + objs += SConscript(os.path.join(name, 'SConscript')) + +Return('objs') diff --git a/bsp/synwit/swm341/SConstruct b/bsp/synwit/swm320-mini/SConstruct similarity index 81% rename from bsp/synwit/swm341/SConstruct rename to bsp/synwit/swm320-mini/SConstruct index 10cfbff368..6ae0391615 100644 --- a/bsp/synwit/swm341/SConstruct +++ b/bsp/synwit/swm320-mini/SConstruct @@ -37,5 +37,13 @@ Export('rtconfig') # prepare building environment objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) +libraries_path = os.path.join(GetCurrentDir(), '..', 'libraries') + +# include libraries +objs += SConscript(os.path.join(libraries_path, 'SWM320_CSL', 'SConscript')) + +# include drivers +objs += SConscript(os.path.join(libraries_path, 'SWM320_drivers', 'SConscript')) + # make a building DoBuilding(TARGET, objs) diff --git a/bsp/synwit/swm320/applications/SConscript b/bsp/synwit/swm320-mini/applications/SConscript similarity index 53% rename from bsp/synwit/swm320/applications/SConscript rename to bsp/synwit/swm320-mini/applications/SConscript index 7eaae20596..add84aabfe 100644 --- a/bsp/synwit/swm320/applications/SConscript +++ b/bsp/synwit/swm320-mini/applications/SConscript @@ -1,9 +1,8 @@ from building import * -cwd = GetCurrentDir() -CPPPATH = [cwd] -src = Glob('*.c') + Glob('*.cpp') +cwd = GetCurrentDir() +src = Glob('*.c') + Glob('*.cpp') -group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('Applications', src, depend = [''], CPPPATH = [cwd]) Return('group') diff --git a/bsp/synwit/swm320/applications/main.c b/bsp/synwit/swm320-mini/applications/main.c similarity index 100% rename from bsp/synwit/swm320/applications/main.c rename to bsp/synwit/swm320-mini/applications/main.c diff --git a/bsp/synwit/swm320/drivers/Kconfig b/bsp/synwit/swm320-mini/board/Kconfig similarity index 99% rename from bsp/synwit/swm320/drivers/Kconfig rename to bsp/synwit/swm320-mini/board/Kconfig index 6858ab0568..6dab8a31ef 100644 --- a/bsp/synwit/swm320/drivers/Kconfig +++ b/bsp/synwit/swm320-mini/board/Kconfig @@ -2,6 +2,7 @@ menu "Hardware Drivers Config" config SOC_SWM320 bool + select ARCH_ARM_CORTEX_M4 select RT_USING_COMPONENTS_INIT select RT_USING_USER_MAIN default y diff --git a/bsp/synwit/swm320-mini/board/SConscript b/bsp/synwit/swm320-mini/board/SConscript new file mode 100644 index 0000000000..5e35a9a1ec --- /dev/null +++ b/bsp/synwit/swm320-mini/board/SConscript @@ -0,0 +1,8 @@ +from building import * + +cwd = GetCurrentDir() +src = Split('board.c') + +group = DefineGroup('Board', src, depend = [''], CPPPATH = [cwd]) + +Return('group') diff --git a/bsp/synwit/swm320/drivers/board.c b/bsp/synwit/swm320-mini/board/board.c similarity index 100% rename from bsp/synwit/swm320/drivers/board.c rename to bsp/synwit/swm320-mini/board/board.c diff --git a/bsp/synwit/swm320/drivers/board.h b/bsp/synwit/swm320-mini/board/board.h similarity index 100% rename from bsp/synwit/swm320/drivers/board.h rename to bsp/synwit/swm320-mini/board/board.h diff --git a/bsp/synwit/swm320/drivers/linker_scripts/link.icf b/bsp/synwit/swm320-mini/board/linker_scripts/link.icf similarity index 100% rename from bsp/synwit/swm320/drivers/linker_scripts/link.icf rename to bsp/synwit/swm320-mini/board/linker_scripts/link.icf diff --git a/bsp/synwit/swm320/drivers/linker_scripts/link.lds b/bsp/synwit/swm320-mini/board/linker_scripts/link.lds similarity index 100% rename from bsp/synwit/swm320/drivers/linker_scripts/link.lds rename to bsp/synwit/swm320-mini/board/linker_scripts/link.lds diff --git a/bsp/synwit/swm320/drivers/linker_scripts/link.sct b/bsp/synwit/swm320-mini/board/linker_scripts/link.sct similarity index 100% rename from bsp/synwit/swm320/drivers/linker_scripts/link.sct rename to bsp/synwit/swm320-mini/board/linker_scripts/link.sct diff --git a/bsp/synwit/swm320/project.ewp b/bsp/synwit/swm320-mini/project.ewp similarity index 96% rename from bsp/synwit/swm320/project.ewp rename to bsp/synwit/swm320-mini/project.ewp index 678e990856..bd3246db63 100644 --- a/bsp/synwit/swm320/project.ewp +++ b/bsp/synwit/swm320-mini/project.ewp @@ -777,7 +777,7 @@