From 04305203719b36b6cf1becf61ad9f92d55f94b6c Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Mon, 11 Jun 2018 09:49:32 -0400 Subject: [PATCH] Revert "px4io: fix NuttX build" This reverts commit 27e75920bd560b7d8de295db45aba8cf036cd98d. --- src/drivers/px4io/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/drivers/px4io/CMakeLists.txt b/src/drivers/px4io/CMakeLists.txt index 24068de454..df6332ddf5 100644 --- a/src/drivers/px4io/CMakeLists.txt +++ b/src/drivers/px4io/CMakeLists.txt @@ -49,7 +49,7 @@ px4_add_module( # include the px4io binary in ROMFS message(STATUS "Building and including ${config_io_board}") -set(fw_io_exe "${PX4_SOURCE_DIR}/build/${config_io_board}_default/nuttx_${config_io_board}_default.elf") +set(fw_io_exe "${PX4_SOURCE_DIR}/build/nuttx_${config_io_board}_default/nuttx_${config_io_board}_default.elf") set(fw_io_bin "${PX4_BINARY_DIR}/genromfs/${config_romfs_root}/extras/${config_io_board}.bin") file(GLOB_RECURSE px4io_driver_files ${PX4_SOURCE_DIR}/src/drivers/boards/${config_io_board}/*) @@ -57,7 +57,7 @@ file(GLOB_RECURSE px4io_config_files ${PX4_SOURCE_DIR}/platforms/nuttx/NuttX/con file(GLOB_RECURSE px4io_firmware_files ${PX4_SOURCE_DIR}/src/modules/px4iofirmware/*) file(GLOB_RECURSE px4io_rc_files ${PX4_SOURCE_DIR}/src/lib/rc/*) add_custom_command(OUTPUT ${fw_io_exe} - COMMAND make --no-print-directory ${config_io_board}_default + COMMAND make --no-print-directory nuttx_${config_io_board}_default DEPENDS ${px4io_driver_files} ${px4io_config_files} ${px4io_firmware_files} ${px4io_rc_files} WORKING_DIRECTORY ${PX4_SOURCE_DIR} COMMENT "Building ${config_io_board}"