| Message ID | 20220528231318.359510-1-judge.packham@gmail.com |
|---|---|
| State | Accepted |
| Commit | bfbd62f69114fb4a8a1685e5d95b2e5789422fd4 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [1/3] arm: mvebu: Use MVEBU_SPL_BOOT_DEVICE instead of SPL_BOOT_DEVICE | expand |
On 29.05.22 01:13, Chris Packham wrote: > Update the way KWB_CFG_SEC_BOOT_DEV is determined to use > CONFIG_MVEBU_SPL_BOOT_DEVICE_{SPI,MMC} instead of > CONFIG_SPL_BOOT_DEVICE. > > Signed-off-by: Chris Packham <judge.packham@gmail.com> Reviewed-by: Stefan Roese <sr@denx.de> Thanks, Stefan > --- > > arch/arm/mach-mvebu/Makefile | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile > index 8bd2246325ca..61eeb9c8c186 100644 > --- a/arch/arm/mach-mvebu/Makefile > +++ b/arch/arm/mach-mvebu/Makefile > @@ -65,10 +65,12 @@ KWB_REPLACE += CSK_INDEX > KWB_CFG_CSK_INDEX = $(CONFIG_SECURED_MODE_CSK_INDEX) > > KWB_REPLACE += SEC_BOOT_DEV > -KWB_CFG_SEC_BOOT_DEV=$(patsubst "%",%, \ > - $(if $(findstring BOOT_SPI_NOR_FLASH,$(CONFIG_SPL_BOOT_DEVICE)),0x34) \ > - $(if $(findstring BOOT_SDIO_MMC_CARD,$(CONFIG_SPL_BOOT_DEVICE)),0x31) \ > - ) > +ifneq ($(CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI),) > + KWB_CFG_SEC_BOOT_DEV=0x34 > +endif > +ifneq ($(CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC),) > + KWB_CFG_SEC_BOOT_DEV=0x31 > +endif > > KWB_REPLACE += SEC_FUSE_DUMP > KWB_CFG_SEC_FUSE_DUMP = a38x Viele Grüße, Stefan Roese
On Sun, May 29, 2022 at 11:13:16AM +1200, Chris Packham wrote: > Update the way KWB_CFG_SEC_BOOT_DEV is determined to use > CONFIG_MVEBU_SPL_BOOT_DEVICE_{SPI,MMC} instead of > CONFIG_SPL_BOOT_DEVICE. > > Signed-off-by: Chris Packham <judge.packham@gmail.com> > Reviewed-by: Stefan Roese <sr@denx.de> Applied to u-boot/next, thanks!
diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile index 8bd2246325ca..61eeb9c8c186 100644 --- a/arch/arm/mach-mvebu/Makefile +++ b/arch/arm/mach-mvebu/Makefile @@ -65,10 +65,12 @@ KWB_REPLACE += CSK_INDEX KWB_CFG_CSK_INDEX = $(CONFIG_SECURED_MODE_CSK_INDEX) KWB_REPLACE += SEC_BOOT_DEV -KWB_CFG_SEC_BOOT_DEV=$(patsubst "%",%, \ - $(if $(findstring BOOT_SPI_NOR_FLASH,$(CONFIG_SPL_BOOT_DEVICE)),0x34) \ - $(if $(findstring BOOT_SDIO_MMC_CARD,$(CONFIG_SPL_BOOT_DEVICE)),0x31) \ - ) +ifneq ($(CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI),) + KWB_CFG_SEC_BOOT_DEV=0x34 +endif +ifneq ($(CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC),) + KWB_CFG_SEC_BOOT_DEV=0x31 +endif KWB_REPLACE += SEC_FUSE_DUMP KWB_CFG_SEC_FUSE_DUMP = a38x
Update the way KWB_CFG_SEC_BOOT_DEV is determined to use CONFIG_MVEBU_SPL_BOOT_DEVICE_{SPI,MMC} instead of CONFIG_SPL_BOOT_DEVICE. Signed-off-by: Chris Packham <judge.packham@gmail.com> --- arch/arm/mach-mvebu/Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)