| Message ID | 20191025142209.3838-1-simon.k.r.goldschmidt@gmail.com |
|---|---|
| State | Accepted |
| Commit | d024e992b3f88745ca80ce81055974c9bf2134d4 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [U-Boot,v2] spl: fix SPI config dependencies | expand |
On Fri, 25 Oct 2019 16:22:09 +0200 Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> wrote: > As SPL_SPI_FLASH_SUPPORT cannot work without SPL_SPI_SUPPORT, fix > dependencies to prevent enabling SPI flash support without basic SPI > support. > > Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> > --- > > Changes in v2: > - move SYS_SPI_U_BOOT_OFFS out of the SPL_SPI_FLASH_SUPPORT guard > since that broke sunxi SPL (which uses non-DM spi) > > common/spl/Kconfig | 21 +++++++++++---------- > 1 file changed, 11 insertions(+), 10 deletions(-) > > diff --git a/common/spl/Kconfig b/common/spl/Kconfig > index 86d7edfee1..b8d234eb5e 100644 > --- a/common/spl/Kconfig > +++ b/common/spl/Kconfig > @@ -1014,8 +1014,19 @@ config SPL_SERIAL_SUPPORT > unless there are space reasons not to. Even then, consider > enabling SPL_USE_TINY_PRINTF which is a small printf() > version. > +config SPL_SPI_SUPPORT > + bool "Support SPI drivers" > + help > + Enable support for using SPI in SPL. This is used for > connecting > + to SPI flash for loading U-Boot. See SPL_SPI_FLASH_SUPPORT > for > + more details on that. The SPI driver provides the > transport for > + data between the SPI flash and the CPU. This option can be > used to > + enable SPI drivers that are needed for other purposes > also, such > + as a SPI PMIC. > + > config SPL_SPI_FLASH_SUPPORT > bool "Support SPI flash drivers" > + depends on SPL_SPI_SUPPORT > help > Enable support for using SPI flash in SPL, and loading > U-Boot from SPI flash. SPI flash (Serial Peripheral Bus flash) is > named after @@ -1060,16 +1071,6 @@ config SYS_SPI_U_BOOT_OFFS > Address within SPI-Flash from where the u-boot payload is > fetched from. > > -config SPL_SPI_SUPPORT > - bool "Support SPI drivers" > - help > - Enable support for using SPI in SPL. This is used for > connecting > - to SPI flash for loading U-Boot. See SPL_SPI_FLASH_SUPPORT > for > - more details on that. The SPI driver provides the > transport for > - data between the SPI flash and the CPU. This option can be > used to > - enable SPI drivers that are needed for other purposes > also, such > - as a SPI PMIC. > - > config SPL_THERMAL > bool "Driver support for thermal devices" > help Reviewed-by: Lukasz Majewski <lukma@denx.de> Best regards, Lukasz Majewski -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma@denx.de
On Fri, Oct 25, 2019 at 04:22:09PM +0200, Simon Goldschmidt wrote: > As SPL_SPI_FLASH_SUPPORT cannot work without SPL_SPI_SUPPORT, fix > dependencies to prevent enabling SPI flash support without basic SPI > support. > > Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> > Reviewed-by: Lukasz Majewski <lukma@denx.de> Applied to u-boot/master, thanks!
diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 86d7edfee1..b8d234eb5e 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -1014,8 +1014,19 @@ config SPL_SERIAL_SUPPORT unless there are space reasons not to. Even then, consider enabling SPL_USE_TINY_PRINTF which is a small printf() version. +config SPL_SPI_SUPPORT + bool "Support SPI drivers" + help + Enable support for using SPI in SPL. This is used for connecting + to SPI flash for loading U-Boot. See SPL_SPI_FLASH_SUPPORT for + more details on that. The SPI driver provides the transport for + data between the SPI flash and the CPU. This option can be used to + enable SPI drivers that are needed for other purposes also, such + as a SPI PMIC. + config SPL_SPI_FLASH_SUPPORT bool "Support SPI flash drivers" + depends on SPL_SPI_SUPPORT help Enable support for using SPI flash in SPL, and loading U-Boot from SPI flash. SPI flash (Serial Peripheral Bus flash) is named after @@ -1060,16 +1071,6 @@ config SYS_SPI_U_BOOT_OFFS Address within SPI-Flash from where the u-boot payload is fetched from. -config SPL_SPI_SUPPORT - bool "Support SPI drivers" - help - Enable support for using SPI in SPL. This is used for connecting - to SPI flash for loading U-Boot. See SPL_SPI_FLASH_SUPPORT for - more details on that. The SPI driver provides the transport for - data between the SPI flash and the CPU. This option can be used to - enable SPI drivers that are needed for other purposes also, such - as a SPI PMIC. - config SPL_THERMAL bool "Driver support for thermal devices" help
As SPL_SPI_FLASH_SUPPORT cannot work without SPL_SPI_SUPPORT, fix dependencies to prevent enabling SPI flash support without basic SPI support. Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> --- Changes in v2: - move SYS_SPI_U_BOOT_OFFS out of the SPL_SPI_FLASH_SUPPORT guard since that broke sunxi SPL (which uses non-DM spi) common/spl/Kconfig | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)