Browse Source

fsl-layerscape/ppa: cleanup ppa.h

Moved the ifdef into ppa.h and removed the duplicated macros.

Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
Hou Zhiqiang 8 years ago
parent
commit
9e052d9750

+ 2 - 5
arch/arm/include/asm/arch-fsl-layerscape/ppa.h

@@ -7,10 +7,7 @@
 #ifndef __FSL_PPA_H_
 #ifndef __FSL_PPA_H_
 #define __FSL_PPA_H_
 #define __FSL_PPA_H_
 
 
-#define SEC_FIRMWARE_FIT_IMAGE		"firmware"
-#define SEC_FIRMEWARE_FIT_CNF_NAME	"config@1"
-#define SEC_FIRMWARE_TARGET_EL		2
-
+#ifdef CONFIG_FSL_LS_PPA
 int ppa_init(void);
 int ppa_init(void);
-
+#endif
 #endif
 #endif

+ 0 - 4
arch/arm/include/asm/armv8/sec_firmware.h

@@ -7,10 +7,6 @@
 #ifndef __SEC_FIRMWARE_H_
 #ifndef __SEC_FIRMWARE_H_
 #define __SEC_FIRMWARE_H_
 #define __SEC_FIRMWARE_H_
 
 
-#ifdef CONFIG_FSL_LS_PPA
-#include <asm/arch/ppa.h>
-#endif
-
 int sec_firmware_init(const void *, u32 *, u32 *);
 int sec_firmware_init(const void *, u32 *, u32 *);
 int _sec_firmware_entry(const void *, u32 *, u32 *);
 int _sec_firmware_entry(const void *, u32 *, u32 *);
 bool sec_firmware_is_valid(const void *);
 bool sec_firmware_is_valid(const void *);

+ 0 - 2
board/freescale/ls1043ardb/ls1043ardb.c

@@ -23,9 +23,7 @@
 #ifdef CONFIG_U_QE
 #ifdef CONFIG_U_QE
 #include <fsl_qe.h>
 #include <fsl_qe.h>
 #endif
 #endif
-#ifdef CONFIG_FSL_LS_PPA
 #include <asm/arch/ppa.h>
 #include <asm/arch/ppa.h>
-#endif
 
 
 DECLARE_GLOBAL_DATA_PTR;
 DECLARE_GLOBAL_DATA_PTR;