* [PATCH v3 1/3] configs: rockchip: reduce diff for rk3308, rk3328, rk3399, rk3568, and rk3588
@ 2024-07-17 4:47 FUKAUMI Naoki
2024-07-17 4:47 ` [PATCH v3 2/3] configs: rockchip: sync ENV_MEM_LAYOUT_SETTINGS for rk3308, rk3328, and rk3399 FUKAUMI Naoki
2024-07-17 4:47 ` [PATCH v3 3/3] configs: rockchip: imply OF_LIBFDT_OVERLAY for rk3308 and rk3328 FUKAUMI Naoki
0 siblings, 2 replies; 5+ messages in thread
From: FUKAUMI Naoki @ 2024-07-17 4:47 UTC (permalink / raw)
To: u-boot
Cc: sjg, philipp.tomsich, kever.yang, andy.yan, gajjar04akash, jonas,
FUKAUMI Naoki
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 Naoki <naoki@radxa.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
---
Changes in v3:
- add missing separator in commit message
- collect R-b tag
Changes in v2:
- rewrite whole commit message
---
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v3 2/3] configs: rockchip: sync ENV_MEM_LAYOUT_SETTINGS for rk3308, rk3328, and rk3399
2024-07-17 4:47 [PATCH v3 1/3] configs: rockchip: reduce diff for rk3308, rk3328, rk3399, rk3568, and rk3588 FUKAUMI Naoki
@ 2024-07-17 4:47 ` FUKAUMI Naoki
2024-07-17 4:47 ` [PATCH v3 3/3] configs: rockchip: imply OF_LIBFDT_OVERLAY for rk3308 and rk3328 FUKAUMI Naoki
1 sibling, 0 replies; 5+ messages in thread
From: FUKAUMI Naoki @ 2024-07-17 4:47 UTC (permalink / raw)
To: u-boot
Cc: sjg, philipp.tomsich, kever.yang, andy.yan, gajjar04akash, jonas,
FUKAUMI Naoki
- 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>
---
Changes in v3:
- add missing separator in commit message
- collect R-b tag
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" \
--
2.43.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v3 3/3] configs: rockchip: imply OF_LIBFDT_OVERLAY for rk3308 and rk3328
2024-07-17 4:47 [PATCH v3 1/3] configs: rockchip: reduce diff for rk3308, rk3328, rk3399, rk3568, and rk3588 FUKAUMI Naoki
2024-07-17 4:47 ` [PATCH v3 2/3] configs: rockchip: sync ENV_MEM_LAYOUT_SETTINGS for rk3308, rk3328, and rk3399 FUKAUMI Naoki
@ 2024-07-17 4:47 ` FUKAUMI Naoki
2024-07-17 5:04 ` Chen-Yu Tsai
2024-07-17 8:25 ` Kever Yang
1 sibling, 2 replies; 5+ messages in thread
From: FUKAUMI Naoki @ 2024-07-17 4:47 UTC (permalink / raw)
To: u-boot
Cc: sjg, philipp.tomsich, kever.yang, andy.yan, gajjar04akash, jonas,
FUKAUMI Naoki
for rk3308, all defconfigs have CONFIG_OF_LIBFDT_OVERLAY=y, so enable it
by default.
for rk3328, any defconfig doesn't have it. but there is no strong reason
not to enable it. at least it's required for ROCK Pi E.
Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
---
Changes in v3:
- add missing separator in commit message
Changes in v2:
- none
---
arch/arm/mach-rockchip/Kconfig | 2 ++
configs/evb-rk3308_defconfig | 1 -
configs/roc-cc-rk3308_defconfig | 1 -
configs/rock-pi-s-rk3308_defconfig | 1 -
4 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index 661e7fd1c9..5f6a4dd24a 100644
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -166,6 +166,7 @@ config ROCKCHIP_RK3308
imply LEGACY_IMAGE_FORMAT
imply MISC
imply MISC_INIT_R
+ imply OF_LIBFDT_OVERLAY
imply OF_UPSTREAM
imply RNG_ROCKCHIP
imply ROCKCHIP_COMMON_BOARD
@@ -196,6 +197,7 @@ config ROCKCHIP_RK3328
imply ARMV8_SET_SMPEN
imply MISC
imply MISC_INIT_R
+ imply OF_LIBFDT_OVERLAY
imply OF_LIVE
imply OF_UPSTREAM
imply PRE_CONSOLE_BUFFER
diff --git a/configs/evb-rk3308_defconfig b/configs/evb-rk3308_defconfig
index f4c2ea12ad..6d090dba30 100644
--- a/configs/evb-rk3308_defconfig
+++ b/configs/evb-rk3308_defconfig
@@ -3,7 +3,6 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
CONFIG_COUNTER_FREQUENCY=24000000
CONFIG_ARCH_ROCKCHIP=y
CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3308-evb"
-CONFIG_OF_LIBFDT_OVERLAY=y
CONFIG_DM_RESET=y
CONFIG_ROCKCHIP_RK3308=y
CONFIG_TARGET_EVB_RK3308=y
diff --git a/configs/roc-cc-rk3308_defconfig b/configs/roc-cc-rk3308_defconfig
index 862ea4301f..b1b59d9cb5 100644
--- a/configs/roc-cc-rk3308_defconfig
+++ b/configs/roc-cc-rk3308_defconfig
@@ -4,7 +4,6 @@ CONFIG_COUNTER_FREQUENCY=24000000
CONFIG_ARCH_ROCKCHIP=y
CONFIG_SPL_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3308-roc-cc"
-CONFIG_OF_LIBFDT_OVERLAY=y
CONFIG_DM_RESET=y
CONFIG_ROCKCHIP_RK3308=y
CONFIG_TARGET_ROC_RK3308_CC=y
diff --git a/configs/rock-pi-s-rk3308_defconfig b/configs/rock-pi-s-rk3308_defconfig
index c15ba3d8a4..e450a06180 100644
--- a/configs/rock-pi-s-rk3308_defconfig
+++ b/configs/rock-pi-s-rk3308_defconfig
@@ -3,7 +3,6 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
CONFIG_COUNTER_FREQUENCY=24000000
CONFIG_ARCH_ROCKCHIP=y
CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3308-rock-pi-s"
-CONFIG_OF_LIBFDT_OVERLAY=y
CONFIG_DM_RESET=y
CONFIG_ROCKCHIP_RK3308=y
CONFIG_TARGET_EVB_RK3308=y
--
2.43.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v3 3/3] configs: rockchip: imply OF_LIBFDT_OVERLAY for rk3308 and rk3328
2024-07-17 4:47 ` [PATCH v3 3/3] configs: rockchip: imply OF_LIBFDT_OVERLAY for rk3308 and rk3328 FUKAUMI Naoki
@ 2024-07-17 5:04 ` Chen-Yu Tsai
2024-07-17 8:25 ` Kever Yang
1 sibling, 0 replies; 5+ messages in thread
From: Chen-Yu Tsai @ 2024-07-17 5:04 UTC (permalink / raw)
To: FUKAUMI Naoki
Cc: u-boot, sjg, philipp.tomsich, kever.yang, andy.yan, gajjar04akash,
jonas
On Wed, Jul 17, 2024 at 12:47 PM FUKAUMI Naoki <naoki@radxa.com> wrote:
>
> for rk3308, all defconfigs have CONFIG_OF_LIBFDT_OVERLAY=y, so enable it
> by default.
>
> for rk3328, any defconfig doesn't have it. but there is no strong reason
> not to enable it. at least it's required for ROCK Pi E.
I wonder if it makes sense to eventually move it up to ARCH_ROCKCHIP?
ChenYu
> Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
> ---
> Changes in v3:
> - add missing separator in commit message
> Changes in v2:
> - none
> ---
> arch/arm/mach-rockchip/Kconfig | 2 ++
> configs/evb-rk3308_defconfig | 1 -
> configs/roc-cc-rk3308_defconfig | 1 -
> configs/rock-pi-s-rk3308_defconfig | 1 -
> 4 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
> index 661e7fd1c9..5f6a4dd24a 100644
> --- a/arch/arm/mach-rockchip/Kconfig
> +++ b/arch/arm/mach-rockchip/Kconfig
> @@ -166,6 +166,7 @@ config ROCKCHIP_RK3308
> imply LEGACY_IMAGE_FORMAT
> imply MISC
> imply MISC_INIT_R
> + imply OF_LIBFDT_OVERLAY
> imply OF_UPSTREAM
> imply RNG_ROCKCHIP
> imply ROCKCHIP_COMMON_BOARD
> @@ -196,6 +197,7 @@ config ROCKCHIP_RK3328
> imply ARMV8_SET_SMPEN
> imply MISC
> imply MISC_INIT_R
> + imply OF_LIBFDT_OVERLAY
> imply OF_LIVE
> imply OF_UPSTREAM
> imply PRE_CONSOLE_BUFFER
> diff --git a/configs/evb-rk3308_defconfig b/configs/evb-rk3308_defconfig
> index f4c2ea12ad..6d090dba30 100644
> --- a/configs/evb-rk3308_defconfig
> +++ b/configs/evb-rk3308_defconfig
> @@ -3,7 +3,6 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
> CONFIG_COUNTER_FREQUENCY=24000000
> CONFIG_ARCH_ROCKCHIP=y
> CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3308-evb"
> -CONFIG_OF_LIBFDT_OVERLAY=y
> CONFIG_DM_RESET=y
> CONFIG_ROCKCHIP_RK3308=y
> CONFIG_TARGET_EVB_RK3308=y
> diff --git a/configs/roc-cc-rk3308_defconfig b/configs/roc-cc-rk3308_defconfig
> index 862ea4301f..b1b59d9cb5 100644
> --- a/configs/roc-cc-rk3308_defconfig
> +++ b/configs/roc-cc-rk3308_defconfig
> @@ -4,7 +4,6 @@ CONFIG_COUNTER_FREQUENCY=24000000
> CONFIG_ARCH_ROCKCHIP=y
> CONFIG_SPL_GPIO=y
> CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3308-roc-cc"
> -CONFIG_OF_LIBFDT_OVERLAY=y
> CONFIG_DM_RESET=y
> CONFIG_ROCKCHIP_RK3308=y
> CONFIG_TARGET_ROC_RK3308_CC=y
> diff --git a/configs/rock-pi-s-rk3308_defconfig b/configs/rock-pi-s-rk3308_defconfig
> index c15ba3d8a4..e450a06180 100644
> --- a/configs/rock-pi-s-rk3308_defconfig
> +++ b/configs/rock-pi-s-rk3308_defconfig
> @@ -3,7 +3,6 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
> CONFIG_COUNTER_FREQUENCY=24000000
> CONFIG_ARCH_ROCKCHIP=y
> CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3308-rock-pi-s"
> -CONFIG_OF_LIBFDT_OVERLAY=y
> CONFIG_DM_RESET=y
> CONFIG_ROCKCHIP_RK3308=y
> CONFIG_TARGET_EVB_RK3308=y
> --
> 2.43.0
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v3 3/3] configs: rockchip: imply OF_LIBFDT_OVERLAY for rk3308 and rk3328
2024-07-17 4:47 ` [PATCH v3 3/3] configs: rockchip: imply OF_LIBFDT_OVERLAY for rk3308 and rk3328 FUKAUMI Naoki
2024-07-17 5:04 ` Chen-Yu Tsai
@ 2024-07-17 8:25 ` Kever Yang
1 sibling, 0 replies; 5+ messages in thread
From: Kever Yang @ 2024-07-17 8:25 UTC (permalink / raw)
To: FUKAUMI Naoki, u-boot
Cc: sjg, philipp.tomsich, andy.yan, gajjar04akash, jonas
On 2024/7/17 12:47, FUKAUMI Naoki wrote:
> for rk3308, all defconfigs have CONFIG_OF_LIBFDT_OVERLAY=y, so enable it
> by default.
>
> for rk3328, any defconfig doesn't have it. but there is no strong reason
> not to enable it. at least it's required for ROCK Pi E.
>
> Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Thanks,
- Kever
> ---
> Changes in v3:
> - add missing separator in commit message
> Changes in v2:
> - none
> ---
> arch/arm/mach-rockchip/Kconfig | 2 ++
> configs/evb-rk3308_defconfig | 1 -
> configs/roc-cc-rk3308_defconfig | 1 -
> configs/rock-pi-s-rk3308_defconfig | 1 -
> 4 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
> index 661e7fd1c9..5f6a4dd24a 100644
> --- a/arch/arm/mach-rockchip/Kconfig
> +++ b/arch/arm/mach-rockchip/Kconfig
> @@ -166,6 +166,7 @@ config ROCKCHIP_RK3308
> imply LEGACY_IMAGE_FORMAT
> imply MISC
> imply MISC_INIT_R
> + imply OF_LIBFDT_OVERLAY
> imply OF_UPSTREAM
> imply RNG_ROCKCHIP
> imply ROCKCHIP_COMMON_BOARD
> @@ -196,6 +197,7 @@ config ROCKCHIP_RK3328
> imply ARMV8_SET_SMPEN
> imply MISC
> imply MISC_INIT_R
> + imply OF_LIBFDT_OVERLAY
> imply OF_LIVE
> imply OF_UPSTREAM
> imply PRE_CONSOLE_BUFFER
> diff --git a/configs/evb-rk3308_defconfig b/configs/evb-rk3308_defconfig
> index f4c2ea12ad..6d090dba30 100644
> --- a/configs/evb-rk3308_defconfig
> +++ b/configs/evb-rk3308_defconfig
> @@ -3,7 +3,6 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
> CONFIG_COUNTER_FREQUENCY=24000000
> CONFIG_ARCH_ROCKCHIP=y
> CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3308-evb"
> -CONFIG_OF_LIBFDT_OVERLAY=y
> CONFIG_DM_RESET=y
> CONFIG_ROCKCHIP_RK3308=y
> CONFIG_TARGET_EVB_RK3308=y
> diff --git a/configs/roc-cc-rk3308_defconfig b/configs/roc-cc-rk3308_defconfig
> index 862ea4301f..b1b59d9cb5 100644
> --- a/configs/roc-cc-rk3308_defconfig
> +++ b/configs/roc-cc-rk3308_defconfig
> @@ -4,7 +4,6 @@ CONFIG_COUNTER_FREQUENCY=24000000
> CONFIG_ARCH_ROCKCHIP=y
> CONFIG_SPL_GPIO=y
> CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3308-roc-cc"
> -CONFIG_OF_LIBFDT_OVERLAY=y
> CONFIG_DM_RESET=y
> CONFIG_ROCKCHIP_RK3308=y
> CONFIG_TARGET_ROC_RK3308_CC=y
> diff --git a/configs/rock-pi-s-rk3308_defconfig b/configs/rock-pi-s-rk3308_defconfig
> index c15ba3d8a4..e450a06180 100644
> --- a/configs/rock-pi-s-rk3308_defconfig
> +++ b/configs/rock-pi-s-rk3308_defconfig
> @@ -3,7 +3,6 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
> CONFIG_COUNTER_FREQUENCY=24000000
> CONFIG_ARCH_ROCKCHIP=y
> CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3308-rock-pi-s"
> -CONFIG_OF_LIBFDT_OVERLAY=y
> CONFIG_DM_RESET=y
> CONFIG_ROCKCHIP_RK3308=y
> CONFIG_TARGET_EVB_RK3308=y
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-07-17 8:25 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-17 4:47 [PATCH v3 1/3] configs: rockchip: reduce diff for rk3308, rk3328, rk3399, rk3568, and rk3588 FUKAUMI Naoki
2024-07-17 4:47 ` [PATCH v3 2/3] configs: rockchip: sync ENV_MEM_LAYOUT_SETTINGS for rk3308, rk3328, and rk3399 FUKAUMI Naoki
2024-07-17 4:47 ` [PATCH v3 3/3] configs: rockchip: imply OF_LIBFDT_OVERLAY for rk3308 and rk3328 FUKAUMI Naoki
2024-07-17 5:04 ` Chen-Yu Tsai
2024-07-17 8:25 ` Kever Yang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).