diff mbox

[U-Boot,v4,04/10] am33xx: config.mk: Fix option used to enable SPI SPL image type

Message ID 20160830190629.13956-5-afd@ti.com
State Accepted
Commit 7e5a0bfbd23584e31e490871931378e647ad827b
Delegated to: Tom Rini
Headers show

Commit Message

Andrew Davis Aug. 30, 2016, 7:06 p.m. UTC
The option SPL_SPI_SUPPORT is used to enable support in SPL for loading
images from SPI flash, it should not be used to determine the build type
of the SPL image itself. The ability to read images from SPI flash does
not imply the SPL will be booted from SPI flash.

Unconditionally build SPI flash compatible SPL images.

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

Comments

Lokesh Vutla Aug. 31, 2016, 3:27 a.m. UTC | #1
On Wednesday 31 August 2016 12:36 AM, Andrew F. Davis wrote:
> The option SPL_SPI_SUPPORT is used to enable support in SPL for loading
> images from SPI flash, it should not be used to determine the build type
> of the SPL image itself. The ability to read images from SPI flash does
> not imply the SPL will be booted from SPI flash.
> 
> Unconditionally build SPI flash compatible SPL images.


Acked-by: Lokesh Vutla <lokeshvutla@ti.com>

Thanks and regards,
Lokesh

> 
> Signed-off-by: Andrew F. Davis <afd@ti.com>
> ---
>  arch/arm/cpu/armv7/am33xx/config.mk | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/cpu/armv7/am33xx/config.mk b/arch/arm/cpu/armv7/am33xx/config.mk
> index 431cf62..87b76d9 100644
> --- a/arch/arm/cpu/armv7/am33xx/config.mk
> +++ b/arch/arm/cpu/armv7/am33xx/config.mk
> @@ -31,13 +31,13 @@ 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-y += u-boot-spl_HS_SPI_X-LOADER
>  ALL-y += u-boot-spl_HS_X-LOADER
>  ALL-y += u-boot-spl_HS_MLO
>  ALL-y += u-boot-spl_HS_2ND
>  else
>  ALL-y	+= MLO
> -ALL-$(CONFIG_SPL_SPI_SUPPORT) += MLO.byteswap
> +ALL-y += MLO.byteswap
>  endif
>  else
>  ifeq ($(CONFIG_TI_SECURE_DEVICE),y)
>
Tom Rini Sept. 2, 2016, 2:53 p.m. UTC | #2
On Tue, Aug 30, 2016 at 02:06:23PM -0500, Andrew F. Davis wrote:

> The option SPL_SPI_SUPPORT is used to enable support in SPL for loading
> images from SPI flash, it should not be used to determine the build type
> of the SPL image itself. The ability to read images from SPI flash does
> not imply the SPL will be booted from SPI flash.
> 
> Unconditionally build SPI flash compatible SPL images.
> 
> Signed-off-by: Andrew F. Davis <afd@ti.com>

Reviewed-by: Tom Rini <trini@konsulko.com>
Tom Rini Oct. 3, 2016, 1:38 p.m. UTC | #3
On Tue, Aug 30, 2016 at 02:06:23PM -0500, Andrew F. Davis wrote:

> The option SPL_SPI_SUPPORT is used to enable support in SPL for loading
> images from SPI flash, it should not be used to determine the build type
> of the SPL image itself. The ability to read images from SPI flash does
> not imply the SPL will be booted from SPI flash.
> 
> Unconditionally build SPI flash compatible SPL images.
> 
> Signed-off-by: Andrew F. Davis <afd@ti.com>
> Acked-by: Lokesh Vutla <lokeshvutla@ti.com>
> Reviewed-by: Tom Rini <trini@konsulko.com>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/arch/arm/cpu/armv7/am33xx/config.mk b/arch/arm/cpu/armv7/am33xx/config.mk
index 431cf62..87b76d9 100644
--- a/arch/arm/cpu/armv7/am33xx/config.mk
+++ b/arch/arm/cpu/armv7/am33xx/config.mk
@@ -31,13 +31,13 @@  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-y += u-boot-spl_HS_SPI_X-LOADER
 ALL-y += u-boot-spl_HS_X-LOADER
 ALL-y += u-boot-spl_HS_MLO
 ALL-y += u-boot-spl_HS_2ND
 else
 ALL-y	+= MLO
-ALL-$(CONFIG_SPL_SPI_SUPPORT) += MLO.byteswap
+ALL-y += MLO.byteswap
 endif
 else
 ifeq ($(CONFIG_TI_SECURE_DEVICE),y)