fix build

Signed-off-by: Peter Bee <[email protected]>
apache · Nov 18, 2024 · 2e9b3e7 · 2e9b3e7
1 parent b6b72f1
commit 2e9b3e7
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 13 deletions.
diff --git a/boards/arm/rp23xx/common/src/rp23xx_common_bringup.c b/boards/arm/rp23xx/common/src/rp23xx_common_bringup.c
@@ -74,10 +74,6 @@ int rp23xx_common_bringup(void)
 {
   int ret = 0;
 
-#ifdef CONFIG_RP23XX_FLASH_FILE_SYSTEM
-  struct mtd_dev_s *mtd_dev;
-#endif
-
 #ifdef CONFIG_RP23XX_I2C_DRIVER
   #ifdef CONFIG_RP23XX_I2C0
   ret = board_i2cdev_initialize(0);

diff --git a/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/nshsram/defconfig b/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/nshsram/defconfig
@@ -11,7 +11,6 @@
 # CONFIG_NSH_CMDOPT_HEXDUMP is not set
 # CONFIG_NSH_DISABLE_DATE is not set
 # CONFIG_NSH_DISABLE_LOSMART is not set
-# CONFIG_RP23XX_FLASH_BOOT is not set
 # CONFIG_STANDARD_SERIAL is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD="raspberrypi-pico-2"

diff --git a/...i-pico-2-plus/configs/nsh-flash/defconfig → ...aspberrypi-pico-2/configs/spisd/defconfig b/...i-pico-2-plus/configs/nsh-flash/defconfig → ...aspberrypi-pico-2/configs/spisd/defconfig
@@ -9,6 +9,8 @@
 # CONFIG_NSH_ARGCAT is not set
 # CONFIG_NSH_CMDOPT_HEXDUMP is not set
 # CONFIG_NSH_DISABLE_DATE is not set
+# CONFIG_NSH_DISABLE_LOSMART is not set
+# CONFIG_SPI_CALLBACK is not set
 # CONFIG_STANDARD_SERIAL is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD="raspberrypi-pico-2"
@@ -17,33 +19,64 @@ CONFIG_ARCH_CHIP="rp23xx"
 CONFIG_ARCH_CHIP_RP23XX=y
 CONFIG_ARCH_RAMVECTORS=y
 CONFIG_ARCH_STACKDUMP=y
+CONFIG_AUDIO=y
+CONFIG_AUDIO_I2S=y
 CONFIG_BOARDCTL_RESET=y
 CONFIG_BOARD_LOOPSPERMSEC=10450
 CONFIG_BUILTIN=y
+CONFIG_DEBUG_AUDIO=y
+CONFIG_DEBUG_AUDIO_ERROR=y
+CONFIG_DEBUG_AUDIO_WARN=y
+CONFIG_DEBUG_FEATURES=y
+CONFIG_DEBUG_FS=y
+CONFIG_DEBUG_FS_ERROR=y
+CONFIG_DEBUG_FS_WARN=y
 CONFIG_DEBUG_FULLOPT=y
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_DISABLE_POSIX_TIMERS=y
+CONFIG_DRIVERS_AUDIO=y
+CONFIG_ETC_ROMFS=y
 CONFIG_EXAMPLES_HELLO=y
+CONFIG_EXAMPLES_WS2812=y
 CONFIG_FS_PROCFS=y
 CONFIG_FS_PROCFS_REGISTER=y
+CONFIG_FS_ROMFS=y
+CONFIG_FS_TMPFS=y
 CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_LIBC_LZF=y
+CONFIG_LIBC_MEMFD_ERROR=y
+CONFIG_MMCSD=y
+CONFIG_MMCSD_PROCFS=y
 CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_READLINE=y
 CONFIG_RAM_SIZE=532480
 CONFIG_RAM_START=0x20000000
 CONFIG_READLINE_CMD_HISTORY=y
-CONFIG_RP23XX_FLASH_FILE_SYSTEM=y
+CONFIG_RP23XX_BOARD_HAS_WS2812=y
+CONFIG_RP23XX_I2S=y
+CONFIG_RP23XX_SPI0=y
+CONFIG_RP23XX_SPI0_CS_GPIO=5
+CONFIG_RP23XX_SPI0_RX_GPIO=4
+CONFIG_RP23XX_SPI0_SCK_GPIO=2
+CONFIG_RP23XX_SPI0_TX_GPIO=3
+CONFIG_RP23XX_SPI=y
+CONFIG_RP23XX_SPISD=y
+CONFIG_RP23XX_WS2812_GPIO_PIN=6
 CONFIG_RR_INTERVAL=200
+CONFIG_SCHED_HPWORK=y
+CONFIG_SCHED_LPWORK=y
 CONFIG_SCHED_WAITPID=y
-CONFIG_SMARTFS_ALIGNED_ACCESS=y
 CONFIG_START_DAY=9
 CONFIG_START_MONTH=2
 CONFIG_START_YEAR=2021
 CONFIG_SYSLOG_CONSOLE=y
 CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NXLOOPER=y
+CONFIG_SYSTEM_NXPLAYER=y
+CONFIG_SYSTEM_NXRECORDER=y
 CONFIG_TESTING_GETPRIME=y
 CONFIG_TESTING_OSTEST=y
-CONFIG_TESTING_SMART_TEST=y
 CONFIG_UART0_SERIAL_CONSOLE=y
+CONFIG_WS2812=y
diff --git a/tools/rp23xx/Config.mk b/tools/rp23xx/Config.mk
@@ -24,10 +24,33 @@
 
 # POSTBUILD -- Perform post build operations
 
-ifeq ($(CONFIG_RP23XX_UF2_BINARY),y)
-define POSTBUILD
-	$(Q)echo "Generating: nuttx.uf2"; \
-	picotool uf2 convert nuttx -t elf nuttx.uf2
-	$(Q)([ $$? -eq 0 ] && echo nuttx.uf2 >> nuttx.manifest && echo "Done.")
+PICOTOOL_BIN_PATH?=$(PICO_SDK_PATH)$(DELIM)_deps$(DELIM)picotool$(DELIM)picotool
+
+define GEN_PICO_UF2
+  $(Q)echo "Generating: nuttx.uf2"; \
+
+  $(Q)$1 uf2 convert --quiet -t elf nuttx nuttx.uf2;
+  $(Q)([ $$? -eq 0 ] && echo nuttx.uf2 >> nuttx.manifest && echo "Done.")
 endef
+
+ifeq ($(CONFIG_RP23XX_UF2_BINARY),y)
+  ifneq ($(shell which picotool),)
+    define POSTBUILD
+      $(call GEN_PICO_UF2, picotool)
+    endef
+  else ifdef PICO_SDK_PATH
+    define POSTBUILD
+      $(Q)(if ! $(PICOTOOL_BIN_PATH) help >&/dev/null; then \
+              echo "Building: picotool"; \
+              cd $(PICO_SDK_PATH); \
+              cmake . >&/dev/null; \
+              make picotoolBuild >&/dev/null; \
+           fi;)
+      $(call GEN_PICO_UF2, $(PICOTOOL_BIN_PATH))
+    endef
+  else
+    define POSTBUILD
+      $(Q) echo "PICO_SDK_PATH/picotool must be specified/installed for flash boot"
+    endef
+  endif
 endif