[U-Boot] [PATCH v3 2/7] include/configs: move definition of CONFIG_CMD_BLOB
Ruchika Gupta
ruchika.gupta at nxp.com
Wed Jan 27 13:01:45 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 2/7] include/configs: move definition of
> CONFIG_CMD_BLOB
>
> CONFIG_CMD_BLOB must be defined in case of Secure Boot.
> It was earlier defined in all config files. The definition has been moved to a
> common file which is included by all configs.
>
> 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 | 1 +
> arch/powerpc/include/asm/fsl_secure_boot.h | 1 +
> include/configs/B4860QDS.h | 4 ----
> include/configs/BSC9132QDS.h | 4 ----
> include/configs/C29XPCIE.h | 4 ----
> include/configs/P1010RDB.h | 4 ----
> include/configs/P2041RDB.h | 4 ----
> include/configs/T102xQDS.h | 4 ----
> include/configs/T102xRDB.h | 4 ----
> include/configs/T1040QDS.h | 4 ----
> include/configs/T104xRDB.h | 4 ----
> include/configs/T208xQDS.h | 5 -----
> include/configs/T208xRDB.h | 5 -----
> include/configs/T4240QDS.h | 4 ----
> include/configs/T4240RDB.h | 9 ---------
> include/configs/corenet_ds.h | 4 ----
> include/configs/ls1021aqds.h | 4 ----
> include/configs/ls1021atwr.h | 4 ----
> 18 files changed, 2 insertions(+), 71 deletions(-)
>
> diff --git a/arch/arm/include/asm/fsl_secure_boot.h
> b/arch/arm/include/asm/fsl_secure_boot.h
> index b29e71c..8491a72 100644
> --- a/arch/arm/include/asm/fsl_secure_boot.h
> +++ b/arch/arm/include/asm/fsl_secure_boot.h
> @@ -9,6 +9,7 @@
>
> #ifdef CONFIG_SECURE_BOOT
> #define CONFIG_CMD_ESBC_VALIDATE
> +#define CONFIG_CMD_BLOB
> #define CONFIG_FSL_SEC_MON
> #define CONFIG_SHA_PROG_HW_ACCEL
> #define CONFIG_RSA
> diff --git a/arch/powerpc/include/asm/fsl_secure_boot.h
> b/arch/powerpc/include/asm/fsl_secure_boot.h
> index 87415b1..7d217a6 100644
> --- a/arch/powerpc/include/asm/fsl_secure_boot.h
> +++ b/arch/powerpc/include/asm/fsl_secure_boot.h
> @@ -10,6 +10,7 @@
>
> #ifdef CONFIG_SECURE_BOOT
> #define CONFIG_CMD_ESBC_VALIDATE
> +#define CONFIG_CMD_BLOB
> #define CONFIG_FSL_SEC_MON
> #define CONFIG_SHA_PROG_HW_ACCEL
> #define CONFIG_DM
> diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index
> 9fb5cee..bcbae50 100644
> --- a/include/configs/B4860QDS.h
> +++ b/include/configs/B4860QDS.h
> @@ -924,8 +924,4 @@ unsigned long get_board_ddr_clk(void);
>
> #include <asm/fsl_secure_boot.h>
>
> -#ifdef CONFIG_SECURE_BOOT
> -#define CONFIG_CMD_BLOB
> -#endif
> -
> #endif /* __CONFIG_H */
> diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h
> index d0e5a25..89907dc 100644
> --- a/include/configs/BSC9132QDS.h
> +++ b/include/configs/BSC9132QDS.h
> @@ -722,8 +722,4 @@ combinations. this should be removed later
>
> #include <asm/fsl_secure_boot.h>
>
> -#ifdef CONFIG_SECURE_BOOT
> -#define CONFIG_CMD_BLOB
> -#endif
> -
> #endif /* __CONFIG_H */
> diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index
> 890dcbb..16920c6 100644
> --- a/include/configs/C29XPCIE.h
> +++ b/include/configs/C29XPCIE.h
> @@ -567,8 +567,4 @@
>
> #include <asm/fsl_secure_boot.h>
>
> -#ifdef CONFIG_SECURE_BOOT
> -#define CONFIG_CMD_BLOB
> -#endif
> -
> #endif /* __CONFIG_H */
> diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index
> f9776c0..3c0faca 100644
> --- a/include/configs/P1010RDB.h
> +++ b/include/configs/P1010RDB.h
> @@ -952,8 +952,4 @@ extern unsigned long get_sdram_size(void);
>
> #include <asm/fsl_secure_boot.h>
>
> -#ifdef CONFIG_SECURE_BOOT
> -#define CONFIG_CMD_BLOB
> -#endif
> -
> #endif /* __CONFIG_H */
> diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index
> b2e51b5..f250e7f 100644
> --- a/include/configs/P2041RDB.h
> +++ b/include/configs/P2041RDB.h
> @@ -756,8 +756,4 @@ unsigned long get_board_sys_clk(unsigned long
> dummy);
>
> #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
> fb41a7d..e5df784 100644
> --- a/include/configs/T102xQDS.h
> +++ b/include/configs/T102xQDS.h
> @@ -946,8 +946,4 @@ unsigned long get_board_ddr_clk(void);
>
> #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
> 113df37..3cda3b1 100644
> --- a/include/configs/T102xRDB.h
> +++ b/include/configs/T102xRDB.h
> @@ -958,8 +958,4 @@ unsigned long get_board_ddr_clk(void);
>
> #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
> 5fd93a1..2e7892f 100644
> --- a/include/configs/T1040QDS.h
> +++ b/include/configs/T1040QDS.h
> @@ -837,8 +837,4 @@ unsigned long get_board_ddr_clk(void);
>
> #include <asm/fsl_secure_boot.h>
>
> -#ifdef CONFIG_SECURE_BOOT
> -#define CONFIG_CMD_BLOB
> -#endif
> -
> #endif /* __CONFIG_H */
> diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index
> eec2971..5fc3497 100644
> --- a/include/configs/T104xRDB.h
> +++ b/include/configs/T104xRDB.h
> @@ -940,8 +940,4 @@
> $(SRCTREE)/board/freescale/t104xrdb/t1042d4_rcw.cfg
>
> #include <asm/fsl_secure_boot.h>
>
> -#ifdef CONFIG_SECURE_BOOT
> -#define CONFIG_CMD_BLOB
> -#endif
> -
> #endif /* __CONFIG_H */
> diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index
> 019878a..a56208c 100644
> --- a/include/configs/T208xQDS.h
> +++ b/include/configs/T208xQDS.h
> @@ -935,9 +935,4 @@ unsigned long get_board_ddr_clk(void);
>
> #include <asm/fsl_secure_boot.h>
>
> -#ifdef CONFIG_SECURE_BOOT
> -#define CONFIG_CMD_BLOB
> -#undef CONFIG_CMD_USB
> -#endif
> -
> #endif /* __T208xQDS_H */
> diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index
> 3665b7d..b5290a1 100644
> --- a/include/configs/T208xRDB.h
> +++ b/include/configs/T208xRDB.h
> @@ -891,9 +891,4 @@ unsigned long get_board_ddr_clk(void);
>
> #include <asm/fsl_secure_boot.h>
>
> -#ifdef CONFIG_SECURE_BOOT
> -#define CONFIG_CMD_BLOB
> -#undef CONFIG_CMD_USB
> -#endif
> -
> #endif /* __T2080RDB_H */
> diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h index
> 1b94f64..91857d6 100644
> --- a/include/configs/T4240QDS.h
> +++ b/include/configs/T4240QDS.h
> @@ -644,8 +644,4 @@ unsigned long get_board_ddr_clk(void);
>
> #include <asm/fsl_secure_boot.h>
>
> -#ifdef CONFIG_SECURE_BOOT
> -#define CONFIG_CMD_BLOB
> -#endif
> -
> #endif /* __CONFIG_H */
> diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index
> 73279c8..eb4d52c 100644
> --- a/include/configs/T4240RDB.h
> +++ b/include/configs/T4240RDB.h
> @@ -837,13 +837,4 @@ unsigned long get_board_ddr_clk(void);
>
> #include <asm/fsl_secure_boot.h>
>
> -#ifdef CONFIG_SECURE_BOOT
> -/* Secure Boot target was not getting build for T4240 because of
> - * increased binary size. So the size is being reduced by removing USB
> - * which is anyways not used in Secure Environment.
> - */
> -#undef CONFIG_CMD_USB
> -#define CONFIG_CMD_BLOB
> -#endif
> -
> #endif /* __CONFIG_H */
> diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
> index aef37dd..a099eee 100644
> --- a/include/configs/corenet_ds.h
> +++ b/include/configs/corenet_ds.h
> @@ -765,8 +765,4 @@
>
> #include <asm/fsl_secure_boot.h>
>
> -#ifdef CONFIG_SECURE_BOOT
> -#define CONFIG_CMD_BLOB
> -#endif
> -
> #endif /* __CONFIG_H */
> diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
> index 0f1ad21..7c54af4 100644
> --- a/include/configs/ls1021aqds.h
> +++ b/include/configs/ls1021aqds.h
> @@ -667,8 +667,4 @@ unsigned long get_board_ddr_clk(void);
>
> #include <asm/fsl_secure_boot.h>
>
> -#ifdef CONFIG_SECURE_BOOT
> -#define CONFIG_CMD_BLOB
> -#endif
> -
> #endif
> diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
> index d368cf2..fe0e9a8 100644
> --- a/include/configs/ls1021atwr.h
> +++ b/include/configs/ls1021atwr.h
> @@ -523,8 +523,4 @@
>
> #include <asm/fsl_secure_boot.h>
>
> -#ifdef CONFIG_SECURE_BOOT
> -#define CONFIG_CMD_BLOB
> -#endif
> -
> #endif
> --
> 1.8.1.4
Acked-by: Ruchika Gupta <ruchika.gupta at nxp.com>
More information about the U-Boot
mailing list