| Message ID | 20191022175458.22604-6-jagan@amarulasolutions.com |
|---|---|
| State | New |
| Headers | show |
| Series |
|
| Related | show |
Jagan, On 2019/10/23 上午1:54, Jagan Teki wrote: > Select CONFIG_FASTBOOT_FLASH, CONFIG_FASTBOOT_FLASH_MMC_DEV > for rockchip SoC plaforms in fastboot Kconfig file instead > of defined it in board defconfig. > > This eventually drop the explicit configs defined in > supporting board defconfig files. > > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> > --- > configs/evb-rk3036_defconfig | 2 -- > configs/evb-rk3128_defconfig | 2 -- > configs/evb-rk3229_defconfig | 2 -- > configs/evb-rk3288_defconfig | 2 -- > configs/evb-rk3328_defconfig | 2 -- > configs/firefly-rk3288_defconfig | 2 -- > configs/kylin-rk3036_defconfig | 2 -- > configs/miqi-rk3288_defconfig | 2 -- > configs/phycore-rk3288_defconfig | 2 -- > configs/popmetal-rk3288_defconfig | 2 -- > configs/rock64-rk3328_defconfig | 2 -- > configs/tinker-rk3288_defconfig | 2 -- > drivers/fastboot/Kconfig | 4 +++- > 13 files changed, 3 insertions(+), 25 deletions(-) > > diff --git a/configs/evb-rk3036_defconfig b/configs/evb-rk3036_defconfig > index c02ef6af4e..ca2ba9d0d8 100644 > --- a/configs/evb-rk3036_defconfig > +++ b/configs/evb-rk3036_defconfig > @@ -36,8 +36,6 @@ CONFIG_REGMAP=y > CONFIG_SYSCON=y > # CONFIG_SPL_BLK is not set > CONFIG_CLK=y > -CONFIG_FASTBOOT_FLASH=y > -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 > CONFIG_FASTBOOT_CMD_OEM_FORMAT=y > CONFIG_ROCKCHIP_GPIO=y > CONFIG_SYS_I2C_ROCKCHIP=y > diff --git a/configs/evb-rk3128_defconfig b/configs/evb-rk3128_defconfig > index a3189638a1..9d81d96e68 100644 > --- a/configs/evb-rk3128_defconfig > +++ b/configs/evb-rk3128_defconfig > @@ -22,8 +22,6 @@ CONFIG_SYSCON=y > CONFIG_CLK=y > CONFIG_FASTBOOT_BUF_ADDR=0x60800800 > CONFIG_FASTBOOT_BUF_SIZE=0x04000000 > -CONFIG_FASTBOOT_FLASH=y > -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 > CONFIG_FASTBOOT_CMD_OEM_FORMAT=y > CONFIG_ROCKCHIP_GPIO=y > CONFIG_SYS_I2C_ROCKCHIP=y > diff --git a/configs/evb-rk3229_defconfig b/configs/evb-rk3229_defconfig > index e7b813d627..a365931e47 100644 > --- a/configs/evb-rk3229_defconfig > +++ b/configs/evb-rk3229_defconfig > @@ -44,8 +44,6 @@ CONFIG_CLK=y > CONFIG_SPL_CLK=y > CONFIG_TPL_CLK=y > CONFIG_FASTBOOT_BUF_SIZE=0x04000000 > -CONFIG_FASTBOOT_FLASH=y > -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 > CONFIG_FASTBOOT_CMD_OEM_FORMAT=y > CONFIG_ROCKCHIP_GPIO=y > CONFIG_SYS_I2C_ROCKCHIP=y > diff --git a/configs/evb-rk3288_defconfig b/configs/evb-rk3288_defconfig > index a6c57dfaa6..a88f391b96 100644 > --- a/configs/evb-rk3288_defconfig > +++ b/configs/evb-rk3288_defconfig > @@ -44,8 +44,6 @@ CONFIG_SYSCON=y > CONFIG_SPL_SYSCON=y > CONFIG_CLK=y > CONFIG_SPL_CLK=y > -CONFIG_FASTBOOT_FLASH=y > -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 > CONFIG_FASTBOOT_CMD_OEM_FORMAT=y > CONFIG_ROCKCHIP_GPIO=y > CONFIG_SYS_I2C_ROCKCHIP=y > diff --git a/configs/evb-rk3328_defconfig b/configs/evb-rk3328_defconfig > index c9d056b4b9..d133477e62 100644 > --- a/configs/evb-rk3328_defconfig > +++ b/configs/evb-rk3328_defconfig > @@ -48,8 +48,6 @@ CONFIG_CLK=y > CONFIG_SPL_CLK=y > CONFIG_TPL_CLK=y > CONFIG_FASTBOOT_BUF_ADDR=0x800800 > -CONFIG_FASTBOOT_FLASH=y > -CONFIG_FASTBOOT_FLASH_MMC_DEV=1 > CONFIG_FASTBOOT_CMD_OEM_FORMAT=y > CONFIG_ROCKCHIP_GPIO=y > CONFIG_SYS_I2C_ROCKCHIP=y > diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig > index 2de166ae90..4bd81048e9 100644 > --- a/configs/firefly-rk3288_defconfig > +++ b/configs/firefly-rk3288_defconfig > @@ -46,8 +46,6 @@ CONFIG_SPL_SYSCON=y > # CONFIG_SPL_SIMPLE_BUS is not set > CONFIG_CLK=y > CONFIG_SPL_CLK=y > -CONFIG_FASTBOOT_FLASH=y > -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 > CONFIG_FASTBOOT_CMD_OEM_FORMAT=y > CONFIG_ROCKCHIP_GPIO=y > CONFIG_SYS_I2C_ROCKCHIP=y > diff --git a/configs/kylin-rk3036_defconfig b/configs/kylin-rk3036_defconfig > index ff20dea0fc..79188c16b7 100644 > --- a/configs/kylin-rk3036_defconfig > +++ b/configs/kylin-rk3036_defconfig > @@ -38,8 +38,6 @@ CONFIG_REGMAP=y > CONFIG_SYSCON=y > # CONFIG_SPL_BLK is not set > CONFIG_CLK=y > -CONFIG_FASTBOOT_FLASH=y > -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 > CONFIG_FASTBOOT_CMD_OEM_FORMAT=y > CONFIG_ROCKCHIP_GPIO=y > CONFIG_SYS_I2C_ROCKCHIP=y > diff --git a/configs/miqi-rk3288_defconfig b/configs/miqi-rk3288_defconfig > index fbafbb857a..1b55008a96 100644 > --- a/configs/miqi-rk3288_defconfig > +++ b/configs/miqi-rk3288_defconfig > @@ -46,8 +46,6 @@ CONFIG_SPL_SYSCON=y > # CONFIG_SPL_SIMPLE_BUS is not set > CONFIG_CLK=y > CONFIG_SPL_CLK=y > -CONFIG_FASTBOOT_FLASH=y > -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 > CONFIG_FASTBOOT_CMD_OEM_FORMAT=y > CONFIG_ROCKCHIP_GPIO=y > CONFIG_SYS_I2C_ROCKCHIP=y > diff --git a/configs/phycore-rk3288_defconfig b/configs/phycore-rk3288_defconfig > index 70e3bdc621..f44974b191 100644 > --- a/configs/phycore-rk3288_defconfig > +++ b/configs/phycore-rk3288_defconfig > @@ -48,8 +48,6 @@ CONFIG_SPL_SYSCON=y > # CONFIG_SPL_SIMPLE_BUS is not set > CONFIG_CLK=y > CONFIG_SPL_CLK=y > -CONFIG_FASTBOOT_FLASH=y > -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 > CONFIG_FASTBOOT_CMD_OEM_FORMAT=y > CONFIG_ROCKCHIP_GPIO=y > CONFIG_SYS_I2C_ROCKCHIP=y > diff --git a/configs/popmetal-rk3288_defconfig b/configs/popmetal-rk3288_defconfig > index 611aff5e1d..af70684045 100644 > --- a/configs/popmetal-rk3288_defconfig > +++ b/configs/popmetal-rk3288_defconfig > @@ -46,8 +46,6 @@ CONFIG_SPL_SYSCON=y > # CONFIG_SPL_SIMPLE_BUS is not set > CONFIG_CLK=y > CONFIG_SPL_CLK=y > -CONFIG_FASTBOOT_FLASH=y > -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 > CONFIG_FASTBOOT_CMD_OEM_FORMAT=y > CONFIG_ROCKCHIP_GPIO=y > CONFIG_SYS_I2C_ROCKCHIP=y > diff --git a/configs/rock64-rk3328_defconfig b/configs/rock64-rk3328_defconfig > index 5e64003dd3..fc9079eb4e 100644 > --- a/configs/rock64-rk3328_defconfig > +++ b/configs/rock64-rk3328_defconfig > @@ -51,8 +51,6 @@ CONFIG_CLK=y > CONFIG_SPL_CLK=y > CONFIG_TPL_CLK=y > CONFIG_FASTBOOT_BUF_ADDR=0x800800 > -CONFIG_FASTBOOT_FLASH=y > -CONFIG_FASTBOOT_FLASH_MMC_DEV=1 > CONFIG_FASTBOOT_CMD_OEM_FORMAT=y > CONFIG_ROCKCHIP_GPIO=y > CONFIG_SYS_I2C_ROCKCHIP=y > diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig > index 467065e3ad..a624270aff 100644 > --- a/configs/tinker-rk3288_defconfig > +++ b/configs/tinker-rk3288_defconfig > @@ -48,8 +48,6 @@ CONFIG_SPL_SYSCON=y > # CONFIG_SPL_SIMPLE_BUS is not set > CONFIG_CLK=y > CONFIG_SPL_CLK=y > -CONFIG_FASTBOOT_FLASH=y > -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 > CONFIG_FASTBOOT_CMD_OEM_FORMAT=y > CONFIG_ROCKCHIP_GPIO=y > CONFIG_SYS_I2C_ROCKCHIP=y > diff --git a/drivers/fastboot/Kconfig b/drivers/fastboot/Kconfig > index d63ecdd27e..34864ca613 100644 > --- a/drivers/fastboot/Kconfig > +++ b/drivers/fastboot/Kconfig > @@ -64,7 +64,7 @@ config FASTBOOT_USB_DEV > > config FASTBOOT_FLASH > bool "Enable FASTBOOT FLASH command" > - default y if ARCH_SUNXI > + default y if ARCH_SUNXI || ARCH_ROCKCHIP > depends on MMC || (NAND && CMD_MTDPARTS) > select IMAGE_SPARSE > help > @@ -89,6 +89,8 @@ endchoice > config FASTBOOT_FLASH_MMC_DEV > int "Define FASTBOOT MMC FLASH default device" > depends on FASTBOOT_FLASH_MMC > + default 1 if ROCKCHIP_RK3328 We can use '0' for rk3328 and remove this line. When we using fastboot, we suppose to access to eMMC, but not SDCard, and the eMMC number is always '0' on Rockchip platform. Thanks, - Kever > + default 0 if ARCH_ROCKCHIP > default 0 if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA = -1 > default 1 if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA != -1 > help
On Wed, Oct 23, 2019 at 1:17 PM Kever Yang <kever.yang@rock-chips.com> wrote: > > Jagan, > > On 2019/10/23 上午1:54, Jagan Teki wrote: > > Select CONFIG_FASTBOOT_FLASH, CONFIG_FASTBOOT_FLASH_MMC_DEV > > for rockchip SoC plaforms in fastboot Kconfig file instead > > of defined it in board defconfig. > > > > This eventually drop the explicit configs defined in > > supporting board defconfig files. > > > > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> > > --- > > configs/evb-rk3036_defconfig | 2 -- > > configs/evb-rk3128_defconfig | 2 -- > > configs/evb-rk3229_defconfig | 2 -- > > configs/evb-rk3288_defconfig | 2 -- > > configs/evb-rk3328_defconfig | 2 -- > > configs/firefly-rk3288_defconfig | 2 -- > > configs/kylin-rk3036_defconfig | 2 -- > > configs/miqi-rk3288_defconfig | 2 -- > > configs/phycore-rk3288_defconfig | 2 -- > > configs/popmetal-rk3288_defconfig | 2 -- > > configs/rock64-rk3328_defconfig | 2 -- > > configs/tinker-rk3288_defconfig | 2 -- > > drivers/fastboot/Kconfig | 4 +++- > > 13 files changed, 3 insertions(+), 25 deletions(-) > > > > diff --git a/configs/evb-rk3036_defconfig b/configs/evb-rk3036_defconfig > > index c02ef6af4e..ca2ba9d0d8 100644 > > --- a/configs/evb-rk3036_defconfig > > +++ b/configs/evb-rk3036_defconfig > > @@ -36,8 +36,6 @@ CONFIG_REGMAP=y > > CONFIG_SYSCON=y > > # CONFIG_SPL_BLK is not set > > CONFIG_CLK=y > > -CONFIG_FASTBOOT_FLASH=y > > -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 > > CONFIG_FASTBOOT_CMD_OEM_FORMAT=y > > CONFIG_ROCKCHIP_GPIO=y > > CONFIG_SYS_I2C_ROCKCHIP=y > > diff --git a/configs/evb-rk3128_defconfig b/configs/evb-rk3128_defconfig > > index a3189638a1..9d81d96e68 100644 > > --- a/configs/evb-rk3128_defconfig > > +++ b/configs/evb-rk3128_defconfig > > @@ -22,8 +22,6 @@ CONFIG_SYSCON=y > > CONFIG_CLK=y > > CONFIG_FASTBOOT_BUF_ADDR=0x60800800 > > CONFIG_FASTBOOT_BUF_SIZE=0x04000000 > > -CONFIG_FASTBOOT_FLASH=y > > -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 > > CONFIG_FASTBOOT_CMD_OEM_FORMAT=y > > CONFIG_ROCKCHIP_GPIO=y > > CONFIG_SYS_I2C_ROCKCHIP=y > > diff --git a/configs/evb-rk3229_defconfig b/configs/evb-rk3229_defconfig > > index e7b813d627..a365931e47 100644 > > --- a/configs/evb-rk3229_defconfig > > +++ b/configs/evb-rk3229_defconfig > > @@ -44,8 +44,6 @@ CONFIG_CLK=y > > CONFIG_SPL_CLK=y > > CONFIG_TPL_CLK=y > > CONFIG_FASTBOOT_BUF_SIZE=0x04000000 > > -CONFIG_FASTBOOT_FLASH=y > > -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 > > CONFIG_FASTBOOT_CMD_OEM_FORMAT=y > > CONFIG_ROCKCHIP_GPIO=y > > CONFIG_SYS_I2C_ROCKCHIP=y > > diff --git a/configs/evb-rk3288_defconfig b/configs/evb-rk3288_defconfig > > index a6c57dfaa6..a88f391b96 100644 > > --- a/configs/evb-rk3288_defconfig > > +++ b/configs/evb-rk3288_defconfig > > @@ -44,8 +44,6 @@ CONFIG_SYSCON=y > > CONFIG_SPL_SYSCON=y > > CONFIG_CLK=y > > CONFIG_SPL_CLK=y > > -CONFIG_FASTBOOT_FLASH=y > > -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 > > CONFIG_FASTBOOT_CMD_OEM_FORMAT=y > > CONFIG_ROCKCHIP_GPIO=y > > CONFIG_SYS_I2C_ROCKCHIP=y > > diff --git a/configs/evb-rk3328_defconfig b/configs/evb-rk3328_defconfig > > index c9d056b4b9..d133477e62 100644 > > --- a/configs/evb-rk3328_defconfig > > +++ b/configs/evb-rk3328_defconfig > > @@ -48,8 +48,6 @@ CONFIG_CLK=y > > CONFIG_SPL_CLK=y > > CONFIG_TPL_CLK=y > > CONFIG_FASTBOOT_BUF_ADDR=0x800800 > > -CONFIG_FASTBOOT_FLASH=y > > -CONFIG_FASTBOOT_FLASH_MMC_DEV=1 > > CONFIG_FASTBOOT_CMD_OEM_FORMAT=y > > CONFIG_ROCKCHIP_GPIO=y > > CONFIG_SYS_I2C_ROCKCHIP=y > > diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig > > index 2de166ae90..4bd81048e9 100644 > > --- a/configs/firefly-rk3288_defconfig > > +++ b/configs/firefly-rk3288_defconfig > > @@ -46,8 +46,6 @@ CONFIG_SPL_SYSCON=y > > # CONFIG_SPL_SIMPLE_BUS is not set > > CONFIG_CLK=y > > CONFIG_SPL_CLK=y > > -CONFIG_FASTBOOT_FLASH=y > > -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 > > CONFIG_FASTBOOT_CMD_OEM_FORMAT=y > > CONFIG_ROCKCHIP_GPIO=y > > CONFIG_SYS_I2C_ROCKCHIP=y > > diff --git a/configs/kylin-rk3036_defconfig b/configs/kylin-rk3036_defconfig > > index ff20dea0fc..79188c16b7 100644 > > --- a/configs/kylin-rk3036_defconfig > > +++ b/configs/kylin-rk3036_defconfig > > @@ -38,8 +38,6 @@ CONFIG_REGMAP=y > > CONFIG_SYSCON=y > > # CONFIG_SPL_BLK is not set > > CONFIG_CLK=y > > -CONFIG_FASTBOOT_FLASH=y > > -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 > > CONFIG_FASTBOOT_CMD_OEM_FORMAT=y > > CONFIG_ROCKCHIP_GPIO=y > > CONFIG_SYS_I2C_ROCKCHIP=y > > diff --git a/configs/miqi-rk3288_defconfig b/configs/miqi-rk3288_defconfig > > index fbafbb857a..1b55008a96 100644 > > --- a/configs/miqi-rk3288_defconfig > > +++ b/configs/miqi-rk3288_defconfig > > @@ -46,8 +46,6 @@ CONFIG_SPL_SYSCON=y > > # CONFIG_SPL_SIMPLE_BUS is not set > > CONFIG_CLK=y > > CONFIG_SPL_CLK=y > > -CONFIG_FASTBOOT_FLASH=y > > -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 > > CONFIG_FASTBOOT_CMD_OEM_FORMAT=y > > CONFIG_ROCKCHIP_GPIO=y > > CONFIG_SYS_I2C_ROCKCHIP=y > > diff --git a/configs/phycore-rk3288_defconfig b/configs/phycore-rk3288_defconfig > > index 70e3bdc621..f44974b191 100644 > > --- a/configs/phycore-rk3288_defconfig > > +++ b/configs/phycore-rk3288_defconfig > > @@ -48,8 +48,6 @@ CONFIG_SPL_SYSCON=y > > # CONFIG_SPL_SIMPLE_BUS is not set > > CONFIG_CLK=y > > CONFIG_SPL_CLK=y > > -CONFIG_FASTBOOT_FLASH=y > > -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 > > CONFIG_FASTBOOT_CMD_OEM_FORMAT=y > > CONFIG_ROCKCHIP_GPIO=y > > CONFIG_SYS_I2C_ROCKCHIP=y > > diff --git a/configs/popmetal-rk3288_defconfig b/configs/popmetal-rk3288_defconfig > > index 611aff5e1d..af70684045 100644 > > --- a/configs/popmetal-rk3288_defconfig > > +++ b/configs/popmetal-rk3288_defconfig > > @@ -46,8 +46,6 @@ CONFIG_SPL_SYSCON=y > > # CONFIG_SPL_SIMPLE_BUS is not set > > CONFIG_CLK=y > > CONFIG_SPL_CLK=y > > -CONFIG_FASTBOOT_FLASH=y > > -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 > > CONFIG_FASTBOOT_CMD_OEM_FORMAT=y > > CONFIG_ROCKCHIP_GPIO=y > > CONFIG_SYS_I2C_ROCKCHIP=y > > diff --git a/configs/rock64-rk3328_defconfig b/configs/rock64-rk3328_defconfig > > index 5e64003dd3..fc9079eb4e 100644 > > --- a/configs/rock64-rk3328_defconfig > > +++ b/configs/rock64-rk3328_defconfig > > @@ -51,8 +51,6 @@ CONFIG_CLK=y > > CONFIG_SPL_CLK=y > > CONFIG_TPL_CLK=y > > CONFIG_FASTBOOT_BUF_ADDR=0x800800 > > -CONFIG_FASTBOOT_FLASH=y > > -CONFIG_FASTBOOT_FLASH_MMC_DEV=1 > > CONFIG_FASTBOOT_CMD_OEM_FORMAT=y > > CONFIG_ROCKCHIP_GPIO=y > > CONFIG_SYS_I2C_ROCKCHIP=y > > diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig > > index 467065e3ad..a624270aff 100644 > > --- a/configs/tinker-rk3288_defconfig > > +++ b/configs/tinker-rk3288_defconfig > > @@ -48,8 +48,6 @@ CONFIG_SPL_SYSCON=y > > # CONFIG_SPL_SIMPLE_BUS is not set > > CONFIG_CLK=y > > CONFIG_SPL_CLK=y > > -CONFIG_FASTBOOT_FLASH=y > > -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 > > CONFIG_FASTBOOT_CMD_OEM_FORMAT=y > > CONFIG_ROCKCHIP_GPIO=y > > CONFIG_SYS_I2C_ROCKCHIP=y > > diff --git a/drivers/fastboot/Kconfig b/drivers/fastboot/Kconfig > > index d63ecdd27e..34864ca613 100644 > > --- a/drivers/fastboot/Kconfig > > +++ b/drivers/fastboot/Kconfig > > @@ -64,7 +64,7 @@ config FASTBOOT_USB_DEV > > > > config FASTBOOT_FLASH > > bool "Enable FASTBOOT FLASH command" > > - default y if ARCH_SUNXI > > + default y if ARCH_SUNXI || ARCH_ROCKCHIP > > depends on MMC || (NAND && CMD_MTDPARTS) > > select IMAGE_SPARSE > > help > > @@ -89,6 +89,8 @@ endchoice > > config FASTBOOT_FLASH_MMC_DEV > > int "Define FASTBOOT MMC FLASH default device" > > depends on FASTBOOT_FLASH_MMC > > + default 1 if ROCKCHIP_RK3328 > > We can use '0' for rk3328 and remove this line. > > When we using fastboot, we suppose to access to eMMC, but not SDCard, > > and the eMMC number is always '0' on Rockchip platform. True, since the respective defconfig is using 1 I have used the same. will make another change to update that.
diff --git a/configs/evb-rk3036_defconfig b/configs/evb-rk3036_defconfig index c02ef6af4e..ca2ba9d0d8 100644 --- a/configs/evb-rk3036_defconfig +++ b/configs/evb-rk3036_defconfig @@ -36,8 +36,6 @@ CONFIG_REGMAP=y CONFIG_SYSCON=y # CONFIG_SPL_BLK is not set CONFIG_CLK=y -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y diff --git a/configs/evb-rk3128_defconfig b/configs/evb-rk3128_defconfig index a3189638a1..9d81d96e68 100644 --- a/configs/evb-rk3128_defconfig +++ b/configs/evb-rk3128_defconfig @@ -22,8 +22,6 @@ CONFIG_SYSCON=y CONFIG_CLK=y CONFIG_FASTBOOT_BUF_ADDR=0x60800800 CONFIG_FASTBOOT_BUF_SIZE=0x04000000 -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y diff --git a/configs/evb-rk3229_defconfig b/configs/evb-rk3229_defconfig index e7b813d627..a365931e47 100644 --- a/configs/evb-rk3229_defconfig +++ b/configs/evb-rk3229_defconfig @@ -44,8 +44,6 @@ CONFIG_CLK=y CONFIG_SPL_CLK=y CONFIG_TPL_CLK=y CONFIG_FASTBOOT_BUF_SIZE=0x04000000 -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y diff --git a/configs/evb-rk3288_defconfig b/configs/evb-rk3288_defconfig index a6c57dfaa6..a88f391b96 100644 --- a/configs/evb-rk3288_defconfig +++ b/configs/evb-rk3288_defconfig @@ -44,8 +44,6 @@ CONFIG_SYSCON=y CONFIG_SPL_SYSCON=y CONFIG_CLK=y CONFIG_SPL_CLK=y -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y diff --git a/configs/evb-rk3328_defconfig b/configs/evb-rk3328_defconfig index c9d056b4b9..d133477e62 100644 --- a/configs/evb-rk3328_defconfig +++ b/configs/evb-rk3328_defconfig @@ -48,8 +48,6 @@ CONFIG_CLK=y CONFIG_SPL_CLK=y CONFIG_TPL_CLK=y CONFIG_FASTBOOT_BUF_ADDR=0x800800 -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=1 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig index 2de166ae90..4bd81048e9 100644 --- a/configs/firefly-rk3288_defconfig +++ b/configs/firefly-rk3288_defconfig @@ -46,8 +46,6 @@ CONFIG_SPL_SYSCON=y # CONFIG_SPL_SIMPLE_BUS is not set CONFIG_CLK=y CONFIG_SPL_CLK=y -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y diff --git a/configs/kylin-rk3036_defconfig b/configs/kylin-rk3036_defconfig index ff20dea0fc..79188c16b7 100644 --- a/configs/kylin-rk3036_defconfig +++ b/configs/kylin-rk3036_defconfig @@ -38,8 +38,6 @@ CONFIG_REGMAP=y CONFIG_SYSCON=y # CONFIG_SPL_BLK is not set CONFIG_CLK=y -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y diff --git a/configs/miqi-rk3288_defconfig b/configs/miqi-rk3288_defconfig index fbafbb857a..1b55008a96 100644 --- a/configs/miqi-rk3288_defconfig +++ b/configs/miqi-rk3288_defconfig @@ -46,8 +46,6 @@ CONFIG_SPL_SYSCON=y # CONFIG_SPL_SIMPLE_BUS is not set CONFIG_CLK=y CONFIG_SPL_CLK=y -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y diff --git a/configs/phycore-rk3288_defconfig b/configs/phycore-rk3288_defconfig index 70e3bdc621..f44974b191 100644 --- a/configs/phycore-rk3288_defconfig +++ b/configs/phycore-rk3288_defconfig @@ -48,8 +48,6 @@ CONFIG_SPL_SYSCON=y # CONFIG_SPL_SIMPLE_BUS is not set CONFIG_CLK=y CONFIG_SPL_CLK=y -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y diff --git a/configs/popmetal-rk3288_defconfig b/configs/popmetal-rk3288_defconfig index 611aff5e1d..af70684045 100644 --- a/configs/popmetal-rk3288_defconfig +++ b/configs/popmetal-rk3288_defconfig @@ -46,8 +46,6 @@ CONFIG_SPL_SYSCON=y # CONFIG_SPL_SIMPLE_BUS is not set CONFIG_CLK=y CONFIG_SPL_CLK=y -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y diff --git a/configs/rock64-rk3328_defconfig b/configs/rock64-rk3328_defconfig index 5e64003dd3..fc9079eb4e 100644 --- a/configs/rock64-rk3328_defconfig +++ b/configs/rock64-rk3328_defconfig @@ -51,8 +51,6 @@ CONFIG_CLK=y CONFIG_SPL_CLK=y CONFIG_TPL_CLK=y CONFIG_FASTBOOT_BUF_ADDR=0x800800 -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=1 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig index 467065e3ad..a624270aff 100644 --- a/configs/tinker-rk3288_defconfig +++ b/configs/tinker-rk3288_defconfig @@ -48,8 +48,6 @@ CONFIG_SPL_SYSCON=y # CONFIG_SPL_SIMPLE_BUS is not set CONFIG_CLK=y CONFIG_SPL_CLK=y -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y diff --git a/drivers/fastboot/Kconfig b/drivers/fastboot/Kconfig index d63ecdd27e..34864ca613 100644 --- a/drivers/fastboot/Kconfig +++ b/drivers/fastboot/Kconfig @@ -64,7 +64,7 @@ config FASTBOOT_USB_DEV config FASTBOOT_FLASH bool "Enable FASTBOOT FLASH command" - default y if ARCH_SUNXI + default y if ARCH_SUNXI || ARCH_ROCKCHIP depends on MMC || (NAND && CMD_MTDPARTS) select IMAGE_SPARSE help @@ -89,6 +89,8 @@ endchoice config FASTBOOT_FLASH_MMC_DEV int "Define FASTBOOT MMC FLASH default device" depends on FASTBOOT_FLASH_MMC + default 1 if ROCKCHIP_RK3328 + default 0 if ARCH_ROCKCHIP default 0 if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA = -1 default 1 if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA != -1 help
Select CONFIG_FASTBOOT_FLASH, CONFIG_FASTBOOT_FLASH_MMC_DEV for rockchip SoC plaforms in fastboot Kconfig file instead of defined it in board defconfig. This eventually drop the explicit configs defined in supporting board defconfig files. Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> --- configs/evb-rk3036_defconfig | 2 -- configs/evb-rk3128_defconfig | 2 -- configs/evb-rk3229_defconfig | 2 -- configs/evb-rk3288_defconfig | 2 -- configs/evb-rk3328_defconfig | 2 -- configs/firefly-rk3288_defconfig | 2 -- configs/kylin-rk3036_defconfig | 2 -- configs/miqi-rk3288_defconfig | 2 -- configs/phycore-rk3288_defconfig | 2 -- configs/popmetal-rk3288_defconfig | 2 -- configs/rock64-rk3328_defconfig | 2 -- configs/tinker-rk3288_defconfig | 2 -- drivers/fastboot/Kconfig | 4 +++- 13 files changed, 3 insertions(+), 25 deletions(-)