u-boot-variscite: Fix build for recent layers

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller 2020-01-03 14:19:34 +01:00 committed by Otavio Salvador
parent aea3771baa
commit fdc6360b8f
2 changed files with 35 additions and 0 deletions

View File

@ -0,0 +1,34 @@
From 8c3356f5328d3e48709ed7483564a1cd79e387cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Fri, 3 Jan 2020 14:04:46 +0100
Subject: [PATCH] Fix build with recent layers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Fixes:
arm-mortsgna-linux-gnueabi-ld.bfd: error: linker script file '<workdir>/git/arch/arm/lib/elf_arm_efi.lds' appears multiple times
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
scripts/Makefile.lib | 2 --
1 file changed, 2 deletions(-)
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 23be324369..a32daa4394 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -377,8 +377,6 @@ cmd_efi_ld = $(LD) -nostdlib -znocombreloc -T $(EFI_LDS_PATH) -shared \
EFI_LDS_PATH = $(srctree)/arch/$(ARCH)/lib/$(EFI_LDS)
-$(obj)/helloworld.so: $(EFI_LDS_PATH)
-
$(obj)/helloworld.so: $(obj)/helloworld.o arch/$(ARCH)/lib/$(EFI_CRT0) \
arch/$(ARCH)/lib/$(EFI_RELOC)
$(call cmd,efi_ld)
--
2.21.0

View File

@ -14,6 +14,7 @@ SRCBRANCH = "imx_v2017.03_4.9.11_1.0.0_ga_var01"
SRC_URI = "\
git://github.com/varigit/uboot-imx.git;protocol=git;branch=${SRCBRANCH} \
file://0001-Fix-build-with-recent-layers.patch \
"
S = "${WORKDIR}/git"