colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mach-omap2: Fix secure boot media generation

Browse Source 
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: 983e37007d ("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>
This commit is contained in:
Andrew F. Davis
2017-01-12 10:21:58 -06:00
committed by Tom Rini
parent cf947da19a
commit a4a35934c7
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/mach-omap2/config.mk
View File

@@ -6,7 +6,7 @@
include $(srctree)/arch/arm/mach-omap2/config_secure.mk include $(srctree)/arch/arm/mach-omap2/config_secure.mk
ifdef CONFIG_SPL_BUILD ifdef CONFIG_SPL_BUILD
ifeq ($(CONFIG_AM33XX)$(CONFIG_TI_SECURE_DEVICE),yy) ifeq ($(CONFIG_TI_SECURE_DEVICE),y)
# #
# For booting from SPI use # For booting from SPI use
# u-boot-spl_HS_SPI_X-LOADER to program flash # 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_MLO
ALL-y += u-boot-spl_HS_2ND ALL-y += u-boot-spl_HS_2ND
else 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 ALL-y += MLO
ifeq ($(CONFIG_AM33XX),y) ifeq ($(CONFIG_AM33XX),y)
ALL-y += MLO.byteswap ALL-y += MLO.byteswap
endif endif
endif endif
endif
else else
ifeq ($(CONFIG_TI_SECURE_DEVICE),y) ifeq ($(CONFIG_TI_SECURE_DEVICE),y)
ALL-$(CONFIG_QSPI_BOOT) += u-boot_HS_XIP_X-LOADER ALL-$(CONFIG_QSPI_BOOT) += u-boot_HS_XIP_X-LOADER