ARM: rmobile: Convert to bootm_size

Convert all Renesas R-Car boards to bootm_size of 256 MiB and drop both
fdt_high and initrd_high. This change implies that the FDT and initrd
will always be copied into the first 256 MiB of RAM instead of being
used in place, which can cause various kinds of inobvious problems.

The simpler problems include FDT or initrd being overwritten or being
used from unaligned addresses, especially on ARM64. The overhead of
copying the FDT to aligned location is negligible and these problems
go away, so the benefit is significant.

Regarding alignment problems with fitImage. The alignment of DT properties
is always 32 bits, which implies that the alignment of the "data" property
in fitImage is also 32 bits. The /incbin/ syntax plays no role here. The
kernel expects all elements, including DT and initrd, to be aligned to
64 bits on ARM64, thus using them in place may not be possible. Using the
bootm_size assures correct alignment, again with negligible overhead.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Cc: Tom Rini <trini@konsulko.com>

diff --git a/include/configs/alt.h b/include/configs/alt.h
index cc6a7bf..3f7f379 100644 (file)
--- a/include/configs/alt.h
+++ b/include/configs/alt.h
@@ -39,8 +39,7 @@
 #define CONFIG_SYS_CLK_FREQ    RMOBILE_XTAL_CLK
 
 #define CONFIG_EXTRA_ENV_SETTINGS      \
-       "fdt_high=0xffffffff\0"         \
-       "initrd_high=0xffffffff\0"
+       "bootm_size=0x10000000\0"
 
 /* SPL support */
 #define CONFIG_SPL_TEXT_BASE           0xe6300000

diff --git a/include/configs/gose.h b/include/configs/gose.h
index 36ac88a..8f0e378 100644 (file)
--- a/include/configs/gose.h
+++ b/include/configs/gose.h
@@ -35,8 +35,7 @@
 #define CONFIG_SYS_CLK_FREQ    RMOBILE_XTAL_CLK
 
 #define CONFIG_EXTRA_ENV_SETTINGS      \
-       "fdt_high=0xffffffff\0"         \
-       "initrd_high=0xffffffff\0"
+       "bootm_size=0x10000000\0"
 
 /* SPL support */
 #define CONFIG_SPL_TEXT_BASE           0xe6300000

diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h
index ef26a14..33c8bd4 100644 (file)
--- a/include/configs/koelsch.h
+++ b/include/configs/koelsch.h
@@ -35,8 +35,7 @@
 #define CONFIG_SYS_CLK_FREQ    RMOBILE_XTAL_CLK
 
 #define CONFIG_EXTRA_ENV_SETTINGS      \
-       "fdt_high=0xffffffff\0"         \
-       "initrd_high=0xffffffff\0"
+       "bootm_size=0x10000000\0"
 
 /* SPL support */
 #define CONFIG_SPL_TEXT_BASE           0xe6300000

diff --git a/include/configs/lager.h b/include/configs/lager.h
index 08498c6..89c5d01 100644 (file)
--- a/include/configs/lager.h
+++ b/include/configs/lager.h
@@ -36,8 +36,7 @@
 #define CONFIG_SYS_CLK_FREQ    RMOBILE_XTAL_CLK
 
 #define CONFIG_EXTRA_ENV_SETTINGS      \
-       "fdt_high=0xffffffff\0"         \
-       "initrd_high=0xffffffff\0"
+       "bootm_size=0x10000000\0"
 
 /* SPL support */
 #define CONFIG_SPL_TEXT_BASE           0xe6300000

diff --git a/include/configs/porter.h b/include/configs/porter.h
index e56dc3f..9950f80 100644 (file)
--- a/include/configs/porter.h
+++ b/include/configs/porter.h
@@ -40,8 +40,7 @@
 #define CONFIG_SYS_CLK_FREQ    RMOBILE_XTAL_CLK
 
 #define CONFIG_EXTRA_ENV_SETTINGS      \
-       "fdt_high=0xffffffff\0"         \
-       "initrd_high=0xffffffff\0"
+       "bootm_size=0x10000000\0"
 
 /* SPL support */
 #define CONFIG_SPL_TEXT_BASE           0xe6300000

diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h
index 435d108..6c2fa6a 100644 (file)
--- a/include/configs/rcar-gen3-common.h
+++ b/include/configs/rcar-gen3-common.h
@@ -59,8 +59,7 @@
 #define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)
 
 #define CONFIG_EXTRA_ENV_SETTINGS      \
-       "fdt_high=0xffffffffffffffff\0" \
-       "initrd_high=0xffffffffffffffff\0"
+       "bootm_size=0x10000000\0"
 
 #define CONFIG_BOOTCOMMAND     \
        "tftp 0x48080000 Image; " \

diff --git a/include/configs/silk.h b/include/configs/silk.h
index a94928b..112806c 100644 (file)
--- a/include/configs/silk.h
+++ b/include/configs/silk.h
@@ -40,8 +40,7 @@
 #define CONFIG_SYS_CLK_FREQ    RMOBILE_XTAL_CLK
 
 #define CONFIG_EXTRA_ENV_SETTINGS      \
-       "fdt_high=0xffffffff\0"         \
-       "initrd_high=0xffffffff\0"
+       "bootm_size=0x10000000\0"
 
 /* SPL support */
 #define CONFIG_SPL_TEXT_BASE           0xe6300000

diff --git a/include/configs/stout.h b/include/configs/stout.h
index b72b565..93d9805 100644 (file)
--- a/include/configs/stout.h
+++ b/include/configs/stout.h
@@ -44,8 +44,7 @@
 #define CONFIG_SYS_CLK_FREQ    RMOBILE_XTAL_CLK
 
 #define CONFIG_EXTRA_ENV_SETTINGS      \
-       "fdt_high=0xffffffff\0"         \
-       "initrd_high=0xffffffff\0"
+       "bootm_size=0x10000000\0"
 
 /* SPL support */
 #define CONFIG_SPL_TEXT_BASE           0xe6300000