From: Masahiro Yamada <yamada.masahiro@socionext.com>
Date: Thu, 9 Jul 2020 06:08:15 +0000 (+0900)
Subject: ARM: uniphier: fix build error when CONFIG_MICRO_SUPPORT_CARD=n
X-Git-Tag: v2025.01-rc5-pxa1908~2312^2~11
X-Git-Url: http://git.dujemihanovic.xyz/html/static/git-logo.png?a=commitdiff_plain;h=43db571b2dafd6f6ef24c03e29c08f5e9a98f3e3;p=u-boot.git

ARM: uniphier: fix build error when CONFIG_MICRO_SUPPORT_CARD=n

If CONFIG_MICRO_SUPPORT_CARD is unset, the build fails due to
function redefinition.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

diff --git a/arch/arm/mach-uniphier/sbc/Makefile b/arch/arm/mach-uniphier/sbc/Makefile
index 6c698a3922..1bc912c939 100644
--- 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