Allow secure boot on AM33xx devices

PATCH New Andrew F. Davis 4 participants 46 messages Aug 30, 2016 – Oct 3, 2016 Arm (32-bit)

lore

Share & tools

lore

Andrew F. Davis

author

2016-08-30 19:06 UTC #0 lore raw

v4 cover Allow secure boot on AM33xx devices

Hello all,

I've recently been tasked with enabling authenticated boot for AM33xx based devices. This work is similar to what has already been done for the AM43xx and AM57xx SoCs and leverages much of the infrastructure from them.

The big difference here is the size of SRAM available on AM33xx being much less than on the other SoCs, when performing a secure boot this limits the maximum size of the SPL to just ~41k, the SPL currently generated for AM33xx SoCs is ~70k.

I have added a defconfig for booting from mmc, but it is RFC for now as the generated SPL is still much too large to fit into SRAM on HS devices. If you would like to help out you can build this defconfig and it will report by how much we have overflowed SRAM, any help reducing this would be greatly appreciated.

Thanks,
Andrew

Changes from v3:
- Drop SPL_*_BOOT patches as these do not get used by almost anyone so we can just work to remove them completly.
- Fixed defaults for ISW_ENTRY_ADDR.

Changes from v2:
- Dropping the SPL_*_SUPPORT patches as Simon is already way ahead of me on this front[0].
- Minor re-organization of the patches, dropped a couple that I didn't feel were important enough to continue working right now.

Changes from v1:
- I've moved the cleanup patches to the end of the series and now consider them RFCs. I also do not move any Kconfig options over as this can be performed automatically but will need to be done by someone who understands the build system better than me.
- Separate additional AM33xx SOC based boards out from the SoC definition in patch #1.

[0] https://www.mail-archive.com/u-boot at lists.denx.de/msg222736.html

Andrew F. Davis (10):
Kconfig: Separate AM33XX SOC config from target board config
am33xx: config.mk: Add support for additional secure boot image types
doc: Update info on using AM33xx secure devices from TI
am33xx: config.mk: Fix option used to enable SPI SPL image type
board: am33xx-hs: Allow post-processing of FIT image on AM33xx
ti: omap-common: Allow AM33xx devices to be built securely
am335x: configs: Use ISW_ENTRY_ADDR to set SPL_TEXT_BASE
config: Remove usage of CONFIG_STORAGE_EMMC
ti_armv7_common: Disable Falcon Mode on HS devices
defconfig: Add a config for AM335x High Security EVM with SD Boot
support

 arch/arm/Kconfig                                   | 98 +++-------------------
 arch/arm/cpu/armv7/am33xx/Kconfig                  | 89 +++++++++++++++++++-
 arch/arm/cpu/armv7/am33xx/config.mk                | 24 +++++-
 arch/arm/cpu/armv7/omap-common/Kconfig             |  2 +-
 board/ti/am335x/board.c                            |  8 ++
 configs/am335x_baltos_defconfig                    |  1 +
 configs/am335x_boneblack_defconfig                 |  1 +
 configs/am335x_boneblack_vboot_defconfig           |  1 +
 configs/am335x_evm_defconfig                       |  1 +
 configs/am335x_evm_nor_defconfig                   |  1 +
 configs/am335x_evm_norboot_defconfig               |  1 +
 configs/am335x_evm_spiboot_defconfig               |  1 +
 configs/am335x_evm_usbspl_defconfig                |  1 +
 ...x_evm_defconfig => am335x_hs_evm_mmc_defconfig} |  8 +-
 configs/am335x_igep0033_defconfig                  |  1 +
 configs/am335x_shc_defconfig                       |  1 +
 configs/am335x_shc_ict_defconfig                   |  1 +
 configs/am335x_shc_netboot_defconfig               |  1 +
 configs/am335x_shc_prompt_defconfig                |  1 +
 configs/am335x_shc_sdboot_defconfig                |  1 +
 configs/am335x_shc_sdboot_prompt_defconfig         |  1 +
 configs/am335x_sl50_defconfig                      |  1 +
 configs/birdland_bav335a_defconfig                 |  1 +
 configs/birdland_bav335b_defconfig                 |  1 +
 configs/cm_t335_defconfig                          |  1 +
 configs/pcm051_rev1_defconfig                      |  1 +
 configs/pcm051_rev3_defconfig                      |  1 +
 configs/pengwyn_defconfig                          |  1 +
 configs/pepper_defconfig                           |  1 +
 doc/README.ti-secure                               | 32 +++++++
 include/configs/am335x_evm.h                       |  2 -
 include/configs/am335x_shc.h                       |  2 -
 include/configs/am335x_sl50.h                      |  2 -
 include/configs/bav335x.h                          |  2 -
 include/configs/ti_am335x_common.h                 |  3 +-
 include/configs/ti_armv7_common.h                  | 15 ++--
 36 files changed, 201 insertions(+), 109 deletions(-)
 copy configs/{am335x_evm_defconfig => am335x_hs_evm_mmc_defconfig} (86%)

Signature · 1 line

2.9.3

Andrew F. Davis

author

2016-08-30 19:06 UTC #1 lore raw

PATCH v4 1/10 Kconfig: Separate AM33XX SOC config from target board config

The config option AM33XX is used in several boards and should be defined as a stand-alone option for this SOC. We break this out from target boards that use this SoC and common headers then enable AM33XX on in all the boards that used these targets to eliminate any functional change with this patch.

This is similar to what has already been done in
9de852642cae ("arm: Kconfig: Add support for AM43xx SoC specific Kconfig") and is done for the same reasons.

Signed-off-by Andrew F. Davis <[email protected]>

---
 arch/arm/Kconfig                           | 98 ++++--------------------------
 arch/arm/cpu/armv7/am33xx/Kconfig          | 86 ++++++++++++++++++++++++++
 configs/am335x_baltos_defconfig            |  1 +
 configs/am335x_boneblack_defconfig         |  1 +
 configs/am335x_boneblack_vboot_defconfig   |  1 +
 configs/am335x_evm_defconfig               |  1 +
 configs/am335x_evm_nor_defconfig           |  1 +
 configs/am335x_evm_norboot_defconfig       |  1 +
 configs/am335x_evm_spiboot_defconfig       |  1 +
 configs/am335x_evm_usbspl_defconfig        |  1 +
 configs/am335x_igep0033_defconfig          |  1 +
 configs/am335x_shc_defconfig               |  1 +
 configs/am335x_shc_ict_defconfig           |  1 +
 configs/am335x_shc_netboot_defconfig       |  1 +
 configs/am335x_shc_prompt_defconfig        |  1 +
 configs/am335x_shc_sdboot_defconfig        |  1 +
 configs/am335x_shc_sdboot_prompt_defconfig |  1 +
 configs/am335x_sl50_defconfig              |  1 +
 configs/birdland_bav335a_defconfig         |  1 +
 configs/birdland_bav335b_defconfig         |  1 +
 configs/cm_t335_defconfig                  |  1 +
 configs/pcm051_rev1_defconfig              |  1 +
 configs/pcm051_rev3_defconfig              |  1 +
 configs/pengwyn_defconfig                  |  1 +
 configs/pepper_defconfig                   |  1 +
 include/configs/ti_am335x_common.h         |  1 -
 26 files changed, 120 insertions(+), 88 deletions(-)

arch/arm/Kconfig +11 ~~-87~~

index c871eaf..1d6ba37 100644
@@ -341,38 +341,6 @@ config TARGET_BRPPT1
 	select CPU_V7
 	select SUPPORT_SPL
 
-config TARGET_CM_T335
-	bool "Support cm_t335"
-	select CPU_V7
-	select SUPPORT_SPL
-	select DM
-	select DM_SERIAL
-	select DM_GPIO
-
-config TARGET_PEPPER
-	bool "Support pepper"
-	select CPU_V7
-	select SUPPORT_SPL
-	select DM
-	select DM_SERIAL
-	select DM_GPIO
-
-config TARGET_AM335X_IGEP0033
-	bool "Support am335x_igep0033"
-	select CPU_V7
-	select SUPPORT_SPL
-	select DM
-	select DM_SERIAL
-	select DM_GPIO
-
-config TARGET_PCM051
-	bool "Support pcm051"
-	select CPU_V7
-	select SUPPORT_SPL
-	select DM
-	select DM_SERIAL
-	select DM_GPIO
-
 config TARGET_DRACO
 	bool "Support draco"
 	select CPU_V7

@@ -421,61 +389,6 @@ config TARGET_RUT
 	select DM_SERIAL
 	select DM_GPIO
 
-config TARGET_PENGWYN
-	bool "Support pengwyn"
-	select CPU_V7
-	select SUPPORT_SPL
-	select DM
-	select DM_SERIAL
-	select DM_GPIO
-
-config TARGET_AM335X_BALTOS
-	bool "Support am335x_baltos"
-	select CPU_V7
-	select SUPPORT_SPL
-	select DM
-	select DM_SERIAL
-	select DM_GPIO
-
-config TARGET_AM335X_EVM
-	bool "Support am335x_evm"
-	select CPU_V7
-	select SUPPORT_SPL
-	select DM
-	select DM_SERIAL
-	select DM_GPIO
-	select TI_I2C_BOARD_DETECT
-
-config TARGET_AM335X_SHC
-	bool "Support am335x based shc board from bosch"
-	select CPU_V7
-	select SUPPORT_SPL
-	select DM
-	select DM_SERIAL
-	select DM_GPIO
-
-config TARGET_AM335X_SL50
-	bool "Support am335x_sl50"
-	select CPU_V7
-	select SUPPORT_SPL
-	select DM
-	select DM_SERIAL
-
-config TARGET_BAV335X
-	bool "Support bav335x"
-	select CPU_V7
-	select SUPPORT_SPL
-	select DM
-	select DM_SERIAL
-	help
-	  The BAV335x OEM Network Processor integrates all the functions of an
-	  embedded network computer in a small, easy to use SODIMM module which
-	  incorporates the popular Texas Instruments Sitara 32bit ARM Coretex-A8
-	  processor, with fast DDR3 512MB SDRAM, 4GB of embedded MMC and a Gigabit
-	  ethernet with simple connection to external connectors.
-
-	  For more information, visit: http://birdland.com/oem
-
 config TARGET_TI814X_EVM
 	bool "Support ti814x_evm"
 	select CPU_V7

@@ -605,6 +518,17 @@ config AM43XX
 	  protocols, dual camera support, optional 3D graphics
 	  and an optional customer programmable secure boot.
 
+config AM33XX
+	bool "AM33XX SoC"
+	select CPU_V7
+	select SUPPORT_SPL
+	help
+	  Support for AM335x SOC from Texas Instruments.
+	  The AM335x high performance SOC features a Cortex-A8
+	  ARM core, a dual core PRU-ICSS for industrial Ethernet
+	  protocols, optional 3D graphics and an optional customer
+	  programmable secure boot.
+
 config ARCH_RMOBILE
 	bool "Renesas ARM SoCs"
 	select DM

arch/arm/cpu/armv7/am33xx/Kconfig +86 -0

96 lines not on this page · raw message

configs/am335x_baltos_defconfig +1 -0

index 78f55cc..b6cfd07 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_AM33XX=y
 CONFIG_TARGET_AM335X_BALTOS=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_SPL=y

configs/am335x_boneblack_defconfig +1 -0

index d310e0b..5fabff6 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_AM33XX=y
 CONFIG_TARGET_AM335X_EVM=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_SPL=y

configs/am335x_boneblack_vboot_defconfig +1 -0

index c2f09cb..b47b51f 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_AM33XX=y
 CONFIG_TARGET_AM335X_EVM=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_DEFAULT_DEVICE_TREE="am335x-boneblack"

configs/am335x_evm_defconfig +1 -0

index 6885230..b344bb7 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_AM33XX=y
 CONFIG_TARGET_AM335X_EVM=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_DEFAULT_DEVICE_TREE="am335x-evm"

configs/am335x_evm_nor_defconfig +1 -0

index 76a004e..e434dec 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_AM33XX=y
 CONFIG_TARGET_AM335X_EVM=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_NOR=y

configs/am335x_evm_norboot_defconfig +1 -0

index 99fc555..063eea7 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_AM33XX=y
 CONFIG_TARGET_AM335X_EVM=y
 CONFIG_NOR=y
 CONFIG_NOR_BOOT=y

configs/am335x_evm_spiboot_defconfig +1 -0

index 2fe1a25..89f472d 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_AM33XX=y
 CONFIG_TARGET_AM335X_EVM=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_SPL=y

configs/am335x_evm_usbspl_defconfig +1 -0

index cba5e84..b689181 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_AM33XX=y
 CONFIG_TARGET_AM335X_EVM=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_SPL=y

configs/am335x_igep0033_defconfig +1 -0

index d6022a3..33e0637 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_AM33XX=y
 CONFIG_TARGET_AM335X_IGEP0033=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_SPL=y

configs/am335x_shc_defconfig +1 -0

index c83311f..04d1c91 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_AM33XX=y
 CONFIG_TARGET_AM335X_SHC=y
 CONFIG_SERIES=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000

configs/am335x_shc_ict_defconfig +1 -0

index bfb56b2..999dc60 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_AM33XX=y
 CONFIG_TARGET_AM335X_SHC=y
 CONFIG_SHC_ICT=y
 CONFIG_SERIES=y

configs/am335x_shc_netboot_defconfig +1 -0

index d16c5f0..a6eaf6b 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_AM33XX=y
 CONFIG_TARGET_AM335X_SHC=y
 CONFIG_SHC_NETBOOT=y
 CONFIG_SERIES=y

configs/am335x_shc_prompt_defconfig +1 -0

index b9bc355..e174ba9 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_AM33XX=y
 CONFIG_TARGET_AM335X_SHC=y
 CONFIG_SERIES=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000

configs/am335x_shc_sdboot_defconfig +1 -0

index b0e8eff..7b3974c 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_AM33XX=y
 CONFIG_TARGET_AM335X_SHC=y
 CONFIG_SHC_SDBOOT=y
 CONFIG_SERIES=y

configs/am335x_shc_sdboot_prompt_defconfig +1 -0

index b0e8eff..7b3974c 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_AM33XX=y
 CONFIG_TARGET_AM335X_SHC=y
 CONFIG_SHC_SDBOOT=y
 CONFIG_SERIES=y

configs/am335x_sl50_defconfig +1 -0

index 01c1eeb..87ea29e 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_AM33XX=y
 CONFIG_TARGET_AM335X_SL50=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_SPL=y

configs/birdland_bav335a_defconfig +1 -0

index bb5db5c..046260d 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_AM33XX=y
 CONFIG_TARGET_BAV335X=y
 CONFIG_BAV_VERSION=1
 CONFIG_SPL=y

configs/birdland_bav335b_defconfig +1 -0

index 39cc222..38a27ad 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_AM33XX=y
 CONFIG_TARGET_BAV335X=y
 CONFIG_BAV_VERSION=2
 CONFIG_SPL=y

configs/cm_t335_defconfig +1 -0

index 1b29331..c89a723 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_AM33XX=y
 CONFIG_TARGET_CM_T335=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y

configs/pcm051_rev1_defconfig +1 -0

index 27f681f..41cb1cd 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_AM33XX=y
 CONFIG_TARGET_PCM051=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="REV1"

configs/pcm051_rev3_defconfig +1 -0

index b277b3a..3d1abd8 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_AM33XX=y
 CONFIG_TARGET_PCM051=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="REV3"

configs/pengwyn_defconfig +1 -0

index 3eba3ce..2ddb858 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_AM33XX=y
 CONFIG_TARGET_PENGWYN=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y

configs/pepper_defconfig +1 -0

index 4a46f24..4114cdc 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_AM33XX=y
 CONFIG_TARGET_PEPPER=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y

include/configs/ti_am335x_common.h +0 -1

index a9b10d0..349d410 100644
@@ -12,7 +12,6 @@
 #ifndef __CONFIG_TI_AM335X_COMMON_H__
 #define __CONFIG_TI_AM335X_COMMON_H__
 
-#define CONFIG_AM33XX
 #define CONFIG_ARCH_CPU_INIT
 #define CONFIG_MAX_RAM_BANK_SIZE	(1024 << 20)	/* 1GB */
 #define CONFIG_SYS_TIMERBASE		0x48040000	/* Use Timer2 */

Signature · 1 line

2.9.3

Lokesh Vutla

2016-08-31 03:26 UTC #2 lore raw

PATCH v4 1/10 Kconfig: Separate AM33XX SOC config from target board config

Quoted 10 lines · Andrew F. Davis

The config option AM33XX is used in several boards and should be defined as a stand-alone option for this SOC. We break this out from target boards that use this SoC and common headers then enable AM33XX on in all the boards that used these targets to eliminate any functional change with this patch.
This is similar to what has already been done in
9de852642cae ("arm: Kconfig: Add support for AM43xx SoC specific Kconfig") and is done for the same reasons.

Acked-by Lokesh Vutla <[email protected]>

Thanks and regards,
Lokesh

Quoted 498 lines

Signed-off-by Andrew F. Davis <[email protected]>

---
 arch/arm/Kconfig                           | 98 ++++--------------------------
 arch/arm/cpu/armv7/am33xx/Kconfig          | 86 ++++++++++++++++++++++++++
 configs/am335x_baltos_defconfig            |  1 +
 configs/am335x_boneblack_defconfig         |  1 +
 configs/am335x_boneblack_vboot_defconfig   |  1 +
 configs/am335x_evm_defconfig               |  1 +
 configs/am335x_evm_nor_defconfig           |  1 +
 configs/am335x_evm_norboot_defconfig       |  1 +
 configs/am335x_evm_spiboot_defconfig       |  1 +
 configs/am335x_evm_usbspl_defconfig        |  1 +
 configs/am335x_igep0033_defconfig          |  1 +
 configs/am335x_shc_defconfig               |  1 +
 configs/am335x_shc_ict_defconfig           |  1 +
 configs/am335x_shc_netboot_defconfig       |  1 +
 configs/am335x_shc_prompt_defconfig        |  1 +
 configs/am335x_shc_sdboot_defconfig        |  1 +
 configs/am335x_shc_sdboot_prompt_defconfig |  1 +
 configs/am335x_sl50_defconfig              |  1 +
 configs/birdland_bav335a_defconfig         |  1 +
 configs/birdland_bav335b_defconfig         |  1 +
 configs/cm_t335_defconfig                  |  1 +
 configs/pcm051_rev1_defconfig              |  1 +
 configs/pcm051_rev3_defconfig              |  1 +
 configs/pengwyn_defconfig                  |  1 +
 configs/pepper_defconfig                   |  1 +
 include/configs/ti_am335x_common.h         |  1 -
 26 files changed, 120 insertions(+), 88 deletions(-)

arch/arm/Kconfig +11 ~~-87~~

index c871eaf..1d6ba37 100644
@@ -341,38 +341,6 @@ config TARGET_BRPPT1
 	select CPU_V7
 	select SUPPORT_SPL
 
-config TARGET_CM_T335
-	bool "Support cm_t335"
-	select CPU_V7
-	select SUPPORT_SPL
-	select DM
-	select DM_SERIAL
-	select DM_GPIO
-
-config TARGET_PEPPER
-	bool "Support pepper"
-	select CPU_V7
-	select SUPPORT_SPL
-	select DM
-	select DM_SERIAL
-	select DM_GPIO
-
-config TARGET_AM335X_IGEP0033
-	bool "Support am335x_igep0033"
-	select CPU_V7
-	select SUPPORT_SPL
-	select DM
-	select DM_SERIAL
-	select DM_GPIO
-
-config TARGET_PCM051
-	bool "Support pcm051"
-	select CPU_V7
-	select SUPPORT_SPL
-	select DM
-	select DM_SERIAL
-	select DM_GPIO
-
 config TARGET_DRACO
 	bool "Support draco"
 	select CPU_V7

@@ -421,61 +389,6 @@ config TARGET_RUT
 	select DM_SERIAL
 	select DM_GPIO
 
-config TARGET_PENGWYN
-	bool "Support pengwyn"
-	select CPU_V7
-	select SUPPORT_SPL
-	select DM
-	select DM_SERIAL
-	select DM_GPIO
-
-config TARGET_AM335X_BALTOS
-	bool "Support am335x_baltos"
-	select CPU_V7
-	select SUPPORT_SPL
-	select DM
-	select DM_SERIAL
-	select DM_GPIO
-
-config TARGET_AM335X_EVM
-	bool "Support am335x_evm"
-	select CPU_V7
-	select SUPPORT_SPL
-	select DM
-	select DM_SERIAL
-	select DM_GPIO
-	select TI_I2C_BOARD_DETECT
-
-config TARGET_AM335X_SHC
-	bool "Support am335x based shc board from bosch"
-	select CPU_V7
-	select SUPPORT_SPL
-	select DM
-	select DM_SERIAL
-	select DM_GPIO
-
-config TARGET_AM335X_SL50
-	bool "Support am335x_sl50"
-	select CPU_V7
-	select SUPPORT_SPL
-	select DM
-	select DM_SERIAL
-
-config TARGET_BAV335X
-	bool "Support bav335x"
-	select CPU_V7
-	select SUPPORT_SPL
-	select DM
-	select DM_SERIAL
-	help
-	  The BAV335x OEM Network Processor integrates all the functions of an
-	  embedded network computer in a small, easy to use SODIMM module which
-	  incorporates the popular Texas Instruments Sitara 32bit ARM Coretex-A8
-	  processor, with fast DDR3 512MB SDRAM, 4GB of embedded MMC and a Gigabit
-	  ethernet with simple connection to external connectors.
-
-	  For more information, visit: http://birdland.com/oem
-
 config TARGET_TI814X_EVM
 	bool "Support ti814x_evm"
 	select CPU_V7

@@ -605,6 +518,17 @@ config AM43XX
 	  protocols, dual camera support, optional 3D graphics
 	  and an optional customer programmable secure boot.
 
+config AM33XX
+	bool "AM33XX SoC"
+	select CPU_V7
+	select SUPPORT_SPL
+	help
+	  Support for AM335x SOC from Texas Instruments.
+	  The AM335x high performance SOC features a Cortex-A8
+	  ARM core, a dual core PRU-ICSS for industrial Ethernet
+	  protocols, optional 3D graphics and an optional customer
+	  programmable secure boot.
+
 config ARCH_RMOBILE
 	bool "Renesas ARM SoCs"
 	select DM

arch/arm/cpu/armv7/am33xx/Kconfig +86 -0

index dc51e9b..e57e6fb 100644
@@ -1,3 +1,87 @@
+if AM33XX
+
+choice
+	prompt "AM33xx board select"
+	optional
+
+config TARGET_AM335X_EVM
+	bool "Support am335x_evm"
+	select DM
+	select DM_SERIAL
+	select DM_GPIO
+	select TI_I2C_BOARD_DETECT
+	help
+	  This option specifies support for the AM335x
+	  GP and HS EVM development platforms. The AM335x
+	  GP EVM is a standalone test, development, and
+	  evaluation module system that enables developers
+	  to write software and develop hardware around
+	  an AM335x processor subsystem.
+
+config TARGET_AM335X_BALTOS
+	bool "Support am335x_baltos"
+	select DM
+	select DM_SERIAL
+	select DM_GPIO
+
+config TARGET_AM335X_IGEP0033
+	bool "Support am335x_igep0033"
+	select DM
+	select DM_SERIAL
+	select DM_GPIO
+
+config TARGET_AM335X_SHC
+	bool "Support am335x based shc board from bosch"
+	select DM
+	select DM_SERIAL
+	select DM_GPIO
+
+config TARGET_AM335X_SL50
+	bool "Support am335x_sl50"
+	select DM
+	select DM_SERIAL
+
+config TARGET_BAV335X
+	bool "Support bav335x"
+	select DM
+	select DM_SERIAL
+	help
+	  The BAV335x OEM Network Processor integrates all the functions of an
+	  embedded network computer in a small, easy to use SODIMM module which
+	  incorporates the popular Texas Instruments Sitara 32bit ARM Coretex-A8
+	  processor, with fast DDR3 512MB SDRAM, 4GB of embedded MMC and a Gigabit
+	  ethernet with simple connection to external connectors.
+
+	  For more information, visit: http://birdland.com/oem
+
+config TARGET_CM_T335
+	bool "Support cm_t335"
+	select DM
+	select DM_SERIAL
+	select DM_GPIO
+
+config TARGET_PCM051
+	bool "Support pcm051"
+	select DM
+	select DM_SERIAL
+	select DM_GPIO
+
+config TARGET_PENGWYN
+	bool "Support pengwyn"
+	select DM
+	select DM_SERIAL
+	select DM_GPIO
+
+config TARGET_PEPPER
+	bool "Support pepper"
+	select DM
+	select DM_SERIAL
+	select DM_GPIO
+
+endchoice
+
+endif
+
 if AM43XX
 config TARGET_AM43XX_EVM
 	bool "Support am43xx_evm"

@@ -9,7 +93,9 @@ config TARGET_AM43XX_EVM
 	  evaluation module system that enables developers
 	  to write software and develop hardware around
 	  an AM43xx processor subsystem.
+endif
 
+if AM43XX || AM33XX
 config ISW_ENTRY_ADDR
 	hex "Address in memory or XIP flash of bootloader entry point"
 	help

configs/am335x_baltos_defconfig +1 -0

index 78f55cc..b6cfd07 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_AM33XX=y
 CONFIG_TARGET_AM335X_BALTOS=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_SPL=y

configs/am335x_boneblack_defconfig +1 -0

index d310e0b..5fabff6 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_AM33XX=y
 CONFIG_TARGET_AM335X_EVM=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_SPL=y

configs/am335x_boneblack_vboot_defconfig +1 -0

index c2f09cb..b47b51f 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_AM33XX=y
 CONFIG_TARGET_AM335X_EVM=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_DEFAULT_DEVICE_TREE="am335x-boneblack"

configs/am335x_evm_defconfig +1 -0

index 6885230..b344bb7 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_AM33XX=y
 CONFIG_TARGET_AM335X_EVM=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_DEFAULT_DEVICE_TREE="am335x-evm"

configs/am335x_evm_nor_defconfig +1 -0

index 76a004e..e434dec 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_AM33XX=y
 CONFIG_TARGET_AM335X_EVM=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_NOR=y

configs/am335x_evm_norboot_defconfig +1 -0

index 99fc555..063eea7 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_AM33XX=y
 CONFIG_TARGET_AM335X_EVM=y
 CONFIG_NOR=y
 CONFIG_NOR_BOOT=y

configs/am335x_evm_spiboot_defconfig +1 -0

index 2fe1a25..89f472d 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_AM33XX=y
 CONFIG_TARGET_AM335X_EVM=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_SPL=y

configs/am335x_evm_usbspl_defconfig +1 -0

index cba5e84..b689181 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_AM33XX=y
 CONFIG_TARGET_AM335X_EVM=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_SPL=y

configs/am335x_igep0033_defconfig +1 -0

index d6022a3..33e0637 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_AM33XX=y
 CONFIG_TARGET_AM335X_IGEP0033=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_SPL=y

configs/am335x_shc_defconfig +1 -0

index c83311f..04d1c91 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_AM33XX=y
 CONFIG_TARGET_AM335X_SHC=y
 CONFIG_SERIES=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000

configs/am335x_shc_ict_defconfig +1 -0

index bfb56b2..999dc60 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_AM33XX=y
 CONFIG_TARGET_AM335X_SHC=y
 CONFIG_SHC_ICT=y
 CONFIG_SERIES=y

configs/am335x_shc_netboot_defconfig +1 -0

index d16c5f0..a6eaf6b 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_AM33XX=y
 CONFIG_TARGET_AM335X_SHC=y
 CONFIG_SHC_NETBOOT=y
 CONFIG_SERIES=y

configs/am335x_shc_prompt_defconfig +1 -0

index b9bc355..e174ba9 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_AM33XX=y
 CONFIG_TARGET_AM335X_SHC=y
 CONFIG_SERIES=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000

configs/am335x_shc_sdboot_defconfig +1 -0

index b0e8eff..7b3974c 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_AM33XX=y
 CONFIG_TARGET_AM335X_SHC=y
 CONFIG_SHC_SDBOOT=y
 CONFIG_SERIES=y

configs/am335x_shc_sdboot_prompt_defconfig +1 -0

index b0e8eff..7b3974c 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_AM33XX=y
 CONFIG_TARGET_AM335X_SHC=y
 CONFIG_SHC_SDBOOT=y
 CONFIG_SERIES=y

configs/am335x_sl50_defconfig +1 -0

index 01c1eeb..87ea29e 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_AM33XX=y
 CONFIG_TARGET_AM335X_SL50=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_SPL=y

configs/birdland_bav335a_defconfig +1 -0

index bb5db5c..046260d 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_AM33XX=y
 CONFIG_TARGET_BAV335X=y
 CONFIG_BAV_VERSION=1
 CONFIG_SPL=y

configs/birdland_bav335b_defconfig +1 -0

index 39cc222..38a27ad 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_AM33XX=y
 CONFIG_TARGET_BAV335X=y
 CONFIG_BAV_VERSION=2
 CONFIG_SPL=y

configs/cm_t335_defconfig +1 -0

index 1b29331..c89a723 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_AM33XX=y
 CONFIG_TARGET_CM_T335=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y

configs/pcm051_rev1_defconfig +1 -0

index 27f681f..41cb1cd 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_AM33XX=y
 CONFIG_TARGET_PCM051=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="REV1"

configs/pcm051_rev3_defconfig +1 -0

index b277b3a..3d1abd8 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_AM33XX=y
 CONFIG_TARGET_PCM051=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="REV3"

configs/pengwyn_defconfig +1 -0

index 3eba3ce..2ddb858 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_AM33XX=y
 CONFIG_TARGET_PENGWYN=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y

configs/pepper_defconfig +1 -0

index 4a46f24..4114cdc 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_AM33XX=y
 CONFIG_TARGET_PEPPER=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y

include/configs/ti_am335x_common.h +0 -1

index a9b10d0..349d410 100644
@@ -12,7 +12,6 @@
 #ifndef __CONFIG_TI_AM335X_COMMON_H__
 #define __CONFIG_TI_AM335X_COMMON_H__
 
-#define CONFIG_AM33XX
 #define CONFIG_ARCH_CPU_INIT
 #define CONFIG_MAX_RAM_BANK_SIZE	(1024 << 20)	/* 1GB */
 #define CONFIG_SYS_TIMERBASE		0x48040000	/* Use Timer2 */

Hannes Schmelzer

2016-08-31 16:06 UTC #3 lore raw

PATCH v4 1/10 Kconfig: Separate AM33XX SOC config from target board config

In reply to Andrew F. Davis

Quoted 31 lines · Andrew F. Davis

The config option AM33XX is used in several boards and should be defined as a stand-alone option for this SOC. We break this out from target boards that use this SoC and common headers then enable AM33XX on in all the boards that used these targets to eliminate any functional change with this patch.
This is similar to what has already been done in
9de852642cae ("arm: Kconfig: Add support for AM43xx SoC specific Kconfig") and is done for the same reasons.
Signed-off-by Andrew F. Davis <[email protected]>
---
  arch/arm/Kconfig                           | 98 ++++--------------------------
  arch/arm/cpu/armv7/am33xx/Kconfig          | 86 ++++++++++++++++++++++++++
  configs/am335x_baltos_defconfig            |  1 +
  configs/am335x_boneblack_defconfig         |  1 +
  configs/am335x_boneblack_vboot_defconfig   |  1 +
  configs/am335x_evm_defconfig               |  1 +
  configs/am335x_evm_nor_defconfig           |  1 +
  configs/am335x_evm_norboot_defconfig       |  1 +
  configs/am335x_evm_spiboot_defconfig       |  1 +
  configs/am335x_evm_usbspl_defconfig        |  1 +
  configs/am335x_igep0033_defconfig          |  1 +
  configs/am335x_shc_defconfig               |  1 +
  configs/am335x_shc_ict_defconfig           |  1 +
  configs/am335x_shc_netboot_defconfig       |  1 +
  configs/am335x_shc_prompt_defconfig        |  1 +
  configs/am335x_shc_sdboot_defconfig        |  1 +
  configs/am335x_shc_sdboot_prompt_defconfig |  1 +
  configs/am335x_sl50_defconfig              |  1 +
  configs/birdland_bav335a_defconfig         |  1 +

Quoted 8 lines

  configs/birdland_bav335b_defconfig         |  1 +
  configs/cm_t335_defconfig                  |  1 +
  configs/pcm051_rev1_defconfig              |  1 +
  configs/pcm051_rev3_defconfig              |  1 +
  configs/pengwyn_defconfig                  |  1 +
  configs/pepper_defconfig                   |  1 +
  include/configs/ti_am335x_common.h         |  1 -
  26 files changed, 120 insertions(+), 88 deletions(-)

Hi Andrew,

why is this "CONFIG_AM33XX" only done at related ti_am335x_common.h boards?

grep -r "#define CONFIG_AM33XX" * include/configs/bur_am335x_common.h:#define CONFIG_AM33XX include/configs/ti_am335x_common.h:#define CONFIG_AM33XX include/configs/siemens-am33x-common.h:#define CONFIG_AM33XX

I'm responsible for the bur_am335x_common.h related boards.

cheers,
Hannes

Andrew F. Davis

author

2016-08-31 16:16 UTC #4 lore raw

PATCH v4 1/10 Kconfig: Separate AM33XX SOC config from target board config

Quoted 45 lines · Hannes Schmelzer

Quoted 34 lines · Andrew F. Davis

The config option AM33XX is used in several boards and should be defined as a stand-alone option for this SOC. We break this out from target boards that use this SoC and common headers then enable AM33XX on in all the boards that used these targets to eliminate any functional change with this patch.
This is similar to what has already been done in 9de852642cae ("arm: Kconfig: Add support for AM43xx SoC specific Kconfig")
and is done for the same reasons.
Signed-off-by Andrew F. Davis <[email protected]>
---
  arch/arm/Kconfig                           | 98
++++--------------------------
  arch/arm/cpu/armv7/am33xx/Kconfig          | 86
++++++++++++++++++++++++++
  configs/am335x_baltos_defconfig            |  1 +
  configs/am335x_boneblack_defconfig         |  1 +
  configs/am335x_boneblack_vboot_defconfig   |  1 +
  configs/am335x_evm_defconfig               |  1 +
  configs/am335x_evm_nor_defconfig           |  1 +
  configs/am335x_evm_norboot_defconfig       |  1 +
  configs/am335x_evm_spiboot_defconfig       |  1 +
  configs/am335x_evm_usbspl_defconfig        |  1 +
  configs/am335x_igep0033_defconfig          |  1 +
  configs/am335x_shc_defconfig               |  1 +
  configs/am335x_shc_ict_defconfig           |  1 +
  configs/am335x_shc_netboot_defconfig       |  1 +
  configs/am335x_shc_prompt_defconfig        |  1 +
  configs/am335x_shc_sdboot_defconfig        |  1 +
  configs/am335x_shc_sdboot_prompt_defconfig |  1 +
  configs/am335x_sl50_defconfig              |  1 +
  configs/birdland_bav335a_defconfig         |  1 +

Quoted 8 lines

  configs/birdland_bav335b_defconfig         |  1 +
  configs/cm_t335_defconfig                  |  1 +
  configs/pcm051_rev1_defconfig              |  1 +
  configs/pcm051_rev3_defconfig              |  1 +
  configs/pengwyn_defconfig                  |  1 +
  configs/pepper_defconfig                   |  1 +
  include/configs/ti_am335x_common.h         |  1 -
  26 files changed, 120 insertions(+), 88 deletions(-)

Hi Andrew,

Quoted 9 lines

why is this "CONFIG_AM33XX" only done at related ti_am335x_common.h boards?
grep -r "#define CONFIG_AM33XX" * include/configs/bur_am335x_common.h:#define CONFIG_AM33XX include/configs/ti_am335x_common.h:#define CONFIG_AM33XX include/configs/siemens-am33x-common.h:#define CONFIG_AM33XX
I'm responsible for the bur_am335x_common.h related boards.

My original intent was to start with just one board (am335x_evm), but it has a common header config with all these other boards, so they were converted too for consistency.

You should be able to convert your boards in a similar way and add them to arch/arm/cpu/armv7/am33xx/Kconfig, or if you would like I can do that for you in a different patch ( I don't want to add too much to this one, it is already tested and I'm afraid to touch it to much :) ).

Thanks,
Andrew

Quoted 3 lines

cheers,
Hannes

Hannes Schmelzer

2016-08-31 17:45 UTC #5 lore raw

PATCH v4 1/10 Kconfig: Separate AM33XX SOC config from target board config

mfG
Schmelzer Hannes

Quoted 59 lines · Andrew F. Davis

Quoted 45 lines · Hannes Schmelzer
Quoted 34 lines · Andrew F. Davis
The config option AM33XX is used in several boards and should be defined as a stand-alone option for this SOC. We break this out from target boards that use this SoC and common headers then enable AM33XX on in all the boards that used these targets to eliminate any functional change with this patch.
This is similar to what has already been done in 9de852642cae ("arm: Kconfig: Add support for AM43xx SoC specific Kconfig")
and is done for the same reasons.
Signed-off-by Andrew F. Davis <[email protected]>
---
   arch/arm/Kconfig                           | 98
++++--------------------------
   arch/arm/cpu/armv7/am33xx/Kconfig          | 86
++++++++++++++++++++++++++
   configs/am335x_baltos_defconfig            |  1 +
   configs/am335x_boneblack_defconfig         |  1 +
   configs/am335x_boneblack_vboot_defconfig   |  1 +
   configs/am335x_evm_defconfig               |  1 +
   configs/am335x_evm_nor_defconfig           |  1 +
   configs/am335x_evm_norboot_defconfig       |  1 +
   configs/am335x_evm_spiboot_defconfig       |  1 +
   configs/am335x_evm_usbspl_defconfig        |  1 +
   configs/am335x_igep0033_defconfig          |  1 +
   configs/am335x_shc_defconfig               |  1 +
   configs/am335x_shc_ict_defconfig           |  1 +
   configs/am335x_shc_netboot_defconfig       |  1 +
   configs/am335x_shc_prompt_defconfig        |  1 +
   configs/am335x_shc_sdboot_defconfig        |  1 +
   configs/am335x_shc_sdboot_prompt_defconfig |  1 +
   configs/am335x_sl50_defconfig              |  1 +
   configs/birdland_bav335a_defconfig         |  1 +
Quoted 8 lines
   configs/birdland_bav335b_defconfig         |  1 +
   configs/cm_t335_defconfig                  |  1 +
   configs/pcm051_rev1_defconfig              |  1 +
   configs/pcm051_rev3_defconfig              |  1 +
   configs/pengwyn_defconfig                  |  1 +
   configs/pepper_defconfig                   |  1 +
   include/configs/ti_am335x_common.h         |  1 -
   26 files changed, 120 insertions(+), 88 deletions(-)
Hi Andrew,
Quoted 9 lines
why is this "CONFIG_AM33XX" only done at related ti_am335x_common.h boards?
grep -r "#define CONFIG_AM33XX" * include/configs/bur_am335x_common.h:#define CONFIG_AM33XX include/configs/ti_am335x_common.h:#define CONFIG_AM33XX include/configs/siemens-am33x-common.h:#define CONFIG_AM33XX
I'm responsible for the bur_am335x_common.h related boards.
My original intent was to start with just one board (am335x_evm), but it has a common header config with all these other boards, so they were converted too for consistency.

Quoted 7 lines

You should be able to convert your boards in a similar way and add them to arch/arm/cpu/armv7/am33xx/Kconfig, or if you would like I can do that for you in a different patch ( I don't want to add too much to this one, it is already tested and I'm afraid to touch it to much :) ).
Thanks,
Andrew

OK for me.
I will convert my boards later, once your series got applied.

thanks,
Hannes

Tom Rini

2016-09-02 14:53 UTC #6 lore raw

PATCH v4 1/10 Kconfig: Separate AM33XX SOC config from target board config

In reply to Andrew F. Davis

Quoted 11 lines · Andrew F. Davis

The config option AM33XX is used in several boards and should be defined as a stand-alone option for this SOC. We break this out from target boards that use this SoC and common headers then enable AM33XX on in all the boards that used these targets to eliminate any functional change with this patch.
This is similar to what has already been done in
9de852642cae ("arm: Kconfig: Add support for AM43xx SoC specific Kconfig") and is done for the same reasons.
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/20160902/6d205e58/attachment.sig>

Tom Rini

2016-10-03 13:38 UTC #7 lore raw

PATCH v4 1/10 Kconfig: Separate AM33XX SOC config from target board config

In reply to Andrew F. Davis

Quoted 6 lines · Andrew F. Davis

The config option AM33XX is used in several boards and should be defined as a stand-alone option for this SOC. We break this out from target boards that use this SoC and common headers then enable AM33XX on in all the boards that used these targets to eliminate any functional change with this patch.

Quoted 7 lines

This is similar to what has already been done in
9de852642cae ("arm: Kconfig: Add support for AM43xx SoC specific Kconfig") and is done for the same reasons.
Signed-off-by Andrew F. Davis <[email protected]>
Acked-by Lokesh Vutla <[email protected]>
Reviewed-by Tom Rini <[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/20161003/36a021d9/attachment.sig>

Andrew F. Davis

author

2016-08-30 19:06 UTC #8 lore raw

PATCH v4 2/10 am33xx: config.mk: Add support for additional secure boot image types

In reply to Andrew F. Davis

Depending on the boot media, different images are needed for secure devices. The build generates u-boot*_HS_* files as appropriate for the different boot modes.

For AM33xx devices additional image types are needed for various SPL boot modes as the ROM checks for the name of the boot mode in the file it loads.

Signed-off-by Andrew F. Davis <[email protected]>

Reviewed-by Tom Rini <[email protected]>

---
 arch/arm/cpu/armv7/am33xx/config.mk | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

arch/arm/cpu/armv7/am33xx/config.mk +18 -2

index d4eb21c..431cf62 100644
@@ -12,13 +12,29 @@ ifeq ($(CONFIG_TI_SECURE_DEVICE),y)
 # For booting from SPI use
 # u-boot-spl_HS_SPI_X-LOADER to program flash
 #
-# For booting spl from all other  media
-# use u-boot-spl_HS_ISSW
+# On AM43XX:
+#
+# For booting spl from all other media use
+# u-boot-spl_HS_ISSW
+#
+# On AM33XX:
+#
+# For booting spl from NAND flash use
+# u-boot-spl_HS_X-LOADER
+#
+# For booting spl from SD/MMC/eMMC media 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
 ALL-$(CONFIG_SPL_SPI_SUPPORT) += 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
 ALL-y	+= MLO
 ALL-$(CONFIG_SPL_SPI_SUPPORT) += MLO.byteswap

Signature · 1 line

2.9.3

Lokesh Vutla

2016-08-31 03:26 UTC #9 lore raw

PATCH v4 2/10 am33xx: config.mk: Add support for additional secure boot image types

Quoted 10 lines · Andrew F. Davis

Depending on the boot media, different images are needed for secure devices. The build generates u-boot*_HS_* files as appropriate for the different boot modes.
For AM33xx devices additional image types are needed for various SPL boot modes as the ROM checks for the name of the boot mode in the file it loads.
Signed-off-by Andrew F. Davis <[email protected]>
Reviewed-by Tom Rini <[email protected]>

Acked-by Lokesh Vutla <[email protected]>

Thanks and regards,
Lokesh

Quoted 41 lines

---
 arch/arm/cpu/armv7/am33xx/config.mk | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

arch/arm/cpu/armv7/am33xx/config.mk +18 -2

index d4eb21c..431cf62 100644
@@ -12,13 +12,29 @@ ifeq ($(CONFIG_TI_SECURE_DEVICE),y)
 # For booting from SPI use
 # u-boot-spl_HS_SPI_X-LOADER to program flash
 #
-# For booting spl from all other  media
-# use u-boot-spl_HS_ISSW
+# On AM43XX:
+#
+# For booting spl from all other media use
+# u-boot-spl_HS_ISSW
+#
+# On AM33XX:
+#
+# For booting spl from NAND flash use
+# u-boot-spl_HS_X-LOADER
+#
+# For booting spl from SD/MMC/eMMC media 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
 ALL-$(CONFIG_SPL_SPI_SUPPORT) += 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
 ALL-y	+= MLO
 ALL-$(CONFIG_SPL_SPI_SUPPORT) += MLO.byteswap

Tom Rini

2016-09-02 14:53 UTC #10 lore raw

PATCH v4 2/10 am33xx: config.mk: Add support for additional secure boot image types

In reply to Andrew F. Davis

Quoted 10 lines · Andrew F. Davis

Depending on the boot media, different images are needed for secure devices. The build generates u-boot*_HS_* files as appropriate for the different boot modes.
For AM33xx devices additional image types are needed for various SPL boot modes as the ROM checks for the name of the boot mode in the file it loads.
Signed-off-by Andrew F. Davis <[email protected]>
Reviewed-by Tom Rini <[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/20160902/c2717716/attachment.sig>

Tom Rini

2016-10-03 13:38 UTC #11 lore raw

PATCH v4 2/10 am33xx: config.mk: Add support for additional secure boot image types

In reply to Andrew F. Davis

Quoted 4 lines · Andrew F. Davis

Depending on the boot media, different images are needed for secure devices. The build generates u-boot*_HS_* files as appropriate for the different boot modes.

Quoted 8 lines

For AM33xx devices additional image types are needed for various SPL boot modes as the ROM checks for the name of the boot mode in the file it loads.
Signed-off-by Andrew F. Davis <[email protected]>
Reviewed-by Tom Rini <[email protected]>
Acked-by Lokesh Vutla <[email protected]>
Reviewed-by Tom Rini <[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/20161003/78ed1240/attachment.sig>

Andrew F. Davis

author

2016-08-30 19:06 UTC #12 lore raw

PATCH v4 3/10 doc: Update info on using AM33xx secure devices from TI

In reply to Andrew F. Davis

Add a section describing the additional boot types used on AM33xx secure devices.

Signed-off-by Andrew F. Davis <[email protected]>

Reviewed-by Tom Rini <[email protected]>

---
 doc/README.ti-secure | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

doc/README.ti-secure +32 -0

index 54c996d..9b0fbf9 100644
@@ -43,6 +43,38 @@ Booting of U-Boot SPL
 	The script is basically the only required interface to the TI SECDEV
 	package for creating a bootable SPL image for secure TI devices.
 
+	Invoking the script for AM33xx Secure Devices
+	=============================================
+
+	create-boot-image.sh \
+		<IMAGE_FLAG> <INPUT_FILE> <OUTPUT_FILE> <SPL_LOAD_ADDR>
+
+	<IMAGE_FLAG> is a value that specifies the type of the image to
+	generate OR the action the image generation tool will take. Valid
+	values are:
+		SPI_X-LOADER - Generates an image for SPI flash (byte swapped)
+		X-LOADER - Generates an image for non-XIP flash
+		MLO - Generates an image for SD/MMC/eMMC media
+		2ND - Generates an image for USB, UART and Ethernet
+		XIP_X-LOADER - Generates a single stage u-boot for NOR/QSPI XiP
+
+	<INPUT_FILE> is the full path and filename of the public world boot
+	loaderbinary file (depending on the boot media, this is usually
+	either u-boot-spl.bin or u-boot.bin).
+
+	<OUTPUT_FILE> is the full path and filename of the final secure
+	image. The output binary images should be used in place of the standard
+	non-secure binary images (see the platform-specific user's guides and
+	releases notes for how the non-secure images are typically used)
+	u-boot-spl_HS_SPI_X-LOADER - byte swapped boot image for SPI flash
+	u-boot-spl_HS_X-LOADER - boot image for NAND or SD/MMC/eMMC rawmode
+	u-boot-spl_HS_MLO - boot image for SD/MMC/eMMC media
+	u-boot-spl_HS_2ND - boot image for USB, UART and Ethernet
+	u-boot_HS_XIP_X-LOADER - boot image for NOR or QSPI Xip flash
+
+	<SPL_LOAD_ADDR> is the address at which SOC ROM should load the
+	<INPUT_FILE>
+
 	Invoking the script for AM43xx Secure Devices
 	=============================================

Signature · 1 line

2.9.3

Lokesh Vutla

2016-08-31 03:26 UTC #13 lore raw

PATCH v4 3/10 doc: Update info on using AM33xx secure devices from TI

Quoted 5 lines · Andrew F. Davis

Add a section describing the additional boot types used on AM33xx secure devices.
Signed-off-by Andrew F. Davis <[email protected]>
Reviewed-by Tom Rini <[email protected]>

Acked-by Lokesh Vutla <[email protected]>

Thanks and regards,
Lokesh

Quoted 48 lines

---
 doc/README.ti-secure | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

doc/README.ti-secure +32 -0

index 54c996d..9b0fbf9 100644
@@ -43,6 +43,38 @@ Booting of U-Boot SPL
 	The script is basically the only required interface to the TI SECDEV
 	package for creating a bootable SPL image for secure TI devices.
 
+	Invoking the script for AM33xx Secure Devices
+	=============================================
+
+	create-boot-image.sh \
+		<IMAGE_FLAG> <INPUT_FILE> <OUTPUT_FILE> <SPL_LOAD_ADDR>
+
+	<IMAGE_FLAG> is a value that specifies the type of the image to
+	generate OR the action the image generation tool will take. Valid
+	values are:
+		SPI_X-LOADER - Generates an image for SPI flash (byte swapped)
+		X-LOADER - Generates an image for non-XIP flash
+		MLO - Generates an image for SD/MMC/eMMC media
+		2ND - Generates an image for USB, UART and Ethernet
+		XIP_X-LOADER - Generates a single stage u-boot for NOR/QSPI XiP
+
+	<INPUT_FILE> is the full path and filename of the public world boot
+	loaderbinary file (depending on the boot media, this is usually
+	either u-boot-spl.bin or u-boot.bin).
+
+	<OUTPUT_FILE> is the full path and filename of the final secure
+	image. The output binary images should be used in place of the standard
+	non-secure binary images (see the platform-specific user's guides and
+	releases notes for how the non-secure images are typically used)
+	u-boot-spl_HS_SPI_X-LOADER - byte swapped boot image for SPI flash
+	u-boot-spl_HS_X-LOADER - boot image for NAND or SD/MMC/eMMC rawmode
+	u-boot-spl_HS_MLO - boot image for SD/MMC/eMMC media
+	u-boot-spl_HS_2ND - boot image for USB, UART and Ethernet
+	u-boot_HS_XIP_X-LOADER - boot image for NOR or QSPI Xip flash
+
+	<SPL_LOAD_ADDR> is the address at which SOC ROM should load the
+	<INPUT_FILE>
+
 	Invoking the script for AM43xx Secure Devices
 	=============================================

Tom Rini

2016-09-02 14:53 UTC #14 lore raw

PATCH v4 3/10 doc: Update info on using AM33xx secure devices from TI

In reply to Andrew F. Davis

Quoted 5 lines · Andrew F. Davis

Add a section describing the additional boot types used on AM33xx secure devices.
Signed-off-by Andrew F. Davis <[email protected]>
Reviewed-by Tom Rini <[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/20160902/9af08576/attachment.sig>

Tom Rini

2016-10-03 13:38 UTC #15 lore raw

PATCH v4 3/10 doc: Update info on using AM33xx secure devices from TI

In reply to Andrew F. Davis

Quoted 7 lines · Andrew F. Davis

Add a section describing the additional boot types used on AM33xx secure devices.
Signed-off-by Andrew F. Davis <[email protected]>
Reviewed-by Tom Rini <[email protected]>
Acked-by Lokesh Vutla <[email protected]>
Reviewed-by Tom Rini <[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/20161003/244e5049/attachment.sig>

Andrew F. Davis

author

2016-08-30 19:06 UTC #16 lore raw

PATCH v4 4/10 am33xx: config.mk: Fix option used to enable SPI SPL image type

In reply to Andrew F. Davis

The option SPL_SPI_SUPPORT is used to enable support in SPL for loading images from SPI flash, it should not be used to determine the build type of the SPL image itself. The ability to read images from SPI flash does not imply the SPL will be booted from SPI flash.

Unconditionally build SPI flash compatible SPL images.

Signed-off-by Andrew F. Davis <[email protected]>

---
 arch/arm/cpu/armv7/am33xx/config.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

arch/arm/cpu/armv7/am33xx/config.mk +2 -2

index 431cf62..87b76d9 100644
@@ -31,13 +31,13 @@ ifeq ($(CONFIG_TI_SECURE_DEVICE),y)
 # Refer to README.ti-secure for more info
 #
 ALL-y	+= u-boot-spl_HS_ISSW
-ALL-$(CONFIG_SPL_SPI_SUPPORT) += u-boot-spl_HS_SPI_X-LOADER
+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
 ALL-y	+= MLO
-ALL-$(CONFIG_SPL_SPI_SUPPORT) += MLO.byteswap
+ALL-y += MLO.byteswap
 endif
 else
 ifeq ($(CONFIG_TI_SECURE_DEVICE),y)

Signature · 1 line

2.9.3

Lokesh Vutla

2016-08-31 03:27 UTC #17 lore raw

PATCH v4 4/10 am33xx: config.mk: Fix option used to enable SPI SPL image type

Quoted 6 lines · Andrew F. Davis

The option SPL_SPI_SUPPORT is used to enable support in SPL for loading images from SPI flash, it should not be used to determine the build type of the SPL image itself. The ability to read images from SPI flash does not imply the SPL will be booted from SPI flash.
Unconditionally build SPI flash compatible SPL images.

Acked-by Lokesh Vutla <[email protected]>

Thanks and regards,
Lokesh

Quoted 27 lines

Signed-off-by Andrew F. Davis <[email protected]>

---
 arch/arm/cpu/armv7/am33xx/config.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

arch/arm/cpu/armv7/am33xx/config.mk +2 -2

index 431cf62..87b76d9 100644
@@ -31,13 +31,13 @@ ifeq ($(CONFIG_TI_SECURE_DEVICE),y)
 # Refer to README.ti-secure for more info
 #
 ALL-y	+= u-boot-spl_HS_ISSW
-ALL-$(CONFIG_SPL_SPI_SUPPORT) += u-boot-spl_HS_SPI_X-LOADER
+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
 ALL-y	+= MLO
-ALL-$(CONFIG_SPL_SPI_SUPPORT) += MLO.byteswap
+ALL-y += MLO.byteswap
 endif
 else
 ifeq ($(CONFIG_TI_SECURE_DEVICE),y)

Tom Rini

2016-09-02 14:53 UTC #18 lore raw

PATCH v4 4/10 am33xx: config.mk: Fix option used to enable SPI SPL image type

In reply to Andrew F. Davis

Quoted 8 lines · Andrew F. Davis

The option SPL_SPI_SUPPORT is used to enable support in SPL for loading images from SPI flash, it should not be used to determine the build type of the SPL image itself. The ability to read images from SPI flash does not imply the SPL will be booted from SPI flash.
Unconditionally build SPI flash compatible SPL images.
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/20160902/cb120901/attachment.sig>

Tom Rini

2016-10-03 13:38 UTC #19 lore raw

PATCH v4 4/10 am33xx: config.mk: Fix option used to enable SPI SPL image type

In reply to Andrew F. Davis

Quoted 10 lines · Andrew F. Davis

The option SPL_SPI_SUPPORT is used to enable support in SPL for loading images from SPI flash, it should not be used to determine the build type of the SPL image itself. The ability to read images from SPI flash does not imply the SPL will be booted from SPI flash.
Unconditionally build SPI flash compatible SPL images.
Signed-off-by Andrew F. Davis <[email protected]>
Acked-by Lokesh Vutla <[email protected]>
Reviewed-by Tom Rini <[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/20161003/8307d4f1/attachment.sig>

Andrew F. Davis

author

2016-08-30 19:06 UTC #20 lore raw

PATCH v4 5/10 board: am33xx-hs: Allow post-processing of FIT image on AM33xx

In reply to Andrew F. Davis

When CONFIG_FIT_IMAGE_POST_PROCESS or CONFIG_SPL_FIT_IMAGE_POST_PROCESS is enabled board_fit_image_post_process will be called, add this function to am33xx boards when CONFIG_TI_SECURE_DEVICE is set to verify the loaded image.

Signed-off-by Andrew F. Davis <[email protected]>

Reviewed-by Tom Rini <[email protected]>

---
 board/ti/am335x/board.c | 8 ++++++++
 1 file changed, 8 insertions(+)

board/ti/am335x/board.c +8 -0

index 56f4984..0ed16ca 100644
@@ -25,6 +25,7 @@
 #include <asm/io.h>
 #include <asm/emif.h>
 #include <asm/gpio.h>
+#include <asm/omap_sec_common.h>
 #include <i2c.h>
 #include <miiphy.h>
 #include <cpsw.h>

@@ -775,3 +776,10 @@ int board_fit_config_name_match(const char *name)
 		return -1;
 }
 #endif
+
+#ifdef CONFIG_TI_SECURE_DEVICE
+void board_fit_image_post_process(void **p_image, size_t *p_size)
+{
+	secure_boot_verify_image(p_image, p_size);
+}
+#endif

Signature · 1 line

2.9.3

Lokesh Vutla

2016-08-31 03:28 UTC #21 lore raw

PATCH v4 5/10 board: am33xx-hs: Allow post-processing of FIT image on AM33xx

Quoted 4 lines · Andrew F. Davis

When CONFIG_FIT_IMAGE_POST_PROCESS or CONFIG_SPL_FIT_IMAGE_POST_PROCESS is enabled board_fit_image_post_process will be called, add this function to am33xx boards when CONFIG_TI_SECURE_DEVICE is set to verify the loaded image.

Acked-by Lokesh Vutla <[email protected]>

Thanks and regards,
Lokesh

Quoted 31 lines

Signed-off-by Andrew F. Davis <[email protected]>

Reviewed-by Tom Rini <[email protected]>

---
 board/ti/am335x/board.c | 8 ++++++++
 1 file changed, 8 insertions(+)

board/ti/am335x/board.c +8 -0

index 56f4984..0ed16ca 100644
@@ -25,6 +25,7 @@
 #include <asm/io.h>
 #include <asm/emif.h>
 #include <asm/gpio.h>
+#include <asm/omap_sec_common.h>
 #include <i2c.h>
 #include <miiphy.h>
 #include <cpsw.h>

@@ -775,3 +776,10 @@ int board_fit_config_name_match(const char *name)
 		return -1;
 }
 #endif
+
+#ifdef CONFIG_TI_SECURE_DEVICE
+void board_fit_image_post_process(void **p_image, size_t *p_size)
+{
+	secure_boot_verify_image(p_image, p_size);
+}
+#endif

Tom Rini

2016-09-02 14:53 UTC #22 lore raw

PATCH v4 5/10 board: am33xx-hs: Allow post-processing of FIT image on AM33xx

In reply to Andrew F. Davis

Quoted 7 lines · Andrew F. Davis

When CONFIG_FIT_IMAGE_POST_PROCESS or CONFIG_SPL_FIT_IMAGE_POST_PROCESS is enabled board_fit_image_post_process will be called, add this function to am33xx boards when CONFIG_TI_SECURE_DEVICE is set to verify the loaded image.
Signed-off-by Andrew F. Davis <[email protected]>
Reviewed-by Tom Rini <[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/20160902/aefb06de/attachment.sig>

Tom Rini

2016-10-03 13:38 UTC #23 lore raw

PATCH v4 5/10 board: am33xx-hs: Allow post-processing of FIT image on AM33xx

In reply to Andrew F. Davis

Quoted 9 lines · Andrew F. Davis

When CONFIG_FIT_IMAGE_POST_PROCESS or CONFIG_SPL_FIT_IMAGE_POST_PROCESS is enabled board_fit_image_post_process will be called, add this function to am33xx boards when CONFIG_TI_SECURE_DEVICE is set to verify the loaded image.
Signed-off-by Andrew F. Davis <[email protected]>
Reviewed-by Tom Rini <[email protected]>
Acked-by Lokesh Vutla <[email protected]>
Reviewed-by Tom Rini <[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/20161003/6aa84c69/attachment.sig>

Andrew F. Davis

author

2016-08-30 19:06 UTC #24 lore raw

PATCH v4 6/10 ti: omap-common: Allow AM33xx devices to be built securely

In reply to Andrew F. Davis

Like OMAP54xx and AM43xx family SoCs, AM33xx based SoCs have high security enabled models. Allow AM33xx devices to be built with HS Device Type Support.

Signed-off-by Andrew F. Davis <[email protected]>

Reviewed-by Tom Rini <[email protected]>

---
 arch/arm/cpu/armv7/omap-common/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

arch/arm/cpu/armv7/omap-common/Kconfig +1 -1

index 7b39506..4daccd9 100644
@@ -1,6 +1,6 @@
 config TI_SECURE_DEVICE
 	bool "HS Device Type Support"
-	depends on OMAP54XX || AM43XX
+	depends on OMAP54XX || AM43XX || AM33XX
 	help
 	  If a high secure (HS) device type is being used, this config
 	  must be set. This option impacts various aspects of the

Signature · 1 line

2.9.3

Lokesh Vutla

2016-08-31 03:28 UTC #25 lore raw

PATCH v4 6/10 ti: omap-common: Allow AM33xx devices to be built securely

Quoted 6 lines · Andrew F. Davis

Like OMAP54xx and AM43xx family SoCs, AM33xx based SoCs have high security enabled models. Allow AM33xx devices to be built with HS Device Type Support.
Signed-off-by Andrew F. Davis <[email protected]>
Reviewed-by Tom Rini <[email protected]>

Acked-by Lokesh Vutla <[email protected]>

Thanks and regards,
Lokesh

Quoted 17 lines

---
 arch/arm/cpu/armv7/omap-common/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

arch/arm/cpu/armv7/omap-common/Kconfig +1 -1

index 7b39506..4daccd9 100644
@@ -1,6 +1,6 @@
 config TI_SECURE_DEVICE
 	bool "HS Device Type Support"
-	depends on OMAP54XX || AM43XX
+	depends on OMAP54XX || AM43XX || AM33XX
 	help
 	  If a high secure (HS) device type is being used, this config
 	  must be set. This option impacts various aspects of the

Tom Rini

2016-09-02 14:53 UTC #26 lore raw

PATCH v4 6/10 ti: omap-common: Allow AM33xx devices to be built securely

In reply to Andrew F. Davis

Quoted 6 lines · Andrew F. Davis

Like OMAP54xx and AM43xx family SoCs, AM33xx based SoCs have high security enabled models. Allow AM33xx devices to be built with HS Device Type Support.
Signed-off-by Andrew F. Davis <[email protected]>
Reviewed-by Tom Rini <[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/20160902/b8bf7f07/attachment.sig>

Tom Rini

2016-10-03 13:38 UTC #27 lore raw

PATCH v4 6/10 ti: omap-common: Allow AM33xx devices to be built securely

In reply to Andrew F. Davis

Quoted 8 lines · Andrew F. Davis

Like OMAP54xx and AM43xx family SoCs, AM33xx based SoCs have high security enabled models. Allow AM33xx devices to be built with HS Device Type Support.
Signed-off-by Andrew F. Davis <[email protected]>
Reviewed-by Tom Rini <[email protected]>
Acked-by Lokesh Vutla <[email protected]>
Reviewed-by Tom Rini <[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/20161003/1ca8bf31/attachment.sig>

Andrew F. Davis

author

2016-08-30 19:06 UTC #28 lore raw

PATCH v4 7/10 am335x: configs: Use ISW_ENTRY_ADDR to set SPL_TEXT_BASE

In reply to Andrew F. Davis

The SPL load address changes based on boot time in HS devices, ISW_ENTRY_ADDR is used to set this address for AM43xx based SoCs for similar reasons. Add this same logic for AM33xx devices.

Also make the default value for ISW_ENTRY_ADDR correct for GP devices based on SoC, HS devices already pick the correct value in their defconfig.

Signed-off-by Andrew F. Davis <[email protected]>

---
 arch/arm/cpu/armv7/am33xx/Kconfig  | 3 ++-
 include/configs/ti_am335x_common.h | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

arch/arm/cpu/armv7/am33xx/Kconfig +2 -1

index e57e6fb..79c05dd 100644
@@ -108,7 +108,8 @@ config ISW_ENTRY_ADDR
 	  point address depending on the device type
 	  (secure/non-secure), boot media (xip/non-xip) and
 	  image headers.
-	default 0x402F4000
+	default 0x402F4000 if AM43XX
+	default 0x402F0400 if AM33XX
 
 config PUB_ROM_DATA_SIZE
 	hex "Size in bytes of the L3 SRAM reserved by ROM to store data"

include/configs/ti_am335x_common.h +1 -1

index 349d410..dba40fc 100644
@@ -56,7 +56,7 @@
  * supports X-MODEM loading via UART, and we leverage this and then use
  * Y-MODEM to load u-boot.img, when booted over UART.
  */
-#define CONFIG_SPL_TEXT_BASE		0x402F0400
+#define CONFIG_SPL_TEXT_BASE		CONFIG_ISW_ENTRY_ADDR
 #define CONFIG_SPL_MAX_SIZE		(0x4030B800 - CONFIG_SPL_TEXT_BASE)
 #define CONFIG_SYS_SPL_ARGS_ADDR	(CONFIG_SYS_SDRAM_BASE + \
 					 (128 << 20))

Signature · 1 line

2.9.3

Lokesh Vutla

2016-08-31 03:28 UTC #29 lore raw

PATCH v4 7/10 am335x: configs: Use ISW_ENTRY_ADDR to set SPL_TEXT_BASE

Quoted 9 lines · Andrew F. Davis

The SPL load address changes based on boot time in HS devices, ISW_ENTRY_ADDR is used to set this address for AM43xx based SoCs for similar reasons. Add this same logic for AM33xx devices.
Also make the default value for ISW_ENTRY_ADDR correct for GP devices based on SoC, HS devices already pick the correct value in their defconfig.
Signed-off-by Andrew F. Davis <[email protected]>

Acked-by Lokesh Vutla <[email protected]>

Thanks and regards,
Lokesh

Quoted 33 lines

---
 arch/arm/cpu/armv7/am33xx/Kconfig  | 3 ++-
 include/configs/ti_am335x_common.h | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

arch/arm/cpu/armv7/am33xx/Kconfig +2 -1

index e57e6fb..79c05dd 100644
@@ -108,7 +108,8 @@ config ISW_ENTRY_ADDR
 	  point address depending on the device type
 	  (secure/non-secure), boot media (xip/non-xip) and
 	  image headers.
-	default 0x402F4000
+	default 0x402F4000 if AM43XX
+	default 0x402F0400 if AM33XX
 
 config PUB_ROM_DATA_SIZE
 	hex "Size in bytes of the L3 SRAM reserved by ROM to store data"

include/configs/ti_am335x_common.h +1 -1

index 349d410..dba40fc 100644
@@ -56,7 +56,7 @@
  * supports X-MODEM loading via UART, and we leverage this and then use
  * Y-MODEM to load u-boot.img, when booted over UART.
  */
-#define CONFIG_SPL_TEXT_BASE		0x402F0400
+#define CONFIG_SPL_TEXT_BASE		CONFIG_ISW_ENTRY_ADDR
 #define CONFIG_SPL_MAX_SIZE		(0x4030B800 - CONFIG_SPL_TEXT_BASE)
 #define CONFIG_SYS_SPL_ARGS_ADDR	(CONFIG_SYS_SDRAM_BASE + \
 					 (128 << 20))

Tom Rini

2016-09-02 14:53 UTC #30 lore raw

PATCH v4 7/10 am335x: configs: Use ISW_ENTRY_ADDR to set SPL_TEXT_BASE

In reply to Andrew F. Davis

Quoted 9 lines · Andrew F. Davis

The SPL load address changes based on boot time in HS devices, ISW_ENTRY_ADDR is used to set this address for AM43xx based SoCs for similar reasons. Add this same logic for AM33xx devices.
Also make the default value for ISW_ENTRY_ADDR correct for GP devices based on SoC, HS devices already pick the correct value in their defconfig.
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/20160902/e02ed1e0/attachment.sig>

Andrew F. Davis

author

2016-08-30 19:06 UTC #31 lore raw

PATCH v4 8/10 config: Remove usage of CONFIG_STORAGE_EMMC

In reply to Andrew F. Davis

This config option seems to be unused and is probably vestigial. Remove it.

Signed-off-by Andrew F. Davis <[email protected]>

Reviewed-by Tom Rini <[email protected]>

---
 include/configs/am335x_evm.h  | 2 --
 include/configs/am335x_shc.h  | 2 --
 include/configs/am335x_sl50.h | 2 --
 include/configs/bav335x.h     | 2 --
 4 files changed, 8 deletions(-)

include/configs/am335x_evm.h +0 -2

index ba4c215..23ee75c 100644
@@ -301,8 +301,6 @@
 #define CONFIG_FASTBOOT_BUF_ADDR	CONFIG_SYS_LOAD_ADDR
 #define CONFIG_FASTBOOT_BUF_SIZE	0x07000000
 
-/* To support eMMC booting */
-#define CONFIG_STORAGE_EMMC
 #define CONFIG_FASTBOOT_FLASH_MMC_DEV   1
 #endif

include/configs/am335x_shc.h +0 -2

index f2484cb..8708c91 100644
@@ -287,8 +287,6 @@
 #define CONFIG_SPL_LDSCRIPT		"$(CPUDIR)/am33xx/u-boot-spl.lds"
 
 #ifndef CONFIG_SPL_USBETH_SUPPORT
-/* To support eMMC booting */
-#define CONFIG_STORAGE_EMMC
 #define CONFIG_FASTBOOT_FLASH_MMC_DEV   1
 #endif

include/configs/am335x_sl50.h +0 -2

index 8454872..06ce4e9 100644
@@ -91,8 +91,6 @@
 #define CONFIG_SPL_LDSCRIPT		"$(CPUDIR)/am33xx/u-boot-spl.lds"
 
 #ifndef CONFIG_SPL_USBETH_SUPPORT
-/* To support eMMC booting */
-#define CONFIG_STORAGE_EMMC
 #define CONFIG_FASTBOOT_FLASH_MMC_DEV   1
 #endif

include/configs/bav335x.h +0 -2

index e391c91..05fc6d9 100644
@@ -451,8 +451,6 @@ DEFAULT_LINUX_BOOT_ENV \
 #define CONFIG_FASTBOOT_BUF_ADDR	CONFIG_SYS_LOAD_ADDR
 #define CONFIG_FASTBOOT_BUF_SIZE	0x07000000
 
-/* To support eMMC booting */
-#define CONFIG_STORAGE_EMMC
 #define CONFIG_FASTBOOT_FLASH_MMC_DEV   1
 #endif

Signature · 1 line

2.9.3

Lokesh Vutla

2016-08-31 03:28 UTC #32 lore raw

PATCH v4 8/10 config: Remove usage of CONFIG_STORAGE_EMMC

Quoted 5 lines · Andrew F. Davis

This config option seems to be unused and is probably vestigial. Remove it.
Signed-off-by Andrew F. Davis <[email protected]>
Reviewed-by Tom Rini <[email protected]>

Acked-by Lokesh Vutla <[email protected]>

Thanks and regards,
Lokesh

Quoted 60 lines

---
 include/configs/am335x_evm.h  | 2 --
 include/configs/am335x_shc.h  | 2 --
 include/configs/am335x_sl50.h | 2 --
 include/configs/bav335x.h     | 2 --
 4 files changed, 8 deletions(-)

include/configs/am335x_evm.h +0 -2

index ba4c215..23ee75c 100644
@@ -301,8 +301,6 @@
 #define CONFIG_FASTBOOT_BUF_ADDR	CONFIG_SYS_LOAD_ADDR
 #define CONFIG_FASTBOOT_BUF_SIZE	0x07000000
 
-/* To support eMMC booting */
-#define CONFIG_STORAGE_EMMC
 #define CONFIG_FASTBOOT_FLASH_MMC_DEV   1
 #endif

include/configs/am335x_shc.h +0 -2

index f2484cb..8708c91 100644
@@ -287,8 +287,6 @@
 #define CONFIG_SPL_LDSCRIPT		"$(CPUDIR)/am33xx/u-boot-spl.lds"
 
 #ifndef CONFIG_SPL_USBETH_SUPPORT
-/* To support eMMC booting */
-#define CONFIG_STORAGE_EMMC
 #define CONFIG_FASTBOOT_FLASH_MMC_DEV   1
 #endif

include/configs/am335x_sl50.h +0 -2

index 8454872..06ce4e9 100644
@@ -91,8 +91,6 @@
 #define CONFIG_SPL_LDSCRIPT		"$(CPUDIR)/am33xx/u-boot-spl.lds"
 
 #ifndef CONFIG_SPL_USBETH_SUPPORT
-/* To support eMMC booting */
-#define CONFIG_STORAGE_EMMC
 #define CONFIG_FASTBOOT_FLASH_MMC_DEV   1
 #endif

include/configs/bav335x.h +0 -2

index e391c91..05fc6d9 100644
@@ -451,8 +451,6 @@ DEFAULT_LINUX_BOOT_ENV \
 #define CONFIG_FASTBOOT_BUF_ADDR	CONFIG_SYS_LOAD_ADDR
 #define CONFIG_FASTBOOT_BUF_SIZE	0x07000000
 
-/* To support eMMC booting */
-#define CONFIG_STORAGE_EMMC
 #define CONFIG_FASTBOOT_FLASH_MMC_DEV   1
 #endif

Tom Rini

2016-09-02 14:54 UTC #33 lore raw

PATCH v4 8/10 config: Remove usage of CONFIG_STORAGE_EMMC

In reply to Andrew F. Davis

Quoted 5 lines · Andrew F. Davis

This config option seems to be unused and is probably vestigial. Remove it.
Signed-off-by Andrew F. Davis <[email protected]>
Reviewed-by Tom Rini <[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/20160902/41a27827/attachment.sig>

Tom Rini

2016-10-03 13:38 UTC #34 lore raw

PATCH v4 8/10 config: Remove usage of CONFIG_STORAGE_EMMC

In reply to Andrew F. Davis

Quoted 7 lines · Andrew F. Davis

This config option seems to be unused and is probably vestigial. Remove it.
Signed-off-by Andrew F. Davis <[email protected]>
Reviewed-by Tom Rini <[email protected]>
Acked-by Lokesh Vutla <[email protected]>
Reviewed-by Tom Rini <[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/20161003/c8c7042d/attachment.sig>

Andrew F. Davis

author

2016-08-30 19:06 UTC #35 lore raw

PATCH v4 9/10 ti_armv7_common: Disable Falcon Mode on HS devices

In reply to Andrew F. Davis

Authentication of images in Falcon Mode is not supported. Do not enable SPL_OS_BOOT when TI_SECURE_DEVICE is enabled. This prevents attempting to directly load kernel images which will fail, for security reasons, on HS devices, the board is locked if a non-authenticatable image load is attempted, so we disable attempting Falcon Mode.

Signed-off-by Andrew F. Davis <[email protected]>

Reviewed-by Tom Rini <[email protected]>

---
 include/configs/ti_armv7_common.h | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

include/configs/ti_armv7_common.h +10 -5

index 9f947ee..949b6d1 100644
@@ -198,16 +198,21 @@
 
 /*
  * Our platforms make use of SPL to initalize the hardware (primarily
- * memory) enough for full U-Boot to be loaded.  We also support Falcon
- * Mode so that the Linux kernel can be booted directly from SPL
- * instead, if desired.  We make use of the general SPL framework found
- * under common/spl/.  Given our generally common memory map, we set a
- * number of related defaults and sizes here.
+ * memory) enough for full U-Boot to be loaded. We make use of the general
+ * SPL framework found under common/spl/.  Given our generally common memory
+ * map, we set a number of related defaults and sizes here.
  */
 #if !defined(CONFIG_NOR_BOOT) && \
 	!(defined(CONFIG_QSPI_BOOT) && defined(CONFIG_AM43XX))
 #define CONFIG_SPL_FRAMEWORK
+
+/*
+ * We also support Falcon Mode so that the Linux kernel can be booted
+ * directly from SPL. This is not currently available on HS devices.
+ */
+#if !defined(CONFIG_TI_SECURE_DEVICE)
 #define CONFIG_SPL_OS_BOOT
+#endif
 
 /*
  * Place the image at the start of the ROM defined image space (per

Signature · 1 line

2.9.3

Lokesh Vutla

2016-08-31 03:29 UTC #36 lore raw

PATCH v4 9/10 ti_armv7_common: Disable Falcon Mode on HS devices

Quoted 8 lines · Andrew F. Davis

Authentication of images in Falcon Mode is not supported. Do not enable SPL_OS_BOOT when TI_SECURE_DEVICE is enabled. This prevents attempting to directly load kernel images which will fail, for security reasons, on HS devices, the board is locked if a non-authenticatable image load is attempted, so we disable attempting Falcon Mode.
Signed-off-by Andrew F. Davis <[email protected]>
Reviewed-by Tom Rini <[email protected]>

Acked-by Lokesh Vutla <[email protected]>

Just make sure Falcon boot is supported eventually.

Thanks and regards,
Lokesh

Quoted 36 lines

---
 include/configs/ti_armv7_common.h | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

include/configs/ti_armv7_common.h +10 -5

index 9f947ee..949b6d1 100644
@@ -198,16 +198,21 @@
 
 /*
  * Our platforms make use of SPL to initalize the hardware (primarily
- * memory) enough for full U-Boot to be loaded.  We also support Falcon
- * Mode so that the Linux kernel can be booted directly from SPL
- * instead, if desired.  We make use of the general SPL framework found
- * under common/spl/.  Given our generally common memory map, we set a
- * number of related defaults and sizes here.
+ * memory) enough for full U-Boot to be loaded. We make use of the general
+ * SPL framework found under common/spl/.  Given our generally common memory
+ * map, we set a number of related defaults and sizes here.
  */
 #if !defined(CONFIG_NOR_BOOT) && \
 	!(defined(CONFIG_QSPI_BOOT) && defined(CONFIG_AM43XX))
 #define CONFIG_SPL_FRAMEWORK
+
+/*
+ * We also support Falcon Mode so that the Linux kernel can be booted
+ * directly from SPL. This is not currently available on HS devices.
+ */
+#if !defined(CONFIG_TI_SECURE_DEVICE)
 #define CONFIG_SPL_OS_BOOT
+#endif
 
 /*
  * Place the image at the start of the ROM defined image space (per

Tom Rini

2016-09-02 14:54 UTC #37 lore raw

PATCH v4 9/10 ti_armv7_common: Disable Falcon Mode on HS devices

In reply to Andrew F. Davis

Quoted 8 lines · Andrew F. Davis

Authentication of images in Falcon Mode is not supported. Do not enable SPL_OS_BOOT when TI_SECURE_DEVICE is enabled. This prevents attempting to directly load kernel images which will fail, for security reasons, on HS devices, the board is locked if a non-authenticatable image load is attempted, so we disable attempting Falcon Mode.
Signed-off-by Andrew F. Davis <[email protected]>
Reviewed-by Tom Rini <[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/20160902/9ef861ab/attachment.sig>

Tom Rini

2016-10-03 13:38 UTC #38 lore raw

PATCH v4 9/10 ti_armv7_common: Disable Falcon Mode on HS devices

In reply to Andrew F. Davis

Quoted 10 lines · Andrew F. Davis

Authentication of images in Falcon Mode is not supported. Do not enable SPL_OS_BOOT when TI_SECURE_DEVICE is enabled. This prevents attempting to directly load kernel images which will fail, for security reasons, on HS devices, the board is locked if a non-authenticatable image load is attempted, so we disable attempting Falcon Mode.
Signed-off-by Andrew F. Davis <[email protected]>
Reviewed-by Tom Rini <[email protected]>
Acked-by Lokesh Vutla <[email protected]>
Reviewed-by Tom Rini <[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/20161003/138be83d/attachment.sig>

Andrew F. Davis

author

2016-08-30 19:06 UTC #39 lore raw

PATCH v4 10/10 defconfig: Add a config for AM335x High Security EVM with SD Boot support

In reply to Andrew F. Davis

Add a new defconfig file for the AM335x High Security EVM. This config is specific for the case of SD card booting, we the boot types to be seperate defconfigs as some options change depending on boot type, in addition this allows us to trim the SPL size as we only need to support one boot media.

This defconfig is the same as for the non-secure part, except for:
CONFIG_TI_SECURE_DEVICE option set to 'y' CONFIG_ISW_ENTRY_ADDR updated for secure images. CONFIG_FIT_IMAGE_POST_PROCESS option set to 'y' CONFIG_SPL_FIT_IMAGE_POST_PROCESS option set to 'y' CONFIG_SPL_SD_BOOT option set to 'y' so we will build an MMC
compatible SPL
CONFIG_USE_TINY_PRINTF option set to 'y' to reduce SPL size NAND removed from CONFIG_SYS_EXTRA_OPTIONS as this adds NAND
support to SPL, not just U-Boot proper, when this is fixed this can be added back

Signed-off-by Andrew F. Davis <[email protected]>

---
 configs/am335x_hs_evm_mmc_defconfig | 58 +++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 configs/am335x_hs_evm_mmc_defconfig

configs/am335x_hs_evm_mmc_defconfig new file +58 -0

new file mode 100644
index 0000000..d10faaa
@@ -0,0 +1,58 @@
+CONFIG_ARM=y
+CONFIG_AM33XX=y
+CONFIG_TI_SECURE_DEVICE=y
+CONFIG_TARGET_AM335X_EVM=y
+CONFIG_SPL_STACK_R_ADDR=0x82000000
+CONFIG_DEFAULT_DEVICE_TREE="am335x-evm"
+CONFIG_SPL=y
+CONFIG_ISW_ENTRY_ADDR=0x40301750
+CONFIG_SPL_STACK_R=y
+CONFIG_HUSH_PARSER=y
+CONFIG_CMD_BOOTZ=y
+# CONFIG_CMD_IMLS is not set
+CONFIG_CMD_ASKENV=y
+# CONFIG_CMD_FLASH is not set
+CONFIG_CMD_MMC=y
+CONFIG_CMD_SF=y
+CONFIG_CMD_SPI=y
+CONFIG_CMD_I2C=y
+CONFIG_CMD_USB=y
+CONFIG_CMD_DFU=y
+CONFIG_CMD_GPIO=y
+# CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_DHCP=y
+CONFIG_CMD_MII=y
+CONFIG_CMD_PING=y
+CONFIG_CMD_EXT2=y
+CONFIG_CMD_EXT4=y
+CONFIG_CMD_EXT4_WRITE=y
+CONFIG_CMD_FAT=y
+CONFIG_CMD_FS_GENERIC=y
+CONFIG_OF_CONTROL=y
+CONFIG_DM_MMC=y
+CONFIG_SPI_FLASH=y
+CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_DM_ETH=y
+CONFIG_SYS_NS16550=y
+CONFIG_TIMER=y
+CONFIG_OMAP_TIMER=y
+CONFIG_USB=y
+CONFIG_USB_MUSB_HOST=y
+CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
+CONFIG_G_DNL_VENDOR_NUM=0x0451
+CONFIG_G_DNL_PRODUCT_NUM=0xd022
+CONFIG_OF_LIBFDT=y
+CONFIG_SPL_NET_VCI_STRING="AM335x U-Boot SPL"
+CONFIG_RSA=y
+CONFIG_FIT=y
+CONFIG_SPL_OF_LIBFDT=y
+CONFIG_SPL_LOAD_FIT=y
+CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y
+CONFIG_OF_LIST="am335x-evm am335x-bone am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2"
+CONFIG_DM_I2C=y
+CONFIG_FIT_IMAGE_POST_PROCESS=y
+CONFIG_SPL_SD_BOOT=y
+CONFIG_USE_TINY_PRINTF=y

Signature · 1 line

2.9.3

Lokesh Vutla

2016-08-31 03:30 UTC #40 lore raw

PATCH v4 10/10 defconfig: Add a config for AM335x High Security EVM with SD Boot support

Quoted 6 lines · Andrew F. Davis

Add a new defconfig file for the AM335x High Security EVM. This config is specific for the case of SD card booting, we the boot types to be seperate defconfigs as some options change depending on boot type, in addition this allows us to trim the SPL size as we only need to support one boot media.

Quoted 11 lines

This defconfig is the same as for the non-secure part, except for:
CONFIG_TI_SECURE_DEVICE option set to 'y' CONFIG_ISW_ENTRY_ADDR updated for secure images. CONFIG_FIT_IMAGE_POST_PROCESS option set to 'y' CONFIG_SPL_FIT_IMAGE_POST_PROCESS option set to 'y' CONFIG_SPL_SD_BOOT option set to 'y' so we will build an MMC
compatible SPL
CONFIG_USE_TINY_PRINTF option set to 'y' to reduce SPL size NAND removed from CONFIG_SYS_EXTRA_OPTIONS as this adds NAND
support to SPL, not just U-Boot proper, when this is fixed this can be added back

Acked-by Lokesh Vutla <[email protected]>

Thanks and regards,
Lokesh

Quoted 72 lines

Signed-off-by Andrew F. Davis <[email protected]>

---
 configs/am335x_hs_evm_mmc_defconfig | 58 +++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 configs/am335x_hs_evm_mmc_defconfig

configs/am335x_hs_evm_mmc_defconfig new file +58 -0

new file mode 100644
index 0000000..d10faaa
@@ -0,0 +1,58 @@
+CONFIG_ARM=y
+CONFIG_AM33XX=y
+CONFIG_TI_SECURE_DEVICE=y
+CONFIG_TARGET_AM335X_EVM=y
+CONFIG_SPL_STACK_R_ADDR=0x82000000
+CONFIG_DEFAULT_DEVICE_TREE="am335x-evm"
+CONFIG_SPL=y
+CONFIG_ISW_ENTRY_ADDR=0x40301750
+CONFIG_SPL_STACK_R=y
+CONFIG_HUSH_PARSER=y
+CONFIG_CMD_BOOTZ=y
+# CONFIG_CMD_IMLS is not set
+CONFIG_CMD_ASKENV=y
+# CONFIG_CMD_FLASH is not set
+CONFIG_CMD_MMC=y
+CONFIG_CMD_SF=y
+CONFIG_CMD_SPI=y
+CONFIG_CMD_I2C=y
+CONFIG_CMD_USB=y
+CONFIG_CMD_DFU=y
+CONFIG_CMD_GPIO=y
+# CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_DHCP=y
+CONFIG_CMD_MII=y
+CONFIG_CMD_PING=y
+CONFIG_CMD_EXT2=y
+CONFIG_CMD_EXT4=y
+CONFIG_CMD_EXT4_WRITE=y
+CONFIG_CMD_FAT=y
+CONFIG_CMD_FS_GENERIC=y
+CONFIG_OF_CONTROL=y
+CONFIG_DM_MMC=y
+CONFIG_SPI_FLASH=y
+CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_DM_ETH=y
+CONFIG_SYS_NS16550=y
+CONFIG_TIMER=y
+CONFIG_OMAP_TIMER=y
+CONFIG_USB=y
+CONFIG_USB_MUSB_HOST=y
+CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
+CONFIG_G_DNL_VENDOR_NUM=0x0451
+CONFIG_G_DNL_PRODUCT_NUM=0xd022
+CONFIG_OF_LIBFDT=y
+CONFIG_SPL_NET_VCI_STRING="AM335x U-Boot SPL"
+CONFIG_RSA=y
+CONFIG_FIT=y
+CONFIG_SPL_OF_LIBFDT=y
+CONFIG_SPL_LOAD_FIT=y
+CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y
+CONFIG_OF_LIST="am335x-evm am335x-bone am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2"
+CONFIG_DM_I2C=y
+CONFIG_FIT_IMAGE_POST_PROCESS=y
+CONFIG_SPL_SD_BOOT=y
+CONFIG_USE_TINY_PRINTF=y

Tom Rini

2016-09-02 14:54 UTC #41 lore raw

PATCH v4 10/10 defconfig: Add a config for AM335x High Security EVM with SD Boot support

In reply to Andrew F. Davis

Quoted 18 lines · Andrew F. Davis

Add a new defconfig file for the AM335x High Security EVM. This config is specific for the case of SD card booting, we the boot types to be seperate defconfigs as some options change depending on boot type, in addition this allows us to trim the SPL size as we only need to support one boot media.
This defconfig is the same as for the non-secure part, except for:
CONFIG_TI_SECURE_DEVICE option set to 'y' CONFIG_ISW_ENTRY_ADDR updated for secure images. CONFIG_FIT_IMAGE_POST_PROCESS option set to 'y' CONFIG_SPL_FIT_IMAGE_POST_PROCESS option set to 'y' CONFIG_SPL_SD_BOOT option set to 'y' so we will build an MMC
compatible SPL
CONFIG_USE_TINY_PRINTF option set to 'y' to reduce SPL size NAND removed from CONFIG_SYS_EXTRA_OPTIONS as this adds NAND
support to SPL, not just U-Boot proper, when this is fixed this can be added back

Quoted 1 line

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/20160902/9d886d61/attachment.sig>

Andrew F. Davis

author

2016-09-02 14:57 UTC #42 lore raw

PATCH v4 10/10 defconfig: Add a config for AM335x High Security EVM with SD Boot support

Quoted 20 lines · Tom Rini

Quoted 18 lines · Andrew F. Davis
Add a new defconfig file for the AM335x High Security EVM. This config is specific for the case of SD card booting, we the boot types to be seperate defconfigs as some options change depending on boot type, in addition this allows us to trim the SPL size as we only need to support one boot media.
This defconfig is the same as for the non-secure part, except for:
CONFIG_TI_SECURE_DEVICE option set to 'y' CONFIG_ISW_ENTRY_ADDR updated for secure images. CONFIG_FIT_IMAGE_POST_PROCESS option set to 'y' CONFIG_SPL_FIT_IMAGE_POST_PROCESS option set to 'y' CONFIG_SPL_SD_BOOT option set to 'y' so we will build an MMC
compatible SPL
CONFIG_USE_TINY_PRINTF option set to 'y' to reduce SPL size NAND removed from CONFIG_SYS_EXTRA_OPTIONS as this adds NAND
support to SPL, not just U-Boot proper, when this is fixed this can be added back

Quoted 4 lines

Quoted 1 line
Signed-off-by Andrew F. Davis <[email protected]>
Reviewed-by Tom Rini <[email protected]>

Just a heads up, this defconfig will probably not build until Simon's SPL_*_SUPPORT kconfig series is taken.

I would be okay if this didn't get taken right now, I can re-post this and the other boot mode defconfigs when I can test that they build/boot correctly.

Tom Rini

2016-09-02 14:58 UTC #43 lore raw

PATCH v4 10/10 defconfig: Add a config for AM335x High Security EVM with SD Boot support

Quoted 26 lines · Andrew F. Davis

Quoted 20 lines · Tom Rini
Quoted 18 lines · Andrew F. Davis
Add a new defconfig file for the AM335x High Security EVM. This config is specific for the case of SD card booting, we the boot types to be seperate defconfigs as some options change depending on boot type, in addition this allows us to trim the SPL size as we only need to support one boot media.
This defconfig is the same as for the non-secure part, except for:
CONFIG_TI_SECURE_DEVICE option set to 'y' CONFIG_ISW_ENTRY_ADDR updated for secure images. CONFIG_FIT_IMAGE_POST_PROCESS option set to 'y' CONFIG_SPL_FIT_IMAGE_POST_PROCESS option set to 'y' CONFIG_SPL_SD_BOOT option set to 'y' so we will build an MMC
compatible SPL
CONFIG_USE_TINY_PRINTF option set to 'y' to reduce SPL size NAND removed from CONFIG_SYS_EXTRA_OPTIONS as this adds NAND
support to SPL, not just U-Boot proper, when this is fixed this can be added back
Quoted 4 lines
Quoted 1 line
Signed-off-by Andrew F. Davis <[email protected]>
Reviewed-by Tom Rini <[email protected]>

Quoted 6 lines

Just a heads up, this defconfig will probably not build until Simon's SPL_*_SUPPORT kconfig series is taken.
I would be okay if this didn't get taken right now, I can re-post this and the other boot mode defconfigs when I can test that they build/boot correctly.

OK, then yeah, it'll probably need at least one more spin once Simon's series is done.

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/20160902/8dc62152/attachment.sig>

Andrew F. Davis

author

2016-09-07 18:04 UTC #44 lore raw

PATCH v4 10/10 defconfig: Add a config for AM335x High Security EVM with SD Boot support

Quoted 30 lines · Tom Rini

Quoted 29 lines · Andrew F. Davis
Quoted 20 lines · Tom Rini
Quoted 18 lines · Andrew F. Davis
Add a new defconfig file for the AM335x High Security EVM. This config is specific for the case of SD card booting, we the boot types to be seperate defconfigs as some options change depending on boot type, in addition this allows us to trim the SPL size as we only need to support one boot media.
This defconfig is the same as for the non-secure part, except for:
CONFIG_TI_SECURE_DEVICE option set to 'y' CONFIG_ISW_ENTRY_ADDR updated for secure images. CONFIG_FIT_IMAGE_POST_PROCESS option set to 'y' CONFIG_SPL_FIT_IMAGE_POST_PROCESS option set to 'y' CONFIG_SPL_SD_BOOT option set to 'y' so we will build an MMC
compatible SPL
CONFIG_USE_TINY_PRINTF option set to 'y' to reduce SPL size NAND removed from CONFIG_SYS_EXTRA_OPTIONS as this adds NAND
support to SPL, not just U-Boot proper, when this is fixed this can be added back
Quoted 4 lines
Quoted 1 line
Signed-off-by Andrew F. Davis <[email protected]>
Reviewed-by Tom Rini <[email protected]>
Just a heads up, this defconfig will probably not build until Simon's SPL_*_SUPPORT kconfig series is taken.

Quoted 7 lines

Quoted 3 lines
I would be okay if this didn't get taken right now, I can re-post this and the other boot mode defconfigs when I can test that they build/boot correctly.
OK, then yeah, it'll probably need at least one more spin once Simon's series is done.

Yeah, this defconfig will probably change, the rest of the series is still good to be taken whenever you feel it is ready.

Thanks,
Andrew

Tom Rini

2016-10-03 13:39 UTC #45 lore raw

PATCH v4 10/10 defconfig: Add a config for AM335x High Security EVM with SD Boot support

In reply to Andrew F. Davis

Quoted 18 lines · Andrew F. Davis

Add a new defconfig file for the AM335x High Security EVM. This config is specific for the case of SD card booting, we the boot types to be seperate defconfigs as some options change depending on boot type, in addition this allows us to trim the SPL size as we only need to support one boot media.
This defconfig is the same as for the non-secure part, except for:
CONFIG_TI_SECURE_DEVICE option set to 'y' CONFIG_ISW_ENTRY_ADDR updated for secure images. CONFIG_FIT_IMAGE_POST_PROCESS option set to 'y' CONFIG_SPL_FIT_IMAGE_POST_PROCESS option set to 'y' CONFIG_SPL_SD_BOOT option set to 'y' so we will build an MMC
compatible SPL
CONFIG_USE_TINY_PRINTF option set to 'y' to reduce SPL size NAND removed from CONFIG_SYS_EXTRA_OPTIONS as this adds NAND
support to SPL, not just U-Boot proper, when this is fixed this can be added back

Quoted 3 lines

Signed-off-by Andrew F. Davis <[email protected]>
Acked-by Lokesh Vutla <[email protected]>
Reviewed-by Tom Rini <[email protected]>

Please rebase this on 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/20161003/0f1a89a4/attachment.sig>