| Message ID | 20240618095334.47722-2-naoki@radxa.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | [v2,1/3] configs: rockchip: reduce diff for rk3308, rk3328, rk3399, rk3568, and rk3588 | expand |
On 2024/6/18 17:53, FUKAUMI Naoki wrote: > - 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> Thanks, - Kever > > Changes in v2: > - minor cosmetic change in commit message > --- > include/configs/rk3308_common.h | 12 ++++++++---- > include/configs/rk3328_common.h | 5 ++++- > include/configs/rk3399_common.h | 4 ++-- > 3 files changed, 14 insertions(+), 7 deletions(-) > > diff --git a/include/configs/rk3308_common.h b/include/configs/rk3308_common.h > index 80113220e4..2de55538fd 100644 > --- 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 f9e6634c5f..bd2bfe2910 100644 > --- 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 62007c8b27..d652ae4ca3 100644 > --- 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" \
diff --git a/include/configs/rk3308_common.h b/include/configs/rk3308_common.h index 80113220e4..2de55538fd 100644 --- 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 f9e6634c5f..bd2bfe2910 100644 --- 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 62007c8b27..d652ae4ca3 100644 --- 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" \
- 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> Changes in v2: - minor cosmetic change in commit message --- include/configs/rk3308_common.h | 12 ++++++++---- include/configs/rk3328_common.h | 5 ++++- include/configs/rk3399_common.h | 4 ++-- 3 files changed, 14 insertions(+), 7 deletions(-)