From e8a806c49e8b5ee0e6c6c79e9c875d47a9349ab7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
Date: Fri, 4 Mar 2022 09:39:05 +0100
Subject: [PATCH] bcm4908: include U-Boot in images
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a step forward in adding support for devices with U-Boot.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit 34fd5e325af5cbcb64696c9b4b1660f22299790f)
---
 target/linux/bcm4908/image/bootfs-generic.its | 35 +++++++++++++++++--
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/target/linux/bcm4908/image/bootfs-generic.its b/target/linux/bcm4908/image/bootfs-generic.its
index 3cde532d72..bd566d5d22 100644
--- a/target/linux/bcm4908/image/bootfs-generic.its
+++ b/target/linux/bcm4908/image/bootfs-generic.its
@@ -22,6 +22,20 @@
 			};
 		};
 
+		uboot {
+			description = "U-Boot";
+			data = /incbin/("${images_dir}/u-boot/u-boot-nodtb.bin");
+			os = "U-Boot";
+			arch = "arm64";
+			compression = "none";
+			load = <0x1000000>;
+			entry = <0x1000000>;
+
+			hash-1 {
+				algo = "sha256";
+			};
+		};
+
 		kernel {
 			description = "Linux kernel";
 			data = /incbin/("${kernel}");
@@ -37,10 +51,9 @@
 			};
 		};
 
-		fdt_linux_RAX220 {
+		fdt_uboot {
 			description = "dtb";
-			data = /incbin/("${dts_dir}/broadcom/bcm4908/bcm4908-netgear-raxe500.dtb");
-			arch = "arm64";
+			data = /incbin/("${images_dir}/u-boot/u-boot.dtb");
 			type = "flat_dt";
 			compression = "none";
 
@@ -48,9 +61,25 @@
 				algo = "sha256";
 			};
 		};
+
+		fdt_linux_RAX220 {
+			description = "dtb";
+			data = /incbin/("${dts_dir}/broadcom/bcm4908/bcm4908-netgear-raxe500.dtb");
+			arch = "arm64";
+			type = "flat_dt";
+			compression = "none";
+		};
 	};
 
 	configurations {
+		default = "conf_uboot";
+
+		conf_uboot {
+			description = "BRCM 63xxx with uboot";
+			fdt = "fdt_uboot";
+			loadables = "atf", "uboot";
+		};
+
 		conf_lx_RAX220 {
 			description = "BRCM 63xxx linux";
 			kernel = "kernel";