From a4a35934c7e0475e968e82ded33ef8ad47f10bc7 Mon Sep 17 00:00:00 2001 From: "Andrew F. Davis" Date: Thu, 12 Jan 2017 10:21:58 -0600 Subject: [PATCH] mach-omap2: Fix secure boot media generation 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 Acked-by: Lokesh Vutla --- 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.25.1