merged tx6dl-devel into denx master branch

[karo-tx-uboot.git] / arch / arm / lib / Makefile

diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile
index 4e78723ea94a0cc3a7b00ac41baa6297e3100d66..a68adf97ab3ce2f9ef9df88b5e79ba02ace7f7a2 100644 (file)
--- a/arch/arm/lib/Makefile
+++ b/arch/arm/lib/Makefile
@@ -20,8 +20,6 @@ GLSOBJS       += _umodsi3.o
 
 GLCOBJS        += div0.o
 
-SOBJS-y += crt0.o
-
 ifndef CONFIG_SPL_BUILD
 SOBJS-y += relocate.o
 ifndef CONFIG_SYS_GENERIC_BOARD
@@ -32,10 +30,14 @@ COBJS-y += sections.o
 COBJS-$(CONFIG_OF_LIBFDT) += bootm-fdt.o
 COBJS-$(CONFIG_CMD_BOOTM) += bootm.o
 COBJS-$(CONFIG_SYS_L2_PL310) += cache-pl310.o
+SOBJS-y += crt0.o
 SOBJS-$(CONFIG_USE_ARCH_MEMSET) += memset.o
 SOBJS-$(CONFIG_USE_ARCH_MEMCPY) += memcpy.o
 else
 COBJS-$(CONFIG_SPL_FRAMEWORK) += spl.o
+ifndef CONFIG_SPL_NO_CPU_SUPPORT_CODE
+SOBJS-y += crt0.o
+endif
 endif
 
 COBJS-y        += interrupts.o