Skip to contentSkip to conversation

powerpc: add CONFIG_SECURE_BOOT condition into fsl_secure_boot.h

PATCH New Po Liu 2 participants 2 messages Aug 21, 2013 – Sep 27, 2013 PowerPC

lore
Share & tools
lore

Po Liu

author
#0 lore raw

PATCH 1/1 powerpc: add CONFIG_SECURE_BOOT condition into fsl_secure_boot.h

This patch is for board config file not to add CONFIG_SECURE_BOOT condition for include the asm/fsl_secure_boot.h.

---
 arch/powerpc/include/asm/fsl_secure_boot.h | 2 ++
 include/configs/B4860QDS.h                 | 2 --
 include/configs/P1010RDB.h                 | 2 --
 include/configs/P2041RDB.h                 | 2 --
 include/configs/T4240QDS.h                 | 2 --
 include/configs/corenet_ds.h               | 2 --
 6 files changed, 2 insertions(+), 10 deletions(-)
arch/powerpc/include/asm/fsl_secure_boot.h +2 -0
index c36f3c3..4c7f0b1 100644
@@ -7,6 +7,7 @@
 #ifndef __FSL_SECURE_BOOT_H
 #define __FSL_SECURE_BOOT_H
 
+#ifdef CONFIG_SECURE_BOOT
 #if defined(CONFIG_FSL_CORENET)
 #define CONFIG_SYS_PBI_FLASH_BASE		0xc0000000
 #else
@@ -15,3 +16,4 @@
 #define CONFIG_SYS_PBI_FLASH_WINDOW		0xcff80000
 
 #endif
+#endif
include/configs/B4860QDS.h +0 -2
index 2f0bc6b..aa62d94 100644
@@ -841,8 +841,6 @@ unsigned long get_board_ddr_clk(void);
 
 #define CONFIG_BOOTCOMMAND		CONFIG_LINUX
 
-#ifdef CONFIG_SECURE_BOOT
 #include <asm/fsl_secure_boot.h>
-#endif
 
 #endif	/* __CONFIG_H */
include/configs/P1010RDB.h +0 -2
index ba3f7c2..c058613 100644
@@ -759,8 +759,6 @@ extern unsigned long get_sdram_size(void);
 
 #define CONFIG_BOOTCOMMAND CONFIG_RAMBOOTCOMMAND
 
-#ifdef CONFIG_SECURE_BOOT
 #include <asm/fsl_secure_boot.h>
-#endif
 
 #endif	/* __CONFIG_H */
include/configs/P2041RDB.h +0 -2
index 905bacf..2f27e16 100644
@@ -746,8 +746,6 @@ unsigned long get_board_sys_clk(unsigned long dummy);
 
 #define CONFIG_BOOTCOMMAND		CONFIG_HDBOOT
 
-#ifdef CONFIG_SECURE_BOOT
 #include <asm/fsl_secure_boot.h>
-#endif
 
 #endif	/* __CONFIG_H */
include/configs/T4240QDS.h +0 -2
index 92a30ab..590799c 100644
@@ -553,8 +553,6 @@ unsigned long get_board_ddr_clk(void);
 
 #define CONFIG_BOOTCOMMAND		CONFIG_LINUX
 
-#ifdef CONFIG_SECURE_BOOT
 #include <asm/fsl_secure_boot.h>
-#endif
 
 #endif	/* __CONFIG_H */
include/configs/corenet_ds.h +0 -2
index c3fb80c..966b0ab 100644
@@ -745,8 +745,6 @@
 
 #define CONFIG_BOOTCOMMAND		CONFIG_HDBOOT
 
-#ifdef CONFIG_SECURE_BOOT
 #include <asm/fsl_secure_boot.h>
-#endif
 
 #endif	/* __CONFIG_H */
Signature · 1 line
1.8.0
#1 lore raw

PATCH 1/1 powerpc: add CONFIG_SECURE_BOOT condition into fsl_secure_boot.h

Quoted 5 lines · Po Liu

This patch is for board config file not to add CONFIG_SECURE_BOOT condition for include the asm/fsl_secure_boot.h.

---

Applied to u-boot-mpc85xx/next, pending merging to u-boot-mpc85xx/master branch.

York