secure_boot: 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@nxp.com>
Acked-by: Ruchika Gupta <ruchika.gupta@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>

diff --git a/arch/arm/include/asm/fsl_secure_boot.h b/arch/arm/include/asm/fsl_secure_boot.h
index b29e71cc431db167a6596efff5dd545e65bd8472..8491a72dd1523243eeb7acab3aae88323847d357 100644 (file)
--- 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 87415b123f4a325efdddd4c15b5c71a46d115846..7d217a63fd4a46fce90f6aa4f062370e497fdfd6 100644 (file)
--- 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 9fb5cee711fc1f7c49b939bdc90977dd72247b7b..bcbae5099a778c8d8eec35f2d47b199e5e2b6531 100644 (file)
--- 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 d0e5a2565a98fea58e17c22c74899c09d3810715..89907dce4b17e8783d1a364f8261ff48f0982ca1 100644 (file)
--- 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 890dcbb3e9c55b7b83ee214e522a499d652937da..16920c6032037654b7ce96490932ecf77373bdae 100644 (file)
--- 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 f9776c033306e815132d77094421036d870dbed7..3c0faca1347d8e02d0f72ece2bed9f5deb0cd27e 100644 (file)
--- 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 b2e51b5b2f6ebcf7f6c4d5cb3a4b0989eee0a664..f250e7f88ec60266aca8dc1e1031a69419d35305 100644 (file)
--- 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 fb41a7dacc4decd0b769ece19ef1308eff4615b9..e5df784ece9ac8cdd0137a297af8b4235a6b9233 100644 (file)
--- 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 113df37c5d178130267736e2d04590419c6a1f3e..3cda3b1afdd6a6fbd42472ab21ff5dfab6700912 100644 (file)
--- 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 5fd93a10f1e5f196c687845e7f194d0f7ba5c37a..2e7892f94ace35edebf9cc1d9b16d7454e47332b 100644 (file)
--- 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 eec297188fb3ce77d0dd314fd8be2c1fe062c622..5fc34976d747caafc7ec4894b6d1dcb303b0d322 100644 (file)
--- 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 019878a70f8e1d497bbc20e25192974538dbccd4..a56208c6a6c80cec47925b8cdd4f20a13ca59e8d 100644 (file)
--- 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 3665b7d1047f97d02ae27fc397d24b19b352b762..b5290a1a16e7cfbeb073eb7fc9180e9ed6e130f1 100644 (file)
--- 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 1b94f6436c8773ecb9f0cd3e782bd5db1c3c1a5b..91857d69970ebb746447f4987d5e0def6659e40a 100644 (file)
--- 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 73279c899e8cbc64dd5e2066ec98132697caee46..eb4d52c6f5e21750d0716990e002f4c64cf24308 100644 (file)
--- 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 aef37dd670b178daf1dd4317d96b5ac4df3c584e..a099eee047ccad92d3498c8669733603a8727ccd 100644 (file)
--- 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 ee4494a8e06cc8c7ad895f8ab03ea76f91a5d3e2..c90f5315fd598a418240e79e2af7c6ac33a5722d 100644 (file)
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -666,8 +666,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 d20062af5ea527db7bfb073a4ff7236af3dd872f..f820de3b09e7253bb246f4ba9d2999a2efa034ba 100644 (file)
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -524,8 +524,4 @@
 
 #include <asm/fsl_secure_boot.h>
 
-#ifdef CONFIG_SECURE_BOOT
-#define CONFIG_CMD_BLOB
-#endif
-
 #endif