NuttX build in place

- cmake NuttX build wrapper compile in place instead of copying source tree to build directory
    - slightly faster skipping necessary copying (depending on system)
    - allows debugging in place
    - easier to work directly in NuttX following official documentation
    - simplifies overall build which should make it easier to resolve any remaining NuttX dependency issues in the build system
 - the downside is switching back and forth between different builds always require rebuilding NuttX, but I think this is worth the improved developer experience
 - also no longer builds px4io and bootloader in every single build, for most users these rarely change and we're wasting a lot of build time

.ci/Jenkinsfile-hardware

@@ -18,8 +18,8 @@ pipeline {
               }
               steps {
                 checkoutSCM()
+                sh 'make cubepilot_cubeorange_bootloader'
                 sh 'make cubepilot_cubeorange_test'
-                sh 'make cubepilot_cubeorange_test bootloader_elf'
                 sh 'ccache -s'
                 stash includes: 'build/*/*.elf, platforms/nuttx/Debug/*, Tools/HIL/*.py', name: 'cubepilot_cubeorange_test'
               }
@@ -39,7 +39,7 @@ pipeline {
                     sh 'export'
                     sh 'find /dev/serial'
                     unstash 'cubepilot_cubeorange_test'
-                    sh './platforms/nuttx/Debug/upload_jlink_gdb.sh build/cubepilot_cubeorange_test/cubepilot_cubeorange_bootloader.elf'
+                    sh './platforms/nuttx/Debug/upload_jlink_gdb.sh build/cubepilot_cubeorange_bootloader/cubepilot_cubeorange_bootloader.elf'
                     // flash board and watch bootup
                     sh './platforms/nuttx/Debug/upload_jlink_gdb.sh build/cubepilot_cubeorange_test/cubepilot_cubeorange_test.elf && ./Tools/HIL/monitor_firmware_upload.py --device `find /dev/serial -name *usb-*` --baudrate 57600'
                   }
@@ -89,8 +89,8 @@ pipeline {
               }
               steps {
                 checkoutSCM()
+                sh 'make cuav_x7pro_bootloader'
                 sh 'make cuav_x7pro_test'
-                sh 'make cuav_x7pro_test bootloader_elf'
                 sh 'ccache -s'
                 stash includes: 'build/*/*.elf, platforms/nuttx/Debug/*, Tools/HIL/*.py', name: 'cuav_x7pro_test'
               }
@@ -110,7 +110,7 @@ pipeline {
                     sh 'export'
                     sh 'find /dev/serial'
                     unstash 'cuav_x7pro_test'
-                    sh './platforms/nuttx/Debug/upload_jlink_gdb.sh build/cuav_x7pro_test/cuav_x7pro_bootloader.elf'
+                    sh './platforms/nuttx/Debug/upload_jlink_gdb.sh build/cuav_x7pro_bootloader/cuav_x7pro_bootloader.elf'
                     // flash board and watch bootup
                     sh './platforms/nuttx/Debug/upload_jlink_gdb.sh build/cuav_x7pro_test/cuav_x7pro_test.elf && ./Tools/HIL/monitor_firmware_upload.py --device `find /dev/serial -name *usb-*` --baudrate 57600'
                   }

.vscode/settings.json

@@ -14,7 +14,6 @@
         "C_Cpp.workspaceParsingPriority": "low",
         "cmake.buildBeforeRun": true,
         "cmake.buildDirectory": "${workspaceFolder}/build/${variant:CONFIG}",
-        "cmake.buildTask": true,
         "cmake.configureOnOpen": true,
         "cmake.ctest.parallelJobs": 1,
         "cmake.skipConfigureIfCachePresent": true,

CMakeLists.txt

@@ -40,7 +40,7 @@
 # * Common functions should be included in px_base.cmake.
 #
 # * OS/ board specific fucntions should be include in
-#	px_impl_${PX4_PLATFORM}.cmake or px4_impl_${PX4_PLATFORM}_${PX4_BOARD}.cmake.
+#	px_impl_${PX4_PLATFORM}.cmake
 #
 # Formatting
 # ---------------------------------------------------------------------------
@@ -101,8 +101,8 @@
 
 cmake_minimum_required(VERSION 3.2 FATAL_ERROR)
 
-set(PX4_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
-set(PX4_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}")
+set(PX4_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}" CACHE FILEPATH "PX4 source directory" FORCE)
+set(PX4_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}" CACHE FILEPATH "PX4 binary directory" FORCE)
 
 list(APPEND CMAKE_MODULE_PATH ${PX4_SOURCE_DIR}/cmake)
 include(px4_parse_function_args)

Kconfig

@@ -63,13 +63,10 @@ menu "Toolchain"
         help
             relative path to the ROMFS root directory
 
-    config BOARD_BUILD_BOOTLOADER
-        bool "Enable bootloader"
-        help
-            flag to enable building and including the bootloader config
-
     config BOARD_IO
         string "IO board name"
+        default "px4_io-v2_default"
+        depends on DRIVERS_PX4IO
         help
             name of IO board to be built and included in the ROMFS (requires a valid ROMFSROOT)
 

Makefile

@@ -309,6 +309,24 @@ uorb_graphs:
 	@$(MAKE) --no-print-directory px4_fmu-v5_default uorb_graph
 	@$(MAKE) --no-print-directory px4_sitl_default uorb_graph
 
+px4io_update: px4_io-v2_default cubepilot_io-v2_default
+	# px4_io-v2_default
+	cp build/px4_io-v2_default/px4_io-v2_default.bin boards/holybro/durandal-v1/extras/px4_io-v2_default.bin
+	cp build/px4_io-v2_default/px4_io-v2_default.bin boards/holybro/pix32v5/extras/px4_io-v2_default.bin
+	cp build/px4_io-v2_default/px4_io-v2_default.bin boards/mro/x21-777/extras/px4_io-v2_default.bin
+	cp build/px4_io-v2_default/px4_io-v2_default.bin boards/px4/fmu-v2/extras/px4_io-v2_default.bin
+	cp build/px4_io-v2_default/px4_io-v2_default.bin boards/px4/fmu-v3/extras/px4_io-v2_default.bin
+	cp build/px4_io-v2_default/px4_io-v2_default.bin boards/px4/fmu-v4pro/extras/px4_io-v2_default.bin
+	cp build/px4_io-v2_default/px4_io-v2_default.bin boards/px4/fmu-v5/extras/px4_io-v2_default.bin
+	cp build/px4_io-v2_default/px4_io-v2_default.bin boards/px4/fmu-v5x/extras/px4_io-v2_default.bin
+	cp build/px4_io-v2_default/px4_io-v2_default.bin boards/px4/fmu-v6x/extras/px4_io-v2_default.bin
+	# cubepilot_io-v2_default
+	cp build/cubepilot_io-v2_default/cubepilot_io-v2_default.bin boards/cubepilot/cubeorange/extras/cubepilot_io-v2_default.bin
+	cp build/cubepilot_io-v2_default/cubepilot_io-v2_default.bin boards/cubepilot/cubeyellow/extras/cubepilot_io-v2_default.bin
+	git status
+
+bootloaders_update: cuav_nora_bootloader cuav_x7pro_bootloader cubepilot_cubeorange_bootloader holybro_durandal-v1_bootloader matek_h743-slim_bootloader modalai_fc-v2_bootloader mro_ctrl-zero-h7_bootloader mro_ctrl-zero-h7-oem_bootloader mro_pixracerpro_bootloader px4_fmu-v6u_bootloader px4_fmu-v6x_bootloader
+	git status
 
 .PHONY: coverity_scan
 

ROMFS/CMakeLists.txt

@@ -143,37 +143,13 @@ add_custom_command(
 	COMMENT "ROMFS: copying, generating airframes"
 	)
 
-# copy extras into ROMFS
-set(extras_dependencies)
-
-# copy px4io binary if configured
-if(config_io_board)
-	list(APPEND extras_dependencies
-		copy_px4io_bin
-		${fw_io_bin}
-	)
-	file(RELATIVE_PATH iofw_file_relative ${PX4_SOURCE_DIR} ${fw_io_bin})
-	message(STATUS "ROMFS:  Adding ${iofw_file_relative} -> /etc/extras/${config_io_board}.bin")
-endif()
-
-
-# board bootloader (built or included)
-if(TARGET copy_bootloader_bin)
-
-	if(board_bootloader_firmware)
-		file(RELATIVE_PATH bl_file_relative ${PX4_SOURCE_DIR} ${board_bootloader_firmware})
-		message(STATUS "ROMFS:  Adding ${bl_file_relative} -> /etc/extras/bootloader.bin")
-	else()
-		file(RELATIVE_PATH bl_file_relative ${PX4_SOURCE_DIR} ${bootloader_bin})
-		message(STATUS "ROMFS:  Adding ${bl_file_relative} -> /etc/extras/bootloader.bin")
-	endif()
-
-	list(APPEND extras_dependencies
-		copy_bootloader_bin
-		${bootloader_bin}
-	)
+if(EXISTS ${PX4_BOARD_DIR}/extras/${PX4_BOARD_VENDOR}_${PX4_BOARD_MODEL}_bootloader.bin)
+	set(BOARD_FIRMWARE_BIN "${PX4_BOARD_VENDOR}_${PX4_BOARD_MODEL}_bootloader.bin")
+	configure_file(${PX4_SOURCE_DIR}/platforms/nuttx/init/rc.board_bootloader_upgrade.in ${romfs_gen_root_dir}/init.d/rc.board_bootloader_upgrade @ONLY)
 endif()
 
+# copy extras into ROMFS
+set(extras_dependencies)
 
 # optional board architecture defaults
 set(board_arch_rc_file "rc.board_arch_defaults")
@@ -199,6 +175,7 @@ if(EXISTS "${PX4_SOURCE_DIR}/platforms/${PX4_PLATFORM}/init/${CONFIG_ARCH_CHIP}/
 endif()
 
 
+# board custom init files
 set(OPTIONAL_BOARD_RC)
 list(APPEND OPTIONAL_BOARD_RC
 	rc.board_defaults
@@ -233,21 +210,59 @@ foreach(board_rc_file ${OPTIONAL_BOARD_RC})
 endforeach()
 
 
+# board extras
+set(OPTIONAL_BOARD_EXTRAS)
+file(GLOB OPTIONAL_BOARD_EXTRAS ${PX4_BOARD_DIR}/extras/*)
+
+foreach(board_extra_file ${OPTIONAL_BOARD_EXTRAS})
+
+	if(EXISTS "${board_extra_file}")
+		file(RELATIVE_PATH extra_file_base_name ${PX4_BOARD_DIR}/extras/ ${board_extra_file})
+		file(RELATIVE_PATH extra_file_relative_source ${PX4_SOURCE_DIR} ${board_extra_file})
+		message(STATUS "ROMFS:  Adding ${extra_file_relative_source} -> /etc/extras/${extra_file_base_name}")
+
+		add_custom_command(
+			OUTPUT
+				${romfs_gen_root_dir}/extras/${extra_file_base_name}
+				${extra_file_base_name}.stamp
+			COMMAND ${CMAKE_COMMAND} -E copy_if_different ${PX4_BOARD_DIR}/extras/${extra_file_base_name} ${romfs_gen_root_dir}/extras/${extra_file_base_name}
+			COMMAND ${CMAKE_COMMAND} -E touch ${extra_file_base_name}.stamp
+			DEPENDS
+				${board_extra_file}
+				romfs_copy.stamp
+			COMMENT "ROMFS: copying ${board_extra_file}"
+		)
+
+		list(APPEND extras_dependencies
+			${extra_file_base_name}.stamp
+		)
+	endif()
+
+endforeach()
+
+
+
 if(config_uavcan_peripheral_firmware)
 
 	include(ExternalProject)
 
 	foreach(uavcan_peripheral_config ${config_uavcan_peripheral_firmware})
-		# include the px4io binary in ROMFS
+		# include the UAVCAN peripheral binaries in ROMFS
 		message(STATUS "ROMFS:  Adding UAVCAN peripheral ${uavcan_peripheral_config} -> /etc/uavcan/fw/")
+
+		# ExternalProject_Add() with GIT_SUBMODULES "" initializes no submodules.
+		cmake_policy(SET CMP0097 NEW)
+
+		include(ExternalProject)
+
 		ExternalProject_Add(build_${uavcan_peripheral_config}
-			SOURCE_DIR ${CMAKE_SOURCE_DIR}
-			DOWNLOAD_COMMAND ""
-			UPDATE_COMMAND ""
+			GIT_REPOSITORY ${CMAKE_SOURCE_DIR}
+			GIT_TAG ${PX4_GIT_TAG}
+			GIT_SUBMODULES ""
+			DOWNLOAD_NO_PROGRESS true
 			CMAKE_ARGS -DCONFIG=${uavcan_peripheral_config}
 			INSTALL_COMMAND ""
 			USES_TERMINAL_BUILD true
-			DEPENDS git_nuttx git_nuttx_apps
 			BUILD_ALWAYS 1
 		)
 

ROMFS/px4fmu_common/init.d/rcS

@@ -507,21 +507,13 @@ else
 		. ${R}etc/init.d/rc.autostart.post
 	fi
 
-	#
-	# Bootloader upgrade
-	#
-	if param compare -s SYS_BL_UPDATE 1
-	then
-		if [ -f "/etc/extras/bootloader.bin" ]
+
+	set BOARD_BOOTLOADER_UPGRADE ${R}etc/init.d/rc.board_bootloader_upgrade
+	if [ -f $BOARD_BOOTLOADER_UPGRADE ]
 	then
-			param set SYS_BL_UPDATE 0
-			param save
-			echo "bootloader update..."
-			bl_update "/etc/extras/bootloader.bin"
-			echo "bootloader update done, rebooting"
-			reboot
-		fi
+		sh $BOARD_BOOTLOADER_UPGRADE
 	fi
+	unset BOARD_BOOTLOADER_UPGRADE
 
 #
 # End of autostart.

Tools/setup/ubuntu.sh

@@ -143,6 +143,7 @@ if [[ $INSTALL_NUTTX == "true" ]]; then
 		libisl-dev \
 		libmpc-dev \
 		libmpfr-dev \
+		libncurses5 \
 		libncurses5-dev \
 		libncursesw5-dev \
 		libtool \

boards/airmind/mindpx-v2/nuttx-config/nsh/defconfig

@@ -25,7 +25,7 @@
 # CONFIG_STM32_CCMEXCLUDE is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/airmind/mindpx-v2/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="stm32"
@@ -92,7 +92,6 @@ CONFIG_MTD_PARTITION=y
 CONFIG_MTD_RAMTRON=y
 CONFIG_NAME_MAX=40
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_ARGCAT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CMDPARMS=y

boards/ark/can-flow/nuttx-config/canbootloader/defconfig

@@ -7,7 +7,7 @@
 #
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/ark/can-flow/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="stm32"
@@ -40,13 +40,6 @@ CONFIG_FS_PROCFS_MAX_TASKS=0
 CONFIG_MM_REGIONS=2
 CONFIG_NAME_MAX=0
 CONFIG_NUNGET_CHARS=0
-CONFIG_NXFONTS_DISABLE_16BPP=y
-CONFIG_NXFONTS_DISABLE_1BPP=y
-CONFIG_NXFONTS_DISABLE_24BPP=y
-CONFIG_NXFONTS_DISABLE_2BPP=y
-CONFIG_NXFONTS_DISABLE_32BPP=y
-CONFIG_NXFONTS_DISABLE_4BPP=y
-CONFIG_NXFONTS_DISABLE_8BPP=y
 CONFIG_PREALLOC_TIMERS=0
 CONFIG_PTHREAD_STACK_MIN=512
 CONFIG_RAM_SIZE=262144

boards/ark/can-flow/nuttx-config/nsh/defconfig

@@ -21,7 +21,7 @@
 # CONFIG_STM32_DMACAPABLE is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/ark/can-flow/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="stm32"
@@ -70,7 +70,6 @@ CONFIG_MTD_PARTITION=y
 CONFIG_MTD_RAMTRON=y
 CONFIG_NAME_MAX=40
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_ARGCAT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CMDPARMS=y

boards/ark/can-gps/nuttx-config/canbootloader/defconfig

@@ -7,7 +7,7 @@
 #
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/ark/can-gps/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="stm32"
@@ -40,13 +40,6 @@ CONFIG_FS_PROCFS_MAX_TASKS=0
 CONFIG_MM_REGIONS=2
 CONFIG_NAME_MAX=0
 CONFIG_NUNGET_CHARS=0
-CONFIG_NXFONTS_DISABLE_16BPP=y
-CONFIG_NXFONTS_DISABLE_1BPP=y
-CONFIG_NXFONTS_DISABLE_24BPP=y
-CONFIG_NXFONTS_DISABLE_2BPP=y
-CONFIG_NXFONTS_DISABLE_32BPP=y
-CONFIG_NXFONTS_DISABLE_4BPP=y
-CONFIG_NXFONTS_DISABLE_8BPP=y
 CONFIG_PREALLOC_TIMERS=0
 CONFIG_PTHREAD_STACK_MIN=512
 CONFIG_RAM_SIZE=262144

boards/ark/can-gps/nuttx-config/nsh/defconfig

@@ -21,7 +21,7 @@
 # CONFIG_STM32_DMACAPABLE is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/ark/can-gps/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="stm32"
@@ -72,7 +72,6 @@ CONFIG_MTD_PARTITION=y
 CONFIG_MTD_RAMTRON=y
 CONFIG_NAME_MAX=40
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_ARGCAT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CMDPARMS=y

boards/ark/can-rtk-gps/nuttx-config/canbootloader/defconfig

@@ -7,7 +7,7 @@
 #
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/ark/can-rtk-gps/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="stm32"
@@ -40,13 +40,6 @@ CONFIG_FS_PROCFS_MAX_TASKS=0
 CONFIG_MM_REGIONS=2
 CONFIG_NAME_MAX=0
 CONFIG_NUNGET_CHARS=0
-CONFIG_NXFONTS_DISABLE_16BPP=y
-CONFIG_NXFONTS_DISABLE_1BPP=y
-CONFIG_NXFONTS_DISABLE_24BPP=y
-CONFIG_NXFONTS_DISABLE_2BPP=y
-CONFIG_NXFONTS_DISABLE_32BPP=y
-CONFIG_NXFONTS_DISABLE_4BPP=y
-CONFIG_NXFONTS_DISABLE_8BPP=y
 CONFIG_PREALLOC_TIMERS=0
 CONFIG_PTHREAD_STACK_MIN=512
 CONFIG_RAM_SIZE=262144

boards/ark/can-rtk-gps/nuttx-config/nsh/defconfig

@@ -21,7 +21,7 @@
 # CONFIG_STM32_DMACAPABLE is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/ark/can-rtk-gps/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="stm32"
@@ -72,7 +72,6 @@ CONFIG_MTD_PARTITION=y
 CONFIG_MTD_RAMTRON=y
 CONFIG_NAME_MAX=40
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_ARGCAT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CMDPARMS=y

boards/atl/mantis-edu/nuttx-config/nsh/defconfig

@@ -25,7 +25,7 @@
 # CONFIG_NSH_DISABLE_TIME is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/atl/mantis-edu/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="stm32f7"
@@ -97,7 +97,6 @@ CONFIG_MTD_PARTITION=y
 CONFIG_MTD_RAMTRON=y
 CONFIG_NAME_MAX=40
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_ARGCAT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CMDPARMS=y

boards/av/x-v1/nuttx-config/nsh/defconfig

@@ -37,7 +37,7 @@
 # CONFIG_NSH_DISABLE_XD is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/av/x-v1/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="stm32f7"
@@ -123,7 +123,6 @@ CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
 CONFIG_NET_UDP_WRITE_BUFFERS=y
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_ARGCAT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CMDPARMS=y

boards/bitcraze/crazyflie/nuttx-config/nsh/defconfig

@@ -25,7 +25,7 @@
 # CONFIG_STM32_CCMEXCLUDE is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/bitcraze/crazyflie/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="stm32"
@@ -88,7 +88,6 @@ CONFIG_MTD_AT24XX=y
 CONFIG_MTD_BYTE_WRITE=y
 CONFIG_MTD_PARTITION=y
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_ARGCAT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CMDPARMS=y

boards/bitcraze/crazyflie21/nuttx-config/nsh/defconfig

@@ -24,7 +24,7 @@
 # CONFIG_STM32_CCMEXCLUDE is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/bitcraze/crazyflie21/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="stm32"
@@ -86,7 +86,6 @@ CONFIG_MTD_AT24XX=y
 CONFIG_MTD_BYTE_WRITE=y
 CONFIG_MTD_PARTITION=y
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_ARGCAT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CMDPARMS=y

boards/cuav/can-gps-v1/nuttx-config/canbootloader/defconfig

@@ -7,7 +7,7 @@
 #
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/cuav/can-gps-v1/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="stm32"
@@ -40,13 +40,6 @@ CONFIG_FS_PROCFS_MAX_TASKS=0
 CONFIG_MM_REGIONS=2
 CONFIG_NAME_MAX=0
 CONFIG_NUNGET_CHARS=0
-CONFIG_NXFONTS_DISABLE_16BPP=y
-CONFIG_NXFONTS_DISABLE_1BPP=y
-CONFIG_NXFONTS_DISABLE_24BPP=y
-CONFIG_NXFONTS_DISABLE_2BPP=y
-CONFIG_NXFONTS_DISABLE_32BPP=y
-CONFIG_NXFONTS_DISABLE_4BPP=y
-CONFIG_NXFONTS_DISABLE_8BPP=y
 CONFIG_PREALLOC_TIMERS=0
 CONFIG_PTHREAD_STACK_MIN=512
 CONFIG_RAM_SIZE=262144

boards/cuav/can-gps-v1/nuttx-config/nsh/defconfig

@@ -21,7 +21,7 @@
 # CONFIG_STM32_DMACAPABLE is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/cuav/can-gps-v1/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="stm32"
@@ -72,7 +72,6 @@ CONFIG_MTD_PARTITION=y
 CONFIG_MTD_RAMTRON=y
 CONFIG_NAME_MAX=40
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_ARGCAT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CMDPARMS=y

boards/cuav/nora/default.px4board

@@ -1,6 +1,5 @@
 CONFIG_BOARD_TOOLCHAIN="arm-none-eabi"
 CONFIG_BOARD_ARCHITECTURE="cortex-m7"
-CONFIG_BOARD_BUILD_BOOTLOADER=y
 CONFIG_BOARD_SERIAL_GPS1="/dev/ttyS0"
 CONFIG_BOARD_SERIAL_GPS2="/dev/ttyS2"
 CONFIG_BOARD_SERIAL_TEL1="/dev/ttyS1"

boards/cuav/nora/nuttx-config/bootloader/defconfig

@@ -11,7 +11,7 @@
 # CONFIG_STM32H7_SYSCFG is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/cuav/nora/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="stm32h7"

boards/cuav/nora/nuttx-config/nsh/defconfig

@@ -24,7 +24,7 @@
 # CONFIG_NSH_DISABLE_TIME is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/cuav/nora/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="stm32h7"
@@ -98,7 +98,6 @@ CONFIG_MTD_PROGMEM=y
 CONFIG_MTD_RAMTRON=y
 CONFIG_NAME_MAX=40
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_ARGCAT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CMDPARMS=y

boards/cuav/x7pro/default.px4board

@@ -1,6 +1,5 @@
 CONFIG_BOARD_TOOLCHAIN="arm-none-eabi"
 CONFIG_BOARD_ARCHITECTURE="cortex-m7"
-CONFIG_BOARD_BUILD_BOOTLOADER=y
 CONFIG_BOARD_SERIAL_GPS1="/dev/ttyS0"
 CONFIG_BOARD_SERIAL_GPS2="/dev/ttyS2"
 CONFIG_BOARD_SERIAL_TEL1="/dev/ttyS1"

boards/cuav/x7pro/nuttx-config/bootloader/defconfig

@@ -11,7 +11,7 @@
 # CONFIG_STM32H7_SYSCFG is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/cuav/x7pro/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="stm32h7"

boards/cuav/x7pro/nuttx-config/nsh/defconfig

@@ -24,7 +24,7 @@
 # CONFIG_NSH_DISABLE_TIME is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/cuav/x7pro/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="stm32h7"
@@ -98,7 +98,6 @@ CONFIG_MTD_PROGMEM=y
 CONFIG_MTD_RAMTRON=y
 CONFIG_NAME_MAX=40
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_ARGCAT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CMDPARMS=y

boards/cubepilot/cubeorange/default.px4board

@@ -1,6 +1,5 @@
 CONFIG_BOARD_TOOLCHAIN="arm-none-eabi"
 CONFIG_BOARD_ARCHITECTURE="cortex-m7"
-CONFIG_BOARD_BUILD_BOOTLOADER=y
 CONFIG_BOARD_IO="cubepilot_io-v2_default"
 CONFIG_BOARD_SERIAL_GPS1="/dev/ttyS2"
 CONFIG_BOARD_SERIAL_GPS2="/dev/ttyS5"

boards/cubepilot/cubeorange/nuttx-config/bootloader/defconfig

@@ -11,7 +11,7 @@
 # CONFIG_STM32H7_SYSCFG is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/cubepilot/cubeorange/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="stm32h7"

boards/cubepilot/cubeorange/nuttx-config/nsh/defconfig

@@ -25,7 +25,7 @@
 # CONFIG_NSH_DISABLE_TIME is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/cubepilot/cubeorange/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="stm32h7"
@@ -99,7 +99,6 @@ CONFIG_MTD_PROGMEM=y
 CONFIG_MTD_RAMTRON=y
 CONFIG_NAME_MAX=40
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_ARGCAT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CMDPARMS=y

boards/cubepilot/cubeorange/nuttx-config/test/defconfig

@@ -24,7 +24,7 @@
 # CONFIG_NSH_DISABLE_TIME is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/cubepilot/cubeorange/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="stm32h7"
@@ -98,7 +98,6 @@ CONFIG_MTD_PROGMEM=y
 CONFIG_MTD_RAMTRON=y
 CONFIG_NAME_MAX=40
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_ARGCAT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CMDPARMS=y

boards/cubepilot/cubeyellow/nuttx-config/nsh/defconfig

@@ -26,7 +26,7 @@
 # CONFIG_NSH_DISABLE_TIME is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/cubepilot/cubeyellow/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="stm32f7"
@@ -98,7 +98,6 @@ CONFIG_MTD_PARTITION=y
 CONFIG_MTD_RAMTRON=y
 CONFIG_NAME_MAX=40
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_ARGCAT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CMDPARMS=y

boards/cubepilot/io-v2/nuttx-config/nsh/defconfig

@@ -8,7 +8,7 @@
 # CONFIG_DEV_NULL is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/cubepilot/io-v2/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="stm32"

boards/freefly/can-rtk-gps/nuttx-config/canbootloader/defconfig

@@ -7,7 +7,7 @@
 #
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/freefly/can-rtk-gps/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="stm32f7"

boards/freefly/can-rtk-gps/nuttx-config/nsh/defconfig

@@ -20,7 +20,7 @@
 # CONFIG_NSH_DISABLE_TIME is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/freefly/can-rtk-gps/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="stm32f7"
@@ -82,7 +82,6 @@ CONFIG_MTD_PARTITION=y
 CONFIG_MTD_RAMTRON=y
 CONFIG_NAME_MAX=40
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_ARGCAT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CMDPARMS=y

boards/holybro/can-gps-v1/nuttx-config/canbootloader/defconfig

@@ -7,7 +7,7 @@
 #
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/holybro/can-gps-v1/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="stm32"
@@ -40,13 +40,6 @@ CONFIG_FS_PROCFS_MAX_TASKS=0
 CONFIG_MM_REGIONS=2
 CONFIG_NAME_MAX=0
 CONFIG_NUNGET_CHARS=0
-CONFIG_NXFONTS_DISABLE_16BPP=y
-CONFIG_NXFONTS_DISABLE_1BPP=y
-CONFIG_NXFONTS_DISABLE_24BPP=y
-CONFIG_NXFONTS_DISABLE_2BPP=y
-CONFIG_NXFONTS_DISABLE_32BPP=y
-CONFIG_NXFONTS_DISABLE_4BPP=y
-CONFIG_NXFONTS_DISABLE_8BPP=y
 CONFIG_PREALLOC_TIMERS=0
 CONFIG_PTHREAD_STACK_MIN=512
 CONFIG_RAM_SIZE=262144

boards/holybro/can-gps-v1/nuttx-config/nsh/defconfig

@@ -21,7 +21,7 @@
 # CONFIG_STM32_DMACAPABLE is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/holybro/can-gps-v1/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="stm32"
@@ -72,7 +72,6 @@ CONFIG_MTD_PARTITION=y
 CONFIG_MTD_RAMTRON=y
 CONFIG_NAME_MAX=40
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_ARGCAT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CMDPARMS=y

boards/holybro/durandal-v1/default.px4board

@@ -1,7 +1,5 @@
 CONFIG_BOARD_TOOLCHAIN="arm-none-eabi"
 CONFIG_BOARD_ARCHITECTURE="cortex-m7"
-CONFIG_BOARD_BUILD_BOOTLOADER=y
-CONFIG_BOARD_IO="px4_io-v2_default"
 CONFIG_BOARD_SERIAL_GPS1="/dev/ttyS0"
 CONFIG_BOARD_SERIAL_TEL1="/dev/ttyS1"
 CONFIG_BOARD_SERIAL_TEL2="/dev/ttyS2"

boards/holybro/durandal-v1/nuttx-config/bootloader/defconfig

@@ -11,7 +11,7 @@
 # CONFIG_STM32H7_SYSCFG is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/holybro/durandal-v1/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="stm32h7"

boards/holybro/durandal-v1/nuttx-config/nsh/defconfig

@@ -24,7 +24,7 @@
 # CONFIG_NSH_DISABLE_TIME is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/holybro/durandal-v1/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="stm32h7"
@@ -99,7 +99,6 @@ CONFIG_MTD_PROGMEM=y
 CONFIG_MTD_RAMTRON=y
 CONFIG_NAME_MAX=40
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_ARGCAT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CMDPARMS=y

boards/holybro/kakutef7/nuttx-config/nsh/defconfig

@@ -24,7 +24,7 @@
 # CONFIG_SPI_CALLBACK is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/holybro/kakutef7/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="stm32f7"
@@ -98,7 +98,6 @@ CONFIG_MTD_PARTITION=y
 CONFIG_MTD_RAMTRON=y
 CONFIG_NAME_MAX=40
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_ARGCAT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CMDPARMS=y

boards/holybro/pix32v5/nuttx-config/nsh/defconfig

@@ -25,7 +25,7 @@
 # CONFIG_NSH_DISABLE_TIME is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/holybro/pix32v5/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="stm32f7"
@@ -97,7 +97,6 @@ CONFIG_MTD_PARTITION=y
 CONFIG_MTD_RAMTRON=y
 CONFIG_NAME_MAX=40
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_ARGCAT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CMDPARMS=y

boards/matek/h743-slim/nuttx-config/bootloader/defconfig

@@ -11,7 +11,7 @@
 # CONFIG_STM32H7_SYSCFG is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/matek/h743-slim/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="stm32h7"

boards/matek/h743-slim/nuttx-config/nsh/defconfig

@@ -23,7 +23,7 @@
 # CONFIG_NSH_DISABLE_TIME is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/matek/h743-slim/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="stm32h7"
@@ -92,7 +92,6 @@ CONFIG_MMCSD_SDIOWAIT_WRCOMPLETE=y
 CONFIG_MM_REGIONS=4
 CONFIG_NAME_MAX=40
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_ARGCAT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CMDPARMS=y

boards/modalai/fc-v1/nuttx-config/nsh/defconfig

@@ -24,7 +24,7 @@
 # CONFIG_NSH_DISABLE_TIME is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/modalai/fc-v1/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="stm32f7"
@@ -96,7 +96,6 @@ CONFIG_MTD_PARTITION=y
 CONFIG_MTD_RAMTRON=y
 CONFIG_NAME_MAX=40
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_ARGCAT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CMDPARMS=y

boards/modalai/fc-v2/default.px4board

@@ -1,6 +1,5 @@
 CONFIG_BOARD_TOOLCHAIN="arm-none-eabi"
 CONFIG_BOARD_ARCHITECTURE="cortex-m7"
-CONFIG_BOARD_BUILD_BOOTLOADER=y
 CONFIG_BOARD_SERIAL_GPS1="/dev/ttyS0"
 CONFIG_BOARD_SERIAL_TEL1="/dev/ttyS6"
 CONFIG_BOARD_SERIAL_TEL2="/dev/ttyS4"

boards/modalai/fc-v2/nuttx-config/bootloader/defconfig

@@ -11,7 +11,7 @@
 # CONFIG_STM32H7_SYSCFG is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/modalai/fc-v2/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="stm32h7"

boards/modalai/fc-v2/nuttx-config/nsh/defconfig

@@ -24,7 +24,7 @@
 # CONFIG_NSH_DISABLE_TIME is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/modalai/fc-v2/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="stm32h7"
@@ -101,7 +101,6 @@ CONFIG_MTD_PROGMEM=y
 CONFIG_MTD_RAMTRON=y
 CONFIG_NAME_MAX=40
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_ARGCAT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CMDPARMS=y

boards/mro/ctrl-zero-f7-oem/nuttx-config/nsh/defconfig

@@ -24,7 +24,7 @@
 # CONFIG_NSH_DISABLE_TIME is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/mro/ctrl-zero-f7-oem/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="stm32f7"
@@ -96,7 +96,6 @@ CONFIG_MTD_PARTITION=y
 CONFIG_MTD_RAMTRON=y
 CONFIG_NAME_MAX=40
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_ARGCAT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CMDPARMS=y

boards/mro/ctrl-zero-f7/nuttx-config/nsh/defconfig

@@ -24,7 +24,7 @@
 # CONFIG_NSH_DISABLE_TIME is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/mro/ctrl-zero-f7/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="stm32f7"
@@ -96,7 +96,6 @@ CONFIG_MTD_PARTITION=y
 CONFIG_MTD_RAMTRON=y
 CONFIG_NAME_MAX=40
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_ARGCAT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CMDPARMS=y

boards/mro/ctrl-zero-h7-oem/default.px4board

@@ -1,6 +1,5 @@
 CONFIG_BOARD_TOOLCHAIN="arm-none-eabi"
 CONFIG_BOARD_ARCHITECTURE="cortex-m7"
-CONFIG_BOARD_BUILD_BOOTLOADER=y
 CONFIG_BOARD_SERIAL_GPS1="/dev/ttyS2"
 CONFIG_BOARD_SERIAL_TEL1="/dev/ttyS0"
 CONFIG_BOARD_SERIAL_TEL2="/dev/ttyS1"

boards/mro/ctrl-zero-h7-oem/nuttx-config/bootloader/defconfig

@@ -11,7 +11,7 @@
 # CONFIG_STM32H7_SYSCFG is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/mro/ctrl-zero-h7-oem/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="stm32h7"

boards/mro/ctrl-zero-h7-oem/nuttx-config/nsh/defconfig

@@ -24,7 +24,7 @@
 # CONFIG_NSH_DISABLE_TIME is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/mro/ctrl-zero-h7-oem/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="stm32h7"
@@ -100,7 +100,6 @@ CONFIG_MTD_PROGMEM=y
 CONFIG_MTD_RAMTRON=y
 CONFIG_NAME_MAX=40
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_ARGCAT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CMDPARMS=y

boards/mro/ctrl-zero-h7/default.px4board

@@ -1,6 +1,5 @@
 CONFIG_BOARD_TOOLCHAIN="arm-none-eabi"
 CONFIG_BOARD_ARCHITECTURE="cortex-m7"
-CONFIG_BOARD_BUILD_BOOTLOADER=y
 CONFIG_BOARD_SERIAL_GPS1="/dev/ttyS2"
 CONFIG_BOARD_SERIAL_TEL1="/dev/ttyS0"
 CONFIG_BOARD_SERIAL_TEL2="/dev/ttyS1"

boards/mro/ctrl-zero-h7/nuttx-config/bootloader/defconfig

@@ -11,7 +11,7 @@
 # CONFIG_STM32H7_SYSCFG is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/mro/ctrl-zero-h7/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="stm32h7"

boards/mro/ctrl-zero-h7/nuttx-config/nsh/defconfig

@@ -24,7 +24,7 @@
 # CONFIG_NSH_DISABLE_TIME is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/mro/ctrl-zero-h7/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="stm32h7"
@@ -100,7 +100,6 @@ CONFIG_MTD_PROGMEM=y
 CONFIG_MTD_RAMTRON=y
 CONFIG_NAME_MAX=40
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_ARGCAT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CMDPARMS=y

boards/mro/pixracerpro/default.px4board

@@ -1,6 +1,5 @@
 CONFIG_BOARD_TOOLCHAIN="arm-none-eabi"
 CONFIG_BOARD_ARCHITECTURE="cortex-m7"
-CONFIG_BOARD_BUILD_BOOTLOADER=y
 CONFIG_BOARD_SERIAL_GPS1="/dev/ttyS3"
 CONFIG_BOARD_SERIAL_TEL1="/dev/ttyS1"
 CONFIG_BOARD_SERIAL_TEL2="/dev/ttyS2"

boards/mro/pixracerpro/nuttx-config/bootloader/defconfig

@@ -11,7 +11,7 @@
 # CONFIG_STM32H7_SYSCFG is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/mro/pixracerpro/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="stm32h7"

boards/mro/pixracerpro/nuttx-config/nsh/defconfig

@@ -24,7 +24,7 @@
 # CONFIG_NSH_DISABLE_TIME is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/mro/pixracerpro/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="stm32h7"
@@ -98,7 +98,6 @@ CONFIG_MTD_PROGMEM=y
 CONFIG_MTD_RAMTRON=y
 CONFIG_NAME_MAX=40
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_ARGCAT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CMDPARMS=y

boards/mro/x21-777/default.px4board

@@ -1,6 +1,5 @@
 CONFIG_BOARD_TOOLCHAIN="arm-none-eabi"
 CONFIG_BOARD_ARCHITECTURE="cortex-m7"
-CONFIG_BOARD_IO="px4_io-v2_default"
 CONFIG_BOARD_SERIAL_GPS1="/dev/ttyS3"
 CONFIG_BOARD_SERIAL_TEL1="/dev/ttyS1"
 CONFIG_BOARD_SERIAL_TEL2="/dev/ttyS2"

boards/mro/x21-777/nuttx-config/nsh/defconfig

@@ -24,7 +24,7 @@
 # CONFIG_NSH_DISABLE_TIME is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/mro/x21-777/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="stm32f7"
@@ -96,7 +96,6 @@ CONFIG_MTD_PARTITION=y
 CONFIG_MTD_RAMTRON=y
 CONFIG_NAME_MAX=40
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_ARGCAT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CMDPARMS=y

boards/mro/x21/default.px4board

@@ -1,6 +1,5 @@
 CONFIG_BOARD_TOOLCHAIN="arm-none-eabi"
 CONFIG_BOARD_ARCHITECTURE="cortex-m4"
-CONFIG_BOARD_IO="px4_io-v2_default"
 CONFIG_BOARD_CONSTRAINED_MEMORY=y
 CONFIG_BOARD_SERIAL_GPS1="/dev/ttyS3"
 CONFIG_BOARD_SERIAL_TEL1="/dev/ttyS1"

boards/mro/x21/nuttx-config/nsh/defconfig

@@ -25,7 +25,7 @@
 # CONFIG_STM32_CCMEXCLUDE is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/mro/x21/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="stm32"
@@ -92,7 +92,6 @@ CONFIG_MTD_PARTITION=y
 CONFIG_MTD_RAMTRON=y
 CONFIG_NAME_MAX=40
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_ARGCAT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CMDPARMS=y

boards/nxp/fmuk66-e/nuttx-config/nsh/defconfig

@@ -12,7 +12,7 @@
 # CONFIG_MMCSD_SPI is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/nxp/fmuk66-e/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="kinetis"
@@ -141,7 +141,6 @@ CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CROMFSETC=y
 CONFIG_NSH_DISABLE_BASENAME=y

boards/nxp/fmuk66-e/nuttx-config/socketcan/defconfig

@@ -12,7 +12,7 @@
 # CONFIG_MMCSD_SPI is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/nxp/fmuk66-e/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="kinetis"
@@ -140,7 +140,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TIMESTAMP=y
 CONFIG_NET_UDP=y
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CROMFSETC=y
 CONFIG_NSH_DISABLE_BASENAME=y

boards/nxp/fmuk66-v3/default.px4board

@@ -1,6 +1,5 @@
 CONFIG_BOARD_TOOLCHAIN="arm-none-eabi"
 CONFIG_BOARD_ARCHITECTURE="cortex-m4"
-CONFIG_BOARD_BUILD_BOOTLOADER=y
 CONFIG_BOARD_CONSTRAINED_MEMORY=y
 CONFIG_BOARD_SERIAL_GPS1="/dev/ttyS3"
 CONFIG_BOARD_SERIAL_TEL1="/dev/ttyS4"

boards/nxp/fmuk66-v3/nuttx-config/nsh/defconfig

@@ -11,7 +11,7 @@
 # CONFIG_MMCSD_SPI is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/nxp/fmuk66-v3/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="kinetis"
@@ -140,7 +140,6 @@ CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CROMFSETC=y
 CONFIG_NSH_DISABLE_BASENAME=y

boards/nxp/fmuk66-v3/nuttx-config/socketcan/defconfig

@@ -11,7 +11,7 @@
 # CONFIG_MMCSD_SPI is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/nxp/fmuk66-v3/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="kinetis"
@@ -139,7 +139,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TIMESTAMP=y
 CONFIG_NET_UDP=y
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CROMFSETC=y
 CONFIG_NSH_DISABLE_BASENAME=y

boards/nxp/fmurt1062-v1/nuttx-config/nsh/defconfig

@@ -10,7 +10,7 @@
 # CONFIG_MMCSD_SPI is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/nxp/fmurt1062-v1/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="imxrt"
@@ -154,7 +154,6 @@ CONFIG_MTD_PARTITION=y
 CONFIG_MTD_RAMTRON=y
 CONFIG_NAME_MAX=40
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CROMFSETC=y
 CONFIG_NSH_DISABLE_BASENAME=y

boards/nxp/ucans32k146/nuttx-config/canbootloader/defconfig

@@ -10,7 +10,7 @@
 # CONFIG_SERIAL is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/nxp/ucans32k146/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="s32k1xx"
@@ -46,13 +46,6 @@ CONFIG_LIB_BOARDCTL=y
 CONFIG_FS_PROCFS_MAX_TASKS=0
 CONFIG_NAME_MAX=0
 CONFIG_NUNGET_CHARS=0
-CONFIG_NXFONTS_DISABLE_16BPP=y
-CONFIG_NXFONTS_DISABLE_1BPP=y
-CONFIG_NXFONTS_DISABLE_24BPP=y
-CONFIG_NXFONTS_DISABLE_2BPP=y
-CONFIG_NXFONTS_DISABLE_32BPP=y
-CONFIG_NXFONTS_DISABLE_4BPP=y
-CONFIG_NXFONTS_DISABLE_8BPP=y
 CONFIG_PREALLOC_TIMERS=0
 CONFIG_PTHREAD_STACK_MIN=512
 CONFIG_RAM_SIZE=126976

boards/nxp/ucans32k146/nuttx-config/nsh/defconfig

@@ -11,7 +11,7 @@
 # CONFIG_NSH_CMDOPT_HEXDUMP is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/nxp/ucans32k146/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="s32k1xx"
@@ -66,7 +66,6 @@ CONFIG_NET_CAN_RAW_TX_DEADLINE=y
 CONFIG_NET_CAN_SOCK_OPTS=y
 CONFIG_NET_TIMESTAMP=y
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CROMFSETC=y
 CONFIG_NSH_LINELEN=128

boards/omnibus/f4sd/nuttx-config/nsh/defconfig

@@ -13,7 +13,7 @@
 # CONFIG_STM32_CCMEXCLUDE is not set
 CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD_CUSTOM=y
-CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config"
+CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/omnibus/f4sd/nuttx-config"
 CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD_CUSTOM_NAME="px4"
 CONFIG_ARCH_CHIP="stm32"
@@ -67,7 +67,6 @@ CONFIG_MEMSET_OPTSPEED=y
 CONFIG_MMCSD=y
 CONFIG_MM_REGIONS=2
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CROMFSETC=y
 CONFIG_NSH_DISABLE_BASENAME=y

boards/px4/fmu-v2/default.px4board

@@ -1,6 +1,5 @@
 CONFIG_BOARD_TOOLCHAIN="arm-none-eabi"
 CONFIG_BOARD_ARCHITECTURE="cortex-m4"
-CONFIG_BOARD_IO="px4_io-v2_default"
 CONFIG_BOARD_CONSTRAINED_FLASH=y
 CONFIG_BOARD_NO_HELP=y
 CONFIG_BOARD_CONSTRAINED_MEMORY=y