From e219bfa136888371ef7d928405caa4e9922a0dfe Mon Sep 17 00:00:00 2001
From: CYFS <2805686936@qq.com>
Date: Wed, 3 Jun 2026 13:19:51 +0800
Subject: [PATCH] [bsp][raspberry-pico]: adjust file structure

---
 bsp/raspberry-pico/RP2040/SConstruct                      | 2 +-
 bsp/raspberry-pico/RP2350/SConstruct                      | 2 +-
 bsp/raspberry-pico/{ => libraries}/Drivers/SConscript     | 0
 bsp/raspberry-pico/{ => libraries}/Drivers/drv_adc.c      | 0
 bsp/raspberry-pico/{ => libraries}/Drivers/drv_adc.h      | 0
 bsp/raspberry-pico/{ => libraries}/Drivers/drv_flash.c    | 0
 bsp/raspberry-pico/{ => libraries}/Drivers/drv_flash.h    | 0
 bsp/raspberry-pico/{ => libraries}/Drivers/drv_gpio.c     | 0
 bsp/raspberry-pico/{ => libraries}/Drivers/drv_gpio.h     | 0
 bsp/raspberry-pico/{ => libraries}/Drivers/drv_i2c.c      | 0
 bsp/raspberry-pico/{ => libraries}/Drivers/drv_i2c.h      | 0
 bsp/raspberry-pico/{ => libraries}/Drivers/drv_pwm.c      | 0
 bsp/raspberry-pico/{ => libraries}/Drivers/drv_pwm.h      | 0
 bsp/raspberry-pico/{ => libraries}/Drivers/drv_rtc.c      | 0
 bsp/raspberry-pico/{ => libraries}/Drivers/drv_soft_i2c.c | 0
 bsp/raspberry-pico/{ => libraries}/Drivers/drv_soft_i2c.h | 0
 bsp/raspberry-pico/{ => libraries}/Drivers/drv_soft_spi.c | 0
 bsp/raspberry-pico/{ => libraries}/Drivers/drv_soft_spi.h | 0
 bsp/raspberry-pico/{ => libraries}/Drivers/drv_spi.c      | 0
 bsp/raspberry-pico/{ => libraries}/Drivers/drv_spi.h      | 0
 bsp/raspberry-pico/{ => libraries}/Drivers/drv_timer.c    | 0
 bsp/raspberry-pico/{ => libraries}/Drivers/drv_timer.h    | 0
 bsp/raspberry-pico/{ => libraries}/Drivers/drv_uart.c     | 0
 bsp/raspberry-pico/{ => libraries}/Drivers/drv_uart.h     | 0
 bsp/raspberry-pico/{ => libraries}/Drivers/drv_wdt.c      | 0
 bsp/raspberry-pico/{ => libraries}/Drivers/drv_wdt.h      | 0
 bsp/raspberry-pico/tools/sdk_dist.py                      | 4 ++--
 27 files changed, 4 insertions(+), 4 deletions(-)
 rename bsp/raspberry-pico/{ => libraries}/Drivers/SConscript (100%)
 rename bsp/raspberry-pico/{ => libraries}/Drivers/drv_adc.c (100%)
 rename bsp/raspberry-pico/{ => libraries}/Drivers/drv_adc.h (100%)
 rename bsp/raspberry-pico/{ => libraries}/Drivers/drv_flash.c (100%)
 rename bsp/raspberry-pico/{ => libraries}/Drivers/drv_flash.h (100%)
 rename bsp/raspberry-pico/{ => libraries}/Drivers/drv_gpio.c (100%)
 rename bsp/raspberry-pico/{ => libraries}/Drivers/drv_gpio.h (100%)
 rename bsp/raspberry-pico/{ => libraries}/Drivers/drv_i2c.c (100%)
 rename bsp/raspberry-pico/{ => libraries}/Drivers/drv_i2c.h (100%)
 rename bsp/raspberry-pico/{ => libraries}/Drivers/drv_pwm.c (100%)
 rename bsp/raspberry-pico/{ => libraries}/Drivers/drv_pwm.h (100%)
 rename bsp/raspberry-pico/{ => libraries}/Drivers/drv_rtc.c (100%)
 rename bsp/raspberry-pico/{ => libraries}/Drivers/drv_soft_i2c.c (100%)
 rename bsp/raspberry-pico/{ => libraries}/Drivers/drv_soft_i2c.h (100%)
 rename bsp/raspberry-pico/{ => libraries}/Drivers/drv_soft_spi.c (100%)
 rename bsp/raspberry-pico/{ => libraries}/Drivers/drv_soft_spi.h (100%)
 rename bsp/raspberry-pico/{ => libraries}/Drivers/drv_spi.c (100%)
 rename bsp/raspberry-pico/{ => libraries}/Drivers/drv_spi.h (100%)
 rename bsp/raspberry-pico/{ => libraries}/Drivers/drv_timer.c (100%)
 rename bsp/raspberry-pico/{ => libraries}/Drivers/drv_timer.h (100%)
 rename bsp/raspberry-pico/{ => libraries}/Drivers/drv_uart.c (100%)
 rename bsp/raspberry-pico/{ => libraries}/Drivers/drv_uart.h (100%)
 rename bsp/raspberry-pico/{ => libraries}/Drivers/drv_wdt.c (100%)
 rename bsp/raspberry-pico/{ => libraries}/Drivers/drv_wdt.h (100%)

diff --git a/bsp/raspberry-pico/RP2040/SConstruct b/bsp/raspberry-pico/RP2040/SConstruct
index fb10a92d41..01cea569da 100644
--- a/bsp/raspberry-pico/RP2040/SConstruct
+++ b/bsp/raspberry-pico/RP2040/SConstruct
@@ -38,7 +38,7 @@ os.chdir(ocwd)
 
 objs.extend(SConscript(os.path.join(os.getcwd(), 'board', 'ports', 'SConscript')))
 
-objs.extend(SConscript(os.path.join(os.getcwd(), '..', 'Drivers', 'SConscript')))
+objs.extend(SConscript(os.path.join(os.getcwd(), '..', 'libraries', 'Drivers', 'SConscript')))
 
 # make a building
 DoBuilding(TARGET, objs)
diff --git a/bsp/raspberry-pico/RP2350/SConstruct b/bsp/raspberry-pico/RP2350/SConstruct
index 88abed2070..a590fdd6a7 100644
--- a/bsp/raspberry-pico/RP2350/SConstruct
+++ b/bsp/raspberry-pico/RP2350/SConstruct
@@ -36,7 +36,7 @@ else:
     os.system("scons")
 os.chdir(ocwd)
 
-objs.extend(SConscript(os.path.join(os.getcwd(), '..', 'Drivers', 'SConscript')))
+objs.extend(SConscript(os.path.join(os.getcwd(), '..', 'libraries', 'Drivers', 'SConscript')))
 
 # make a building
 DoBuilding(TARGET, objs)
diff --git a/bsp/raspberry-pico/Drivers/SConscript b/bsp/raspberry-pico/libraries/Drivers/SConscript
similarity index 100%
rename from bsp/raspberry-pico/Drivers/SConscript
rename to bsp/raspberry-pico/libraries/Drivers/SConscript
diff --git a/bsp/raspberry-pico/Drivers/drv_adc.c b/bsp/raspberry-pico/libraries/Drivers/drv_adc.c
similarity index 100%
rename from bsp/raspberry-pico/Drivers/drv_adc.c
rename to bsp/raspberry-pico/libraries/Drivers/drv_adc.c
diff --git a/bsp/raspberry-pico/Drivers/drv_adc.h b/bsp/raspberry-pico/libraries/Drivers/drv_adc.h
similarity index 100%
rename from bsp/raspberry-pico/Drivers/drv_adc.h
rename to bsp/raspberry-pico/libraries/Drivers/drv_adc.h
diff --git a/bsp/raspberry-pico/Drivers/drv_flash.c b/bsp/raspberry-pico/libraries/Drivers/drv_flash.c
similarity index 100%
rename from bsp/raspberry-pico/Drivers/drv_flash.c
rename to bsp/raspberry-pico/libraries/Drivers/drv_flash.c
diff --git a/bsp/raspberry-pico/Drivers/drv_flash.h b/bsp/raspberry-pico/libraries/Drivers/drv_flash.h
similarity index 100%
rename from bsp/raspberry-pico/Drivers/drv_flash.h
rename to bsp/raspberry-pico/libraries/Drivers/drv_flash.h
diff --git a/bsp/raspberry-pico/Drivers/drv_gpio.c b/bsp/raspberry-pico/libraries/Drivers/drv_gpio.c
similarity index 100%
rename from bsp/raspberry-pico/Drivers/drv_gpio.c
rename to bsp/raspberry-pico/libraries/Drivers/drv_gpio.c
diff --git a/bsp/raspberry-pico/Drivers/drv_gpio.h b/bsp/raspberry-pico/libraries/Drivers/drv_gpio.h
similarity index 100%
rename from bsp/raspberry-pico/Drivers/drv_gpio.h
rename to bsp/raspberry-pico/libraries/Drivers/drv_gpio.h
diff --git a/bsp/raspberry-pico/Drivers/drv_i2c.c b/bsp/raspberry-pico/libraries/Drivers/drv_i2c.c
similarity index 100%
rename from bsp/raspberry-pico/Drivers/drv_i2c.c
rename to bsp/raspberry-pico/libraries/Drivers/drv_i2c.c
diff --git a/bsp/raspberry-pico/Drivers/drv_i2c.h b/bsp/raspberry-pico/libraries/Drivers/drv_i2c.h
similarity index 100%
rename from bsp/raspberry-pico/Drivers/drv_i2c.h
rename to bsp/raspberry-pico/libraries/Drivers/drv_i2c.h
diff --git a/bsp/raspberry-pico/Drivers/drv_pwm.c b/bsp/raspberry-pico/libraries/Drivers/drv_pwm.c
similarity index 100%
rename from bsp/raspberry-pico/Drivers/drv_pwm.c
rename to bsp/raspberry-pico/libraries/Drivers/drv_pwm.c
diff --git a/bsp/raspberry-pico/Drivers/drv_pwm.h b/bsp/raspberry-pico/libraries/Drivers/drv_pwm.h
similarity index 100%
rename from bsp/raspberry-pico/Drivers/drv_pwm.h
rename to bsp/raspberry-pico/libraries/Drivers/drv_pwm.h
diff --git a/bsp/raspberry-pico/Drivers/drv_rtc.c b/bsp/raspberry-pico/libraries/Drivers/drv_rtc.c
similarity index 100%
rename from bsp/raspberry-pico/Drivers/drv_rtc.c
rename to bsp/raspberry-pico/libraries/Drivers/drv_rtc.c
diff --git a/bsp/raspberry-pico/Drivers/drv_soft_i2c.c b/bsp/raspberry-pico/libraries/Drivers/drv_soft_i2c.c
similarity index 100%
rename from bsp/raspberry-pico/Drivers/drv_soft_i2c.c
rename to bsp/raspberry-pico/libraries/Drivers/drv_soft_i2c.c
diff --git a/bsp/raspberry-pico/Drivers/drv_soft_i2c.h b/bsp/raspberry-pico/libraries/Drivers/drv_soft_i2c.h
similarity index 100%
rename from bsp/raspberry-pico/Drivers/drv_soft_i2c.h
rename to bsp/raspberry-pico/libraries/Drivers/drv_soft_i2c.h
diff --git a/bsp/raspberry-pico/Drivers/drv_soft_spi.c b/bsp/raspberry-pico/libraries/Drivers/drv_soft_spi.c
similarity index 100%
rename from bsp/raspberry-pico/Drivers/drv_soft_spi.c
rename to bsp/raspberry-pico/libraries/Drivers/drv_soft_spi.c
diff --git a/bsp/raspberry-pico/Drivers/drv_soft_spi.h b/bsp/raspberry-pico/libraries/Drivers/drv_soft_spi.h
similarity index 100%
rename from bsp/raspberry-pico/Drivers/drv_soft_spi.h
rename to bsp/raspberry-pico/libraries/Drivers/drv_soft_spi.h
diff --git a/bsp/raspberry-pico/Drivers/drv_spi.c b/bsp/raspberry-pico/libraries/Drivers/drv_spi.c
similarity index 100%
rename from bsp/raspberry-pico/Drivers/drv_spi.c
rename to bsp/raspberry-pico/libraries/Drivers/drv_spi.c
diff --git a/bsp/raspberry-pico/Drivers/drv_spi.h b/bsp/raspberry-pico/libraries/Drivers/drv_spi.h
similarity index 100%
rename from bsp/raspberry-pico/Drivers/drv_spi.h
rename to bsp/raspberry-pico/libraries/Drivers/drv_spi.h
diff --git a/bsp/raspberry-pico/Drivers/drv_timer.c b/bsp/raspberry-pico/libraries/Drivers/drv_timer.c
similarity index 100%
rename from bsp/raspberry-pico/Drivers/drv_timer.c
rename to bsp/raspberry-pico/libraries/Drivers/drv_timer.c
diff --git a/bsp/raspberry-pico/Drivers/drv_timer.h b/bsp/raspberry-pico/libraries/Drivers/drv_timer.h
similarity index 100%
rename from bsp/raspberry-pico/Drivers/drv_timer.h
rename to bsp/raspberry-pico/libraries/Drivers/drv_timer.h
diff --git a/bsp/raspberry-pico/Drivers/drv_uart.c b/bsp/raspberry-pico/libraries/Drivers/drv_uart.c
similarity index 100%
rename from bsp/raspberry-pico/Drivers/drv_uart.c
rename to bsp/raspberry-pico/libraries/Drivers/drv_uart.c
diff --git a/bsp/raspberry-pico/Drivers/drv_uart.h b/bsp/raspberry-pico/libraries/Drivers/drv_uart.h
similarity index 100%
rename from bsp/raspberry-pico/Drivers/drv_uart.h
rename to bsp/raspberry-pico/libraries/Drivers/drv_uart.h
diff --git a/bsp/raspberry-pico/Drivers/drv_wdt.c b/bsp/raspberry-pico/libraries/Drivers/drv_wdt.c
similarity index 100%
rename from bsp/raspberry-pico/Drivers/drv_wdt.c
rename to bsp/raspberry-pico/libraries/Drivers/drv_wdt.c
diff --git a/bsp/raspberry-pico/Drivers/drv_wdt.h b/bsp/raspberry-pico/libraries/Drivers/drv_wdt.h
similarity index 100%
rename from bsp/raspberry-pico/Drivers/drv_wdt.h
rename to bsp/raspberry-pico/libraries/Drivers/drv_wdt.h
diff --git a/bsp/raspberry-pico/tools/sdk_dist.py b/bsp/raspberry-pico/tools/sdk_dist.py
index f3510ceeb0..8e5b6c4e76 100644
--- a/bsp/raspberry-pico/tools/sdk_dist.py
+++ b/bsp/raspberry-pico/tools/sdk_dist.py
@@ -6,6 +6,6 @@ def dist_do_building(BSP_ROOT, dist_dir):
 
     print("=> copy raspberry-pico drivers")
     bsp_copy_files(
-        os.path.join(os.path.dirname(BSP_ROOT), 'Drivers'),
-        os.path.join(os.path.dirname(dist_dir), 'Drivers'),
+        os.path.join(os.path.dirname(BSP_ROOT), 'libraries', 'Drivers'),
+        os.path.join(os.path.dirname(dist_dir), 'libraries', 'Drivers'),
     )