From 8c7f810cc29aecdbf9cf92ce1adce6e028a7325a Mon Sep 17 00:00:00 2001 From: BharathR Date: Wed, 11 Jan 2017 14:18:33 -0800 Subject: [PATCH] Fixed build error in eagle_legacy_default mode (px4muorb.h generation issue) --- Makefile | 2 +- ...eaglelegacydriver_default.cmake => posix_eagle_legacy.cmake} | 0 ..._eaglelegacydriver_default.cmake => qurt_eagle_legacy.cmake} | 0 src/lib/version/version.h | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) rename cmake/configs/{posix_eaglelegacydriver_default.cmake => posix_eagle_legacy.cmake} (100%) rename cmake/configs/{qurt_eaglelegacydriver_default.cmake => qurt_eagle_legacy.cmake} (100%) diff --git a/Makefile b/Makefile index cff033563b..29a4ba1030 100644 --- a/Makefile +++ b/Makefile @@ -153,7 +153,7 @@ broadcast: posix_sitl_broadcast # Multi- config targets. eagle_default: posix_eagle_default qurt_eagle_default -eagle_legacy_default: posix_eaglelegacydriver_default qurt_eaglelegacydriver_default +eagle_legacy_default: posix_eagle_legacy qurt_eagle_legacy excelsior_default: posix_excelsior_default qurt_excelsior_default # Deprecated config targets. diff --git a/cmake/configs/posix_eaglelegacydriver_default.cmake b/cmake/configs/posix_eagle_legacy.cmake similarity index 100% rename from cmake/configs/posix_eaglelegacydriver_default.cmake rename to cmake/configs/posix_eagle_legacy.cmake diff --git a/cmake/configs/qurt_eaglelegacydriver_default.cmake b/cmake/configs/qurt_eagle_legacy.cmake similarity index 100% rename from cmake/configs/qurt_eaglelegacydriver_default.cmake rename to cmake/configs/qurt_eagle_legacy.cmake diff --git a/src/lib/version/version.h b/src/lib/version/version.h index 2059661f40..f744e800d9 100644 --- a/src/lib/version/version.h +++ b/src/lib/version/version.h @@ -53,7 +53,7 @@ */ #if defined(CONFIG_ARCH_BOARD_SITL) # define BOARD_NAME "SITL" -#elif defined(CONFIG_ARCH_BOARD_EAGLE) || defined(CONFIG_ARCH_BOARD_EAGLELEGACYDRIVER) +#elif defined(CONFIG_ARCH_BOARD_EAGLE) # define BOARD_NAME "EAGLE" #elif defined(CONFIG_ARCH_BOARD_EXCELSIOR) # define BOARD_NAME "EXCELSIOR"