From 01cc7d9bc205251c13712418d51f3a4d7b20861b Mon Sep 17 00:00:00 2001 From: Ye Li Date: Wed, 16 Mar 2016 14:39:06 +0800 Subject: MLK-12500-2 HAB: Add commented secure boot configurations CONFIG_SECURE_BOOT is used for signed image building, this configuration is not enabled at default. Comment it in board header files. Users can uncomment it to enable. Also add CONFIG_CSF_SIZE for defining the CSF reserved size Signed-off-by: Ye Li --- board/freescale/mx6qarm2/imximage_mx6dl.cfg | 7 +++++++ board/freescale/mx6sxsabresd/imximage.cfg | 4 ++++ include/configs/mx6qarm2.h | 9 +++++++++ include/configs/mx6sabre_common.h | 9 +++++++++ include/configs/mx6slevk.h | 9 +++++++++ include/configs/mx6sxsabreauto.h | 9 +++++++++ include/configs/mx6sxsabresd.h | 9 +++++++++ include/configs/mx6ul_14x14_evk.h | 9 +++++++++ include/configs/mx7dsabresd.h | 7 ++++++- 9 files changed, 71 insertions(+), 1 deletion(-) diff --git a/board/freescale/mx6qarm2/imximage_mx6dl.cfg b/board/freescale/mx6qarm2/imximage_mx6dl.cfg index 8b223e8..6753049 100644 --- a/board/freescale/mx6qarm2/imximage_mx6dl.cfg +++ b/board/freescale/mx6qarm2/imximage_mx6dl.cfg @@ -10,6 +10,9 @@ * The syntax is taken as close as possible with the kwbimage */ +#define __ASSEMBLY__ +#include + /* image version */ IMAGE_VERSION 2 @@ -24,6 +27,10 @@ BOOT_FROM sd PLUGIN board/freescale/mx6qarm2/plugin.bin 0x00907000 #else +#ifdef CONFIG_SECURE_BOOT +CSF CONFIG_CSF_SIZE +#endif + /* * Device Configuration Data (DCD) * diff --git a/board/freescale/mx6sxsabresd/imximage.cfg b/board/freescale/mx6sxsabresd/imximage.cfg index bea730a..fea2a81 100644 --- a/board/freescale/mx6sxsabresd/imximage.cfg +++ b/board/freescale/mx6sxsabresd/imximage.cfg @@ -27,6 +27,10 @@ BOOT_FROM sd PLUGIN board/freescale/mx6sxsabresd/plugin.bin 0x00907000 #else +#ifdef CONFIG_SECURE_BOOT +CSF CONFIG_CSF_SIZE +#endif + /* * Device Configuration Data (DCD) * diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h index 36b17c6..28fc22b 100644 --- a/include/configs/mx6qarm2.h +++ b/include/configs/mx6qarm2.h @@ -14,6 +14,15 @@ /* uncomment for PLUGIN mode support */ /* #define CONFIG_USE_PLUGIN */ +/* 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_IMX_THERMAL /* Size of malloc() pool */ diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index da7a507..4fd1131 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -14,6 +14,15 @@ /* uncomment for PLUGIN mode support */ /* #define CONFIG_USE_PLUGIN */ +/* 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_IMX_THERMAL /* Size of malloc() pool */ diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index a97a5d6..ab57eef 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -20,6 +20,15 @@ /* uncomment for PLUGIN mode support */ /* #define CONFIG_USE_PLUGIN */ +/* 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/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h index e907294..651472e 100644 --- a/include/configs/mx6sxsabreauto.h +++ b/include/configs/mx6sxsabreauto.h @@ -15,6 +15,15 @@ /* uncomment for PLUGIN mode support */ /* #define CONFIG_USE_PLUGIN */ +/* uncomment for SECURE mode support */ +/* #define CONFIG_SECURE_BOOT */ + +#ifdef CONFIG_SECURE_BOOT +#ifndef CONFIG_CSF_SIZE +#define CONFIG_CSF_SIZE 0x4000 +#endif +#endif + /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (32 * SZ_1M) diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index 0e7b3b4..91a0586 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -23,6 +23,15 @@ /* uncomment for PLUGIN mode support */ /* #define CONFIG_USE_PLUGIN */ +/* uncomment for SECURE mode support */ +/* #define CONFIG_SECURE_BOOT */ + +#ifdef CONFIG_SECURE_BOOT +#ifndef CONFIG_CSF_SIZE +#define CONFIG_CSF_SIZE 0x4000 +#endif +#endif + /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (32 * SZ_1M) diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index 945fd52..2eb39b2 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -17,6 +17,15 @@ /* uncomment for PLUGIN mode support */ /* #define CONFIG_USE_PLUGIN */ +/* 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 is_mx6ul_9x9_evk() CONFIG_IS_ENABLED(TARGET_MX6UL_9X9_EVK) #ifdef CONFIG_TARGET_MX6UL_9X9_EVK diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index 9db8906..7b28b39 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -19,7 +19,12 @@ /* Uncomment to enable secure boot support */ /* #define CONFIG_SECURE_BOOT */ -#define CONFIG_CSF_SIZE 0x4000 + +#ifdef CONFIG_SECURE_BOOT +#ifndef CONFIG_CSF_SIZE +#define CONFIG_CSF_SIZE 0x4000 +#endif +#endif /* Network */ #define CONFIG_CMD_MII -- cgit v1.1