Currently all secure media types of SPL are generated for all platforms, all platforms do not need all types, only generate the media types valid for each platform.

Signed-off-by: Andrew F. Davis afd@ti.com --- arch/arm/mach-omap2/config.mk | 38 ++++++++++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/arch/arm/mach-omap2/config.mk b/arch/arm/mach-omap2/config.mk index 20b555357a..af455366ed 100644 --- a/arch/arm/mach-omap2/config.mk +++ b/arch/arm/mach-omap2/config.mk @@ -6,34 +6,52 @@ include $(srctree)/arch/arm/mach-omap2/config_secure.mk

ifdef CONFIG_SPL_BUILD -ifeq ($(CONFIG_TI_SECURE_DEVICE),y) +ifeq ($(CONFIG_TI_SECURE_DEVICE),y) # Refer to README.ti-secure for more info +# On DRA7xx/AM57xx: +# +# For booting spl from SD/MMC/eMMC use +# u-boot-spl_HS_MLO # -# For booting from SPI use -# u-boot-spl_HS_SPI_X-LOADER to program flash +# For booting spl over UART or USB use +# u-boot-spl_HS_ULO # +# For booting spl from QSPI or NOR use +# u-boot-spl_HS_X-LOADER +ifeq ($(CONFIG_OMAP54XX),y) +ALL-y += u-boot-spl_HS_MLO +ALL-y += u-boot-spl_HS_ULO +ALL-y += u-boot-spl_HS_X-LOADER +endif # On AM43XX: # +# For booting spl from SPI flash use +# u-boot-spl_HS_SPI_X-LOADER +# # For booting spl from all other media use # u-boot-spl_HS_ISSW -# +ifeq ($(CONFIG_AM43XX),y) +ALL-y += u-boot-spl_HS_SPI_X-LOADER +ALL-y += u-boot-spl_HS_ISSW +endif # On AM33XX: # -# For booting spl from NAND flash use +# For booting spl from SPI flash use +# u-boot-spl_HS_SPI_X-LOADER +# +# For booting spl from NAND flash or raw SD/MMC/eMMC use # u-boot-spl_HS_X-LOADER # -# For booting spl from SD/MMC/eMMC media use +# For booting spl from a filesystem on SD/MMC/eMMC use # u-boot-spl_HS_MLO # # For booting spl over UART, USB, or Ethernet use # u-boot-spl_HS_2ND -# -# Refer to README.ti-secure for more info -# -ALL-y += u-boot-spl_HS_ISSW +ifeq ($(CONFIG_AM33XX),y) 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 +endif else ALL-y += MLO ifeq ($(CONFIG_AM33XX),y)