| Message ID | 20200608225030.481733-3-pbrobinson@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/3] rockchip: Pinebook Pro: enable rng to provide an entropy source | expand |
On 2020/6/9 ??6:50, Peter Robinson wrote: > Some minor fixes for SPI flash on the Pinebook Pro and also > default to saving environment to the SPI flash as it's > guaranteed to be on board. > > Signed-off-by: Peter Robinson <pbrobinson at gmail.com> Reviewed-by: Kever Yang <kever.yang at rock-chips.com> Thanks, - Kever > --- > arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi | 6 +++++- > configs/pinebook-pro-rk3399_defconfig | 3 +++ > include/configs/pinebook-pro-rk3399.h | 9 --------- > 3 files changed, 8 insertions(+), 10 deletions(-) > > diff --git a/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi > index 296321d697..ded7db0aef 100644 > --- a/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi > +++ b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi > @@ -12,7 +12,11 @@ > }; > > chosen { > - u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc; > + u-boot,spl-boot-order = "same-as-spl", &sdhci, &spiflash, &sdmmc; > + }; > + > + config { > + u-boot,spl-payload-offset = <0x60000>; /* @ 384KB */ > }; > }; > > diff --git a/configs/pinebook-pro-rk3399_defconfig b/configs/pinebook-pro-rk3399_defconfig > index 733463556a..18b2d74253 100644 > --- a/configs/pinebook-pro-rk3399_defconfig > +++ b/configs/pinebook-pro-rk3399_defconfig > @@ -1,6 +1,7 @@ > CONFIG_ARM=y > CONFIG_ARCH_ROCKCHIP=y > CONFIG_SYS_TEXT_BASE=0x00200000 > +CONFIG_ENV_SIZE=0x8000 > CONFIG_ROCKCHIP_RK3399=y > CONFIG_TARGET_PINEBOOK_PRO_RK3399=y > CONFIG_NR_DRAM_BANKS=1 > @@ -17,6 +18,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y > CONFIG_SPL_STACK_R=y > CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000 > CONFIG_SPL_MTD_SUPPORT=y > +CONFIG_SPL_SPI_LOAD=y > CONFIG_TPL=y > CONFIG_CMD_BOOTZ=y > CONFIG_CMD_GPIO=y > @@ -32,6 +34,7 @@ CONFIG_CMD_REGULATOR=y > CONFIG_SPL_OF_CONTROL=y > CONFIG_DEFAULT_DEVICE_TREE="rk3399-pinebook-pro" > 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_SPI_FLASH=y > CONFIG_SYS_RELOC_GD_ENV_ADDR=y > CONFIG_ROCKCHIP_GPIO=y > CONFIG_SYS_I2C_ROCKCHIP=y > diff --git a/include/configs/pinebook-pro-rk3399.h b/include/configs/pinebook-pro-rk3399.h > index d910830582..d478b19917 100644 > --- a/include/configs/pinebook-pro-rk3399.h > +++ b/include/configs/pinebook-pro-rk3399.h > @@ -14,15 +14,6 @@ > > #include <configs/rk3399_common.h> > > -#if defined(CONFIG_ENV_IS_IN_MMC) > -#define CONFIG_SYS_MMC_ENV_DEV 0 > -#elif defined(CONFIG_ENV_IS_IN_SPI_FLASH) > -#define CONFIG_ENV_SECT_SIZE (8 * 1024) > -#endif > - > -#undef CONFIG_SYS_SPI_U_BOOT_OFFS > -#define CONFIG_SYS_SPI_U_BOOT_OFFS 1024 * 512 > - > #define SDRAM_BANK_SIZE (2UL << 30) > > #define CONFIG_USB_OHCI_NEW
diff --git a/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi index 296321d697..ded7db0aef 100644 --- a/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi +++ b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi @@ -12,7 +12,11 @@ }; chosen { - u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc; + u-boot,spl-boot-order = "same-as-spl", &sdhci, &spiflash, &sdmmc; + }; + + config { + u-boot,spl-payload-offset = <0x60000>; /* @ 384KB */ }; }; diff --git a/configs/pinebook-pro-rk3399_defconfig b/configs/pinebook-pro-rk3399_defconfig index 733463556a..18b2d74253 100644 --- a/configs/pinebook-pro-rk3399_defconfig +++ b/configs/pinebook-pro-rk3399_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_ROCKCHIP=y CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_ENV_SIZE=0x8000 CONFIG_ROCKCHIP_RK3399=y CONFIG_TARGET_PINEBOOK_PRO_RK3399=y CONFIG_NR_DRAM_BANKS=1 @@ -17,6 +18,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000 CONFIG_SPL_MTD_SUPPORT=y +CONFIG_SPL_SPI_LOAD=y CONFIG_TPL=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPIO=y @@ -32,6 +34,7 @@ CONFIG_CMD_REGULATOR=y CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="rk3399-pinebook-pro" 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_SPI_FLASH=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y diff --git a/include/configs/pinebook-pro-rk3399.h b/include/configs/pinebook-pro-rk3399.h index d910830582..d478b19917 100644 --- a/include/configs/pinebook-pro-rk3399.h +++ b/include/configs/pinebook-pro-rk3399.h @@ -14,15 +14,6 @@ #include <configs/rk3399_common.h> -#if defined(CONFIG_ENV_IS_IN_MMC) -#define CONFIG_SYS_MMC_ENV_DEV 0 -#elif defined(CONFIG_ENV_IS_IN_SPI_FLASH) -#define CONFIG_ENV_SECT_SIZE (8 * 1024) -#endif - -#undef CONFIG_SYS_SPI_U_BOOT_OFFS -#define CONFIG_SYS_SPI_U_BOOT_OFFS 1024 * 512 - #define SDRAM_BANK_SIZE (2UL << 30) #define CONFIG_USB_OHCI_NEW
Some minor fixes for SPI flash on the Pinebook Pro and also default to saving environment to the SPI flash as it's guaranteed to be on board. Signed-off-by: Peter Robinson <pbrobinson at gmail.com> --- arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi | 6 +++++- configs/pinebook-pro-rk3399_defconfig | 3 +++ include/configs/pinebook-pro-rk3399.h | 9 --------- 3 files changed, 8 insertions(+), 10 deletions(-)