From: Rafał Miłecki <rafal@milecki.pl>
Date: Fri, 24 Dec 2021 22:07:39 +0000 (+0100)
Subject: bcm4908: include ATF in bootfs images
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=65974aa18bf49005509e0c31ee3f3aa6fb186015;p=openwrt%2Fstaging%2Frobimarko.git

bcm4908: include ATF in bootfs images

It's required for proper booting.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---

diff --git a/target/linux/bcm4908/image/Makefile b/target/linux/bcm4908/image/Makefile
index 17b5ba960d..91b48291bc 100644
--- a/target/linux/bcm4908/image/Makefile
+++ b/target/linux/bcm4908/image/Makefile
@@ -9,6 +9,7 @@ DEVICE_VARS += PKGTB_ITS
 
 define Image/Prepare
 	cp bootfs-generic.its $(KDIR)/
+	sed -i "s=\$$$${images_dir}=$(STAGING_DIR_IMAGE)=" $(KDIR)/bootfs-generic.its
 	sed -i "s=\$$$${dts_dir}=$(DTS_DIR)=" $(KDIR)/bootfs-generic.its
 endef
 
diff --git a/target/linux/bcm4908/image/bootfs-generic.its b/target/linux/bcm4908/image/bootfs-generic.its
index 6d8b3394ae..3cde532d72 100644
--- a/target/linux/bcm4908/image/bootfs-generic.its
+++ b/target/linux/bcm4908/image/bootfs-generic.its
@@ -7,6 +7,21 @@
 	#address-cells = <1>;
 
 	images {
+		atf {
+			description = "ATF";
+			data = /incbin/("${images_dir}/bl31.bin");
+			type = "firmware";
+			arch = "arm64";
+			os = "arm-trusted-firmware";
+			compression = "none";
+			load = <0x4000>;
+			entry = <0x4000>;
+
+			hash-1 {
+				algo = "sha256";
+			};
+		};
+
 		kernel {
 			description = "Linux kernel";
 			data = /incbin/("${kernel}");