diff options
| author | Po Liu | 2013-08-21 14:20:21 +0800 |
|---|---|---|
| committer | York Sun | 2013-10-16 16:13:10 -0700 |
| commit | 0d2cff2d9eddfd1e7f60f76889b65b931cb25237 (patch) | |
| tree | 02e9ca94579981280c9942ab78ef6c45ddc733ec | |
| parent | 183acb700378a8cfc5d50a01a65de93fb2c24586 (diff) | |
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.
Signed-off-by: Po Liu <Po.Liu@freescale.com>
| -rw-r--r-- | arch/powerpc/include/asm/fsl_secure_boot.h | 2 | ||||
| -rw-r--r-- | include/configs/B4860QDS.h | 2 | ||||
| -rw-r--r-- | include/configs/P1010RDB.h | 2 | ||||
| -rw-r--r-- | include/configs/P2041RDB.h | 2 | ||||
| -rw-r--r-- | include/configs/T4240QDS.h | 2 | ||||
| -rw-r--r-- | include/configs/corenet_ds.h | 2 |
6 files changed, 2 insertions, 10 deletions
diff --git a/arch/powerpc/include/asm/fsl_secure_boot.h b/arch/powerpc/include/asm/fsl_secure_boot.h index c36f3c388ae..4c7f0b1caee 100644 --- a/arch/powerpc/include/asm/fsl_secure_boot.h +++ b/arch/powerpc/include/asm/fsl_secure_boot.h @@ -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 diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index 2f0bc6b062b..aa62d94eacb 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -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 */ diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index ba3f7c28219..c058613ebe4 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -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 */ diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index 862614b5c25..2c4159b3335 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -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 */ diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h index 92a30ab09fc..590799cf59f 100644 --- a/include/configs/T4240QDS.h +++ b/include/configs/T4240QDS.h @@ -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 */ diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index c3fb80c8d05..966b0ab6b93 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -745,8 +745,6 @@ #define CONFIG_BOOTCOMMAND CONFIG_HDBOOT -#ifdef CONFIG_SECURE_BOOT #include <asm/fsl_secure_boot.h> -#endif #endif /* __CONFIG_H */ |