| Message ID | 1486351647-39866-1-git-send-email-Zhiqiang.Hou@nxp.com |
|---|---|
| State | Accepted |
| Commit | 9e052d975058cd01c1421c4beb9ddd387dd525da |
| Delegated to: | York Sun |
| Headers | show |
On 02/05/2017 07:41 PM, Zhiqiang Hou wrote: > From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com> > > Moved the ifdef into ppa.h and removed the duplicated macros. > > Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com> > --- > arch/arm/include/asm/arch-fsl-layerscape/ppa.h | 7 ++----- > arch/arm/include/asm/armv8/sec_firmware.h | 4 ---- > board/freescale/ls1043ardb/ls1043ardb.c | 2 -- > 3 files changed, 2 insertions(+), 11 deletions(-) > Zhiqiang, There are other places (ls1012a boards) ppa.h is included with #ifdef. Can they be cleaned up as well? York
Hi York, Thanks a lot for your comments! > -----Original Message----- > From: york sun > Sent: 2017年2月8日 0:32 > To: Z.Q. Hou <zhiqiang.hou@nxp.com>; u-boot@lists.denx.de; Mingkai Hu > <mingkai.hu@nxp.com>; Prabhakar Kushwaha > <prabhakar.kushwaha@nxp.com> > Subject: Re: [PATCH] fsl-layerscape/ppa: cleanup ppa.h > > On 02/05/2017 07:41 PM, Zhiqiang Hou wrote: > > From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com> > > > > Moved the ifdef into ppa.h and removed the duplicated macros. > > > > Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com> > > --- > > arch/arm/include/asm/arch-fsl-layerscape/ppa.h | 7 ++----- > > arch/arm/include/asm/armv8/sec_firmware.h | 4 ---- > > board/freescale/ls1043ardb/ls1043ardb.c | 2 -- > > 3 files changed, 2 insertions(+), 11 deletions(-) > > > > Zhiqiang, > > There are other places (ls1012a boards) ppa.h is included with #ifdef. > Can they be cleaned up as well? > Yes, they can. Thanks, Zhiqiang
On 02/05/2017 07:41 PM, Zhiqiang Hou wrote: > From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com> > > Moved the ifdef into ppa.h and removed the duplicated macros. > > Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com> > --- Applied to fsl-qoriq master, awaiting upstream. Thanks. York
diff --git a/arch/arm/include/asm/arch-fsl-layerscape/ppa.h b/arch/arm/include/asm/arch-fsl-layerscape/ppa.h index 1f1442b..da4098e 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/ppa.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/ppa.h @@ -7,10 +7,7 @@ #ifndef __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); - +#endif #endif diff --git a/arch/arm/include/asm/armv8/sec_firmware.h b/arch/arm/include/asm/armv8/sec_firmware.h index 5ae00fa..bcdb1b0 100644 --- a/arch/arm/include/asm/armv8/sec_firmware.h +++ b/arch/arm/include/asm/armv8/sec_firmware.h @@ -7,10 +7,6 @@ #ifndef __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_entry(const void *, u32 *, u32 *); bool sec_firmware_is_valid(const void *); diff --git a/board/freescale/ls1043ardb/ls1043ardb.c b/board/freescale/ls1043ardb/ls1043ardb.c index e213128..d9ddd40 100644 --- a/board/freescale/ls1043ardb/ls1043ardb.c +++ b/board/freescale/ls1043ardb/ls1043ardb.c @@ -23,9 +23,7 @@ #ifdef CONFIG_U_QE #include <fsl_qe.h> #endif -#ifdef CONFIG_FSL_LS_PPA #include <asm/arch/ppa.h> -#endif DECLARE_GLOBAL_DATA_PTR;