Hi, On Wed, Mar 13, 2024 at 6:29 PM Kever Yang <kever.y...@rock-chips.com> wrote: > > Hi Chen-Yu, > > On 2024/2/12 21:51, Chen-Yu Tsai wrote: > > From: Chen-Yu Tsai <w...@csie.org> > > Regenerate RK3328 defconfigs after adding imply statements. > > Signed-off-by: Chen-Yu Tsai <w...@csie.org> > Reviewed-by: Christopher Obbard <chris.obb...@collabora.com> > Reviewed-by: Dragan Simic <dsi...@manjaro.org> > --- > configs/evb-rk3328_defconfig | 3 --- > configs/nanopi-r2c-plus-rk3328_defconfig | 3 --- > configs/nanopi-r2c-rk3328_defconfig | 3 --- > configs/nanopi-r2s-rk3328_defconfig | 3 --- > configs/orangepi-r1-plus-lts-rk3328_defconfig | 3 --- > configs/orangepi-r1-plus-rk3328_defconfig | 3 --- > configs/roc-cc-rk3328_defconfig | 3 --- > configs/rock-pi-e-rk3328_defconfig | 3 --- > configs/rock64-rk3328_defconfig | 3 --- > 9 files changed, 27 deletions(-) > > diff --git a/configs/evb-rk3328_defconfig b/configs/evb-rk3328_defconfig > index 995bfd0558b1..c3bde3e5c457 100644 > --- a/configs/evb-rk3328_defconfig > +++ b/configs/evb-rk3328_defconfig > @@ -30,7 +30,6 @@ CONFIG_LEGACY_IMAGE_FORMAT=y > CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-evb.dtb" > # CONFIG_DISPLAY_CPUINFO is not set > CONFIG_DISPLAY_BOARDINFO_LATE=y > -CONFIG_MISC_INIT_R=y > CONFIG_SPL_MAX_SIZE=0x40000 > CONFIG_SPL_PAD_TO=0x7f8000 > CONFIG_SPL_HAS_BSS_LINKER_SECTION=y > @@ -70,8 +69,6 @@ CONFIG_FASTBOOT_BUF_ADDR=0x800800 > CONFIG_FASTBOOT_CMD_OEM_FORMAT=y > CONFIG_ROCKCHIP_GPIO=y > CONFIG_SYS_I2C_ROCKCHIP=y > -CONFIG_MISC=y > -CONFIG_ROCKCHIP_EFUSE=y > > There is no this config in the all these boards when I check the code on next, > > which cause the conflict when apply this patch.
I can respin, but should I still base my patches on Jonas's series? I don't see them in next. ChenYu > > Thanks, > > - Kever > > CONFIG_MMC_DW=y > CONFIG_MMC_DW_ROCKCHIP=y > CONFIG_PHY_MOTORCOMM=y > diff --git a/configs/nanopi-r2c-plus-rk3328_defconfig > b/configs/nanopi-r2c-plus-rk3328_defconfig > index 1cb0ed855398..1b0fa27ced16 100644 > --- a/configs/nanopi-r2c-plus-rk3328_defconfig > +++ b/configs/nanopi-r2c-plus-rk3328_defconfig > @@ -31,7 +31,6 @@ CONFIG_LEGACY_IMAGE_FORMAT=y > CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-nanopi-r2c-plus.dtb" > # CONFIG_DISPLAY_CPUINFO is not set > CONFIG_DISPLAY_BOARDINFO_LATE=y > -CONFIG_MISC_INIT_R=y > CONFIG_SPL_MAX_SIZE=0x40000 > CONFIG_SPL_PAD_TO=0x7f8000 > CONFIG_SPL_HAS_BSS_LINKER_SECTION=y > @@ -72,8 +71,6 @@ CONFIG_FASTBOOT_BUF_ADDR=0x800800 > CONFIG_FASTBOOT_CMD_OEM_FORMAT=y > CONFIG_ROCKCHIP_GPIO=y > CONFIG_SYS_I2C_ROCKCHIP=y > -CONFIG_MISC=y > -CONFIG_ROCKCHIP_EFUSE=y > CONFIG_MMC_DW=y > CONFIG_MMC_DW_ROCKCHIP=y > CONFIG_PHY_MOTORCOMM=y > diff --git a/configs/nanopi-r2c-rk3328_defconfig > b/configs/nanopi-r2c-rk3328_defconfig > index 59801328deda..edf24623da2a 100644 > --- a/configs/nanopi-r2c-rk3328_defconfig > +++ b/configs/nanopi-r2c-rk3328_defconfig > @@ -31,7 +31,6 @@ CONFIG_LEGACY_IMAGE_FORMAT=y > CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-nanopi-r2c.dtb" > # CONFIG_DISPLAY_CPUINFO is not set > CONFIG_DISPLAY_BOARDINFO_LATE=y > -CONFIG_MISC_INIT_R=y > CONFIG_SPL_MAX_SIZE=0x40000 > CONFIG_SPL_PAD_TO=0x7f8000 > CONFIG_SPL_HAS_BSS_LINKER_SECTION=y > @@ -72,8 +71,6 @@ CONFIG_FASTBOOT_BUF_ADDR=0x800800 > CONFIG_FASTBOOT_CMD_OEM_FORMAT=y > CONFIG_ROCKCHIP_GPIO=y > CONFIG_SYS_I2C_ROCKCHIP=y > -CONFIG_MISC=y > -CONFIG_ROCKCHIP_EFUSE=y > CONFIG_MMC_DW=y > CONFIG_MMC_DW_ROCKCHIP=y > CONFIG_PHY_MOTORCOMM=y > diff --git a/configs/nanopi-r2s-rk3328_defconfig > b/configs/nanopi-r2s-rk3328_defconfig > index 61914b1650d2..32c99dfecb86 100644 > --- a/configs/nanopi-r2s-rk3328_defconfig > +++ b/configs/nanopi-r2s-rk3328_defconfig > @@ -31,7 +31,6 @@ CONFIG_LEGACY_IMAGE_FORMAT=y > CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-nanopi-r2s.dtb" > # CONFIG_DISPLAY_CPUINFO is not set > CONFIG_DISPLAY_BOARDINFO_LATE=y > -CONFIG_MISC_INIT_R=y > CONFIG_SPL_MAX_SIZE=0x40000 > CONFIG_SPL_PAD_TO=0x7f8000 > CONFIG_SPL_HAS_BSS_LINKER_SECTION=y > @@ -72,8 +71,6 @@ CONFIG_FASTBOOT_BUF_ADDR=0x800800 > CONFIG_FASTBOOT_CMD_OEM_FORMAT=y > CONFIG_ROCKCHIP_GPIO=y > CONFIG_SYS_I2C_ROCKCHIP=y > -CONFIG_MISC=y > -CONFIG_ROCKCHIP_EFUSE=y > CONFIG_MMC_DW=y > CONFIG_MMC_DW_ROCKCHIP=y > CONFIG_PHY_MOTORCOMM=y > diff --git a/configs/orangepi-r1-plus-lts-rk3328_defconfig > b/configs/orangepi-r1-plus-lts-rk3328_defconfig > index 968110c8cd6f..f554a284d930 100644 > --- a/configs/orangepi-r1-plus-lts-rk3328_defconfig > +++ b/configs/orangepi-r1-plus-lts-rk3328_defconfig > @@ -34,7 +34,6 @@ CONFIG_LEGACY_IMAGE_FORMAT=y > CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-orangepi-r1-plus-lts.dtb" > # CONFIG_DISPLAY_CPUINFO is not set > CONFIG_DISPLAY_BOARDINFO_LATE=y > -CONFIG_MISC_INIT_R=y > CONFIG_SPL_MAX_SIZE=0x40000 > CONFIG_SPL_PAD_TO=0x7f8000 > CONFIG_SPL_HAS_BSS_LINKER_SECTION=y > @@ -77,8 +76,6 @@ CONFIG_FASTBOOT_BUF_ADDR=0x800800 > CONFIG_FASTBOOT_CMD_OEM_FORMAT=y > CONFIG_ROCKCHIP_GPIO=y > CONFIG_SYS_I2C_ROCKCHIP=y > -CONFIG_MISC=y > -CONFIG_ROCKCHIP_EFUSE=y > CONFIG_MMC_DW=y > CONFIG_MMC_DW_ROCKCHIP=y > CONFIG_SPI_FLASH_SFDP_SUPPORT=y > diff --git a/configs/orangepi-r1-plus-rk3328_defconfig > b/configs/orangepi-r1-plus-rk3328_defconfig > index 7038f09f202c..162032460fe0 100644 > --- a/configs/orangepi-r1-plus-rk3328_defconfig > +++ b/configs/orangepi-r1-plus-rk3328_defconfig > @@ -34,7 +34,6 @@ CONFIG_LEGACY_IMAGE_FORMAT=y > CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-orangepi-r1-plus.dtb" > # CONFIG_DISPLAY_CPUINFO is not set > CONFIG_DISPLAY_BOARDINFO_LATE=y > -CONFIG_MISC_INIT_R=y > CONFIG_SPL_MAX_SIZE=0x40000 > CONFIG_SPL_PAD_TO=0x7f8000 > CONFIG_SPL_HAS_BSS_LINKER_SECTION=y > @@ -77,8 +76,6 @@ CONFIG_FASTBOOT_BUF_ADDR=0x800800 > CONFIG_FASTBOOT_CMD_OEM_FORMAT=y > CONFIG_ROCKCHIP_GPIO=y > CONFIG_SYS_I2C_ROCKCHIP=y > -CONFIG_MISC=y > -CONFIG_ROCKCHIP_EFUSE=y > CONFIG_MMC_DW=y > CONFIG_MMC_DW_ROCKCHIP=y > CONFIG_SPI_FLASH_SFDP_SUPPORT=y > diff --git a/configs/roc-cc-rk3328_defconfig b/configs/roc-cc-rk3328_defconfig > index 7d81a715ef25..02be1102697b 100644 > --- a/configs/roc-cc-rk3328_defconfig > +++ b/configs/roc-cc-rk3328_defconfig > @@ -31,7 +31,6 @@ CONFIG_LEGACY_IMAGE_FORMAT=y > CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-roc-cc.dtb" > # CONFIG_DISPLAY_CPUINFO is not set > CONFIG_DISPLAY_BOARDINFO_LATE=y > -CONFIG_MISC_INIT_R=y > CONFIG_SPL_MAX_SIZE=0x40000 > CONFIG_SPL_PAD_TO=0x7f8000 > CONFIG_SPL_HAS_BSS_LINKER_SECTION=y > @@ -73,8 +72,6 @@ CONFIG_FASTBOOT_BUF_ADDR=0x800800 > CONFIG_FASTBOOT_CMD_OEM_FORMAT=y > CONFIG_ROCKCHIP_GPIO=y > CONFIG_SYS_I2C_ROCKCHIP=y > -CONFIG_MISC=y > -CONFIG_ROCKCHIP_EFUSE=y > CONFIG_MMC_DW=y > CONFIG_MMC_DW_ROCKCHIP=y > CONFIG_PHY_REALTEK=y > diff --git a/configs/rock-pi-e-rk3328_defconfig > b/configs/rock-pi-e-rk3328_defconfig > index ddd482dd0195..ac6d6c5df772 100644 > --- a/configs/rock-pi-e-rk3328_defconfig > +++ b/configs/rock-pi-e-rk3328_defconfig > @@ -32,7 +32,6 @@ CONFIG_LEGACY_IMAGE_FORMAT=y > CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-rock-pi-e.dtb" > # CONFIG_DISPLAY_CPUINFO is not set > CONFIG_DISPLAY_BOARDINFO_LATE=y > -CONFIG_MISC_INIT_R=y > CONFIG_SPL_MAX_SIZE=0x40000 > CONFIG_SPL_PAD_TO=0x7f8000 > CONFIG_SPL_HAS_BSS_LINKER_SECTION=y > @@ -73,8 +72,6 @@ CONFIG_FASTBOOT_BUF_ADDR=0x800800 > CONFIG_FASTBOOT_CMD_OEM_FORMAT=y > CONFIG_ROCKCHIP_GPIO=y > CONFIG_SYS_I2C_ROCKCHIP=y > -CONFIG_MISC=y > -CONFIG_ROCKCHIP_EFUSE=y > CONFIG_MMC_DW=y > CONFIG_MMC_DW_ROCKCHIP=y > CONFIG_PHY_REALTEK=y > diff --git a/configs/rock64-rk3328_defconfig b/configs/rock64-rk3328_defconfig > index 01e447448513..718fb8f2025c 100644 > --- a/configs/rock64-rk3328_defconfig > +++ b/configs/rock64-rk3328_defconfig > @@ -34,7 +34,6 @@ CONFIG_LEGACY_IMAGE_FORMAT=y > CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-rock64.dtb" > # CONFIG_DISPLAY_CPUINFO is not set > CONFIG_DISPLAY_BOARDINFO_LATE=y > -CONFIG_MISC_INIT_R=y > CONFIG_SPL_MAX_SIZE=0x40000 > CONFIG_SPL_PAD_TO=0x7f8000 > CONFIG_SPL_HAS_BSS_LINKER_SECTION=y > @@ -77,8 +76,6 @@ CONFIG_FASTBOOT_BUF_ADDR=0x800800 > CONFIG_FASTBOOT_CMD_OEM_FORMAT=y > CONFIG_ROCKCHIP_GPIO=y > CONFIG_SYS_I2C_ROCKCHIP=y > -CONFIG_MISC=y > -CONFIG_ROCKCHIP_EFUSE=y > CONFIG_MMC_DW=y > CONFIG_MMC_DW_ROCKCHIP=y > CONFIG_SPI_FLASH_SFDP_SUPPORT=y
