diff mbox series

[05/10] ARM: uniphier: fix build error when CONFIG_MICRO_SUPPORT_CARD=n

Message ID 20200709060820.121087-5-yamada.masahiro@socionext.com
State Accepted
Commit 43db571b2dafd6f6ef24c03e29c08f5e9a98f3e3
Headers show
Series [01/10] Revert "ARM: uniphier: add weird workaround code for LD20" | expand

Commit Message

Masahiro Yamada July 9, 2020, 6:08 a.m. UTC 
If CONFIG_MICRO_SUPPORT_CARD is unset, the build fails due to
function redefinition.

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

 arch/arm/mach-uniphier/sbc/Makefile | 2 ++
 1 file changed, 2 insertions(+)
diff mbox series

Patch

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