Merge branch 'master' of git://git.denx.de/u-boot-arm

[karo-tx-uboot.git] / arch / arm / cpu / armv7 / sunxi / Makefile

diff --git a/arch/arm/cpu/armv7/sunxi/Makefile b/arch/arm/cpu/armv7/sunxi/Makefile
index 24f1daee64766d1631122a65dcb13dcb88dbc8ea..82dbf764e438adc16c84d231cc910a875aa9e01a 100644 (file)
--- a/arch/arm/cpu/armv7/sunxi/Makefile
+++ b/arch/arm/cpu/armv7/sunxi/Makefile
@@ -11,13 +11,13 @@ obj-y       += timer.o
 obj-y  += board.o
 obj-y  += clock.o
 obj-y  += pinmux.o
-obj-$(CONFIG_SUN6I)    += prcm.o
-obj-$(CONFIG_SUN8I)    += prcm.o
-obj-$(CONFIG_SUN4I)    += clock_sun4i.o
-obj-$(CONFIG_SUN5I)    += clock_sun4i.o
-obj-$(CONFIG_SUN6I)    += clock_sun6i.o
-obj-$(CONFIG_SUN7I)    += clock_sun4i.o
-obj-$(CONFIG_SUN8I)    += clock_sun6i.o
+obj-$(CONFIG_MACH_SUN6I)       += prcm.o
+obj-$(CONFIG_MACH_SUN8I)       += prcm.o
+obj-$(CONFIG_MACH_SUN4I)       += clock_sun4i.o
+obj-$(CONFIG_MACH_SUN5I)       += clock_sun4i.o
+obj-$(CONFIG_MACH_SUN6I)       += clock_sun6i.o
+obj-$(CONFIG_MACH_SUN7I)       += clock_sun4i.o
+obj-$(CONFIG_MACH_SUN8I)       += clock_sun6i.o
 
 ifndef CONFIG_SPL_BUILD
 obj-y  += cpu_info.o
@@ -27,9 +27,9 @@ endif
 endif
 
 ifdef CONFIG_SPL_BUILD
-obj-$(CONFIG_SUN4I)    += dram.o
-obj-$(CONFIG_SUN5I)    += dram.o
-obj-$(CONFIG_SUN7I)    += dram.o
+obj-$(CONFIG_MACH_SUN4I)       += dram.o
+obj-$(CONFIG_MACH_SUN5I)       += dram.o
+obj-$(CONFIG_MACH_SUN7I)       += dram.o
 ifdef CONFIG_SPL_FEL
 obj-y  += start.o
 endif