bcm4908: include ATF in bootfs images

It's required for proper booting.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit 65974aa18bf49005509e0c31ee3f3aa6fb186015)

diff --git a/target/linux/bcm4908/image/Makefile b/target/linux/bcm4908/image/Makefile
index 09a8ddedeed986cdaf9cf4f18148aa113233c587..93a28b7e9d0b9e7eb71c1c5d7e35b055b0dfba8c 100644 (file)
--- 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 6d8b3394ae1184cc2b3fa5466b3f395241c2e097..3cde532d7265d029ce6e54f63fef10636858fd96 100644 (file)
--- 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}");