Merge branch '2019-10-28-azure-ci-support'

[J-u-boot.git] / arch / arm / mach-sunxi / Makefile

diff --git a/arch/arm/mach-sunxi/Makefile b/arch/arm/mach-sunxi/Makefile
index e73114ee642c22861e567e69eff12a676a56d82f..d129f334798bb9e504516012055385088d6f8afa 100644 (file)
--- a/arch/arm/mach-sunxi/Makefile
+++ b/arch/arm/mach-sunxi/Makefile
@@ -1,27 +1,20 @@
+# SPDX-License-Identifier: GPL-2.0+
 #
 # (C) Copyright 2012 Henrik Nordstrom <[email protected]>
 #
 # Based on some other Makefile
 # (C) Copyright 2000-2003
 # Wolfgang Denk, DENX Software Engineering, [email protected].
-#
-# SPDX-License-Identifier:     GPL-2.0+
-#
 
 obj-y  += board.o
 obj-y  += clock.o
 obj-y  += cpu_info.o
 obj-y  += dram_helpers.o
 obj-y  += pinmux.o
-ifndef CONFIG_MACH_SUN9I
-obj-y  += usb_phy.o
-endif
-obj-$(CONFIG_MACH_SUN6I)       += prcm.o
-obj-$(CONFIG_MACH_SUN8I)       += prcm.o
-obj-$(CONFIG_MACH_SUN9I)       += prcm.o
-obj-$(CONFIG_MACH_SUN6I)       += p2wi.o
-obj-$(CONFIG_MACH_SUN8I)       += rsb.o
-obj-$(CONFIG_MACH_SUN9I)       += rsb.o
+obj-$(CONFIG_SUN6I_P2WI)       += p2wi.o
+obj-$(CONFIG_SUN6I_PRCM)       += prcm.o
+obj-$(CONFIG_AXP_PMIC_BUS)     += pmic_bus.o
+obj-$(CONFIG_SUN8I_RSB)                += rsb.o
 obj-$(CONFIG_MACH_SUN4I)       += clock_sun4i.o
 obj-$(CONFIG_MACH_SUN5I)       += clock_sun4i.o
 obj-$(CONFIG_MACH_SUN6I)       += clock_sun6i.o
@@ -33,21 +26,18 @@ else
 obj-$(CONFIG_MACH_SUN8I)       += clock_sun6i.o
 endif
 obj-$(CONFIG_MACH_SUN9I)       += clock_sun9i.o gtbus_sun9i.o
-
-obj-$(CONFIG_AXP152_POWER)     += pmic_bus.o
-obj-$(CONFIG_AXP209_POWER)     += pmic_bus.o
-obj-$(CONFIG_AXP221_POWER)     += pmic_bus.o
-obj-$(CONFIG_AXP809_POWER)     += pmic_bus.o
-obj-$(CONFIG_AXP818_POWER)     += pmic_bus.o
+obj-$(CONFIG_MACH_SUN50I_H6)   += clock_sun50i_h6.o
 
 ifdef CONFIG_SPL_BUILD
-obj-$(CONFIG_MACH_SUN4I)       += dram_sun4i.o
-obj-$(CONFIG_MACH_SUN5I)       += dram_sun4i.o
-obj-$(CONFIG_MACH_SUN6I)       += dram_sun6i.o
-obj-$(CONFIG_MACH_SUN7I)       += dram_sun4i.o
-obj-$(CONFIG_MACH_SUN8I_A23)   += dram_sun8i_a23.o
-obj-$(CONFIG_MACH_SUN8I_A33)   += dram_sun8i_a33.o
-obj-$(CONFIG_MACH_SUN8I_A83T)  += dram_sun8i_a83t.o
-obj-$(CONFIG_MACH_SUN8I_H3)    += dram_sun8i_h3.o
-obj-$(CONFIG_MACH_SUN9I)       += dram_sun9i.o
+obj-$(CONFIG_DRAM_SUN4I)       += dram_sun4i.o
+obj-$(CONFIG_DRAM_SUN6I)       += dram_sun6i.o
+obj-$(CONFIG_DRAM_SUN8I_A23)   += dram_sun8i_a23.o
+obj-$(CONFIG_DRAM_SUN8I_A33)   += dram_sun8i_a33.o
+obj-$(CONFIG_DRAM_SUN8I_A83T)  += dram_sun8i_a83t.o
+obj-$(CONFIG_DRAM_SUN9I)       += dram_sun9i.o
+obj-$(CONFIG_SPL_SPI_SUNXI)    += spl_spi_sunxi.o
+obj-$(CONFIG_SUNXI_DRAM_DW)    += dram_sunxi_dw.o
+obj-$(CONFIG_SUNXI_DRAM_DW)    += dram_timings/
+obj-$(CONFIG_DRAM_SUN50I_H6)   += dram_sun50i_h6.o
+obj-$(CONFIG_DRAM_SUN50I_H6)   += dram_timings/
 endif