All architectures need to build ELF support if either CONFIG_ELF or CONFIG_MODULE are selected. Cortex-M7 also must support module cache corherence

arch/arm/Kconfig

@@ -279,6 +279,7 @@ config ARCH_CORTEXM7
 	select ARCH_HAVE_IRQPRIO
 	select ARCH_HAVE_RAMVECTORS
 	select ARCH_HAVE_HIPRI_INTERRUPT
+	select ARCH_HAVE_COHERENT_DCACHE if ELF || MODULE
 
 config ARCH_CORTEXA5
 	bool
@@ -286,7 +287,7 @@ config ARCH_CORTEXA5
 	select ARCH_HAVE_IRQPRIO
 	select ARCH_HAVE_MMU
 	select ARCH_USE_MMU
-	select ARCH_HAVE_COHERENT_DCACHE if ELF
+	select ARCH_HAVE_COHERENT_DCACHE if ELF || MODULE
 
 config ARCH_CORTEXA8
 	bool
@@ -294,7 +295,7 @@ config ARCH_CORTEXA8
 	select ARCH_HAVE_IRQPRIO
 	select ARCH_HAVE_MMU
 	select ARCH_USE_MMU
-	select ARCH_HAVE_COHERENT_DCACHE if ELF
+	select ARCH_HAVE_COHERENT_DCACHE if ELF || MODULE
 
 config ARCH_FAMILY
 	string

arch/arm/src/a1x/Make.defs

@@ -112,6 +112,8 @@ endif
 
 ifeq ($(CONFIG_ELF),y)
 CMN_CSRCS += arm_elf.c arm_coherent_dcache.c
+else ifeq ($(CONFIG_MODULE),y)
+CMN_CSRCS += arm_elf.c arm_coherent_dcache.c
 endif
 
 ifeq ($(CONFIG_ARCH_FPU),y)

arch/arm/src/armv7-a/arm_coherent_dcache.c

@@ -44,7 +44,7 @@
 
 #include "cp15_cacheops.h"
 
-#include <nuttx/binfmt/elf.h>
+#include <nuttx/arch.h>
 
 /****************************************************************************
  * Pre-processor Definitions

arch/arm/src/armv7-m/up_elf.c

@@ -48,20 +48,6 @@
 #include <nuttx/arch.h>
 #include <nuttx/binfmt/elf.h>
 
-#ifdef CONFIG_ELF
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Function Prototypes
  ****************************************************************************/
@@ -498,4 +484,3 @@ int up_init_exidx(Elf32_Addr address, Elf32_Word size)
 }
 #endif
 
-#endif /* CONFIG_ELF */

arch/arm/src/c5471/Make.defs

@@ -47,6 +47,8 @@ CMN_CSRCS += up_undefinedinsn.c up_usestack.c up_vfork.c
 
 ifeq ($(CONFIG_ELF),y)
 CMN_CSRCS += up_elf.c
+else ifeq ($(CONFIG_MODULE),y)
+CMN_CSRCS += up_elf.c
 endif
 
 ifeq ($(CONFIG_STACK_COLORATION),y)

arch/arm/src/calypso/Make.defs

@@ -50,6 +50,8 @@ CMN_CSRCS += up_undefinedinsn.c up_usestack.c calypso_power.c up_vfork.c
 
 ifeq ($(CONFIG_ELF),y)
 CMN_CSRCS += up_elf.c
+else ifeq ($(CONFIG_MODULE),y)
+CMN_CSRCS += up_elf.c
 endif
 
 ifeq ($(CONFIG_STACK_COLORATION),y)

arch/arm/src/dm320/Make.defs

@@ -48,6 +48,8 @@ CMN_CSRCS += up_undefinedinsn.c up_usestack.c up_vfork.c
 
 ifeq ($(CONFIG_ELF),y)
 CMN_CSRCS += up_elf.c
+else ifeq ($(CONFIG_MODULE),y)
+CMN_CSRCS += up_elf.c
 endif
 
 ifeq ($(CONFIG_STACK_COLORATION),y)

arch/arm/src/efm32/Make.defs

@@ -81,6 +81,8 @@ endif
 
 ifeq ($(CONFIG_ELF),y)
 CMN_CSRCS += up_elf.c
+else ifeq ($(CONFIG_MODULE),y)
+CMN_CSRCS += up_elf.c
 endif
 
 ifeq ($(CONFIG_ARCH_FPU),y)

arch/arm/src/imx/Make.defs

@@ -47,6 +47,8 @@ CMN_CSRCS += up_undefinedinsn.c up_usestack.c up_vfork.c
 
 ifeq ($(CONFIG_ELF),y)
 CMN_CSRCS += up_elf.c
+else ifeq ($(CONFIG_MODULE),y)
+CMN_CSRCS += up_elf.c
 endif
 
 ifeq ($(CONFIG_STACK_COLORATION),y)

arch/arm/src/kinetis/Make.defs

@@ -79,6 +79,8 @@ endif
 
 ifeq ($(CONFIG_ELF),y)
 CMN_CSRCS += up_elf.c
+else ifeq ($(CONFIG_MODULE),y)
+CMN_CSRCS += up_elf.c
 endif
 
 # Required Kinetis files

arch/arm/src/kl/Make.defs

@@ -61,6 +61,8 @@ endif
 
 ifeq ($(CONFIG_ELF),y)
 CMN_CSRCS += up_elf.c
+else ifeq ($(CONFIG_MODULE),y)
+CMN_CSRCS += up_elf.c
 endif
 
 ifeq ($(CONFIG_DEBUG),y)

arch/arm/src/lpc11xx/Make.defs

@@ -61,6 +61,8 @@ endif
 
 ifeq ($(CONFIG_ELF),y)
 CMN_CSRCS += up_elf.c
+else ifeq ($(CONFIG_MODULE),y)
+CMN_CSRCS += up_elf.c
 endif
 
 ifeq ($(CONFIG_DEBUG),y)

arch/arm/src/lpc17xx/Make.defs

@@ -94,6 +94,8 @@ endif
 
 ifeq ($(CONFIG_ELF),y)
 CMN_CSRCS += up_elf.c
+else ifeq ($(CONFIG_MODULE),y)
+CMN_CSRCS += up_elf.c
 endif
 
 ifeq ($(CONFIG_ARCH_FPU),y)

arch/arm/src/lpc214x/Make.defs

@@ -52,6 +52,8 @@ endif
 
 ifeq ($(CONFIG_ELF),y)
 CMN_CSRCS += up_elf.c
+else ifeq ($(CONFIG_MODULE),y)
+CMN_CSRCS += up_elf.c
 endif
 
 ifeq ($(CONFIG_STACK_COLORATION),y)

arch/arm/src/lpc2378/Make.defs

@@ -56,6 +56,8 @@ endif
 
 ifeq ($(CONFIG_ELF),y)
 CMN_CSRCS += up_elf.c
+else ifeq ($(CONFIG_MODULE),y)
+CMN_CSRCS += up_elf.c
 endif
 
 ifeq ($(CONFIG_STACK_COLORATION),y)

arch/arm/src/lpc31xx/Make.defs

@@ -53,6 +53,8 @@ endif
 
 ifeq ($(CONFIG_ELF),y)
 CMN_CSRCS += up_elf.c
+else ifeq ($(CONFIG_MODULE),y)
+CMN_CSRCS += up_elf.c
 endif
 
 ifeq ($(CONFIG_STACK_COLORATION),y)

arch/arm/src/lpc43xx/Make.defs

@@ -78,6 +78,8 @@ endif
 
 ifeq ($(CONFIG_ELF),y)
 CMN_CSRCS += up_elf.c
+else ifeq ($(CONFIG_MODULE),y)
+CMN_CSRCS += up_elf.c
 endif
 
 ifeq ($(CONFIG_ARCH_FPU),y)

arch/arm/src/moxart/Make.defs

@@ -50,6 +50,8 @@ CMN_CSRCS += up_undefinedinsn.c up_usestack.c up_vfork.c up_etherstub.c
 
 ifeq ($(CONFIG_ELF),y)
 CMN_CSRCS += up_elf.c
+else ifeq ($(CONFIG_MODULE),y)
+CMN_CSRCS += up_elf.c
 endif
 
 CHIP_ASRCS  = moxart_lowputc.S

arch/arm/src/nuc1xx/Make.defs

@@ -61,6 +61,8 @@ endif
 
 ifeq ($(CONFIG_ELF),y)
 CMN_CSRCS += up_elf.c
+else ifeq ($(CONFIG_MODULE),y)
+CMN_CSRCS += up_elf.c
 endif
 
 ifeq ($(CONFIG_DEBUG),y)

arch/arm/src/sam34/Make.defs

@@ -85,6 +85,8 @@ endif
 
 ifeq ($(CONFIG_ELF),y)
 CMN_CSRCS += up_elf.c
+else ifeq ($(CONFIG_MODULE),y)
+CMN_CSRCS += up_elf.c
 endif
 
 ifeq ($(CONFIG_ARCH_FPU),y)

arch/arm/src/sama5/Make.defs

@@ -114,6 +114,8 @@ endif
 
 ifeq ($(CONFIG_ELF),y)
 CMN_CSRCS += arm_elf.c arm_coherent_dcache.c
+else ifeq ($(CONFIG_MODULE),y)
+CMN_CSRCS += arm_elf.c arm_coherent_dcache.c
 endif
 
 ifeq ($(CONFIG_ARCH_FPU),y)

arch/arm/src/samdl/Make.defs

@@ -61,6 +61,8 @@ endif
 
 ifeq ($(CONFIG_ELF),y)
 CMN_CSRCS += up_elf.c
+else ifeq ($(CONFIG_MODULE),y)
+CMN_CSRCS += up_elf.c
 endif
 
 ifeq ($(CONFIG_DEBUG),y)

arch/arm/src/samv7/Make.defs

@@ -102,7 +102,9 @@ endif
 endif
 
 ifeq ($(CONFIG_ELF),y)
-CMN_CSRCS += up_elf.c
+CMN_CSRCS += up_elf.c up_coherent_dcache.c
+else ifeq ($(CONFIG_MODULE),y)
+CMN_CSRCS += up_elf.c up_coherent_dcache.c
 endif
 
 ifeq ($(CONFIG_STACK_COLORATION),y)

arch/arm/src/stm32/Make.defs

@@ -89,6 +89,8 @@ endif
 
 ifeq ($(CONFIG_ELF),y)
 CMN_CSRCS += up_elf.c
+else ifeq ($(CONFIG_MODULE),y)
+CMN_CSRCS += up_elf.c
 endif
 
 ifeq ($(CONFIG_ARCH_FPU),y)

arch/arm/src/stm32f7/Make.defs

@@ -99,7 +99,9 @@ endif
 endif
 
 ifeq ($(CONFIG_ELF),y)
-CMN_CSRCS += up_elf.c
+CMN_CSRCS += up_elf.c up_coherent_dcache.c
+else ifeq ($(CONFIG_MODULE),y)
+CMN_CSRCS += up_elf.c up_coherent_dcache.c
 endif
 
 ifeq ($(CONFIG_STACK_COLORATION),y)

arch/arm/src/str71x/Make.defs

@@ -52,6 +52,8 @@ endif
 
 ifeq ($(CONFIG_ELF),y)
 CMN_CSRCS += up_elf.c
+else ifeq ($(CONFIG_MODULE),y)
+CMN_CSRCS += up_elf.c
 endif
 
 ifeq ($(CONFIG_STACK_COLORATION),y)

arch/arm/src/tiva/Make.defs

@@ -71,6 +71,8 @@ endif
 
 ifeq ($(CONFIG_ELF),y)
 CMN_CSRCS += up_elf.c
+else ifeq ($(CONFIG_MODULE),y)
+CMN_CSRCS += up_elf.c
 endif
 
 CHIP_ASRCS  =