rockchip: rk35xx: expand space for decompressed kernel

An uncompressed 6.7.0-rc1 Linux kernel Image built with the arm64
defconfig is about 40MB. This does not fit in to the space between
kernel_comp_addr_r and fdt_addr_r, so when uncompressing an Image.gz
to this size, the FDT will be overwritten. Rearrange addresses to have
128MiB for the kernel and its decompression buffer, then devicetree,
overlay and ramdisk at the end.

Signed-off-by: Hugh Cole-Baker <sigmaris@gmail.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

diff --git a/include/configs/rk3568_common.h b/include/configs/rk3568_common.h
index 1b7d343..48f9308 100644 (file)
--- a/include/configs/rk3568_common.h
+++ b/include/configs/rk3568_common.h
@@ -20,12 +20,12 @@
        "script_offset_f=0xffe000\0"    \
        "script_size_f=0x2000\0"        \
        "pxefile_addr_r=0x00e00000\0"   \
-       "fdt_addr_r=0x0a100000\0"       \
-       "fdtoverlay_addr_r=0x02000000\0"        \
-       "kernel_addr_r=0x02080000\0"    \
-       "ramdisk_addr_r=0x0a200000\0"   \
-       "kernel_comp_addr_r=0x08000000\0"       \
-       "kernel_comp_size=0x2000000\0"
+       "kernel_addr_r=0x02000000\0"    \
+       "kernel_comp_addr_r=0x0a000000\0"       \
+       "fdt_addr_r=0x12000000\0"       \
+       "fdtoverlay_addr_r=0x12100000\0"        \
+       "ramdisk_addr_r=0x12180000\0"   \
+       "kernel_comp_size=0x8000000\0"
 
 #define CFG_EXTRA_ENV_SETTINGS         \
        ENV_MEM_LAYOUT_SETTINGS                 \

diff --git a/include/configs/rk3588_common.h b/include/configs/rk3588_common.h
index 46389d0..7043061 100644 (file)
--- a/include/configs/rk3588_common.h
+++ b/include/configs/rk3588_common.h
@@ -19,12 +19,12 @@
        "script_offset_f=0xffe000\0"    \
        "script_size_f=0x2000\0"        \
        "pxefile_addr_r=0x00e00000\0"   \
-       "fdt_addr_r=0x0a100000\0"       \
-       "fdtoverlay_addr_r=0x02000000\0"        \
-       "kernel_addr_r=0x02080000\0"    \
-       "ramdisk_addr_r=0x0a200000\0"   \
-       "kernel_comp_addr_r=0x08000000\0"       \
-       "kernel_comp_size=0x2000000\0"
+       "kernel_addr_r=0x02000000\0"    \
+       "kernel_comp_addr_r=0x0a000000\0"       \
+       "fdt_addr_r=0x12000000\0"       \
+       "fdtoverlay_addr_r=0x12100000\0"        \
+       "ramdisk_addr_r=0x12180000\0"   \
+       "kernel_comp_size=0x8000000\0"
 
 #define CFG_EXTRA_ENV_SETTINGS \
        "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \