arm64: renesas: Switch R-Car V4H to renesas_rcar4_sa0 binman etype

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@mailbox.org>

diff --git a/arch/arm/dts/r8a779g0-u-boot.dtsi b/arch/arm/dts/r8a779g0-u-boot.dtsi
index 5aa61314834ad3e8a6c8444c98ca303d0ee5dc10..bd6a3d0713f32b46699a07d95a94b3828f02dac2 100644 (file)
--- a/arch/arm/dts/r8a779g0-u-boot.dtsi
+++ b/arch/arm/dts/r8a779g0-u-boot.dtsi
@@ -7,73 +7,25 @@
 
 / {
        binman: binman {
-               multiple-images;
-
                section {
                        filename = "flash.bin";
                        pad-byte = <0xff>;
 
-                       /* Offset 0x0000 set to 0x0000_0000 */
-                       fill@0 {
-                               offset = <0x0>;
-                               size = <0x4>;
-                               fill-byte = [00];
-                       };
-
-                       /* Offset 0x300c set to 0x0000_0000 */
-                       fill@300c {
-                               offset = <0x300c>;
-                               size = <0x4>;
-                               fill-byte = [00];
-                       };
-
-                       /* Offset 0x3154 set to 0xeb21_0000 */
-                       fill@3154 {
-                               offset = <0x3154>;
-                               size = <0x2>;
-                               fill-byte = [00];
-                       };
-
-                       fill@3156 {
-                               offset = <0x3156>;
-                               size = <0x1>;
-                               fill-byte = [21];
-                       };
-
-                       fill@3157 {
-                               offset = <0x3157>;
-                               size = <0x1>;
-                               fill-byte = [eb];
-                       };
-
-                       /* Offset 0x3264 set to 0x0003_b000 */
-                       fill@3264 {
-                               offset = <0x3264>;
-                               size = <0x1>;
-                               fill-byte = [00];
-                       };
-
-                       fill@3265 {
-                               offset = <0x3265>;
-                               size = <0x1>;
-                               fill-byte = [b0];
-                       };
-
-                       fill@3266 {
-                               offset = <0x3266>;
-                               size = <0x1>;
-                               fill-byte = [03];
-                       };
-
-                       fill@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 {