| Message ID | 20190701160554.18688-3-pbrobinson@gmail.com |
|---|---|
| State | Accepted |
| Commit | 6fe736ad0bf91848a5a579be9f82dff3c2ddb930 |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | [U-Boot,1/6] arm64: rockchip: rock960: sync dts files from Linux 5.2-rc6 | expand |
Hi Peter, On 07/02/2019 12:05 AM, Peter Robinson wrote: > The Rock960 doesn't contain SPI flash so drop related config options. > > Signed-off-by: Peter Robinson <pbrobinson@gmail.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > configs/rock960-rk3399_defconfig | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig > index 1958b7e190..1aa986e9cd 100644 > --- a/configs/rock960-rk3399_defconfig > +++ b/configs/rock960-rk3399_defconfig > @@ -21,7 +21,6 @@ CONFIG_SYS_PROMPT="rock960 => " > CONFIG_CMD_BOOTZ=y > CONFIG_CMD_GPT=y > CONFIG_CMD_MMC=y > -CONFIG_CMD_SF=y > CONFIG_CMD_USB=y > # CONFIG_CMD_SETEXPR is not set > CONFIG_CMD_TIME=y > @@ -35,7 +34,6 @@ CONFIG_MMC_DW=y > CONFIG_MMC_DW_ROCKCHIP=y > CONFIG_MMC_SDHCI=y > CONFIG_MMC_SDHCI_ROCKCHIP=y > -CONFIG_SF_DEFAULT_SPEED=20000000 > CONFIG_PMIC_RK8XX=y > CONFIG_REGULATOR_PWM=y > CONFIG_REGULATOR_RK8XX=y
On 1 July 2019 9:35:50 PM IST, Peter Robinson <pbrobinson@gmail.com> wrote: >The Rock960 doesn't contain SPI flash so drop related config options. > >Signed-off-by: Peter Robinson <pbrobinson@gmail.com> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Thanks, Mani >--- > configs/rock960-rk3399_defconfig | 2 -- > 1 file changed, 2 deletions(-) > >diff --git a/configs/rock960-rk3399_defconfig >b/configs/rock960-rk3399_defconfig >index 1958b7e190..1aa986e9cd 100644 >--- a/configs/rock960-rk3399_defconfig >+++ b/configs/rock960-rk3399_defconfig >@@ -21,7 +21,6 @@ CONFIG_SYS_PROMPT="rock960 => " > CONFIG_CMD_BOOTZ=y > CONFIG_CMD_GPT=y > CONFIG_CMD_MMC=y >-CONFIG_CMD_SF=y > CONFIG_CMD_USB=y > # CONFIG_CMD_SETEXPR is not set > CONFIG_CMD_TIME=y >@@ -35,7 +34,6 @@ CONFIG_MMC_DW=y > CONFIG_MMC_DW_ROCKCHIP=y > CONFIG_MMC_SDHCI=y > CONFIG_MMC_SDHCI_ROCKCHIP=y >-CONFIG_SF_DEFAULT_SPEED=20000000 > CONFIG_PMIC_RK8XX=y > CONFIG_REGULATOR_PWM=y > CONFIG_REGULATOR_RK8XX=y
On 2019/7/2 上午10:07, Kever Yang wrote: > Hi Peter, > > > On 07/02/2019 12:05 AM, Peter Robinson wrote: >> The Rock960 doesn't contain SPI flash so drop related config options. >> >> Signed-off-by: Peter Robinson <pbrobinson@gmail.com> > Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Applied to u-boot-rockchip. Thanks, - Kever > > Thanks, > - Kever > >> --- >> configs/rock960-rk3399_defconfig | 2 -- >> 1 file changed, 2 deletions(-) >> >> diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig >> index 1958b7e190..1aa986e9cd 100644 >> --- a/configs/rock960-rk3399_defconfig >> +++ b/configs/rock960-rk3399_defconfig >> @@ -21,7 +21,6 @@ CONFIG_SYS_PROMPT="rock960 => " >> CONFIG_CMD_BOOTZ=y >> CONFIG_CMD_GPT=y >> CONFIG_CMD_MMC=y >> -CONFIG_CMD_SF=y >> CONFIG_CMD_USB=y >> # CONFIG_CMD_SETEXPR is not set >> CONFIG_CMD_TIME=y >> @@ -35,7 +34,6 @@ CONFIG_MMC_DW=y >> CONFIG_MMC_DW_ROCKCHIP=y >> CONFIG_MMC_SDHCI=y >> CONFIG_MMC_SDHCI_ROCKCHIP=y >> -CONFIG_SF_DEFAULT_SPEED=20000000 >> CONFIG_PMIC_RK8XX=y >> CONFIG_REGULATOR_PWM=y >> CONFIG_REGULATOR_RK8XX=y > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > https://lists.denx.de/listinfo/u-boot
diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig index 1958b7e190..1aa986e9cd 100644 --- a/configs/rock960-rk3399_defconfig +++ b/configs/rock960-rk3399_defconfig @@ -21,7 +21,6 @@ CONFIG_SYS_PROMPT="rock960 => " CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y -CONFIG_CMD_SF=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_TIME=y @@ -35,7 +34,6 @@ CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ROCKCHIP=y -CONFIG_SF_DEFAULT_SPEED=20000000 CONFIG_PMIC_RK8XX=y CONFIG_REGULATOR_PWM=y CONFIG_REGULATOR_RK8XX=y
The Rock960 doesn't contain SPI flash so drop related config options. Signed-off-by: Peter Robinson <pbrobinson@gmail.com> --- configs/rock960-rk3399_defconfig | 2 -- 1 file changed, 2 deletions(-)