[PATCH 2/2] arm64: renesas: Switch R-Car V4H to renesas_rcar4_sa0 binman etype

[Marek Vasut]

Replace current ad-hoc generation of SA0 header with renesas_rcar4_sa0 binman
etype on Renesas R-Car V4H. The new binman etype generates header which is
almost identical to the current ad-hoc SA0 header, with one difference, the
load length matches the actual payload size, which slightly improves boot time.

Signed-off-by: Marek Vasut <marek.vasut+renesas at mailbox.org>
---
Cc: Ilias Apalodimas <ilias.apalodimas at linaro.org>
Cc: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
Cc: Simon Glass <sjg at chromium.org>
Cc: Tom Rini <trini at konsulko.com>
Cc: u-boot at lists.denx.de
---
 arch/arm/dts/r8a779g0-u-boot.dtsi | 78 ++++++-------------------------
 1 file changed, 15 insertions(+), 63 deletions(-)

diff --git a/arch/arm/dts/r8a779g0-u-boot.dtsi b/arch/arm/dts/r8a779g0-u-boot.dtsi
index cc9d99b0f34..83f67876d87 100644
--- a/arch/arm/dts/r8a779g0-u-boot.dtsi
+++ b/arch/arm/dts/r8a779g0-u-boot.dtsi
@@ -9,73 +9,25 @@
 
 / {
 	binman: binman {
-		multiple-images;
-
 		section {
 			filename = "flash.bin";
 			pad-byte = <0xff>;
 
-			/* Offset 0x0000 set to 0x0000_0000 */
-			fill at 0 {
-				offset = <0x0>;
-				size = <0x4>;
-				fill-byte = [00];
-			};
-
-			/* Offset 0x300c set to 0x0000_0000 */
-			fill at 300c {
-				offset = <0x300c>;
-				size = <0x4>;
-				fill-byte = [00];
-			};
-
-			/* Offset 0x3154 set to 0xeb21_0000 */
-			fill at 3154 {
-				offset = <0x3154>;
-				size = <0x2>;
-				fill-byte = [00];
-			};
-
-			fill at 3156 {
-				offset = <0x3156>;
-				size = <0x1>;
-				fill-byte = [21];
-			};
-
-			fill at 3157 {
-				offset = <0x3157>;
-				size = <0x1>;
-				fill-byte = [eb];
-			};
-
-			/* Offset 0x3264 set to 0x0003_b000 */
-			fill at 3264 {
-				offset = <0x3264>;
-				size = <0x1>;
-				fill-byte = [00];
-			};
-
-			fill at 3265 {
-				offset = <0x3265>;
-				size = <0x1>;
-				fill-byte = [b0];
-			};
-
-			fill at 3266 {
-				offset = <0x3266>;
-				size = <0x1>;
-				fill-byte = [03];
-			};
-
-			fill at 3267 {
-				offset = <0x3267>;
-				size = <0x1>;
-				fill-byte = [00];
-			};
-
-			u-boot-spl {
-				offset = <0x40000>;
-				align-end = <4>;
+			renesas-rcar4-sa0 {
+				filename = "sa0.bin";
+				pad-byte = <0xff>;
+				renesas,loader-address = <CONFIG_SPL_TEXT_BASE>;
+
+				/*
+				 * This section starts after 0x40000 Bytes long
+				 * header added by the renesas-rcar4-sa0 binman
+				 * etype. That means u-boot-spl {} below starts
+				 * at offset 0x40000 in flash.bin .
+				 */
+				u-boot-spl {
+					offset = <0x40000>;
+					align-end = <4>;
+				};
 			};
 
 			u-boot {
-- 
2.47.2