diff options
| author | Ulises Cardenas <Ulises.Cardenas@freescale.com> | 2015-06-16 12:36:41 -0500 |
|---|---|---|
| committer | Ulises Cardenas <Ulises.Cardenas@freescale.com> | 2015-06-16 12:36:41 -0500 |
| commit | 50198ddbb3f8b34f9d4fc881a34dcd1715b1d61d (patch) | |
| tree | d7694cfec7c05bd28baae1df92ed485e7f89182a /include | |
| parent | 9ea395d7ea6b8ed65d7d68a92d9832264872b447 (diff) | |
| download | u-boot-imx-50198ddbb3f8b34f9d4fc881a34dcd1715b1d61d.zip u-boot-imx-50198ddbb3f8b34f9d4fc881a34dcd1715b1d61d.tar.gz u-boot-imx-50198ddbb3f8b34f9d4fc881a34dcd1715b1d61d.tar.bz2 | |
MLK-11059 imx: HAB unable to support Encrypted boot for 4096-bit keys
Abstracted the CSF size in imximage from a hardcoded value to a config
setting CONFIG_CSF_SIZE. This configuration is only enabled for secure
boot.
Increased the size of the CSF default allocation to 0x4000. This size
covers the event the worst case of 4906-bits keys.
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/mx6qarm2.h | 6 | ||||
| -rw-r--r-- | include/configs/mx6sabre_common.h | 6 | ||||
| -rw-r--r-- | include/configs/mx6slevk.h | 6 | ||||
| -rw-r--r-- | include/configs/mx6sx_arm2.h | 6 | ||||
| -rw-r--r-- | include/configs/mx6sxsabreauto.h | 6 | ||||
| -rw-r--r-- | include/configs/mx6sxsabresd.h | 6 | ||||
| -rw-r--r-- | include/configs/mx6ul_14x14_ddr3_arm2.h | 6 | ||||
| -rw-r--r-- | include/configs/mx6ul_14x14_evk.h | 6 | ||||
| -rw-r--r-- | include/configs/mx7d_arm2.h | 6 | ||||
| -rw-r--r-- | include/configs/mx7dsabresd.h | 6 |
10 files changed, 60 insertions, 0 deletions
diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h index 9d5cc0f..daeca9f 100644 --- a/include/configs/mx6qarm2.h +++ b/include/configs/mx6qarm2.h @@ -17,6 +17,12 @@ /* uncomment for SECURE mode support */ /* #define CONFIG_SECURE_BOOT */ +#ifdef CONFIG_SECURE_BOOT +#ifndef CONFIG_CSF_SIZE +#define CONFIG_CSF_SIZE 0x4000 +#endif +#endif + #include "mx6_common.h" #define CONFIG_DISPLAY_CPUINFO diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index 6812cb4..27b1e85 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -21,6 +21,12 @@ /* uncomment for SECURE mode support */ /* #define CONFIG_SECURE_BOOT */ +#ifdef CONFIG_SECURE_BOOT +#ifndef CONFIG_CSF_SIZE +#define CONFIG_CSF_SIZE 0x4000 +#endif +#endif + #include "mx6_common.h" #include <linux/sizes.h> diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index 5afcaea..1867162 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -24,6 +24,12 @@ /* uncomment for SECURE mode support */ /* #define CONFIG_SECURE_BOOT */ +#ifdef CONFIG_SECURE_BOOT +#ifndef CONFIG_CSF_SIZE +#define CONFIG_CSF_SIZE 0x4000 +#endif +#endif + #define MACH_TYPE_MX6SLEVK 4307 #define CONFIG_MACH_TYPE MACH_TYPE_MX6SLEVK diff --git a/include/configs/mx6sx_arm2.h b/include/configs/mx6sx_arm2.h index defa733..8820e35 100644 --- a/include/configs/mx6sx_arm2.h +++ b/include/configs/mx6sx_arm2.h @@ -27,6 +27,12 @@ /* uncomment for SECURE mode support */ /* #define CONFIG_SECURE_BOOT */ +#ifdef CONFIG_SECURE_BOOT +#ifndef CONFIG_CSF_SIZE +#define CONFIG_CSF_SIZE 0x4000 +#endif +#endif + #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h index b772485..a41ec14 100644 --- a/include/configs/mx6sxsabreauto.h +++ b/include/configs/mx6sxsabreauto.h @@ -27,6 +27,12 @@ /* uncomment for SECURE mode support */ /* #define CONFIG_SECURE_BOOT */ +#ifdef CONFIG_SECURE_BOOT +#ifndef CONFIG_CSF_SIZE +#define CONFIG_CSF_SIZE 0x4000 +#endif +#endif + #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index 5ab4573..bc061d9 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -27,6 +27,12 @@ /* uncomment for SECURE mode support */ /* #define CONFIG_SECURE_BOOT */ +#ifdef CONFIG_SECURE_BOOT +#ifndef CONFIG_CSF_SIZE +#define CONFIG_CSF_SIZE 0x4000 +#endif +#endif + #ifdef CONFIG_SPL #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_MMC_SUPPORT diff --git a/include/configs/mx6ul_14x14_ddr3_arm2.h b/include/configs/mx6ul_14x14_ddr3_arm2.h index 0148f6c..643961e 100644 --- a/include/configs/mx6ul_14x14_ddr3_arm2.h +++ b/include/configs/mx6ul_14x14_ddr3_arm2.h @@ -26,6 +26,12 @@ /* uncomment for SECURE mode support */ /* #define CONFIG_SECURE_BOOT */ +#ifdef CONFIG_SECURE_BOOT +#ifndef CONFIG_CSF_SIZE +#define CONFIG_CSF_SIZE 0x4000 +#endif +#endif + #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index dde1463..98a0346 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -29,6 +29,12 @@ /* uncomment for SECURE mode support */ /* #define CONFIG_SECURE_BOOT */ +#ifdef CONFIG_SECURE_BOOT +#ifndef CONFIG_CSF_SIZE +#define CONFIG_CSF_SIZE 0x4000 +#endif +#endif + #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG diff --git a/include/configs/mx7d_arm2.h b/include/configs/mx7d_arm2.h index 2be10cd..ecc3d22 100644 --- a/include/configs/mx7d_arm2.h +++ b/include/configs/mx7d_arm2.h @@ -27,6 +27,12 @@ /* uncomment for SECURE mode support */ /* #define CONFIG_SECURE_BOOT */ +#ifdef CONFIG_SECURE_BOOT +#ifndef CONFIG_CSF_SIZE +#define CONFIG_CSF_SIZE 0x4000 +#endif +#endif + #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index f0d421c..9c38a7e 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -27,6 +27,12 @@ /* uncomment for SECURE mode support */ /* #define CONFIG_SECURE_BOOT */ +#ifdef CONFIG_SECURE_BOOT +#ifndef CONFIG_CSF_SIZE +#define CONFIG_CSF_SIZE 0x4000 +#endif +#endif + #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG |