[swm] 整合swm bsp

.github/workflows/action.yml

@@ -171,8 +171,8 @@ jobs:
         #  - {RTT_BSP: "stm32/stm32wle5-yizhilian-lm402", RTT_TOOL_CHAIN: "sourcery-arm"}
          - {RTT_BSP: "wch/arm/ch32f103c8-core", RTT_TOOL_CHAIN: "sourcery-arm"}
          - {RTT_BSP: "wch/arm/ch32f203r-evt", RTT_TOOL_CHAIN: "sourcery-arm"}
-         - {RTT_BSP: "swm320", RTT_TOOL_CHAIN: "sourcery-arm"}
-         - {RTT_BSP: "swm341", RTT_TOOL_CHAIN: "sourcery-arm"}
+         - {RTT_BSP: "swm/swm320", RTT_TOOL_CHAIN: "sourcery-arm"}
+         - {RTT_BSP: "swm/swm341", RTT_TOOL_CHAIN: "sourcery-arm"}
          - {RTT_BSP: "beaglebone", RTT_TOOL_CHAIN: "sourcery-arm"}
          - {RTT_BSP: "zynqmp-r5-axu4ev", RTT_TOOL_CHAIN: "sourcery-arm"}
          - {RTT_BSP: "frdm-k64f", RTT_TOOL_CHAIN: "sourcery-arm"}

bsp/swm320/Kconfig → bsp/swm/swm320/Kconfig

@@ -8,7 +8,7 @@ config BSP_DIR
 config RTT_DIR
     string
     option env="RTT_ROOT"
-    default "../.."
+    default "../../.."
 
 config PKGS_DIR
     string

bsp/swm320/SConstruct → bsp/swm/swm320/SConstruct

@@ -5,7 +5,7 @@ import rtconfig
 if os.getenv('RTT_ROOT'):
     RTT_ROOT = os.getenv('RTT_ROOT')
 else:
-    RTT_ROOT = os.path.normpath(os.getcwd() + '/../..')
+    RTT_ROOT = os.path.normpath(os.getcwd() + '/../../..')
 
 sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')]
 

bsp/swm341/Kconfig → bsp/swm/swm341/Kconfig

@@ -8,7 +8,7 @@ config BSP_DIR
 config RTT_DIR
     string
     option env="RTT_ROOT"
-    default "../.."
+    default "../../.."
 
 config PKGS_DIR
     string

bsp/swm341/SConstruct → bsp/swm/swm341/SConstruct

@@ -5,7 +5,7 @@ import rtconfig
 if os.getenv('RTT_ROOT'):
     RTT_ROOT = os.getenv('RTT_ROOT')
 else:
-    RTT_ROOT = os.path.normpath(os.getcwd() + '/../..')
+    RTT_ROOT = os.path.normpath(os.getcwd() + '/../../..')
 
 sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')]
 

bsp/swm341/drivers/Kconfig → bsp/swm/swm341/drivers/Kconfig

@@ -6,6 +6,53 @@ config SOC_SWM341
     select RT_USING_USER_MAIN
     default y
 
+menu "Onboard Peripheral Drivers"
+
+    config BSP_USING_LVGL
+        bool "Enable LVGL for LCD"
+        select PKG_USING_LVGL
+        select BSP_USING_RGB_LCD
+        select BSP_USING_GT9147
+        default n
+
+    config BSP_USING_GT9147
+        bool "Enable gt9147(use i2c0)"
+        select RT_USING_TOUCH
+        select RT_TOUCH_PIN_IRQ
+        select BSP_USING_I2C
+        select BSP_USING_I2C0
+        default n
+        if BSP_USING_GT9147
+            config GT9147_RST_PIN
+                int "GT9147 rst pin number"
+                range 0 111
+                default 39
+            config GT9147_IRQ_PIN
+                int "GT9147 irq pin number"
+                range 0 111
+                default 48
+        endif
+
+    config BSP_USING_RGB_LCD
+        bool "Enable RGB LCD"
+        select BSP_USING_SDRAM
+        default n
+
+    config BSP_USING_SDRAM
+        bool "Enable SDRAM"
+        select RT_USING_MEMHEAP
+        select RT_USING_MEMHEAP_AS_HEAP
+        select RT_USING_MEMHEAP_AUTO_BINDING
+        default n
+
+        if BSP_USING_SDRAM
+            config BSP_SDRAM_SIZE
+            hex "SDRAM size"
+            default 0x800000
+        endif
+
+endmenu
+
 menu "On-chip Peripheral Drivers"
 
     menuconfig BSP_USING_UART
@@ -352,53 +399,9 @@ menu "On-chip Peripheral Drivers"
         select RT_USING_DFS
         select RT_USING_DFS_ELMFAT
         default n
-
-    menuconfig BSP_USING_SDRAM
-        bool "Enable SDRAM"
-        select RT_USING_MEMHEAP
-        select RT_USING_MEMHEAP_AS_HEAP
-        select RT_USING_MEMHEAP_AUTO_BINDING
-        default n
-        if BSP_USING_SDRAM
-            config BSP_SDRAM_SIZE
-            hex "SDRAM size"
-            default 0x800000
-        endif
-
-    menuconfig BSP_USING_GT9147
-        bool "Enable gt9147(use i2c0)"
-        select RT_USING_TOUCH
-        select RT_TOUCH_PIN_IRQ
-        select BSP_USING_I2C
-        select BSP_USING_I2C0
-        default n
-        if BSP_USING_GT9147
-            config GT9147_RST_PIN
-                int "GT9147 rst pin number"
-                range 0 111
-                default 39
-            config GT9147_IRQ_PIN
-                int "GT9147 irq pin number"
-                range 0 111
-                default 48
-        endif
-    menuconfig BSP_USING_RGB_LCD
-        bool "Enable RGB LCD"
-        select BSP_USING_SDRAM
-        default n
-        if BSP_USING_RGB_LCD
-            config BSP_USING_LVGL
-                bool "Enable LVGL for LCD"
-                select PKG_USING_LVGL
-                default n
-        endif
 
 endmenu
 
-menu "Onboard Peripheral Drivers"
-
-endmenu
-
 menu "Offboard Peripheral Drivers"
 
 endmenu