configs: rockchip: sync ENV_MEM_LAYOUT_SETTINGS for rk3308, rk3328, and rk3399

- add support for compressed kernel for rk3308
- prepare support for fdtoverlay for rk3328

tested on ROCK Pi S 256MB, ROCK Pi E 2GB, and ROCK Pi 4A 4GB with
linux-next-20240613 defconfig kernel.

Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

diff --git a/include/configs/rk3308_common.h b/include/configs/rk3308_common.h
index 80113220e40b1fc9e72f611c1dd27bb4136567b6..2de55538fdf1ee9192ce925c8116c5e39943d7ea 100644 (file)
--- a/include/configs/rk3308_common.h
+++ b/include/configs/rk3308_common.h
@@ -15,11 +15,15 @@
 
 #define ENV_MEM_LAYOUT_SETTINGS                \
        "scriptaddr=0x00500000\0"       \
+       "script_offset_f=0xffe000\0"    \
+       "script_size_f=0x2000\0"        \
        "pxefile_addr_r=0x00600000\0"   \
-       "fdt_addr_r=0x03e00000\0"       \
-       "fdtoverlay_addr_r=0x03f00000\0"        \
-       "kernel_addr_r=0x00680000\0"    \
-       "ramdisk_addr_r=0x04000000\0"
+       "fdt_addr_r=0x01e00000\0"       \
+       "fdtoverlay_addr_r=0x01f00000\0"        \
+       "kernel_addr_r=0x02080000\0"    \
+       "ramdisk_addr_r=0x06000000\0"   \
+       "kernel_comp_addr_r=0x08000000\0"       \
+       "kernel_comp_size=0x2000000\0"
 
 #define CFG_EXTRA_ENV_SETTINGS         \
        "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \

diff --git a/include/configs/rk3328_common.h b/include/configs/rk3328_common.h
index f9e6634c5fa530c7a0352f73e8564fd2600560df..bd2bfe291033657126e63f92393f8c7ac91368e6 100644 (file)
--- a/include/configs/rk3328_common.h
+++ b/include/configs/rk3328_common.h
@@ -15,8 +15,11 @@
 
 #define ENV_MEM_LAYOUT_SETTINGS                \
        "scriptaddr=0x00500000\0"       \
+       "script_offset_f=0xffe000\0"    \
+       "script_size_f=0x2000\0"        \
        "pxefile_addr_r=0x00600000\0"   \
-       "fdt_addr_r=0x01f00000\0"       \
+       "fdt_addr_r=0x01e00000\0"       \
+       "fdtoverlay_addr_r=0x01f00000\0"        \
        "kernel_addr_r=0x02080000\0"    \
        "ramdisk_addr_r=0x06000000\0"   \
        "kernel_comp_addr_r=0x08000000\0"       \

diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h
index 62007c8b27ffc3514002b962f77cb5b504cc1f17..d652ae4ca34a469846d541513d5a3e6c7cc9dda0 100644 (file)
--- a/include/configs/rk3399_common.h
+++ b/include/configs/rk3399_common.h
@@ -24,8 +24,8 @@
        "script_offset_f=0xffe000\0"    \
        "script_size_f=0x2000\0"        \
        "pxefile_addr_r=0x00600000\0"   \
-       "fdt_addr_r=0x01f00000\0"       \
-       "fdtoverlay_addr_r=0x02000000\0"        \
+       "fdt_addr_r=0x01e00000\0"       \
+       "fdtoverlay_addr_r=0x01f00000\0"        \
        "kernel_addr_r=0x02080000\0"    \
        "ramdisk_addr_r=0x06000000\0"   \
        "kernel_comp_addr_r=0x08000000\0"       \