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 cc6a7bf6387f639938d43feda4e21d320255a74b..3f7f379e06c4ff6d87652f9f6ec8f42d10f10910 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 36ac88a20df65e8c50423a04e4c06640a49902a6..8f0e37848819586c15b8e5639ed4ad2bee7e06a7 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 ef26a144a95c0d4a87196e37be520293c7aea1b2..33c8bd414976f02f30863d05deccf4a41122a8b9 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 08498c6d810519f8e76696224e895f2b28903a89..89c5d01d3c5c80d5d99f505ed5ba5ee4ad140146 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 e56dc3f1ec62f421e4133293b83ac41b2dca6902..9950f80afd7d08e3eb8d6faa79425e6ae207191e 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 435d1086285b4a843e43ac85728f9826ea3910c5..6c2fa6a63cdea3f6770d62ca84f4ff5dd4d1f3d4 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 a94928bd16959a348bdc5f5714b172023d11af13..112806c342b7de5936e510a0984ce6a273f33c5b 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 b72b565c33df5ae6fee2ac713622721fa288d523..93d980569c9971ea439e914395e134781392af35 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