[PATCH 1/2] configs: rockchip: rk3308: use CONFIG_DEFAULT_FDT_FILE

[Kever Yang]

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 at radxa.com>
Reviewed-by: Kever Yang <kever.yang at 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 \