| Message ID | 20191221075440.6944-7-jagan@amarulasolutions.com |
|---|---|
| State | Accepted |
| Commit | d7b433e40b037733f47b83b8e2f385f91035924b |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | rk3399: SPI boot support (fixes, updates) | expand |
On 2019/12/21 下午3:54, Jagan Teki wrote: > Rockchip do support SPI flash as well, so there is > a possibility of using flash environment for those > use cases. > > So, restrict the current env offset, size for MMC. > > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > env/Kconfig | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/env/Kconfig b/env/Kconfig > index ed12609f6a..9416a70022 100644 > --- a/env/Kconfig > +++ b/env/Kconfig > @@ -488,7 +488,7 @@ config ENV_OFFSET > hex "Environment offset" > depends on ENV_IS_IN_EEPROM || ENV_IS_IN_MMC || ENV_IS_IN_NAND || \ > ENV_IS_IN_SPI_FLASH > - default 0x3f8000 if ARCH_ROCKCHIP > + default 0x3f8000 if ARCH_ROCKCHIP && ENV_IS_IN_MMC > default 0x88000 if ARCH_SUNXI > default 0xE0000 if ARCH_ZYNQ > default 0x1E00000 if ARCH_ZYNQMP > @@ -511,7 +511,8 @@ config ENV_SIZE > hex "Environment Size" > default 0x40000 if ENV_IS_IN_SPI_FLASH && ARCH_ZYNQMP > default 0x20000 if ARCH_SUNXI || ARCH_ZYNQ || ARCH_OMAP2PLUS || ARCH_AT91 > - default 0x8000 if ARCH_ROCKCHIP || ARCH_ZYNQMP || ARCH_VERSAL > + default 0x8000 if ARCH_ROCKCHIP && ENV_IS_IN_MMC > + default 0x8000 if ARCH_ZYNQMP || ARCH_VERSAL > default 0x4000 if ARC > default 0x1f000 > help
diff --git a/env/Kconfig b/env/Kconfig index ed12609f6a..9416a70022 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -488,7 +488,7 @@ config ENV_OFFSET hex "Environment offset" depends on ENV_IS_IN_EEPROM || ENV_IS_IN_MMC || ENV_IS_IN_NAND || \ ENV_IS_IN_SPI_FLASH - default 0x3f8000 if ARCH_ROCKCHIP + default 0x3f8000 if ARCH_ROCKCHIP && ENV_IS_IN_MMC default 0x88000 if ARCH_SUNXI default 0xE0000 if ARCH_ZYNQ default 0x1E00000 if ARCH_ZYNQMP @@ -511,7 +511,8 @@ config ENV_SIZE hex "Environment Size" default 0x40000 if ENV_IS_IN_SPI_FLASH && ARCH_ZYNQMP default 0x20000 if ARCH_SUNXI || ARCH_ZYNQ || ARCH_OMAP2PLUS || ARCH_AT91 - default 0x8000 if ARCH_ROCKCHIP || ARCH_ZYNQMP || ARCH_VERSAL + default 0x8000 if ARCH_ROCKCHIP && ENV_IS_IN_MMC + default 0x8000 if ARCH_ZYNQMP || ARCH_VERSAL default 0x4000 if ARC default 0x1f000 help
Rockchip do support SPI flash as well, so there is a possibility of using flash environment for those use cases. So, restrict the current env offset, size for MMC. Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> --- env/Kconfig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)