Re: [PATCH v2 1/3] configs: rockchip: reduce diff for rk3308, rk3328, rk3399, rk3568, and rk3588

Hi Naoki,

On 2024/6/18 17:53, FUKAUMI Naoki wrote:

this is cosmetic change. no functional change is intended.

• remove redundant white spaces
• replace white spaces with tab
• align position of last letter/word
• sort lines in CFG_EXTRA_ENV_SETTINGS
• add comment after #endif

Signed-off-by: FUKAUMI Naokinaoki@radxa.com

Changes in v2:

• rewrite whole commit message

1. I can't find the 3/3 in the list, I don't know the reason;

2. How do you generate the change log here? This format is not correct because it will be applied in the patch;

I think you miss separator "---" after signature.

Thanks,

- Kever

---

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 */