summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew F. Davis <afd@ti.com>2017-01-12 10:21:58 -0600
committerTom Rini <trini@konsulko.com>2017-01-20 15:38:00 -0500
commita4a35934c7e0475e968e82ded33ef8ad47f10bc7 (patch)
treef1f05ae50a2c69bcf3fdb07fba7b01be03f5d07d
parentcf947da19aecd1b430f22d73ad109af64a6051b5 (diff)
downloadu-boot-imx-a4a35934c7e0475e968e82ded33ef8ad47f10bc7.zip
u-boot-imx-a4a35934c7e0475e968e82ded33ef8ad47f10bc7.tar.gz
u-boot-imx-a4a35934c7e0475e968e82ded33ef8ad47f10bc7.tar.bz2
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 <afd@ti.com> Acked-by: Lokesh Vutla <lokeshvutla@ti.com>
-rw-r--r--arch/arm/mach-omap2/config.mk6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/config.mk b/arch/arm/mach-omap2/config.mk
index 5368f6b..20b5553 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