Skip to contentSkip to conversation

mach-omap2: Cleanup secure boot media generation

PATCH In review Andrew F. Davis 3 participants 4 messages Jan 23, 2017 – Jan 25, 2017

Subsystems (3)
Arm (32-bit) Arm sub-architectures OMAP2+ support
lore
Share & tools
lore

Andrew F. Davis

author
#0 lore raw

PATCH 1/1 mach-omap2: Cleanup secure boot media generation

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 <[email protected]>
---
 arch/arm/mach-omap2/config.mk | 38 ++++++++++++++++++++++++++++----------
 1 file changed, 28 insertions(+), 10 deletions(-)
arch/arm/mach-omap2/config.mk +28 -10
index 20b555357a..af455366ed 100644
@@ -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)
Signature · 1 line
2.11.0
#1 lore raw

PATCH 1/1 mach-omap2: Cleanup secure boot media generation

Quoted 5 lines · Andrew F. Davis

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 <[email protected]>
Reviewed-by Tom Rini <[email protected]>
Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170123/e3139f38/attachment-0001.sig>
#2 lore raw

PATCH 1/1 mach-omap2: Cleanup secure boot media generation

In reply to Andrew F. Davis
Quoted 3 lines · Andrew F. Davis

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.

This fixed the build error on am57xx_hs_evm_defconfig.

Tested-by Lokesh Vutla <[email protected]>

Thanks and regards,
Lokesh

#3 lore raw
In reply to Andrew F. Davis
Quoted 7 lines · Andrew F. Davis

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 <[email protected]>
Reviewed-by Tom Rini <[email protected]>
Tested-by Lokesh Vutla <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170124/9e12d7c0/attachment.sig>