[U-Boot] [PATCH] mach-omap2: Fix secure boot media generation

[U-Boot] [PATCH] mach-omap2: Fix secure boot media generation

[Andrew F. Davis]

While moving OMAP related files to mach-omap2 the functionality
relating to generating secure boot files was modified. This change
prevents secure platforms other than AM33xx and OMAP54XX from
correctly building files for all needed media types.

Fixes: 983e37007da5 ("arm: Introduce arch/arm/mach-omap2 for OMAP2 derivative platforms")
Signed-off-by: Andrew F. Davis <afd@ti.com>
---
 arch/arm/mach-omap2/config.mk | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/arch/arm/mach-omap2/config.mk b/arch/arm/mach-omap2/config.mk
index 5368f6b2d7..20b555357a 100644
--- a/arch/arm/mach-omap2/config.mk
+++ b/arch/arm/mach-omap2/config.mk
@@ -6,7 +6,7 @@
 include  $(srctree)/arch/arm/mach-omap2/config_secure.mk
 
 ifdef CONFIG_SPL_BUILD
-ifeq ($(CONFIG_AM33XX)$(CONFIG_TI_SECURE_DEVICE),yy)
+ifeq ($(CONFIG_TI_SECURE_DEVICE),y)
 #
 # For booting from SPI use
 # u-boot-spl_HS_SPI_X-LOADER to program flash
@@ -35,15 +35,11 @@ ALL-y += u-boot-spl_HS_X-LOADER
 ALL-y += u-boot-spl_HS_MLO
 ALL-y += u-boot-spl_HS_2ND
 else
-ifeq ($(CONFIG_OMAP54XX)$(CONFIG_TI_SECURE_DEVICE),yy)
-ALL-y += u-boot-spl_HS_MLO u-boot-spl_HS_X-LOADER
-else
 ALL-y += MLO
 ifeq ($(CONFIG_AM33XX),y)
 ALL-y += MLO.byteswap
 endif
 endif
-endif
 else
 ifeq ($(CONFIG_TI_SECURE_DEVICE),y)
 ALL-$(CONFIG_QSPI_BOOT) += u-boot_HS_XIP_X-LOADER
-- 
2.11.0

[U-Boot] [PATCH] mach-omap2: Fix secure boot media generation

[Lokesh Vutla]

On Thursday 12 January 2017 09:51 PM, Andrew F. Davis wrote:
> While moving OMAP related files to mach-omap2 the functionality
> relating to generating secure boot files was modified. This change
> prevents secure platforms other than AM33xx and OMAP54XX from
> correctly building files for all needed media types.
> 
> Fixes: 983e37007da5 ("arm: Introduce arch/arm/mach-omap2 for OMAP2 derivative platforms")
> Signed-off-by: Andrew F. Davis <afd@ti.com>

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

Thanks and regards,
Lokesh

> ---
>  arch/arm/mach-omap2/config.mk | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/config.mk b/arch/arm/mach-omap2/config.mk
> index 5368f6b2d7..20b555357a 100644
> --- a/arch/arm/mach-omap2/config.mk
> +++ b/arch/arm/mach-omap2/config.mk
> @@ -6,7 +6,7 @@
>  include  $(srctree)/arch/arm/mach-omap2/config_secure.mk
>  
>  ifdef CONFIG_SPL_BUILD
> -ifeq ($(CONFIG_AM33XX)$(CONFIG_TI_SECURE_DEVICE),yy)
> +ifeq ($(CONFIG_TI_SECURE_DEVICE),y)
>  #
>  # For booting from SPI use
>  # u-boot-spl_HS_SPI_X-LOADER to program flash
> @@ -35,15 +35,11 @@ ALL-y += u-boot-spl_HS_X-LOADER
>  ALL-y += u-boot-spl_HS_MLO
>  ALL-y += u-boot-spl_HS_2ND
>  else
> -ifeq ($(CONFIG_OMAP54XX)$(CONFIG_TI_SECURE_DEVICE),yy)
> -ALL-y += u-boot-spl_HS_MLO u-boot-spl_HS_X-LOADER
> -else
>  ALL-y += MLO
>  ifeq ($(CONFIG_AM33XX),y)
>  ALL-y += MLO.byteswap
>  endif
>  endif
> -endif
>  else
>  ifeq ($(CONFIG_TI_SECURE_DEVICE),y)
>  ALL-$(CONFIG_QSPI_BOOT) += u-boot_HS_XIP_X-LOADER
> 

[U-Boot] mach-omap2: Fix secure boot media generation

[Tom Rini]

On Thu, Jan 12, 2017 at 10:21:58AM -0600, Andrew F. Davis wrote:

> While moving OMAP related files to mach-omap2 the functionality
> relating to generating secure boot files was modified. This change
> prevents secure platforms other than AM33xx and OMAP54XX from
> correctly building files for all needed media types.
> 
> Fixes: 983e37007da5 ("arm: Introduce arch/arm/mach-omap2 for OMAP2 derivative platforms")
> Signed-off-by: Andrew F. Davis <afd@ti.com>
> Acked-by: Lokesh Vutla <lokeshvutla@ti.com>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170120/6f2a3394/attachment.sig>