Merge branch 'next'

[u-boot] / arch / arm / cpu / arm1136 / config.mk

diff --git a/arch/arm/cpu/arm1136/config.mk b/arch/arm/cpu/arm1136/config.mk
index ab1fc4ad156c4be3132f4c131c447cfbe89dee58..a82c6cec9c4d3338b1ee1056d781cb3237cad9bb 100644 (file)
--- a/arch/arm/cpu/arm1136/config.mk
+++ b/arch/arm/cpu/arm1136/config.mk
@@ -7,13 +7,3 @@
 
 # Make ARMv5 to allow more compilers to work, even though its v6.
 PLATFORM_CPPFLAGS += -march=armv5
-
-ifneq ($(CONFIG_IMX_CONFIG),)
-ifdef CONFIG_SPL
-ifdef CONFIG_SPL_BUILD
-ALL-y  += $(OBJTREE)/SPL
-endif
-else
-ALL-y  += u-boot.imx
-endif
-endif