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

Masahiro Yamada yamada.masahiro at socionext.com
Thu Jul 9 08:08:15 CEST 2020


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 --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
-- 
2.25.1



More information about the U-Boot mailing list