On Wed, Jul 17, 2024 at 12:47 PM FUKAUMI Naoki <na...@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 <na...@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 >
