arm: mvebu: Use MVEBU_SPL_BOOT_DEVICE instead of SPL_BOOT_DEVICE
Subsystems (4)
PATCH 1/3 arm: mvebu: Use MVEBU_SPL_BOOT_DEVICE instead of SPL_BOOT_DEVICE
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.
---
arch/arm/mach-mvebu/Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
arch/arm/mach-mvebu/Makefile +6 -4
@@ -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
Signature · 1 line
2.36.1
PATCH 2/3 Convert CONFIG_FIXED_SDHCI_ALIGNED_BUFFER to Kconfig
CONFIG_FIXED_SDHCI_ALIGNED_BUFFER is needed on some Marvell SoCs when booting from MMC. All existing usages of this have the same value so make this the default and have the Kconfig option depend on SPL && MVEBU_SPL_BOOT_DEVICE_MMC.
---
drivers/mmc/Kconfig | 13 +++++++++++++ include/configs/clearfog.h | 7 ------- include/configs/controlcenterdc.h | 7 ------- include/configs/db-88f6820-gp.h | 7 ------- include/configs/helios4.h | 7 ------- include/configs/turris_omnia.h | 7 ------- scripts/config_whitelist.txt | 1 - 7 files changed, 13 insertions(+), 36 deletions(-)
drivers/mmc/Kconfig +13 -0
@@ -484,6 +484,19 @@ config SPL_MMC_SDHCI_ADMA This enables support for the ADMA (Advanced DMA) defined in the SD Host Controller Standard Specification Version 3.00 in SPL. +config FIXED_SDHCI_ALIGNED_BUFFER + hex "SDRAM address for fixed buffer" + depends on SPL && MVEBU_SPL_BOOT_DEVICE_MMC + default 0x00180000 + help + On the Marvell Armada 38x when the SPL runs it located in internal + SRAM which is the L2 cache locked to memory. When the MMC buffers + are located on the stack (or bss), the SDIO controller (SDHCI) can't + write into this L2 cache memory. + + This specifies the address of a fixed buffer located in SDRAM that + will be used for all SDHCI transfers in the SPL. + config MMC_SDHCI_ASPEED bool "Aspeed SDHCI controller" depends on ARCH_ASPEED
include/configs/clearfog.h +0 -7
@@ -56,13 +56,6 @@#define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10))#define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) -#if defined(CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC ) || defined(CONFIG_MVEBU_SPL_BOOT_DEVICE_SATA ) -/* SPL related MMC defines */ -#ifdef CONFIG_SPL_BUILD -#define CONFIG_FIXED_SDHCI_ALIGNED_BUFFER 0x00180000/* in SDRAM */ -#endif -#endif -/* * mv-common.h should be defined after CMD configs since it used them * to enable certain macros
include/configs/controlcenterdc.h +0 -7
@@ -53,13 +53,6 @@#define CONFIG_SPL_STACK (0x40000000 + ((212 - 16) << 10))#define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) -#if CONFIG_SPL_BOOT_DEVICE ==SPL_BOOT_SDIO_MMC_CARD -/* SPL related MMC defines */ -#ifdef CONFIG_SPL_BUILD -#define CONFIG_FIXED_SDHCI_ALIGNED_BUFFER 0x00180000/* in SDRAM */ -#endif -#endif -/* * Environment Configuration */
include/configs/db-88f6820-gp.h +0 -7
@@ -53,13 +53,6 @@#define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10))#define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) -#if CONFIG_SPL_BOOT_DEVICE ==SPL_BOOT_SDIO_MMC_CARD -/* SPL related MMC defines */ -#ifdef CONFIG_SPL_BUILD -#define CONFIG_FIXED_SDHCI_ALIGNED_BUFFER 0x00180000/* in SDRAM */ -#endif -#endif -/* * mv-common.h should be defined after CMD configs since it used them * to enable certain macros
include/configs/helios4.h +0 -7
@@ -56,13 +56,6 @@#define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10))#define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) -#if defined(CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC ) || defined(CONFIG_MVEBU_SPL_BOOT_DEVICE_SATA ) -/* SPL related MMC defines */ -#ifdef CONFIG_SPL_BUILD -#define CONFIG_FIXED_SDHCI_ALIGNED_BUFFER 0x00180000/* in SDRAM */ -#endif -#endif -/* * mv-common.h should be defined after CMD configs since it used them * to enable certain macros
include/configs/turris_omnia.h +0 -7
@@ -36,13 +36,6 @@#define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10))#define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) -#ifdef CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC -/* SPL related MMC defines */ -# ifdef CONFIG_SPL_BUILD -# define CONFIG_FIXED_SDHCI_ALIGNED_BUFFER 0x00180000/* in SDRAM */ -# endif -#endif -/* * mv-common.h should be defined after CMD configs since it used them * to enable certain macros
scripts/config_whitelist.txt +0 -1
@@ -87,7 +87,6 @@ CONFIG_FDTFILE CONFIG_FEC_ENET_DEV CONFIG_FEC_FIXED_SPEED CONFIG_FEC_MXC_PHYADDR -CONFIG_FIXED_SDHCI_ALIGNED_BUFFER CONFIG_FLASH_BR_PRELIM CONFIG_FLASH_CFI_LEGACY CONFIG_FLASH_OR_PRELIM
Signature · 1 line
2.36.1
Re: [PATCH 2/3] Convert CONFIG_FIXED_SDHCI_ALIGNED_BUFFER to Kconfig
Quoted 6 lines · On Sun, 29 May 2022 11:13:17 +1200 Chris Packham <[email protected]>…
CONFIG_FIXED_SDHCI_ALIGNED_BUFFERis needed on some Marvell SoCs when booting from MMC. All existing usages of this have the same value so make this the default and have theKconfigoption depend on SPL &&MVEBU_SPL_BOOT_DEVICE_MMC.Signed-off-by Chris Packham <[email protected]>
Re: [PATCH 2/3] Convert CONFIG_FIXED_SDHCI_ALIGNED_BUFFER to Kconfig
In reply to Chris PackhamQuoted 6 lines · Chris Packham
CONFIG_FIXED_SDHCI_ALIGNED_BUFFERis needed on some Marvell SoCs when booting from MMC. All existing usages of this have the same value so make this the default and have theKconfigoption depend on SPL &&MVEBU_SPL_BOOT_DEVICE_MMC.Signed-off-by Chris Packham <[email protected]>
Thanks,
Stefan
Quoted 130 lines
---
drivers/mmc/Kconfig | 13 +++++++++++++ include/configs/clearfog.h | 7 ------- include/configs/controlcenterdc.h | 7 ------- include/configs/db-88f6820-gp.h | 7 ------- include/configs/helios4.h | 7 ------- include/configs/turris_omnia.h | 7 ------- scripts/config_whitelist.txt | 1 - 7 files changed, 13 insertions(+), 36 deletions(-)drivers/mmc/Kconfig +13
-0@@ -484,6 +484,19 @@ config SPL_MMC_SDHCI_ADMA This enables support for the ADMA (Advanced DMA) defined in the SD Host Controller Standard Specification Version 3.00 in SPL. +config FIXED_SDHCI_ALIGNED_BUFFER + hex "SDRAM address for fixed buffer" + depends on SPL && MVEBU_SPL_BOOT_DEVICE_MMC + default 0x00180000 + help + On the Marvell Armada 38x when the SPL runs it located in internal + SRAM which is the L2 cache locked to memory. When the MMC buffers + are located on the stack (or bss), the SDIO controller (SDHCI) can't + write into this L2 cache memory. + + This specifies the address of a fixed buffer located in SDRAM that + will be used for all SDHCI transfers in the SPL. + config MMC_SDHCI_ASPEED bool "Aspeed SDHCI controller" depends on ARCH_ASPEEDinclude/configs/clearfog.h +0
-7@@ -56,13 +56,6 @@#define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10))#define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) -#if defined(CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC ) || defined(CONFIG_MVEBU_SPL_BOOT_DEVICE_SATA ) -/* SPL related MMC defines */ -#ifdef CONFIG_SPL_BUILD -#define CONFIG_FIXED_SDHCI_ALIGNED_BUFFER 0x00180000/* in SDRAM */ -#endif -#endif -/* * mv-common.h should be defined after CMD configs since it used them * to enable certain macros include/configs/controlcenterdc.h +0
-7@@ -53,13 +53,6 @@#define CONFIG_SPL_STACK (0x40000000 + ((212 - 16) << 10))#define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) -#if CONFIG_SPL_BOOT_DEVICE ==SPL_BOOT_SDIO_MMC_CARD -/* SPL related MMC defines */ -#ifdef CONFIG_SPL_BUILD -#define CONFIG_FIXED_SDHCI_ALIGNED_BUFFER 0x00180000/* in SDRAM */ -#endif -#endif -/* * Environment Configuration */ include/configs/db-88f6820-gp.h +0
-7@@ -53,13 +53,6 @@#define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10))#define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) -#if CONFIG_SPL_BOOT_DEVICE ==SPL_BOOT_SDIO_MMC_CARD -/* SPL related MMC defines */ -#ifdef CONFIG_SPL_BUILD -#define CONFIG_FIXED_SDHCI_ALIGNED_BUFFER 0x00180000/* in SDRAM */ -#endif -#endif -/* * mv-common.h should be defined after CMD configs since it used them * to enable certain macros include/configs/helios4.h +0
-7@@ -56,13 +56,6 @@#define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10))#define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) -#if defined(CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC ) || defined(CONFIG_MVEBU_SPL_BOOT_DEVICE_SATA ) -/* SPL related MMC defines */ -#ifdef CONFIG_SPL_BUILD -#define CONFIG_FIXED_SDHCI_ALIGNED_BUFFER 0x00180000/* in SDRAM */ -#endif -#endif -/* * mv-common.h should be defined after CMD configs since it used them * to enable certain macros include/configs/turris_omnia.h +0
-7@@ -36,13 +36,6 @@#define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10))#define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) -#ifdef CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC -/* SPL related MMC defines */ -# ifdef CONFIG_SPL_BUILD -# define CONFIG_FIXED_SDHCI_ALIGNED_BUFFER 0x00180000/* in SDRAM */ -# endif -#endif -/* * mv-common.h should be defined after CMD configs since it used them * to enable certain macros scripts/config_whitelist.txt +0
-0
scripts/config_whitelist.txt CONFIG_FDTFILE · line 92
Quoted 7 lines
scripts/config_whitelist.txt +0
-1@@ -87,7 +87,6 @@ CONFIG_FDTFILE CONFIG_FEC_ENET_DEV CONFIG_FEC_FIXED_SPEED CONFIG_FEC_MXC_PHYADDR -CONFIG_FIXED_SDHCI_ALIGNED_BUFFER CONFIG_FLASH_BR_PRELIM CONFIG_FLASH_CFI_LEGACY CONFIG_FLASH_OR_PRELIM
Viele Grüße,
Stefan Roese
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]
Re: [PATCH 2/3] Convert CONFIG_FIXED_SDHCI_ALIGNED_BUFFER to Kconfig
In reply to Chris PackhamQuoted 8 lines · Chris Packham
CONFIG_FIXED_SDHCI_ALIGNED_BUFFERis needed on some Marvell SoCs when booting from MMC. All existing usages of this have the same value so make this the default and have theKconfigoption depend on SPL &&MVEBU_SPL_BOOT_DEVICE_MMC.Signed-off-by Chris Packham <[email protected]>Reviewed-by Marek Behún <[email protected]>Reviewed-by Stefan Roese <[email protected]>
Applied to u-boot/next, thanks!
Signature · 1 line
Tom
PATCH 3/3 arm: mvebu: Remove CONFIG_SPL_BOOT_DEVICE
In reply to Chris PackhamCONFIG_SPL_BOOT_DEVICE was made obsolete by CONFIG_MVEBU_SPL_BOOT_DEVICE_{SPI,MMC,SATA,UART}. CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI is the default so existing users of CONFIG_SPL_BOOT_DEVICE can simply have the option removed.
---
include/configs/controlcenterdc.h | 11 ----------- include/configs/db-88f6820-amc.h | 12 ------------ include/configs/db-88f6820-gp.h | 11 ----------- scripts/config_whitelist.txt | 1 - 4 files changed, 35 deletions(-)
include/configs/controlcenterdc.h +0 -11
@@ -23,17 +23,6 @@#endif /* SPL */ -/* -* Select the boot device here -* -* Currently supported are: -* SPL_BOOT_SPI_NOR_FLASH - Booting via SPI NOR flash -* SPL_BOOT_SDIO_MMC_CARD - Booting via SDIO/MMC card (partition 1) -*/ -#define SPL_BOOT_SPI_NOR_FLASH 1 -#define SPL_BOOT_SDIO_MMC_CARD 2 -#define CONFIG_SPL_BOOT_DEVICE SPL_BOOT_SPI_NOR_FLASH -/* Defines for SPL */ #define CONFIG_SPL_SIZE (160 << 10)
include/configs/db-88f6820-amc.h +0 -12
@@ -27,18 +27,6 @@"initrd_high=0x10000000\0" /* SPL */ -/* -* Select the boot device here -* -* Currently supported are: -* SPL_BOOT_SPI_NOR_FLASH - Booting via SPI NOR flash -* -* MMC is not populated on this board. -* NAND support may be added in the future. - */ -#define SPL_BOOT_SPI_NOR_FLASH 1 -#define CONFIG_SPL_BOOT_DEVICE SPL_BOOT_SPI_NOR_FLASH - /* Defines for SPL */#define CONFIG_SPL_SIZE (140 << 10)#define CONFIG_SPL_MAX_SIZE (CONFIG_SPL_SIZE - (CONFIG_SPL_TEXT_BASE - 0x40000000))
include/configs/db-88f6820-gp.h +0 -11
@@ -28,17 +28,6 @@"initrd_high=0x10000000\0" /* SPL */ -/* -* Select the boot device here -* -* Currently supported are: -* SPL_BOOT_SPI_NOR_FLASH - Booting via SPI NOR flash -* SPL_BOOT_SDIO_MMC_CARD - Booting via SDIO/MMC card (partition 1) - */ -#define SPL_BOOT_SPI_NOR_FLASH 1 -#define SPL_BOOT_SDIO_MMC_CARD 2 -#define CONFIG_SPL_BOOT_DEVICE SPL_BOOT_SPI_NOR_FLASH - /* Defines for SPL */#define CONFIG_SPL_SIZE (140 << 10)#define CONFIG_SPL_MAX_SIZE (CONFIG_SPL_SIZE - (CONFIG_SPL_TEXT_BASE - 0x40000000))
scripts/config_whitelist.txt +0 -1
@@ -565,7 +565,6 @@ CONFIG_SPI_HALF_DUPLEX CONFIG_SPI_N25Q256A_RESET CONFIG_SPL_BOARD_LOAD_IMAGE CONFIG_SPL_BOOTROM_SAVE -CONFIG_SPL_BOOT_DEVICE CONFIG_SPL_BSS_MAX_SIZE CONFIG_SPL_BSS_START_ADDR CONFIG_SPL_CMT
Signature · 1 line
2.36.1
Re: [PATCH 3/3] arm: mvebu: Remove CONFIG_SPL_BOOT_DEVICE
Quoted 6 lines · On Sun, 29 May 2022 11:13:18 +1200 Chris Packham <[email protected]>…
CONFIG_SPL_BOOT_DEVICEwas made obsolete by CONFIG_MVEBU_SPL_BOOT_DEVICE_{SPI,MMC,SATA,UART}.CONFIG_MVEBU_SPL_BOOT_DEVICE_SPIis the default so existing users ofCONFIG_SPL_BOOT_DEVICEcan simply have the option removed.Signed-off-by Chris Packham <[email protected]>
Re: [PATCH 3/3] arm: mvebu: Remove CONFIG_SPL_BOOT_DEVICE
In reply to Chris PackhamQuoted 6 lines · Chris Packham
CONFIG_SPL_BOOT_DEVICEwas made obsolete by CONFIG_MVEBU_SPL_BOOT_DEVICE_{SPI,MMC,SATA,UART}.CONFIG_MVEBU_SPL_BOOT_DEVICE_SPIis the default so existing users ofCONFIG_SPL_BOOT_DEVICEcan simply have the option removed.Signed-off-by Chris Packham <[email protected]>
Thanks,
Stefan
Quoted 80 lines
---
include/configs/controlcenterdc.h | 11 ----------- include/configs/db-88f6820-amc.h | 12 ------------ include/configs/db-88f6820-gp.h | 11 ----------- scripts/config_whitelist.txt | 1 - 4 files changed, 35 deletions(-)include/configs/controlcenterdc.h +0
-11@@ -23,17 +23,6 @@#endif /* SPL */ -/* -* Select the boot device here -* -* Currently supported are: -* SPL_BOOT_SPI_NOR_FLASH - Booting via SPI NOR flash -* SPL_BOOT_SDIO_MMC_CARD - Booting via SDIO/MMC card (partition 1) -*/ -#define SPL_BOOT_SPI_NOR_FLASH 1 -#define SPL_BOOT_SDIO_MMC_CARD 2 -#define CONFIG_SPL_BOOT_DEVICE SPL_BOOT_SPI_NOR_FLASH -/* Defines for SPL */ #define CONFIG_SPL_SIZE (160 << 10)include/configs/db-88f6820-amc.h +0
-12@@ -27,18 +27,6 @@"initrd_high=0x10000000\0" /* SPL */ -/* -* Select the boot device here -* -* Currently supported are: -* SPL_BOOT_SPI_NOR_FLASH - Booting via SPI NOR flash -* -* MMC is not populated on this board. -* NAND support may be added in the future. - */ -#define SPL_BOOT_SPI_NOR_FLASH 1 -#define CONFIG_SPL_BOOT_DEVICE SPL_BOOT_SPI_NOR_FLASH - /* Defines for SPL */#define CONFIG_SPL_SIZE (140 << 10)#define CONFIG_SPL_MAX_SIZE (CONFIG_SPL_SIZE - (CONFIG_SPL_TEXT_BASE - 0x40000000))include/configs/db-88f6820-gp.h +0
-11@@ -28,17 +28,6 @@"initrd_high=0x10000000\0" /* SPL */ -/* -* Select the boot device here -* -* Currently supported are: -* SPL_BOOT_SPI_NOR_FLASH - Booting via SPI NOR flash -* SPL_BOOT_SDIO_MMC_CARD - Booting via SDIO/MMC card (partition 1) - */ -#define SPL_BOOT_SPI_NOR_FLASH 1 -#define SPL_BOOT_SDIO_MMC_CARD 2 -#define CONFIG_SPL_BOOT_DEVICE SPL_BOOT_SPI_NOR_FLASH - /* Defines for SPL */#define CONFIG_SPL_SIZE (140 << 10)#define CONFIG_SPL_MAX_SIZE (CONFIG_SPL_SIZE - (CONFIG_SPL_TEXT_BASE - 0x40000000))scripts/config_whitelist.txt +0
-0
scripts/config_whitelist.txt CONFIG_SPI_HALF_DUPLEX · line 570
Quoted 7 lines
scripts/config_whitelist.txt +0
-1@@ -565,7 +565,6 @@ CONFIG_SPI_HALF_DUPLEX CONFIG_SPI_N25Q256A_RESET CONFIG_SPL_BOARD_LOAD_IMAGE CONFIG_SPL_BOOTROM_SAVE -CONFIG_SPL_BOOT_DEVICE CONFIG_SPL_BSS_MAX_SIZE CONFIG_SPL_BSS_START_ADDR CONFIG_SPL_CMT
Viele Grüße,
Stefan Roese
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]
Re: [PATCH 3/3] arm: mvebu: Remove CONFIG_SPL_BOOT_DEVICE
In reply to Chris PackhamQuoted 8 lines · Chris Packham
CONFIG_SPL_BOOT_DEVICEwas made obsolete by CONFIG_MVEBU_SPL_BOOT_DEVICE_{SPI,MMC,SATA,UART}.CONFIG_MVEBU_SPL_BOOT_DEVICE_SPIis the default so existing users ofCONFIG_SPL_BOOT_DEVICEcan simply have the option removed.Signed-off-by Chris Packham <[email protected]>Reviewed-by Marek Behún <[email protected]>Reviewed-by Stefan Roese <[email protected]>
Applied to u-boot/next, thanks!
Signature · 1 line
Tom
Quoted 5 lines · Chris Packham
Update the way
KWB_CFG_SEC_BOOT_DEVis determined to use CONFIG_MVEBU_SPL_BOOT_DEVICE_{SPI,MMC} instead ofCONFIG_SPL_BOOT_DEVICE.Signed-off-by Chris Packham <[email protected]>
Thanks,
Stefan
Quoted 16 lines
---
arch/arm/mach-mvebu/Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)arch/arm/mach-mvebu/Makefile +0
-3@@ -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) \
arch/arm/mach-mvebu/Makefile KWB_REPLACE += CSK_INDEX · line 76
Quoted 10 lines
arch/arm/mach-mvebu/Makefile +6
-1- ) +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
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]
Quoted 6 lines · Chris Packham
Update the way
KWB_CFG_SEC_BOOT_DEVis determined to use CONFIG_MVEBU_SPL_BOOT_DEVICE_{SPI,MMC} instead ofCONFIG_SPL_BOOT_DEVICE.Signed-off-by Chris Packham <[email protected]>Reviewed-by Stefan Roese <[email protected]>
Applied to u-boot/next, thanks!
Signature · 1 line
Tom