[U-Boot] [PATCH v3 1/7] include/configs: make secure boot header file include uniform
Ruchika Gupta
ruchika.gupta at nxp.com
Wed Jan 27 13:01:33 CET 2016
> -----Original Message-----
> From: Aneesh Bansal [mailto:aneesh.bansal at nxp.com]
> Sent: Friday, January 22, 2016 4:37 PM
> To: u-boot at lists.denx.de
> Cc: york sun <york.sun at nxp.com>; Ruchika Gupta
> <ruchika.gupta at nxp.com>; Prabhakar Kushwaha
> <prabhakar.kushwaha at nxp.com>; Aneesh Bansal
> <aneesh.bansal at nxp.com>
> Subject: [PATCH v3 1/7] include/configs: make secure boot header file
> include uniform
>
> The file fsl_secure_boot.h must be included in config file for Secure Boot.
> This is not required to be protected by any macro.
> CONFIG_FSL_CAAM must be defined and CONFIG_CMD_HASH should be
> turned on.
> The above was missing in some config files and all files have been made
> uniform in this respect.
>
> Signed-off-by: Aneesh Bansal <aneesh.bansal at nxp.com>
> ---
> Changes in v3:
> None
>
> Changes in v2:
> None (Changed the Sign-Off with New E-Mail ID)
>
> arch/arm/include/asm/fsl_secure_boot.h | 5 +++++
> include/configs/C29XPCIE.h | 4 ++++
> include/configs/T102xQDS.h | 12 +++++++++++-
> include/configs/T102xRDB.h | 12 +++++++++++-
> include/configs/T1040QDS.h | 3 ++-
> include/configs/T104xRDB.h | 3 ++-
> include/configs/T208xQDS.h | 3 ++-
> include/configs/T208xRDB.h | 3 ++-
> include/configs/ls1021aqds.h | 5 ++++-
> include/configs/ls1021atwr.h | 5 ++++-
> include/configs/ls1043a_common.h | 8 ++++++++
> include/configs/ls1043aqds.h | 2 ++
> include/configs/ls1043ardb.h | 8 --------
> 13 files changed, 57 insertions(+), 16 deletions(-)
>
> diff --git a/arch/arm/include/asm/fsl_secure_boot.h
> b/arch/arm/include/asm/fsl_secure_boot.h
> index 806302b..b29e71c 100644
> --- a/arch/arm/include/asm/fsl_secure_boot.h
> +++ b/arch/arm/include/asm/fsl_secure_boot.h
> @@ -34,6 +34,11 @@
> #define CONFIG_FSL_ISBC_KEY_EXT
> #endif
>
> +#ifdef CONFIG_LS1043A
> +/* For LS1043 (ARMv8), ESBC image Address in Header is 64 bit */
> +#define CONFIG_ESBC_ADDR_64BIT #endif
> +
> #ifndef CONFIG_FIT_SIGNATURE
>
> #define CONFIG_EXTRA_ENV \
> diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index
> 16920c6..890dcbb 100644
> --- a/include/configs/C29XPCIE.h
> +++ b/include/configs/C29XPCIE.h
> @@ -567,4 +567,8 @@
>
> #include <asm/fsl_secure_boot.h>
>
> +#ifdef CONFIG_SECURE_BOOT
> +#define CONFIG_CMD_BLOB
> +#endif
> +
> #endif /* __CONFIG_H */
> diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index
> 951cbc4..fb41a7d 100644
> --- a/include/configs/T102xQDS.h
> +++ b/include/configs/T102xQDS.h
> @@ -39,6 +39,8 @@
> #define CONFIG_BOARD_EARLY_INIT_F
> #endif
>
> +#define CONFIG_FSL_CAAM /* Enable SEC/CAAM */
> +
> #ifdef CONFIG_RAMBOOT_PBL
> #define CONFIG_SYS_FSL_PBL_PBI board/freescale/t102xqds/t1024_pbi.cfg
> #define CONFIG_SYS_FSL_PBL_RCW
> board/freescale/t102xqds/t1024_rcw.cfg
> @@ -936,8 +938,16 @@ unsigned long get_board_ddr_clk(void);
>
> #define CONFIG_BOOTCOMMAND CONFIG_LINUX
>
> -#ifdef CONFIG_SECURE_BOOT
> +/* Hash command with SHA acceleration supported in hardware */ #ifdef
> +CONFIG_FSL_CAAM #define CONFIG_CMD_HASH #define
> CONFIG_SHA_HW_ACCEL
> +#endif
> +
> #include <asm/fsl_secure_boot.h>
> +
> +#ifdef CONFIG_SECURE_BOOT
> +#define CONFIG_CMD_BLOB
> #endif
>
> #endif /* __T1024QDS_H */
> diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index
> 4a0f5b2..113df37 100644
> --- a/include/configs/T102xRDB.h
> +++ b/include/configs/T102xRDB.h
> @@ -33,6 +33,8 @@
> #define CONFIG_FSL_LAW /* Use common FSL init code
> */
> #define CONFIG_ENV_OVERWRITE
>
> +#define CONFIG_FSL_CAAM /* Enable SEC/CAAM */
> +
> /* support deep sleep */
> #ifdef CONFIG_PPC_T1024
> #define CONFIG_DEEP_SLEEP
> @@ -948,8 +950,16 @@ unsigned long get_board_ddr_clk(void);
>
> #define CONFIG_BOOTCOMMAND CONFIG_LINUX
>
> -#ifdef CONFIG_SECURE_BOOT
> +/* Hash command with SHA acceleration supported in hardware */ #ifdef
> +CONFIG_FSL_CAAM #define CONFIG_CMD_HASH #define
> CONFIG_SHA_HW_ACCEL
> +#endif
> +
> #include <asm/fsl_secure_boot.h>
> +
> +#ifdef CONFIG_SECURE_BOOT
> +#define CONFIG_CMD_BLOB
> #endif
>
> #endif /* __T1024RDB_H */
> diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index
> 9e151da..5fd93a1 100644
> --- a/include/configs/T1040QDS.h
> +++ b/include/configs/T1040QDS.h
> @@ -835,8 +835,9 @@ unsigned long get_board_ddr_clk(void);
>
> #define CONFIG_BOOTCOMMAND CONFIG_LINUX
>
> -#ifdef CONFIG_SECURE_BOOT
> #include <asm/fsl_secure_boot.h>
> +
> +#ifdef CONFIG_SECURE_BOOT
> #define CONFIG_CMD_BLOB
> #endif
>
> diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index
> da65f56..eec2971 100644
> --- a/include/configs/T104xRDB.h
> +++ b/include/configs/T104xRDB.h
> @@ -938,8 +938,9 @@
> $(SRCTREE)/board/freescale/t104xrdb/t1042d4_rcw.cfg
>
> #define CONFIG_BOOTCOMMAND CONFIG_LINUX
>
> -#ifdef CONFIG_SECURE_BOOT
> #include <asm/fsl_secure_boot.h>
> +
> +#ifdef CONFIG_SECURE_BOOT
> #define CONFIG_CMD_BLOB
> #endif
>
> diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index
> a0cecc6..019878a 100644
> --- a/include/configs/T208xQDS.h
> +++ b/include/configs/T208xQDS.h
> @@ -933,8 +933,9 @@ unsigned long get_board_ddr_clk(void);
>
> #define CONFIG_BOOTCOMMAND CONFIG_LINUX
>
> -#ifdef CONFIG_SECURE_BOOT
> #include <asm/fsl_secure_boot.h>
> +
> +#ifdef CONFIG_SECURE_BOOT
> #define CONFIG_CMD_BLOB
> #undef CONFIG_CMD_USB
> #endif
> diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index
> 312b0eb..3665b7d 100644
> --- a/include/configs/T208xRDB.h
> +++ b/include/configs/T208xRDB.h
> @@ -889,8 +889,9 @@ unsigned long get_board_ddr_clk(void);
>
> #define CONFIG_BOOTCOMMAND CONFIG_LINUX
>
> -#ifdef CONFIG_SECURE_BOOT
> #include <asm/fsl_secure_boot.h>
> +
> +#ifdef CONFIG_SECURE_BOOT
> #define CONFIG_CMD_BLOB
> #undef CONFIG_CMD_USB
> #endif
> diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
> index 2e8dbc7..0f1ad21 100644
> --- a/include/configs/ls1021aqds.h
> +++ b/include/configs/ls1021aqds.h
> @@ -660,12 +660,15 @@ unsigned long get_board_ddr_clk(void); #define
> CONFIG_MISC_INIT_R
>
> /* Hash command with SHA acceleration supported in hardware */
> +#ifdef CONFIG_FSL_CAAM
> #define CONFIG_CMD_HASH
> #define CONFIG_SHA_HW_ACCEL
> +#endif
> +
> +#include <asm/fsl_secure_boot.h>
>
> #ifdef CONFIG_SECURE_BOOT
> #define CONFIG_CMD_BLOB
> -#include <asm/fsl_secure_boot.h>
> #endif
>
> #endif
> diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
> index c12ba3a..d368cf2 100644
> --- a/include/configs/ls1021atwr.h
> +++ b/include/configs/ls1021atwr.h
> @@ -516,12 +516,15 @@
> #define CONFIG_MISC_INIT_R
>
> /* Hash command with SHA acceleration supported in hardware */
> +#ifdef CONFIG_FSL_CAAM
> #define CONFIG_CMD_HASH
> #define CONFIG_SHA_HW_ACCEL
> +#endif
> +
> +#include <asm/fsl_secure_boot.h>
>
> #ifdef CONFIG_SECURE_BOOT
> #define CONFIG_CMD_BLOB
> -#include <asm/fsl_secure_boot.h>
> #endif
>
> #endif
> diff --git a/include/configs/ls1043a_common.h
> b/include/configs/ls1043a_common.h
> index 677d281..e80ac27 100644
> --- a/include/configs/ls1043a_common.h
> +++ b/include/configs/ls1043a_common.h
> @@ -197,6 +197,8 @@
> #define CONFIG_DOS_PARTITION
> #endif
>
> +#define CONFIG_FSL_CAAM /* Enable SEC/CAAM */
> +
> /* FMan ucode */
> #define CONFIG_SYS_DPAA_FMAN
> #ifdef CONFIG_SYS_DPAA_FMAN
> @@ -252,4 +254,10 @@
>
> #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size
> */
>
> +/* Hash command with SHA acceleration supported in hardware */ #ifdef
> +CONFIG_FSL_CAAM #define CONFIG_CMD_HASH #define
> CONFIG_SHA_HW_ACCEL
> +#endif
> +
> #endif /* __LS1043A_COMMON_H */
> diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h
> index 398f1c3..d5acfaa 100644
> --- a/include/configs/ls1043aqds.h
> +++ b/include/configs/ls1043aqds.h
> @@ -401,4 +401,6 @@ unsigned long get_board_ddr_clk(void); #define
> CONFIG_CMD_MII #define CONFIG_CMDLINE_TAG
>
> +#include <asm/fsl_secure_boot.h>
> +
> #endif /* __LS1043AQDS_H__ */
> diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h
> index 585114f..dbdcc51 100644
> --- a/include/configs/ls1043ardb.h
> +++ b/include/configs/ls1043ardb.h
> @@ -291,14 +291,6 @@
> #define CONFIG_CMD_EXT2
> #endif
>
> -#ifdef CONFIG_SECURE_BOOT
> -#define CONFIG_CMD_HASH
> -#define CONFIG_SHA_HW_ACCEL
> -#define CONFIG_CMD_BLOB
> -/* For LS1043 (ARMv8), ESBC image Address in Header is 64 bit */ -#define
> CONFIG_ESBC_ADDR_64BIT -#endif
> -
> #include <asm/fsl_secure_boot.h>
>
> #endif /* __LS1043ARDB_H__ */
> --
> 1.8.1.4
Acked-by: Ruchika Gupta <ruchika.gupta at nxp.com>
More information about the U-Boot
mailing list