X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=arch%2Farm%2Fmach-omap2%2Fconfig.mk;h=af455366ed934adfd2d60a4979c6ead622a78933;hb=dfd6d3a9d471baf8d0f2d543398b0aad5545d297;hp=5368f6b2d72eff22631cfb0418f391bd19b075e8;hpb=6b29a395b62965eef6b5065d3a526a8588a92038;p=oweals%2Fu-boot.git

diff --git a/arch/arm/mach-omap2/config.mk b/arch/arm/mach-omap2/config.mk
index 5368f6b2d7..af455366ed 100644
--- a/arch/arm/mach-omap2/config.mk
+++ b/arch/arm/mach-omap2/config.mk
@@ -6,44 +6,58 @@
 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) # Refer to README.ti-secure for more info
+# On DRA7xx/AM57xx:
 #
-# For booting from SPI use
-# u-boot-spl_HS_SPI_X-LOADER to program flash
+# For booting spl from SD/MMC/eMMC use
+# u-boot-spl_HS_MLO
+#
+# 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
-else
-ifeq ($(CONFIG_OMAP54XX)$(CONFIG_TI_SECURE_DEVICE),yy)
-ALL-y += u-boot-spl_HS_MLO u-boot-spl_HS_X-LOADER
+endif
 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