[U-Boot] [PATCH v4 18/27] drivers: qe: add TFABOOT support

[Rajesh Bhagat]

> -----Original Message-----
> From: York Sun
> Sent: Monday, October 22, 2018 9:55 PM
> To: Rajesh Bhagat <rajesh.bhagat at nxp.com>; u-boot at lists.denx.de
> Cc: Prabhakar Kushwaha <prabhakar.kushwaha at nxp.com>; Pankit Garg
> <pankit.garg at nxp.com>
> Subject: Re: [PATCH v4 18/27] drivers: qe: add TFABOOT support
> 
> On 10/12/18 07:45, Rajesh Bhagat wrote:
> > Adds TFABOOT support and allows to pick QE firmware on basis of boot
> > source.
> >
> > Signed-off-by: Pankit Garg <pankit.garg at nxp.com>
> > Signed-off-by: Rajesh Bhagat <rajesh.bhagat at nxp.com>
> > ---
> > Change in v4: None
> >
> > Change in v3: None
> >
> > Change in v2:
> >  - Removed extra CONFIG_TFABOOT flag usage
> >
> >  drivers/qe/qe.c | 81
> > +++++++++++++++++++++++++++++++++++++++++++++++++
> >  1 file changed, 81 insertions(+)
> >
> > diff --git a/drivers/qe/qe.c b/drivers/qe/qe.c index
> > 7010bbc230..daefb5aa07 100644
> > --- a/drivers/qe/qe.c
> > +++ b/drivers/qe/qe.c
> > @@ -17,9 +17,17 @@
> >  #include <asm/arch/immap_ls102xa.h>
> >  #endif
> >
> > +#ifdef CONFIG_TFABOOT
> > +#include <mmc.h>
> > +/* required to include IFC and QSPI base address */ #include
> > +<asm/armv8/mmu.h> #include <asm/arch/cpu.h> #include
> <environment.h>
> > +#else
> >  #ifdef CONFIG_SYS_QE_FMAN_FW_IN_MMC
> >  #include <mmc.h>
> >  #endif
> > +#endif
> >
> 
> 
> Would there be any conflict if you drop the #ifdef here? No need to respin the
> patch set for this change. I can fix it for you if you confirm.
> 

AFAIR, there was some conflict. Shall I check it again. 

> York