Work on config only for cmake arguments.

src/firmware/nuttx/CMakeLists.txt

@@ -1,8 +1,8 @@
-px4_add_extra_builtin_cmds(OUT extra_builtins)
-
 px4_nuttx_generate_builtin_commands(
 	OUT builtin_commands.c
-	MODULE_LIST ${module_libraries} ${extra_builtins}
+	MODULE_LIST
+		${module_libraries}
+		${config_extra_builtins_cmds}
 	)
 
 px4_nuttx_generate_romfs(OUT romfs.o
@@ -27,10 +27,9 @@ target_link_libraries(firmware_nuttx
 	apps nuttx nosys m gcc
 	-Wl,--end-group)
 
-px4_get_config(OUT_FW_OPTS fw_opts)
 px4_nuttx_add_firmware(OUT ${CMAKE_CURRENT_BINARY_DIR}/fw_main.px4
 	EXE ${CMAKE_CURRENT_BINARY_DIR}/firmware_nuttx
-	${fw_opts}
+	${config_firmware_options}
 	)
 
 px4_add_upload(OUT upload OS ${OS} BOARD ${BOARD}