diff options
author | Tom Rini <trini@konsulko.com> | 2015-05-04 17:50:20 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2015-05-04 17:50:20 -0400 |
commit | 622da1c36aee9c39075f2109848228a5737925c0 (patch) | |
tree | e08cd8d033fd09e415d603bab26691d776365adb /arch/arm/cpu/armv7/sunxi/Makefile | |
parent | 281239ad9dc2a695a53ab34dda44cdbe31c69122 (diff) | |
parent | fd01ae1384a67c354eb53fc8a4c1e0d519014ae8 (diff) | |
download | u-boot-imx-622da1c36aee9c39075f2109848228a5737925c0.zip u-boot-imx-622da1c36aee9c39075f2109848228a5737925c0.tar.gz u-boot-imx-622da1c36aee9c39075f2109848228a5737925c0.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
Diffstat (limited to 'arch/arm/cpu/armv7/sunxi/Makefile')
-rw-r--r-- | arch/arm/cpu/armv7/sunxi/Makefile | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv7/sunxi/Makefile b/arch/arm/cpu/armv7/sunxi/Makefile index 4bb12ad..6a0299f 100644 --- a/arch/arm/cpu/armv7/sunxi/Makefile +++ b/arch/arm/cpu/armv7/sunxi/Makefile @@ -13,7 +13,7 @@ obj-y += clock.o obj-y += cpu_info.o obj-y += dram_helpers.o obj-y += pinmux.o -obj-y += usbc.o +obj-y += usb_phy.o obj-$(CONFIG_MACH_SUN6I) += prcm.o obj-$(CONFIG_MACH_SUN8I) += prcm.o obj-$(CONFIG_MACH_SUN9I) += prcm.o @@ -27,6 +27,10 @@ obj-$(CONFIG_MACH_SUN7I) += clock_sun4i.o obj-$(CONFIG_MACH_SUN8I) += clock_sun6i.o obj-$(CONFIG_MACH_SUN9I) += clock_sun9i.o +obj-$(CONFIG_AXP152_POWER) += pmic_bus.o +obj-$(CONFIG_AXP209_POWER) += pmic_bus.o +obj-$(CONFIG_AXP221_POWER) += pmic_bus.o + ifndef CONFIG_SPL_BUILD ifdef CONFIG_ARMV7_PSCI obj-y += psci.o @@ -38,6 +42,7 @@ 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) += dram_sun8i.o +obj-$(CONFIG_MACH_SUN8I_A23) += dram_sun8i_a23.o +obj-$(CONFIG_MACH_SUN8I_A33) += dram_sun8i_a33.o obj-y += fel_utils.o endif |