projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.denx.de/u-boot-fsl-qoriq
[oweals/u-boot.git]
/
arch
/
arm
/
mach-uniphier
/
Makefile
diff --git
a/arch/arm/mach-uniphier/Makefile
b/arch/arm/mach-uniphier/Makefile
index ab2c6dc99bea46c04d40e888ea4c05ac2a68a0ea..7a0b25ad51a5464d6b400705ddc60aff55bad3ff 100644
(file)
--- a/
arch/arm/mach-uniphier/Makefile
+++ b/
arch/arm/mach-uniphier/Makefile
@@
-4,26
+4,30
@@
ifdef CONFIG_SPL_BUILD
ifdef CONFIG_SPL_BUILD
+obj-y += boards.o
obj-y += spl_board_init.o
obj-y += memconf.o
obj-y += bcu/
obj-y += spl_board_init.o
obj-y += memconf.o
obj-y += bcu/
+obj-$(CONFIG_SPL_MMC_SUPPORT) += mmc-boot-mode.o
else
else
-obj-$(CONFIG_DISPLAY_CPUINFO) += cpu
_
info.o
+obj-$(CONFIG_DISPLAY_CPUINFO) += cpu
-
info.o
obj-y += dram_init.o
obj-y += board_init.o
obj-$(CONFIG_BOARD_LATE_INIT) += board_late_init.o
obj-y += dram_init.o
obj-y += board_init.o
obj-$(CONFIG_BOARD_LATE_INIT) += board_late_init.o
+ifndef CONFIG_SYSRESET
obj-y += reset.o
obj-y += reset.o
+endif
obj-$(CONFIG_MICRO_SUPPORT_CARD) += sbc/ micro-support-card.o
obj-y += pinctrl-glue.o
obj-$(CONFIG_MICRO_SUPPORT_CARD) += sbc/ micro-support-card.o
obj-y += pinctrl-glue.o
+obj-$(CONFIG_MMC) += mmc-first-dev.o
endif
endif
-obj-y += boards.o
-obj-y += soc_info.o
-obj-y += boot-mode/
+obj-y += soc-info.o
+obj-y += boot-device/
obj-y += clk/
obj-y += dram/
obj-y += clk/
obj-y += dram/