diff options
| author | Dan Douglass <dan.douglass@freescale.com> | 2012-11-12 10:01:31 -0600 |
|---|---|---|
| committer | Dan Douglass <dan.douglass@freescale.com> | 2012-11-12 13:43:06 -0600 |
| commit | ad21cbe117b2f275322be978f3d1a902b49412af (patch) | |
| tree | e039b6ea09dc6a11390d6f35d3f9f3eac3cbe2e5 /include | |
| parent | 552907b7a21ba7712f4c72da8a49c717486a22bd (diff) | |
| download | u-boot-imx-ad21cbe117b2f275322be978f3d1a902b49412af.zip u-boot-imx-ad21cbe117b2f275322be978f3d1a902b49412af.tar.gz u-boot-imx-ad21cbe117b2f275322be978f3d1a902b49412af.tar.bz2 | |
ENGR00233307 Need secure/encrypted boot for Widevine support.
* Adding the config option CONFIG_SECURE_BOOT to the SabreSD board,
but defaulting it to be disabled. Removed the CONFIG_SECURE_BOOT
key from mx6q_arm2_android.h so that it is only in one file,
include/configs/mx6q_arm2.h
* Fixed up an address alignment check in authenticate_image(). The
test would fail in the event the address is already aligned.
Also, added some debug code which can be enabled to assist in
testing secure images.
* Added support for authenticating an image when using booti.
* Adding support for secure boot to the Sabre SD board.
* Added support for encrypted boot to mx6q arm2 board linker script.
Signed-off-by: Dan Douglass <dan.douglass@freescale.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/mx6dl_sabresd.h | 5 | ||||
| -rw-r--r-- | include/configs/mx6q_arm2.h | 8 | ||||
| -rw-r--r-- | include/configs/mx6q_arm2_android.h | 5 |
3 files changed, 9 insertions, 9 deletions
diff --git a/include/configs/mx6dl_sabresd.h b/include/configs/mx6dl_sabresd.h index b59bd8b..ad6825f 100644 --- a/include/configs/mx6dl_sabresd.h +++ b/include/configs/mx6dl_sabresd.h @@ -35,6 +35,11 @@ #define CONFIG_FLASH_HEADER_OFFSET 0x400 #define CONFIG_MX6_CLK32 32768 +/* Disable secure boot feature in default, if you want to enable this + * feature, please carefully read related documents, you may needs to + * change u-boot.lds */ +#undef CONFIG_SECURE_BOOT + #define CONFIG_SKIP_RELOCATE_UBOOT #define CONFIG_ARCH_CPU_INIT diff --git a/include/configs/mx6q_arm2.h b/include/configs/mx6q_arm2.h index baea880..d724dfa 100644 --- a/include/configs/mx6q_arm2.h +++ b/include/configs/mx6q_arm2.h @@ -33,10 +33,10 @@ #define CONFIG_FLASH_HEADER_OFFSET 0x400 #define CONFIG_MX6_CLK32 32768 -/* - * #define CONFIG_SECURE_BOOT - * Enable Secure Boot. DO NOT TURN ON IT until you know what you are doing - */ +/* Disable secure boot feature in default, if you want to enable this + * feature, please carefully read related documents, you may needs to + * change u-boot.lds */ +#undef CONFIG_SECURE_BOOT #define CONFIG_SKIP_RELOCATE_UBOOT diff --git a/include/configs/mx6q_arm2_android.h b/include/configs/mx6q_arm2_android.h index 62bf740..c0096a8 100644 --- a/include/configs/mx6q_arm2_android.h +++ b/include/configs/mx6q_arm2_android.h @@ -24,11 +24,6 @@ #include "mx6q_arm2.h" -/* Disable secure boot feature in default, if you want to enable this - * feature, please carefully read related documents, you may needs to - * change u-boot.lds */ -#undef CONFIG_SECURE_BOOT - /* Disable fastboot and recovery to pass build. ARM2 is not a complete android board, only support boot from |