From 2679bd67842fcdbe77d01f188d466e4ff0dca40f Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 22 Aug 2018 12:26:52 -0600 Subject: [PATCH] Revert "Kconfig and tools/Makefile.unix and : add dynamic application loadable support" This reverts commit dc15583df8bbb242b1837f8fa9a05c48b8ec2a62. --- Kconfig | 10 ---------- tools/Makefile.unix | 6 +++--- tools/Makefile.win | 10 +++++----- 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/Kconfig b/Kconfig index 415774c0b34..c2db1e86820 100644 --- a/Kconfig +++ b/Kconfig @@ -161,16 +161,6 @@ config APPS_DIR example, to include makefile fragments (e.g., .config or Make.defs) or to set up include file paths. -config BUILD_LOADABLE - bool "NuttX application loadable build" - 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' - target and currently has no effect unless you wish to build - loadable applications in a FLAT build. - choice prompt "Memory organization" default BUILD_FLAT diff --git a/tools/Makefile.unix b/tools/Makefile.unix index 5eb7fd87727..dc5466fed99 100644 --- a/tools/Makefile.unix +++ b/tools/Makefile.unix @@ -166,11 +166,11 @@ MKEXPORT_ARGS = -w$(WINTOOL) -t "$(TOPDIR)" ifeq ($(CONFIG_BUILD_PROTECTED),y) MKEXPORT_ARGS += -u -else ifeq ($(CONFIG_BUILD_KERNEL),y) -MKEXPORT_ARGS += -u -else ifeq ($(CONFIG_BUILD_LOADABLE),y) +else +ifeq ($(CONFIG_BUILD_KERNEL),y) MKEXPORT_ARGS += -u endif +endif ifeq ($(V),2) MKEXPORT_ARGS += -d diff --git a/tools/Makefile.win b/tools/Makefile.win index d995c9def21..fadb6e796dc 100644 --- a/tools/Makefile.win +++ b/tools/Makefile.win @@ -158,11 +158,11 @@ MKEXPORT = tools\mkexport.bat MKEXPORT_ARGS = -w$(WINTOOL) -t "$(TOPDIR)" ifeq ($(CONFIG_BUILD_PROTECTED),y) -MKEXPORT_ARGS += -u -else ifeq ($(CONFIG_BUILD_KERNEL),y) -MKEXPORT_ARGS += -u -else ifeq ($(CONFIG_BUILD_LOADABLE),y) -MKEXPORT_ARGS += -u +MKEXPORT_ARGS = -u +else +ifeq ($(CONFIG_BUILD_KERNEL),y) +MKEXPORT_ARGS = -u +endif endif ifeq ($(V),2)