projects / platform / kernel / u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0852033)
ARM: uniphier: fix build error when CONFIG_MICRO_SUPPORT_CARD=n
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Thu, 9 Jul 2020 06:08:15 +0000 (15:08 +0900)
committerMasahiro Yamada <yamada.masahiro@socionext.com>
Sat, 11 Jul 2020 12:30:21 +0000 (21:30 +0900)
If CONFIG_MICRO_SUPPORT_CARD is unset, the build fails due to
function redefinition.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
arch/arm/mach-uniphier/sbc/Makefile patch | blob | history

diff --git a/arch/arm/mach-uniphier/sbc/Makefile b/arch/arm/mach-uniphier/sbc/Makefile
index 6c698a3..1bc912c 100644 (file)
--- a/arch/arm/mach-uniphier/sbc/Makefile
+++ b/arch/arm/mach-uniphier/sbc/Makefile
@@ -3,6 +3,7 @@
 obj-y                                  += sbc-boot.o
 
 ifndef CONFIG_SPL_BUILD
+ifdef CONFIG_MICRO_SUPPORT_CARD
 obj-y                                  += sbc.o
 
 obj-$(CONFIG_ARCH_UNIPHIER_LD4)                += sbc-ld4.o
@@ -13,3 +14,4 @@ obj-$(CONFIG_ARCH_UNIPHIER_LD11)      += sbc-ld11.o
 obj-$(CONFIG_ARCH_UNIPHIER_LD20)       += sbc-ld11.o
 obj-$(CONFIG_ARCH_UNIPHIER_PXS3)       += sbc-pxs2.o
 endif
+endif
Domain: System / Kernel;