diff options
author | Tom Rini <trini@konsulko.com> | 2019-07-11 18:08:44 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-07-11 18:08:44 -0400 |
commit | 79b8d3c285f4f1c2ee4b27367f2ca3ecb76ed9ce (patch) | |
tree | 20571bc51871460b41b53c906881541e4ee2ce5c /arch/arm/mach-uniphier/Makefile | |
parent | 5acce685c9227b3d4b48f6fab6a33f6d74ca9c14 (diff) | |
parent | 2ce6b82d340cf1b1e5a43f1b5c8965d0067d5246 (diff) |
Merge tag 'uniphier-v2019.10' of https://gitlab.denx.de/u-boot/custodians/u-boot-uniphier
UniPhier SoC updates for v2019.10
- import DT updates from Linux
- add UniPhier SPI controller driver
- make U-Boot image for 64bit SoCs position independent
- tidy up various init code for next generation SoCs
- misc cleanups
Diffstat (limited to 'arch/arm/mach-uniphier/Makefile')
-rw-r--r-- | arch/arm/mach-uniphier/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-uniphier/Makefile b/arch/arm/mach-uniphier/Makefile index d0c39d4273..115af244cd 100644 --- a/arch/arm/mach-uniphier/Makefile +++ b/arch/arm/mach-uniphier/Makefile @@ -13,18 +13,20 @@ else obj-$(CONFIG_DISPLAY_CPUINFO) += cpu-info.o obj-y += dram_init.o obj-y += board_init.o +obj-$(CONFIG_ARCH_UNIPHIER_V8_MULTI) += base-address.o obj-$(CONFIG_BOARD_LATE_INIT) += board_late_init.o ifndef CONFIG_SYSRESET obj-y += reset.o endif -obj-$(CONFIG_MICRO_SUPPORT_CARD) += sbc/ micro-support-card.o +obj-$(CONFIG_MICRO_SUPPORT_CARD) += micro-support-card.o obj-y += pinctrl-glue.o obj-$(CONFIG_MMC) += mmc-first-dev.o obj-y += fdt-fixup.o endif +obj-y += sbc/ obj-y += soc-info.o obj-y += boot-device/ obj-y += clk/ |