* [PATCH 1/2] configs: rockchip: rk3308: use CONFIG_DEFAULT_FDT_FILE
@ 2023-09-11 10:01 FUKAUMI Naoki
2023-09-11 10:01 ` [PATCH 2/2] configs: rockchip: rk3308: enable CONFIG_OF_LIBFDT_OVERLAY FUKAUMI Naoki
2023-10-07 2:47 ` [PATCH 1/2] configs: rockchip: rk3308: use CONFIG_DEFAULT_FDT_FILE Kever Yang
0 siblings, 2 replies; 4+ messages in thread
From: FUKAUMI Naoki @ 2023-09-11 10:01 UTC (permalink / raw)
To: u-boot; +Cc: andy.yan, gajjar04akash, sjg, jonas, kever.yang, FUKAUMI Naoki
all rk3308 boards should use their own dtb file.
also, change fdt_addr_r to avoid following error:
"ERROR: Did not find a cmdline Flattened Device Tree"
it happens on Radxa ROCK Pi S (256MB/512MB) with kernel built from
Radxa BSP.
Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
---
configs/evb-rk3308_defconfig | 1 +
configs/roc-cc-rk3308_defconfig | 1 +
configs/rock-pi-s-rk3308_defconfig | 1 +
include/configs/rk3308_common.h | 3 ++-
4 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/configs/evb-rk3308_defconfig b/configs/evb-rk3308_defconfig
index a13a809c1e..2c7ac88ed9 100644
--- a/configs/evb-rk3308_defconfig
+++ b/configs/evb-rk3308_defconfig
@@ -24,6 +24,7 @@ CONFIG_ANDROID_BOOT_IMAGE=y
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_BOOTDELAY=0
+CONFIG_DEFAULT_FDT_FILE="rockchip/rk3308-evb.dtb"
CONFIG_SYS_CONSOLE_INFO_QUIET=y
# CONFIG_DISPLAY_CPUINFO is not set
CONFIG_SPL_MAX_SIZE=0x20000
diff --git a/configs/roc-cc-rk3308_defconfig b/configs/roc-cc-rk3308_defconfig
index 9a789b212f..9cb90f6ee6 100644
--- a/configs/roc-cc-rk3308_defconfig
+++ b/configs/roc-cc-rk3308_defconfig
@@ -24,6 +24,7 @@ CONFIG_ANDROID_BOOT_IMAGE=y
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_BOOTDELAY=0
+CONFIG_DEFAULT_FDT_FILE="rockchip/rk3308-roc-cc.dtb"
CONFIG_SYS_CONSOLE_INFO_QUIET=y
# CONFIG_DISPLAY_CPUINFO is not set
CONFIG_SPL_MAX_SIZE=0x20000
diff --git a/configs/rock-pi-s-rk3308_defconfig b/configs/rock-pi-s-rk3308_defconfig
index cc3274a98b..e2abe4b4f7 100644
--- a/configs/rock-pi-s-rk3308_defconfig
+++ b/configs/rock-pi-s-rk3308_defconfig
@@ -25,6 +25,7 @@ CONFIG_ANDROID_BOOT_IMAGE=y
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_BOOTDELAY=0
+CONFIG_DEFAULT_FDT_FILE="rockchip/rk3308-rock-pi-s.dtb"
CONFIG_SYS_CONSOLE_INFO_QUIET=y
# CONFIG_DISPLAY_CPUINFO is not set
CONFIG_SPL_MAX_SIZE=0x20000
diff --git a/include/configs/rk3308_common.h b/include/configs/rk3308_common.h
index 7d55fcd975..a413af1bd4 100644
--- a/include/configs/rk3308_common.h
+++ b/include/configs/rk3308_common.h
@@ -16,11 +16,12 @@
#define ENV_MEM_LAYOUT_SETTINGS \
"scriptaddr=0x00500000\0" \
"pxefile_addr_r=0x00600000\0" \
- "fdt_addr_r=0x02800000\0" \
+ "fdt_addr_r=0x03e00000\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 \
--
2.39.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] configs: rockchip: rk3308: enable CONFIG_OF_LIBFDT_OVERLAY
2023-09-11 10:01 [PATCH 1/2] configs: rockchip: rk3308: use CONFIG_DEFAULT_FDT_FILE FUKAUMI Naoki
@ 2023-09-11 10:01 ` FUKAUMI Naoki
2023-10-07 2:47 ` Kever Yang
2023-10-07 2:47 ` [PATCH 1/2] configs: rockchip: rk3308: use CONFIG_DEFAULT_FDT_FILE Kever Yang
1 sibling, 1 reply; 4+ messages in thread
From: FUKAUMI Naoki @ 2023-09-11 10:01 UTC (permalink / raw)
To: u-boot; +Cc: andy.yan, gajjar04akash, sjg, jonas, kever.yang, FUKAUMI Naoki
enable CONFIG_OF_LIBFDT_OVERLAY and use it on Radxa ROCK Pi S.
Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
---
configs/rock-pi-s-rk3308_defconfig | 1 +
include/configs/rk3308_common.h | 1 +
2 files changed, 2 insertions(+)
diff --git a/configs/rock-pi-s-rk3308_defconfig b/configs/rock-pi-s-rk3308_defconfig
index e2abe4b4f7..ca4a1800e7 100644
--- a/configs/rock-pi-s-rk3308_defconfig
+++ b/configs/rock-pi-s-rk3308_defconfig
@@ -9,6 +9,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x800000
CONFIG_DEFAULT_DEVICE_TREE="rk3308-rock-pi-s"
+CONFIG_OF_LIBFDT_OVERLAY=y
CONFIG_DM_RESET=y
CONFIG_ROCKCHIP_RK3308=y
CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x0
diff --git a/include/configs/rk3308_common.h b/include/configs/rk3308_common.h
index a413af1bd4..861154fbeb 100644
--- a/include/configs/rk3308_common.h
+++ b/include/configs/rk3308_common.h
@@ -17,6 +17,7 @@
"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"
--
2.39.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] configs: rockchip: rk3308: use CONFIG_DEFAULT_FDT_FILE
2023-09-11 10:01 [PATCH 1/2] configs: rockchip: rk3308: use CONFIG_DEFAULT_FDT_FILE FUKAUMI Naoki
2023-09-11 10:01 ` [PATCH 2/2] configs: rockchip: rk3308: enable CONFIG_OF_LIBFDT_OVERLAY FUKAUMI Naoki
@ 2023-10-07 2:47 ` Kever Yang
1 sibling, 0 replies; 4+ messages in thread
From: Kever Yang @ 2023-10-07 2:47 UTC (permalink / raw)
To: FUKAUMI Naoki, u-boot; +Cc: andy.yan, gajjar04akash, sjg, jonas
On 2023/9/11 18:01, FUKAUMI Naoki wrote:
> all rk3308 boards should use their own dtb file.
>
> also, change fdt_addr_r to avoid following error:
> "ERROR: Did not find a cmdline Flattened Device Tree"
> it happens on Radxa ROCK Pi S (256MB/512MB) with kernel built from
> Radxa BSP.
>
> Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Thanks,
- Kever
> ---
> configs/evb-rk3308_defconfig | 1 +
> configs/roc-cc-rk3308_defconfig | 1 +
> configs/rock-pi-s-rk3308_defconfig | 1 +
> include/configs/rk3308_common.h | 3 ++-
> 4 files changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/configs/evb-rk3308_defconfig b/configs/evb-rk3308_defconfig
> index a13a809c1e..2c7ac88ed9 100644
> --- a/configs/evb-rk3308_defconfig
> +++ b/configs/evb-rk3308_defconfig
> @@ -24,6 +24,7 @@ CONFIG_ANDROID_BOOT_IMAGE=y
> CONFIG_FIT=y
> CONFIG_FIT_VERBOSE=y
> CONFIG_BOOTDELAY=0
> +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3308-evb.dtb"
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> # CONFIG_DISPLAY_CPUINFO is not set
> CONFIG_SPL_MAX_SIZE=0x20000
> diff --git a/configs/roc-cc-rk3308_defconfig b/configs/roc-cc-rk3308_defconfig
> index 9a789b212f..9cb90f6ee6 100644
> --- a/configs/roc-cc-rk3308_defconfig
> +++ b/configs/roc-cc-rk3308_defconfig
> @@ -24,6 +24,7 @@ CONFIG_ANDROID_BOOT_IMAGE=y
> CONFIG_FIT=y
> CONFIG_FIT_VERBOSE=y
> CONFIG_BOOTDELAY=0
> +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3308-roc-cc.dtb"
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> # CONFIG_DISPLAY_CPUINFO is not set
> CONFIG_SPL_MAX_SIZE=0x20000
> diff --git a/configs/rock-pi-s-rk3308_defconfig b/configs/rock-pi-s-rk3308_defconfig
> index cc3274a98b..e2abe4b4f7 100644
> --- a/configs/rock-pi-s-rk3308_defconfig
> +++ b/configs/rock-pi-s-rk3308_defconfig
> @@ -25,6 +25,7 @@ CONFIG_ANDROID_BOOT_IMAGE=y
> CONFIG_FIT=y
> CONFIG_FIT_VERBOSE=y
> CONFIG_BOOTDELAY=0
> +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3308-rock-pi-s.dtb"
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> # CONFIG_DISPLAY_CPUINFO is not set
> CONFIG_SPL_MAX_SIZE=0x20000
> diff --git a/include/configs/rk3308_common.h b/include/configs/rk3308_common.h
> index 7d55fcd975..a413af1bd4 100644
> --- a/include/configs/rk3308_common.h
> +++ b/include/configs/rk3308_common.h
> @@ -16,11 +16,12 @@
> #define ENV_MEM_LAYOUT_SETTINGS \
> "scriptaddr=0x00500000\0" \
> "pxefile_addr_r=0x00600000\0" \
> - "fdt_addr_r=0x02800000\0" \
> + "fdt_addr_r=0x03e00000\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 \
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] configs: rockchip: rk3308: enable CONFIG_OF_LIBFDT_OVERLAY
2023-09-11 10:01 ` [PATCH 2/2] configs: rockchip: rk3308: enable CONFIG_OF_LIBFDT_OVERLAY FUKAUMI Naoki
@ 2023-10-07 2:47 ` Kever Yang
0 siblings, 0 replies; 4+ messages in thread
From: Kever Yang @ 2023-10-07 2:47 UTC (permalink / raw)
To: FUKAUMI Naoki, u-boot; +Cc: andy.yan, gajjar04akash, sjg, jonas
On 2023/9/11 18:01, FUKAUMI Naoki wrote:
> enable CONFIG_OF_LIBFDT_OVERLAY and use it on Radxa ROCK Pi S.
>
> Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Thanks,
- Kever
> ---
> configs/rock-pi-s-rk3308_defconfig | 1 +
> include/configs/rk3308_common.h | 1 +
> 2 files changed, 2 insertions(+)
>
> diff --git a/configs/rock-pi-s-rk3308_defconfig b/configs/rock-pi-s-rk3308_defconfig
> index e2abe4b4f7..ca4a1800e7 100644
> --- a/configs/rock-pi-s-rk3308_defconfig
> +++ b/configs/rock-pi-s-rk3308_defconfig
> @@ -9,6 +9,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
> CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
> CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x800000
> CONFIG_DEFAULT_DEVICE_TREE="rk3308-rock-pi-s"
> +CONFIG_OF_LIBFDT_OVERLAY=y
> CONFIG_DM_RESET=y
> CONFIG_ROCKCHIP_RK3308=y
> CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x0
> diff --git a/include/configs/rk3308_common.h b/include/configs/rk3308_common.h
> index a413af1bd4..861154fbeb 100644
> --- a/include/configs/rk3308_common.h
> +++ b/include/configs/rk3308_common.h
> @@ -17,6 +17,7 @@
> "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"
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-10-07 2:48 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-09-11 10:01 [PATCH 1/2] configs: rockchip: rk3308: use CONFIG_DEFAULT_FDT_FILE FUKAUMI Naoki
2023-09-11 10:01 ` [PATCH 2/2] configs: rockchip: rk3308: enable CONFIG_OF_LIBFDT_OVERLAY FUKAUMI Naoki
2023-10-07 2:47 ` Kever Yang
2023-10-07 2:47 ` [PATCH 1/2] configs: rockchip: rk3308: use CONFIG_DEFAULT_FDT_FILE Kever Yang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.