| Message ID | 20200601204213.466120-3-jagan@amarulasolutions.com |
|---|---|
| State | New |
| Headers | show |
| Series | rockchip: rk3399: Add SPI boot | expand |
On 2020/6/2 ??4:42, Jagan Teki wrote: > Mark the default U-Boot environment as SPI flash since > this is an on board flash device. > > Signed-off-by: Jagan Teki <jagan at amarulasolutions.com> Reviewed-by: Kever Yang <kever.yang at rock-chips.com> Thanks, - Kever > --- > configs/roc-pc-rk3399_defconfig | 3 ++- > include/configs/roc-pc-rk3399.h | 4 ---- > 2 files changed, 2 insertions(+), 5 deletions(-) > > diff --git a/configs/roc-pc-rk3399_defconfig b/configs/roc-pc-rk3399_defconfig > index 76e76c160e..18c343f9f9 100644 > --- a/configs/roc-pc-rk3399_defconfig > +++ b/configs/roc-pc-rk3399_defconfig > @@ -1,6 +1,7 @@ > CONFIG_ARM=y > CONFIG_ARCH_ROCKCHIP=y > CONFIG_SYS_TEXT_BASE=0x00200000 > +CONFIG_ENV_SIZE=0x8000 > CONFIG_ENV_OFFSET=0x3F8000 > CONFIG_ROCKCHIP_RK3399=y > CONFIG_TARGET_ROC_PC_RK3399=y > @@ -24,7 +25,7 @@ CONFIG_CMD_TIME=y > CONFIG_SPL_OF_CONTROL=y > CONFIG_DEFAULT_DEVICE_TREE="rk3399-roc-pc" > CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" > -CONFIG_ENV_IS_IN_MMC=y > +CONFIG_ENV_IS_IN_SPI_FLASH=y > CONFIG_SYS_RELOC_GD_ENV_ADDR=y > CONFIG_ROCKCHIP_GPIO=y > CONFIG_SYS_I2C_ROCKCHIP=y > diff --git a/include/configs/roc-pc-rk3399.h b/include/configs/roc-pc-rk3399.h > index d4cbc3532e..59fe22289c 100644 > --- a/include/configs/roc-pc-rk3399.h > +++ b/include/configs/roc-pc-rk3399.h > @@ -13,10 +13,6 @@ > > #include <configs/rk3399_common.h> > > -#if defined(CONFIG_ENV_IS_IN_MMC) > -# define CONFIG_SYS_MMC_ENV_DEV 0 > -#endif > - > #define SDRAM_BANK_SIZE (2UL << 30) > > #endif
diff --git a/configs/roc-pc-rk3399_defconfig b/configs/roc-pc-rk3399_defconfig index 76e76c160e..18c343f9f9 100644 --- a/configs/roc-pc-rk3399_defconfig +++ b/configs/roc-pc-rk3399_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_ROCKCHIP=y CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_ENV_SIZE=0x8000 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_ROCKCHIP_RK3399=y CONFIG_TARGET_ROC_PC_RK3399=y @@ -24,7 +25,7 @@ CONFIG_CMD_TIME=y CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="rk3399-roc-pc" CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" -CONFIG_ENV_IS_IN_MMC=y +CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y diff --git a/include/configs/roc-pc-rk3399.h b/include/configs/roc-pc-rk3399.h index d4cbc3532e..59fe22289c 100644 --- a/include/configs/roc-pc-rk3399.h +++ b/include/configs/roc-pc-rk3399.h @@ -13,10 +13,6 @@ #include <configs/rk3399_common.h> -#if defined(CONFIG_ENV_IS_IN_MMC) -# define CONFIG_SYS_MMC_ENV_DEV 0 -#endif - #define SDRAM_BANK_SIZE (2UL << 30) #endif
Mark the default U-Boot environment as SPI flash since this is an on board flash device. Signed-off-by: Jagan Teki <jagan at amarulasolutions.com> --- configs/roc-pc-rk3399_defconfig | 3 ++- include/configs/roc-pc-rk3399.h | 4 ---- 2 files changed, 2 insertions(+), 5 deletions(-)