From c3301c42dbb4af7476897efbd0b5f0c7f8403711 Mon Sep 17 00:00:00 2001
From: Fabio Berton <fabio.berton@ossystems.com.br>
Date: Mon, 24 Aug 2020 13:20:10 -0300
Subject: [PATCH] u-boot-variscite: Update to version 2018.03

  - Update to the latest stable release
  - Drop unused patch
  - Adjust recipe to build with newer Yocto Project
    versions (Gatesgarth and Dunfell)

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
---
 .../0001-Fix-build-with-recent-layers.patch   | 34 -------------------
 ...2017.03.bb => u-boot-variscite_2018.03.bb} |  8 ++---
 2 files changed, 3 insertions(+), 39 deletions(-)
 delete mode 100644 recipes-bsp/u-boot/u-boot-variscite/0001-Fix-build-with-recent-layers.patch
 rename recipes-bsp/u-boot/{u-boot-variscite_2017.03.bb => u-boot-variscite_2018.03.bb} (70%)

diff --git a/recipes-bsp/u-boot/u-boot-variscite/0001-Fix-build-with-recent-layers.patch b/recipes-bsp/u-boot/u-boot-variscite/0001-Fix-build-with-recent-layers.patch
deleted file mode 100644
index dba4dc1..0000000
--- a/recipes-bsp/u-boot/u-boot-variscite/0001-Fix-build-with-recent-layers.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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
-
diff --git a/recipes-bsp/u-boot/u-boot-variscite_2017.03.bb b/recipes-bsp/u-boot/u-boot-variscite_2018.03.bb
similarity index 70%
rename from recipes-bsp/u-boot/u-boot-variscite_2017.03.bb
rename to recipes-bsp/u-boot/u-boot-variscite_2018.03.bb
index c529e56..1601faa 100644
--- a/recipes-bsp/u-boot/u-boot-variscite_2017.03.bb
+++ b/recipes-bsp/u-boot/u-boot-variscite_2018.03.bb
@@ -12,14 +12,12 @@ PROVIDES += "u-boot"
 
 SPL_BINARY = "SPL"
 
-SRCREV = "a7869c2cde98e5f5b1886d8f54dff321a7aa0597"
-SRCBRANCH = "imx_v2017.03_4.9.11_1.0.0_ga_var01"
+SRCREV = "717f29898abe82ffa2d74515806c46094075285a"
+SRCBRANCH = "imx_v2018.03_4.14.78_1.0.0_ga_var02"
 
 SRC_URI = "\
     git://github.com/varigit/uboot-imx.git;protocol=git;branch=${SRCBRANCH} \
-    file://0001-Fix-build-with-recent-layers.patch \
 "
 
 S = "${WORKDIR}/git"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
+B = "${WORKDIR}/build"