1 files changed, 39 insertions, 24 deletions

diff --git a/nuttx/arch/arm/src/kinetis/Make.defs b/nuttx/arch/arm/src/kinetis/Make.defs
index 1bfb8803e..1583b3cc2 100644
--- a/nuttx/arch/arm/src/kinetis/Make.defs
+++ b/nuttx/arch/arm/src/kinetis/Make.defs
@@ -35,32 +35,40 @@
 
 # The start-up, "head", file
 
-HEAD_ASRC	= kinetis_vectors.S
+HEAD_ASRC = kinetis_vectors.S
 
 # Common ARM and Cortex-M3 files
 
-CMN_ASRCS	= up_saveusercontext.S up_fullcontextrestore.S up_switchcontext.S \
-			  vfork.S
-CMN_CSRCS	= up_allocateheap.c up_assert.c up_blocktask.c up_copystate.c \
-			  up_createstack.c up_mdelay.c up_udelay.c up_exit.c up_initialize.c \
-			  up_memfault.c up_initialstate.c up_interruptcontext.c \
-			  up_modifyreg8.c up_modifyreg16.c up_modifyreg32.c \
-			  up_releasestack.c up_reprioritizertr.c up_schedulesigaction.c \
-			  up_releasepending.c up_sigdeliver.c up_unblocktask.c up_usestack.c \
-			  up_doirq.c up_hardfault.c up_svcall.c up_checkstack.c \
-			  up_vfork.c
+CMN_ASRCS  = up_saveusercontext.S up_fullcontextrestore.S up_switchcontext.S
+CMN_ASRCS += vfork.S
+
+CMN_CSRCS  = up_assert.c up_blocktask.c up_copystate.c up_createstack.c
+CMN_CSRCS += up_mdelay.c up_udelay.c up_exit.c up_initialize.c up_memfault.c
+CMN_CSRCS += up_initialstate.c up_interruptcontext.c up_modifyreg8.c
+CMN_CSRCS += up_modifyreg16.c up_modifyreg32.c up_releasestack.c
+CMN_CSRCS += up_reprioritizertr.c up_schedulesigaction.c up_releasepending.c
+CMN_CSRCS += up_sigdeliver.c up_unblocktask.c up_usestack.c up_doirq.c
+CMN_CSRCS += up_hardfault.c up_svcall.c up_checkstack.c up_vfork.c
 
 ifeq ($(CONFIG_ARCH_RAMVECTORS),y)
 CMN_CSRCS += up_ramvec_initialize.c up_ramvec_attach.c
 endif
 
 ifeq ($(CONFIG_ARCH_MEMCPY),y)
-CMN_ASRCS	+= up_memcpy.S
+CMN_ASRCS += up_memcpy.S
+endif
+
+ifeq ($(CONFIG_NUTTX_KERNEL),y)
+CMN_CSRCS += up_mpu.c up_task_start.c up_pthread_start.c up_stackframe.c
+ifneq ($(CONFIG_DISABLE_SIGNALS),y)
+CMN_CSRCS += up_signal_dispatch.c
+CMN_UASRCS += up_signal_handler.S
+endif
 endif
 
 ifeq ($(CONFIG_NET),y)
 ifneq ($(CONFIG_KINETIS_ENET),y)
-CMN_CSRCS	+= up_etherstub.c
+CMN_CSRCS += up_etherstub.c
 endif
 endif
 
@@ -70,39 +78,46 @@ endif
 
 # Required Kinetis files
 
-CHIP_ASRCS	=
-CHIP_CSRCS	= kinetis_clockconfig.c kinetis_clrpend.c kinetis_idle.c \
-			  kinetis_irq.c kinetis_lowputc.c kinetis_pin.c kinetis_pingpio.c \
-			  kinetis_serial.c kinetis_start.c kinetis_timerisr.c kinetis_wdog.c
+CHIP_ASRCS  =
+
+CHIP_CSRCS  = kinetis_allocateheap.c kinetis_clockconfig.c
+CHIP_CSRCS += kinetis_clrpend.c kinetis_idle.c kinetis_irq.c
+CHIP_CSRCS += kinetis_lowputc.c kinetis_pin.c kinetis_pingpio.c
+CHIP_CSRCS += kinetis_serial.c kinetis_start.c kinetis_timerisr.c
+CHIP_CSRCS += kinetis_wdog.c
 
 # Configuration-dependent Kinetis files
 
+ifeq ($(CONFIG_NUTTX_KERNEL),y)
+CHIP_CSRCS += kinetis_userspace.c kinetis_mpuinit.c
+endif
+
 ifeq ($(CONFIG_GPIO_IRQ),y)
-CHIP_CSRCS	+= kinetis_pinirq.c
+CHIP_CSRCS += kinetis_pinirq.c
 endif
 
 ifeq ($(CONFIG_DEBUG_GPIO),y)
-CHIP_CSRCS	+= kinetis_pindbg.c
+CHIP_CSRCS += kinetis_pindbg.c
 endif
 
 ifeq ($(CONFIG_KINETIS_SDHC),y)
-CHIP_CSRCS	+= kinetis_sdhc.c
+CHIP_CSRCS += kinetis_sdhc.c
 endif
 
 ifeq ($(CONFIG_USBDEV),y)
-CHIP_CSRCS	+= kinetis_usbdev.c
+CHIP_CSRCS += kinetis_usbdev.c
 endif
 
 ifeq ($(CONFIG_USBHOST),y)
-CHIP_CSRCS	+= kinetis_usbhost.c
+CHIP_CSRCS += kinetis_usbhost.c
 endif
 
 ifeq ($(CONFIG_KINETIS_DMA),y)
-CHIP_CSRCS	+= kinetis_dma.c kinetis_pindma.c
+CHIP_CSRCS += kinetis_dma.c kinetis_pindma.c
 endif
 
 ifeq ($(CONFIG_NET),y)
 ifeq ($(CONFIG_KINETIS_ENET),y)
-CHIP_CSRCS	+= kinetis_enet.c
+CHIP_CSRCS += kinetis_enet.c
 endif
 endif