diff mbox

[U-Boot,v3,05/11] am33xx: config.mk: Fix option used to enable SPI SPL image type

Message ID 20160825214541.22896-6-afd@ti.com
State Superseded
Delegated to: Tom Rini
Headers show

Commit Message

Andrew Davis Aug. 25, 2016, 9:45 p.m. UTC
Before the addition of SPL boot media type Kconfig options there was no
way to determine what boot media the SPL would be booted from, so
it was assumed that if the SPL could load U-Boot proper via SPI then
the SPL itself would probably also be loaded from SPI.

Use the new SPL_SPI_BOOT option to enable the generation an SPL image
capable of being booted from SPI, and not have this depend on the SPL's
media loading capabilities.

Signed-off-by: Andrew F. Davis <afd@ti.com>
---
 arch/arm/cpu/armv7/am33xx/config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Lokesh Vutla Aug. 26, 2016, 4:46 a.m. UTC | #1
On Friday 26 August 2016 03:15 AM, Andrew F. Davis wrote:
> Before the addition of SPL boot media type Kconfig options there was no
> way to determine what boot media the SPL would be booted from, so
> it was assumed that if the SPL could load U-Boot proper via SPI then
> the SPL itself would probably also be loaded from SPI.
> 
> Use the new SPL_SPI_BOOT option to enable the generation an SPL image
> capable of being booted from SPI, and not have this depend on the SPL's
> media loading capabilities.
> 
> Signed-off-by: Andrew F. Davis <afd@ti.com>
> ---
>  arch/arm/cpu/armv7/am33xx/config.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/cpu/armv7/am33xx/config.mk b/arch/arm/cpu/armv7/am33xx/config.mk
> index 8e655d7..2f53df8 100644
> --- a/arch/arm/cpu/armv7/am33xx/config.mk
> +++ b/arch/arm/cpu/armv7/am33xx/config.mk
> @@ -34,7 +34,7 @@ ifeq ($(CONFIG_TI_SECURE_DEVICE),y)
>  # Refer to README.ti-secure for more info
>  #
>  ALL-y	+= u-boot-spl_HS_ISSW
> -ALL-$(CONFIG_SPL_SPI_SUPPORT) += u-boot-spl_HS_SPI_X-LOADER
> +ALL-$(CONFIG_SPL_SPI_BOOT) += u-boot-spl_HS_SPI_X-LOADER

With this change CONFIG_SPL_SPI_BOOT needs to be enabled for
am43xx_hs_evm_defconfig or else SPI boot will break on AM43xx HS.

Thanks and regards,
Lokesh

>  ALL-$(CONFIG_SPL_QSPI_BOOT) += u-boot-spl_HS_XIP_X-LOADER
>  ALL-$(CONFIG_SPL_NOR_BOOT) += u-boot-spl_HS_XIP_X-LOADER
>  ALL-$(CONFIG_SPL_NAND_BOOT) += u-boot-spl_HS_X-LOADER
>
diff mbox

Patch

diff --git a/arch/arm/cpu/armv7/am33xx/config.mk b/arch/arm/cpu/armv7/am33xx/config.mk
index 8e655d7..2f53df8 100644
--- a/arch/arm/cpu/armv7/am33xx/config.mk
+++ b/arch/arm/cpu/armv7/am33xx/config.mk
@@ -34,7 +34,7 @@  ifeq ($(CONFIG_TI_SECURE_DEVICE),y)
 # Refer to README.ti-secure for more info
 #
 ALL-y	+= u-boot-spl_HS_ISSW
-ALL-$(CONFIG_SPL_SPI_SUPPORT) += u-boot-spl_HS_SPI_X-LOADER
+ALL-$(CONFIG_SPL_SPI_BOOT) += u-boot-spl_HS_SPI_X-LOADER
 ALL-$(CONFIG_SPL_QSPI_BOOT) += u-boot-spl_HS_XIP_X-LOADER
 ALL-$(CONFIG_SPL_NOR_BOOT) += u-boot-spl_HS_XIP_X-LOADER
 ALL-$(CONFIG_SPL_NAND_BOOT) += u-boot-spl_HS_X-LOADER