From: Wojciech Dubowik <Wojciech.Dubowik@protonmail.ch>
Date: Wed, 12 Apr 2023 09:20:37 +0000 (+0200)
Subject: uboot-layerscape: Bump to lf-6.1.1-1.0.0 and switch to github
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=69c430aa2c6505772aa331f6c5c10362565af5e3;p=openwrt%2Fstaging%2Fneocturne.git

uboot-layerscape: Bump to lf-6.1.1-1.0.0 and switch to github

The default location of uboot-layerscape has been changed
from codeuaurora to github. Also use the latest tag for
Layerscape Linux Development POC from NXP.

Tested on:
  * NXP FRWY-LS1012A
  * NXP LS1028A-RDB
  * NXP LS1046A-RDB

V2: Remove ls1028ardb specifix fixups not needed with new uboot

Signed-off-by: Wojciech Dubowik <Wojciech.Dubowik@protonmail.ch>
(reset PKG_RELEASE)
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
---

diff --git a/package/boot/uboot-layerscape/Makefile b/package/boot/uboot-layerscape/Makefile
index 044a788d6e..e255debfeb 100644
--- a/package/boot/uboot-layerscape/Makefile
+++ b/package/boot/uboot-layerscape/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uboot-layerscape
-PKG_VERSION:=21.08
-PKG_RELEASE:=7
+PKG_VERSION:=lf-6.1.1-1.0.0
+PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://source.codeaurora.org/external/qoriq/qoriq-components/u-boot
-PKG_SOURCE_VERSION:=LSDK-21.08
-PKG_MIRROR_HASH:=54909a98bdcc26c7f9b35b35fcae09b977ecbf044be7bffa6dad9306c47cccf6
+PKG_SOURCE_URL:=https://github.com/nxp-qoriq/u-boot
+PKG_SOURCE_VERSION:=lf-6.1.1-1.0.0
+PKG_MIRROR_HASH:=f4a3a262fd8923af72dede0348a512c05b756e3925279553eaf1c6667b186fb4
 
 include $(INCLUDE_DIR)/u-boot.mk
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/boot/uboot-layerscape/patches/0003-avoid-calling-sec-firmware-get-random-when-no-kaslr-seed.patch b/package/boot/uboot-layerscape/patches/0003-avoid-calling-sec-firmware-get-random-when-no-kaslr-seed.patch
deleted file mode 100644
index 681ec90f1c..0000000000
--- a/package/boot/uboot-layerscape/patches/0003-avoid-calling-sec-firmware-get-random-when-no-kaslr-seed.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: uboot-layerscape-lf-6.1.1-1.0.0/arch/arm/cpu/armv8/sec_firmware.c
-===================================================================
---- uboot-layerscape-lf-6.1.1-1.0.0.orig/arch/arm/cpu/armv8/sec_firmware.c
-+++ uboot-layerscape-lf-6.1.1-1.0.0/arch/arm/cpu/armv8/sec_firmware.c
-@@ -473,12 +473,6 @@ int fdt_fixup_kaslr(void *fdt)
- 		return 0;
- 	}
- 
--	ret = sec_firmware_get_random(rand, 8);
--	if (ret < 0) {
--		printf("WARNING: No random number to set kaslr-seed\n");
--		return 0;
--	}
--
- 	err = fdt_check_header(fdt);
- 	if (err < 0) {
- 		printf("fdt_chosen: %s\n", fdt_strerror(err));
-@@ -490,6 +484,15 @@ int fdt_fixup_kaslr(void *fdt)
- 	if (nodeoffset < 0)
- 		return 0;
- 
-+	if (fdt_find_or_add_subnode(fdt, nodeoffset, "kaslr-seed"))
-+		return 0;
-+
-+	ret = sec_firmware_get_random(rand, 8);
-+	if (ret < 0) {
-+		printf("WARNING: No random number to set kaslr-seed\n");
-+		return 0;
-+	}
-+
- 	err = fdt_setprop(fdt, nodeoffset, "kaslr-seed", rand,
- 				  sizeof(rand));
- 	if (err < 0) {
diff --git a/package/boot/uboot-layerscape/patches/0004-disable-gic-initialization-for-ls1028ardb.patch b/package/boot/uboot-layerscape/patches/0004-disable-gic-initialization-for-ls1028ardb.patch
deleted file mode 100644
index 72011ae3a9..0000000000
--- a/package/boot/uboot-layerscape/patches/0004-disable-gic-initialization-for-ls1028ardb.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/configs/ls1028ardb_tfa_defconfig
-+++ b/configs/ls1028ardb_tfa_defconfig
-@@ -1,5 +1,4 @@
- CONFIG_ARM=y
--CONFIG_GIC_V3_ITS=y
- CONFIG_TARGET_LS1028ARDB=y
- CONFIG_TFABOOT=y
- CONFIG_SYS_MALLOC_F_LEN=0x6000