From 2d794f41028deb1c919f88ad508f037ecfd925bf Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Mon, 30 Sep 2019 06:57:16 -0600 Subject: [PATCH] Configuration: Auto-select CONFIG_BUILD_LOADABLE when either CONFIG_BUILD_KERNEL or CONFIG_BINFMT_LOADABLE is selected. --- Kconfig | 5 ++--- binfmt/Kconfig | 1 + boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig | 1 - boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig | 1 - boards/arm/stm32/stm32f4discovery/README.txt | 1 - boards/arm/stm32/stm32f4discovery/configs/rndis/defconfig | 1 - boards/sim/sim/sim/configs/loadable/defconfig | 1 - 7 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Kconfig b/Kconfig index 3532ac33cf..aa647d2d68 100644 --- a/Kconfig +++ b/Kconfig @@ -162,10 +162,8 @@ config APPS_DIR or to set up include file paths. config BUILD_LOADABLE - bool "NuttX application loadable build" + bool option modules - default n if !BUILD_KERNEL - default y if BUILD_KERNEL ---help--- Automatically selected if KERNEL build is selected. This selection only effects the behavior of the 'make export' @@ -202,6 +200,7 @@ config BUILD_PROTECTED config BUILD_KERNEL bool "NuttX kernel build" depends on ARCH_USE_MMU && ARCH_ADDRENV + select BUILD_LOADABLE select LIB_SYSCALL ---help--- Builds NuttX as a separately compiled kernel. No applications are diff --git a/binfmt/Kconfig b/binfmt/Kconfig index 5e9a2865e6..57dbcfd8a9 100644 --- a/binfmt/Kconfig +++ b/binfmt/Kconfig @@ -22,6 +22,7 @@ config PATH_INITIAL config BINFMT_LOADABLE bool + select BUILD_LOADABLE default n ---help--- Automatically selected if a loadable binary format is selected. diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig index 3c888cf669..670b69b3e4 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig @@ -29,7 +29,6 @@ CONFIG_AUDIO_WM8776=y CONFIG_BOARDCTL_RESET=y CONFIG_BOARDCTL_USBDEVCTRL=y CONFIG_BOARD_LOOPSPERMSEC=12061 -CONFIG_BUILD_LOADABLE=y CONFIG_BUILD_PROTECTED=y CONFIG_C99_BOOL8=y CONFIG_CODECS_HASH_MD5=y diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig index 2bdc9dbb62..b6411fbee0 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig @@ -28,7 +28,6 @@ CONFIG_AUDIO_WM8776=y CONFIG_BOARDCTL_RESET=y CONFIG_BOARDCTL_USBDEVCTRL=y CONFIG_BOARD_LOOPSPERMSEC=12061 -CONFIG_BUILD_LOADABLE=y CONFIG_BUILTIN=y CONFIG_C99_BOOL8=y CONFIG_CODECS_HASH_MD5=y diff --git a/boards/arm/stm32/stm32f4discovery/README.txt b/boards/arm/stm32/stm32f4discovery/README.txt index f70d7d5d43..235e9a1fc2 100644 --- a/boards/arm/stm32/stm32f4discovery/README.txt +++ b/boards/arm/stm32/stm32f4discovery/README.txt @@ -2305,7 +2305,6 @@ Configuration Sub-directories 2. Loadable ELF modules - CONFIG_BUILD_LOADABLE=y CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_ELF=y CONFIG_EXAMPLES_HELLO=m diff --git a/boards/arm/stm32/stm32f4discovery/configs/rndis/defconfig b/boards/arm/stm32/stm32f4discovery/configs/rndis/defconfig index cf4aaac851..b80128f850 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/rndis/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/rndis/defconfig @@ -22,7 +22,6 @@ CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y CONFIG_BOARDCTL_RESET=y CONFIG_BOARDCTL_USBDEVCTRL=y CONFIG_BOARD_LOOPSPERMSEC=16717 -CONFIG_BUILD_LOADABLE=y CONFIG_BUILTIN=y CONFIG_CLOCK_MONOTONIC=y CONFIG_DEBUG_FULLOPT=y diff --git a/boards/sim/sim/sim/configs/loadable/defconfig b/boards/sim/sim/sim/configs/loadable/defconfig index b63fcaccac..d16e09220c 100644 --- a/boards/sim/sim/sim/configs/loadable/defconfig +++ b/boards/sim/sim/sim/configs/loadable/defconfig @@ -13,7 +13,6 @@ CONFIG_ARCH_CHIP="sim" CONFIG_BOARDCTL_APP_SYMTAB=y CONFIG_BOARDCTL_POWEROFF=y CONFIG_BOARD_LATE_INITIALIZE=y -CONFIG_BUILD_LOADABLE=y CONFIG_BUILTIN=y CONFIG_CLOCK_MONOTONIC=y CONFIG_DEBUG_FEATURES=y