From df107380aded0f478baacaf28cafc69a6dcaaa5c Mon Sep 17 00:00:00 2001 From: Marco Casaroli Date: Tue, 28 Jul 2026 16:28:36 +0200 Subject: [PATCH] boards/rp23xx: Split the xipfs configuration into xipfs and xipfs-nxflat. The xipfs configuration enabled CONFIG_NXFLAT and the nxflatxip example, whose build runs mknxflat to generate the module thunk. The NXFLAT tools are not installed in the CI container, so every CI build of this configuration failed with "mknxflat: command not found". * xipfs keeps the file system, the xipfs command and the test suite. It builds with a plain toolchain, so CI still covers the file system code. * xipfs-nxflat adds CONFIG_NXFLAT and CONFIG_EXAMPLES_NXFLATXIP and is excluded from the CI build list, the same treatment the other NXFLAT configurations already get (eagle100:nxflat, lm3s6965-ek:qemu-nxflat, olimex-lpc1766stk:thttpd-nxflat). Impact: CI and board configurations only. No source or runtime change. Assisted-by: Claude Code:claude-opus-5 Signed-off-by: Marco Casaroli --- .../configs/xipfs-nxflat/defconfig | 54 +++++++++++++++++++ .../configs/xipfs/defconfig | 2 - tools/ci/testlist/arm-06.dat | 2 + 3 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 boards/arm/rp23xx/pimoroni-pico-2-plus/configs/xipfs-nxflat/defconfig diff --git a/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/xipfs-nxflat/defconfig b/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/xipfs-nxflat/defconfig new file mode 100644 index 00000000000..d1876a5ba47 --- /dev/null +++ b/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/xipfs-nxflat/defconfig @@ -0,0 +1,54 @@ +# +# This file is autogenerated: PLEASE DO NOT EDIT IT. +# +# You can use "make menuconfig" to make any modifications to the installed .config file. +# You can then do "make savedefconfig" to generate a new defconfig file that includes your +# modifications. +# +# 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_STANDARD_SERIAL is not set +CONFIG_ARCH="arm" +CONFIG_ARCH_BOARD="pimoroni-pico-2-plus" +CONFIG_ARCH_BOARD_COMMON=y +CONFIG_ARCH_BOARD_PIMORONI_PICO_2_PLUS=y +CONFIG_ARCH_CHIP="rp23xx" +CONFIG_ARCH_CHIP_RP23XX=y +CONFIG_ARCH_RAMVECTORS=y +CONFIG_ARCH_STACKDUMP=y +CONFIG_BOARDCTL_RESET=y +CONFIG_BOARD_LOOPSPERMSEC=10450 +CONFIG_BUILTIN=y +CONFIG_DEBUG_FULLOPT=y +CONFIG_DEBUG_SYMBOLS=y +CONFIG_DISABLE_POSIX_TIMERS=y +CONFIG_EXAMPLES_HELLO=y +CONFIG_EXAMPLES_NXFLATXIP=y +CONFIG_FS_PROCFS=y +CONFIG_FS_PROCFS_REGISTER=y +CONFIG_FS_XIPFS=y +CONFIG_FS_XIPFS_FAULT_INJECT=y +CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_LIBC_EXECFUNCS=y +CONFIG_MTD=y +CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6 +CONFIG_NSH_BUILTIN_APPS=y +CONFIG_NSH_READLINE=y +CONFIG_NXFLAT=y +CONFIG_RAM_SIZE=532480 +CONFIG_RAM_START=0x20000000 +CONFIG_READLINE_CMD_HISTORY=y +CONFIG_RP23XX_FLASH_MTD=y +CONFIG_RR_INTERVAL=200 +CONFIG_SCHED_WAITPID=y +CONFIG_START_DAY=9 +CONFIG_START_MONTH=2 +CONFIG_START_YEAR=2021 +CONFIG_SYSLOG_CONSOLE=y +CONFIG_SYSTEM_NSH=y +CONFIG_SYSTEM_XIPFS=y +CONFIG_TESTING_FS_XIPFS=y +CONFIG_TESTING_FS_XIPFS_MTD="/dev/rpflash" +CONFIG_UART0_SERIAL_CONSOLE=y diff --git a/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/xipfs/defconfig b/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/xipfs/defconfig index d1876a5ba47..f60435da8b0 100644 --- a/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/xipfs/defconfig +++ b/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/xipfs/defconfig @@ -25,7 +25,6 @@ CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y CONFIG_DISABLE_POSIX_TIMERS=y CONFIG_EXAMPLES_HELLO=y -CONFIG_EXAMPLES_NXFLATXIP=y CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_REGISTER=y CONFIG_FS_XIPFS=y @@ -36,7 +35,6 @@ CONFIG_MTD=y CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6 CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_READLINE=y -CONFIG_NXFLAT=y CONFIG_RAM_SIZE=532480 CONFIG_RAM_START=0x20000000 CONFIG_READLINE_CMD_HISTORY=y diff --git a/tools/ci/testlist/arm-06.dat b/tools/ci/testlist/arm-06.dat index 8aae949b04f..3d1bf786775 100644 --- a/tools/ci/testlist/arm-06.dat +++ b/tools/ci/testlist/arm-06.dat @@ -1,4 +1,6 @@ /arm/r*,CONFIG_ARM_TOOLCHAIN_GNU_EABI +# NXFLAT tools (mknxflat) are not available in the CI container +-pimoroni-pico-2-plus:xipfs-nxflat # Boards build by CMake