| Message ID | 20240618010548.1379-1-naoki@radxa.com |
|---|---|
| State | Superseded |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | [1/3] configs: rockchip: cosmetic changes for rk3308, rk3328, rk3399, rk3568, and rk3588 | expand |
On Tue, 18 Jun 2024 at 02:06, FUKAUMI Naoki <naoki@radxa.com> wrote: > > no functional change is intended. Can you please explain what the patch is doing then, the subject of "cosmetic changes for rk3308, rk3328, rk3399, rk3568, and rk3588" doesn't really explain it either. Something like "adjust indentation for consistency" or what the patch actually does is useful. > Signed-off-by: FUKAUMI Naoki <naoki@radxa.com> > --- > include/configs/rk3308_common.h | 26 ++++++++++----------- > include/configs/rk3328_common.h | 28 +++++++++++------------ > include/configs/rk3399_common.h | 40 ++++++++++++++++----------------- > include/configs/rk3568_common.h | 14 ++++++------ > include/configs/rk3588_common.h | 12 +++++----- > 5 files changed, 60 insertions(+), 60 deletions(-) > > diff --git a/include/configs/rk3308_common.h b/include/configs/rk3308_common.h > index 861154fbeb..80113220e4 100644 > --- a/include/configs/rk3308_common.h > +++ b/include/configs/rk3308_common.h > @@ -8,24 +8,24 @@ > > #include "rockchip-common.h" > > -#define CFG_IRAM_BASE 0xfff80000 > +#define CFG_IRAM_BASE 0xfff80000 > > #define CFG_SYS_SDRAM_BASE 0 > #define SDRAM_MAX_SIZE 0xff000000 > > -#define ENV_MEM_LAYOUT_SETTINGS \ > - "scriptaddr=0x00500000\0" \ > - "pxefile_addr_r=0x00600000\0" \ > - "fdt_addr_r=0x03e00000\0" \ > - "fdtoverlay_addr_r=0x03f00000\0" \ > - "kernel_addr_r=0x00680000\0" \ > +#define ENV_MEM_LAYOUT_SETTINGS \ > + "scriptaddr=0x00500000\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" > > -#define CFG_EXTRA_ENV_SETTINGS \ > - "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ > - ENV_MEM_LAYOUT_SETTINGS \ > - "partitions=" PARTS_DEFAULT \ > - ROCKCHIP_DEVICE_SETTINGS \ > +#define CFG_EXTRA_ENV_SETTINGS \ > + "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ > + "partitions=" PARTS_DEFAULT \ > + ENV_MEM_LAYOUT_SETTINGS \ > + ROCKCHIP_DEVICE_SETTINGS \ > "boot_targets=" BOOT_TARGETS "\0" > > -#endif > +#endif /* __CONFIG_RK3308_COMMON_H */ > diff --git a/include/configs/rk3328_common.h b/include/configs/rk3328_common.h > index 2c40674b22..f9e6634c5f 100644 > --- a/include/configs/rk3328_common.h > +++ b/include/configs/rk3328_common.h > @@ -8,25 +8,25 @@ > > #include "rockchip-common.h" > > -#define CFG_IRAM_BASE 0xff090000 > +#define CFG_IRAM_BASE 0xff090000 > > #define CFG_SYS_SDRAM_BASE 0 > #define SDRAM_MAX_SIZE 0xff000000 > > -#define ENV_MEM_LAYOUT_SETTINGS \ > - "scriptaddr=0x00500000\0" \ > - "pxefile_addr_r=0x00600000\0" \ > - "fdt_addr_r=0x01f00000\0" \ > - "kernel_addr_r=0x02080000\0" \ > - "ramdisk_addr_r=0x06000000\0" \ > - "kernel_comp_addr_r=0x08000000\0" \ > +#define ENV_MEM_LAYOUT_SETTINGS \ > + "scriptaddr=0x00500000\0" \ > + "pxefile_addr_r=0x00600000\0" \ > + "fdt_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 \ > - ENV_MEM_LAYOUT_SETTINGS \ > - "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ > - "partitions=" PARTS_DEFAULT \ > - ROCKCHIP_DEVICE_SETTINGS \ > +#define CFG_EXTRA_ENV_SETTINGS \ > + "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ > + "partitions=" PARTS_DEFAULT \ > + ENV_MEM_LAYOUT_SETTINGS \ > + ROCKCHIP_DEVICE_SETTINGS \ > "boot_targets=" BOOT_TARGETS "\0" > > -#endif > +#endif /* __CONFIG_RK3328_COMMON_H */ > diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h > index 4e75771055..62007c8b27 100644 > --- a/include/configs/rk3399_common.h > +++ b/include/configs/rk3399_common.h > @@ -8,36 +8,36 @@ > > #include "rockchip-common.h" > > -#define CFG_IRAM_BASE 0xff8c0000 > +#define CFG_IRAM_BASE 0xff8c0000 > > #define CFG_SYS_SDRAM_BASE 0 > #define SDRAM_MAX_SIZE 0xf8000000 > > #ifndef CONFIG_SPL_BUILD > > -#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" \ > - "fdtoverlay_addr_r=0x02000000\0" \ > - "kernel_addr_r=0x02080000\0" \ > - "ramdisk_addr_r=0x06000000\0" \ > - "kernel_comp_addr_r=0x08000000\0" \ > - "kernel_comp_size=0x2000000\0" > - > #ifndef ROCKCHIP_DEVICE_SETTINGS > #define ROCKCHIP_DEVICE_SETTINGS > #endif > > -#define CFG_EXTRA_ENV_SETTINGS \ > - ENV_MEM_LAYOUT_SETTINGS \ > - "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ > - "partitions=" PARTS_DEFAULT \ > - ROCKCHIP_DEVICE_SETTINGS \ > +#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" \ > + "fdtoverlay_addr_r=0x02000000\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" \ > + "partitions=" PARTS_DEFAULT \ > + ENV_MEM_LAYOUT_SETTINGS \ > + ROCKCHIP_DEVICE_SETTINGS \ > "boot_targets=" BOOT_TARGETS "\0" > > -#endif > +#endif /* CONFIG_SPL_BUILD */ > > -#endif > +#endif /* __CONFIG_RK3399_COMMON_H */ > diff --git a/include/configs/rk3568_common.h b/include/configs/rk3568_common.h > index 48f93083de..09b7b71c6a 100644 > --- a/include/configs/rk3568_common.h > +++ b/include/configs/rk3568_common.h > @@ -1,4 +1,4 @@ > -/* SPDX-License-Identifier: GPL-2.0+ */ > +/* SPDX-License-Identifier: GPL-2.0+ */ > /* > * (C) Copyright 2021 Rockchip Electronics Co., Ltd > */ > @@ -10,7 +10,7 @@ > > #include "rockchip-common.h" > > -#define CFG_IRAM_BASE 0xfdcc0000 > +#define CFG_IRAM_BASE 0xfdcc0000 > > #define CFG_SYS_SDRAM_BASE 0 > #define SDRAM_MAX_SIZE 0xf0000000 > @@ -28,10 +28,10 @@ > "kernel_comp_size=0x8000000\0" > > #define CFG_EXTRA_ENV_SETTINGS \ > - ENV_MEM_LAYOUT_SETTINGS \ > - "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ > - "partitions=" PARTS_DEFAULT \ > - ROCKCHIP_DEVICE_SETTINGS \ > + "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ > + "partitions=" PARTS_DEFAULT \ > + ENV_MEM_LAYOUT_SETTINGS \ > + ROCKCHIP_DEVICE_SETTINGS \ > "boot_targets=" BOOT_TARGETS "\0" > > -#endif > +#endif /* __CONFIG_RK3568_COMMON_H */ > diff --git a/include/configs/rk3588_common.h b/include/configs/rk3588_common.h > index 70430612ef..e6654c275a 100644 > --- a/include/configs/rk3588_common.h > +++ b/include/configs/rk3588_common.h > @@ -1,4 +1,4 @@ > -/* SPDX-License-Identifier: GPL-2.0+ */ > +/* SPDX-License-Identifier: GPL-2.0+ */ > /* > * (C) Copyright 2021 Rockchip Electronics Co., Ltd > * Copyright (c) 2023 Edgeble AI Technologies Pvt. Ltd. > @@ -26,11 +26,11 @@ > "ramdisk_addr_r=0x12180000\0" \ > "kernel_comp_size=0x8000000\0" > > -#define CFG_EXTRA_ENV_SETTINGS \ > - "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ > - "partitions=" PARTS_DEFAULT \ > - ENV_MEM_LAYOUT_SETTINGS \ > - ROCKCHIP_DEVICE_SETTINGS \ > +#define CFG_EXTRA_ENV_SETTINGS \ > + "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ > + "partitions=" PARTS_DEFAULT \ > + ENV_MEM_LAYOUT_SETTINGS \ > + ROCKCHIP_DEVICE_SETTINGS \ > "boot_targets=" BOOT_TARGETS "\0" > > #endif /* __CONFIG_RK3588_COMMON_H */ > -- > 2.43.0 >
hi On 6/18/24 18:18, Peter Robinson wrote: > On Tue, 18 Jun 2024 at 02:06, FUKAUMI Naoki <naoki@radxa.com> wrote: >> >> no functional change is intended. > > Can you please explain what the patch is doing then, the subject of > "cosmetic changes for rk3308, rk3328, rk3399, rk3568, and rk3588" > doesn't really explain it either. Something like "adjust indentation > for consistency" or what the patch actually does is useful. thank you very much for your reply! Best regards, -- FUKAUMI Naoki Radxa Computer (Shenzhen) Co., Ltd. >> Signed-off-by: FUKAUMI Naoki <naoki@radxa.com> >> --- >> include/configs/rk3308_common.h | 26 ++++++++++----------- >> include/configs/rk3328_common.h | 28 +++++++++++------------ >> include/configs/rk3399_common.h | 40 ++++++++++++++++----------------- >> include/configs/rk3568_common.h | 14 ++++++------ >> include/configs/rk3588_common.h | 12 +++++----- >> 5 files changed, 60 insertions(+), 60 deletions(-) >> >> diff --git a/include/configs/rk3308_common.h b/include/configs/rk3308_common.h >> index 861154fbeb..80113220e4 100644 >> --- a/include/configs/rk3308_common.h >> +++ b/include/configs/rk3308_common.h >> @@ -8,24 +8,24 @@ >> >> #include "rockchip-common.h" >> >> -#define CFG_IRAM_BASE 0xfff80000 >> +#define CFG_IRAM_BASE 0xfff80000 >> >> #define CFG_SYS_SDRAM_BASE 0 >> #define SDRAM_MAX_SIZE 0xff000000 >> >> -#define ENV_MEM_LAYOUT_SETTINGS \ >> - "scriptaddr=0x00500000\0" \ >> - "pxefile_addr_r=0x00600000\0" \ >> - "fdt_addr_r=0x03e00000\0" \ >> - "fdtoverlay_addr_r=0x03f00000\0" \ >> - "kernel_addr_r=0x00680000\0" \ >> +#define ENV_MEM_LAYOUT_SETTINGS \ >> + "scriptaddr=0x00500000\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" >> >> -#define CFG_EXTRA_ENV_SETTINGS \ >> - "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ >> - ENV_MEM_LAYOUT_SETTINGS \ >> - "partitions=" PARTS_DEFAULT \ >> - ROCKCHIP_DEVICE_SETTINGS \ >> +#define CFG_EXTRA_ENV_SETTINGS \ >> + "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ >> + "partitions=" PARTS_DEFAULT \ >> + ENV_MEM_LAYOUT_SETTINGS \ >> + ROCKCHIP_DEVICE_SETTINGS \ >> "boot_targets=" BOOT_TARGETS "\0" >> >> -#endif >> +#endif /* __CONFIG_RK3308_COMMON_H */ >> diff --git a/include/configs/rk3328_common.h b/include/configs/rk3328_common.h >> index 2c40674b22..f9e6634c5f 100644 >> --- a/include/configs/rk3328_common.h >> +++ b/include/configs/rk3328_common.h >> @@ -8,25 +8,25 @@ >> >> #include "rockchip-common.h" >> >> -#define CFG_IRAM_BASE 0xff090000 >> +#define CFG_IRAM_BASE 0xff090000 >> >> #define CFG_SYS_SDRAM_BASE 0 >> #define SDRAM_MAX_SIZE 0xff000000 >> >> -#define ENV_MEM_LAYOUT_SETTINGS \ >> - "scriptaddr=0x00500000\0" \ >> - "pxefile_addr_r=0x00600000\0" \ >> - "fdt_addr_r=0x01f00000\0" \ >> - "kernel_addr_r=0x02080000\0" \ >> - "ramdisk_addr_r=0x06000000\0" \ >> - "kernel_comp_addr_r=0x08000000\0" \ >> +#define ENV_MEM_LAYOUT_SETTINGS \ >> + "scriptaddr=0x00500000\0" \ >> + "pxefile_addr_r=0x00600000\0" \ >> + "fdt_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 \ >> - ENV_MEM_LAYOUT_SETTINGS \ >> - "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ >> - "partitions=" PARTS_DEFAULT \ >> - ROCKCHIP_DEVICE_SETTINGS \ >> +#define CFG_EXTRA_ENV_SETTINGS \ >> + "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ >> + "partitions=" PARTS_DEFAULT \ >> + ENV_MEM_LAYOUT_SETTINGS \ >> + ROCKCHIP_DEVICE_SETTINGS \ >> "boot_targets=" BOOT_TARGETS "\0" >> >> -#endif >> +#endif /* __CONFIG_RK3328_COMMON_H */ >> diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h >> index 4e75771055..62007c8b27 100644 >> --- a/include/configs/rk3399_common.h >> +++ b/include/configs/rk3399_common.h >> @@ -8,36 +8,36 @@ >> >> #include "rockchip-common.h" >> >> -#define CFG_IRAM_BASE 0xff8c0000 >> +#define CFG_IRAM_BASE 0xff8c0000 >> >> #define CFG_SYS_SDRAM_BASE 0 >> #define SDRAM_MAX_SIZE 0xf8000000 >> >> #ifndef CONFIG_SPL_BUILD >> >> -#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" \ >> - "fdtoverlay_addr_r=0x02000000\0" \ >> - "kernel_addr_r=0x02080000\0" \ >> - "ramdisk_addr_r=0x06000000\0" \ >> - "kernel_comp_addr_r=0x08000000\0" \ >> - "kernel_comp_size=0x2000000\0" >> - >> #ifndef ROCKCHIP_DEVICE_SETTINGS >> #define ROCKCHIP_DEVICE_SETTINGS >> #endif >> >> -#define CFG_EXTRA_ENV_SETTINGS \ >> - ENV_MEM_LAYOUT_SETTINGS \ >> - "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ >> - "partitions=" PARTS_DEFAULT \ >> - ROCKCHIP_DEVICE_SETTINGS \ >> +#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" \ >> + "fdtoverlay_addr_r=0x02000000\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" \ >> + "partitions=" PARTS_DEFAULT \ >> + ENV_MEM_LAYOUT_SETTINGS \ >> + ROCKCHIP_DEVICE_SETTINGS \ >> "boot_targets=" BOOT_TARGETS "\0" >> >> -#endif >> +#endif /* CONFIG_SPL_BUILD */ >> >> -#endif >> +#endif /* __CONFIG_RK3399_COMMON_H */ >> diff --git a/include/configs/rk3568_common.h b/include/configs/rk3568_common.h >> index 48f93083de..09b7b71c6a 100644 >> --- a/include/configs/rk3568_common.h >> +++ b/include/configs/rk3568_common.h >> @@ -1,4 +1,4 @@ >> -/* SPDX-License-Identifier: GPL-2.0+ */ >> +/* SPDX-License-Identifier: GPL-2.0+ */ >> /* >> * (C) Copyright 2021 Rockchip Electronics Co., Ltd >> */ >> @@ -10,7 +10,7 @@ >> >> #include "rockchip-common.h" >> >> -#define CFG_IRAM_BASE 0xfdcc0000 >> +#define CFG_IRAM_BASE 0xfdcc0000 >> >> #define CFG_SYS_SDRAM_BASE 0 >> #define SDRAM_MAX_SIZE 0xf0000000 >> @@ -28,10 +28,10 @@ >> "kernel_comp_size=0x8000000\0" >> >> #define CFG_EXTRA_ENV_SETTINGS \ >> - ENV_MEM_LAYOUT_SETTINGS \ >> - "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ >> - "partitions=" PARTS_DEFAULT \ >> - ROCKCHIP_DEVICE_SETTINGS \ >> + "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ >> + "partitions=" PARTS_DEFAULT \ >> + ENV_MEM_LAYOUT_SETTINGS \ >> + ROCKCHIP_DEVICE_SETTINGS \ >> "boot_targets=" BOOT_TARGETS "\0" >> >> -#endif >> +#endif /* __CONFIG_RK3568_COMMON_H */ >> diff --git a/include/configs/rk3588_common.h b/include/configs/rk3588_common.h >> index 70430612ef..e6654c275a 100644 >> --- a/include/configs/rk3588_common.h >> +++ b/include/configs/rk3588_common.h >> @@ -1,4 +1,4 @@ >> -/* SPDX-License-Identifier: GPL-2.0+ */ >> +/* SPDX-License-Identifier: GPL-2.0+ */ >> /* >> * (C) Copyright 2021 Rockchip Electronics Co., Ltd >> * Copyright (c) 2023 Edgeble AI Technologies Pvt. Ltd. >> @@ -26,11 +26,11 @@ >> "ramdisk_addr_r=0x12180000\0" \ >> "kernel_comp_size=0x8000000\0" >> >> -#define CFG_EXTRA_ENV_SETTINGS \ >> - "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ >> - "partitions=" PARTS_DEFAULT \ >> - ENV_MEM_LAYOUT_SETTINGS \ >> - ROCKCHIP_DEVICE_SETTINGS \ >> +#define CFG_EXTRA_ENV_SETTINGS \ >> + "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ >> + "partitions=" PARTS_DEFAULT \ >> + ENV_MEM_LAYOUT_SETTINGS \ >> + ROCKCHIP_DEVICE_SETTINGS \ >> "boot_targets=" BOOT_TARGETS "\0" >> >> #endif /* __CONFIG_RK3588_COMMON_H */ >> -- >> 2.43.0 >> >
diff --git a/include/configs/rk3308_common.h b/include/configs/rk3308_common.h index 861154fbeb..80113220e4 100644 --- a/include/configs/rk3308_common.h +++ b/include/configs/rk3308_common.h @@ -8,24 +8,24 @@ #include "rockchip-common.h" -#define CFG_IRAM_BASE 0xfff80000 +#define CFG_IRAM_BASE 0xfff80000 #define CFG_SYS_SDRAM_BASE 0 #define SDRAM_MAX_SIZE 0xff000000 -#define ENV_MEM_LAYOUT_SETTINGS \ - "scriptaddr=0x00500000\0" \ - "pxefile_addr_r=0x00600000\0" \ - "fdt_addr_r=0x03e00000\0" \ - "fdtoverlay_addr_r=0x03f00000\0" \ - "kernel_addr_r=0x00680000\0" \ +#define ENV_MEM_LAYOUT_SETTINGS \ + "scriptaddr=0x00500000\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" -#define CFG_EXTRA_ENV_SETTINGS \ - "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ - ENV_MEM_LAYOUT_SETTINGS \ - "partitions=" PARTS_DEFAULT \ - ROCKCHIP_DEVICE_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ + "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ + "partitions=" PARTS_DEFAULT \ + ENV_MEM_LAYOUT_SETTINGS \ + ROCKCHIP_DEVICE_SETTINGS \ "boot_targets=" BOOT_TARGETS "\0" -#endif +#endif /* __CONFIG_RK3308_COMMON_H */ diff --git a/include/configs/rk3328_common.h b/include/configs/rk3328_common.h index 2c40674b22..f9e6634c5f 100644 --- a/include/configs/rk3328_common.h +++ b/include/configs/rk3328_common.h @@ -8,25 +8,25 @@ #include "rockchip-common.h" -#define CFG_IRAM_BASE 0xff090000 +#define CFG_IRAM_BASE 0xff090000 #define CFG_SYS_SDRAM_BASE 0 #define SDRAM_MAX_SIZE 0xff000000 -#define ENV_MEM_LAYOUT_SETTINGS \ - "scriptaddr=0x00500000\0" \ - "pxefile_addr_r=0x00600000\0" \ - "fdt_addr_r=0x01f00000\0" \ - "kernel_addr_r=0x02080000\0" \ - "ramdisk_addr_r=0x06000000\0" \ - "kernel_comp_addr_r=0x08000000\0" \ +#define ENV_MEM_LAYOUT_SETTINGS \ + "scriptaddr=0x00500000\0" \ + "pxefile_addr_r=0x00600000\0" \ + "fdt_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 \ - ENV_MEM_LAYOUT_SETTINGS \ - "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ - "partitions=" PARTS_DEFAULT \ - ROCKCHIP_DEVICE_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ + "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ + "partitions=" PARTS_DEFAULT \ + ENV_MEM_LAYOUT_SETTINGS \ + ROCKCHIP_DEVICE_SETTINGS \ "boot_targets=" BOOT_TARGETS "\0" -#endif +#endif /* __CONFIG_RK3328_COMMON_H */ diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index 4e75771055..62007c8b27 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -8,36 +8,36 @@ #include "rockchip-common.h" -#define CFG_IRAM_BASE 0xff8c0000 +#define CFG_IRAM_BASE 0xff8c0000 #define CFG_SYS_SDRAM_BASE 0 #define SDRAM_MAX_SIZE 0xf8000000 #ifndef CONFIG_SPL_BUILD -#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" \ - "fdtoverlay_addr_r=0x02000000\0" \ - "kernel_addr_r=0x02080000\0" \ - "ramdisk_addr_r=0x06000000\0" \ - "kernel_comp_addr_r=0x08000000\0" \ - "kernel_comp_size=0x2000000\0" - #ifndef ROCKCHIP_DEVICE_SETTINGS #define ROCKCHIP_DEVICE_SETTINGS #endif -#define CFG_EXTRA_ENV_SETTINGS \ - ENV_MEM_LAYOUT_SETTINGS \ - "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ - "partitions=" PARTS_DEFAULT \ - ROCKCHIP_DEVICE_SETTINGS \ +#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" \ + "fdtoverlay_addr_r=0x02000000\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" \ + "partitions=" PARTS_DEFAULT \ + ENV_MEM_LAYOUT_SETTINGS \ + ROCKCHIP_DEVICE_SETTINGS \ "boot_targets=" BOOT_TARGETS "\0" -#endif +#endif /* CONFIG_SPL_BUILD */ -#endif +#endif /* __CONFIG_RK3399_COMMON_H */ diff --git a/include/configs/rk3568_common.h b/include/configs/rk3568_common.h index 48f93083de..09b7b71c6a 100644 --- a/include/configs/rk3568_common.h +++ b/include/configs/rk3568_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2021 Rockchip Electronics Co., Ltd */ @@ -10,7 +10,7 @@ #include "rockchip-common.h" -#define CFG_IRAM_BASE 0xfdcc0000 +#define CFG_IRAM_BASE 0xfdcc0000 #define CFG_SYS_SDRAM_BASE 0 #define SDRAM_MAX_SIZE 0xf0000000 @@ -28,10 +28,10 @@ "kernel_comp_size=0x8000000\0" #define CFG_EXTRA_ENV_SETTINGS \ - ENV_MEM_LAYOUT_SETTINGS \ - "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ - "partitions=" PARTS_DEFAULT \ - ROCKCHIP_DEVICE_SETTINGS \ + "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ + "partitions=" PARTS_DEFAULT \ + ENV_MEM_LAYOUT_SETTINGS \ + ROCKCHIP_DEVICE_SETTINGS \ "boot_targets=" BOOT_TARGETS "\0" -#endif +#endif /* __CONFIG_RK3568_COMMON_H */ diff --git a/include/configs/rk3588_common.h b/include/configs/rk3588_common.h index 70430612ef..e6654c275a 100644 --- a/include/configs/rk3588_common.h +++ b/include/configs/rk3588_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2021 Rockchip Electronics Co., Ltd * Copyright (c) 2023 Edgeble AI Technologies Pvt. Ltd. @@ -26,11 +26,11 @@ "ramdisk_addr_r=0x12180000\0" \ "kernel_comp_size=0x8000000\0" -#define CFG_EXTRA_ENV_SETTINGS \ - "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ - "partitions=" PARTS_DEFAULT \ - ENV_MEM_LAYOUT_SETTINGS \ - ROCKCHIP_DEVICE_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ + "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ + "partitions=" PARTS_DEFAULT \ + ENV_MEM_LAYOUT_SETTINGS \ + ROCKCHIP_DEVICE_SETTINGS \ "boot_targets=" BOOT_TARGETS "\0" #endif /* __CONFIG_RK3588_COMMON_H */
no functional change is intended. Signed-off-by: FUKAUMI Naoki <naoki@radxa.com> --- include/configs/rk3308_common.h | 26 ++++++++++----------- include/configs/rk3328_common.h | 28 +++++++++++------------ include/configs/rk3399_common.h | 40 ++++++++++++++++----------------- include/configs/rk3568_common.h | 14 ++++++------ include/configs/rk3588_common.h | 12 +++++----- 5 files changed, 60 insertions(+), 60 deletions(-)