| Message ID | 20191018090143.19550-1-laurentiu.tudor@nxp.com |
|---|---|
| State | Accepted |
| Commit | db49c1b2defbcf67ce472787fe5085ac43f19c79 |
| Delegated to: | Priyanka Jain |
| Headers | show |
| Series | [U-Boot,v2,1/6] armv8: fsl-layerscape: guard caam specific defines | expand |
Hi Priyanka, On 18.10.2019 12:01, Laurentiu Tudor wrote: > From: Laurentiu Tudor <laurentiu.tudor@nxp.com> > > These macros should only be used when CONFIG_FSL_CAAM is present. > > Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com> > Reviewed-by: Horia Geant?? <horia.geanta@nxp.com> Looks like our mail server messed Horia's name here. Do you think you could fix by hand when you'll pick up the patch? --- Thanks & Best Regards, Laurentiu > --- > Changes in v2: > - added Reviewed-by tag > > arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c | 2 ++ > arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c | 2 ++ > 2 files changed, 4 insertions(+) > > diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c > index d9d125e8ba..9462298fbf 100644 > --- a/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c > +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c > @@ -18,6 +18,7 @@ struct icid_id_table icid_tbl[] = { > SET_QDMA_ICID("fsl,ls1028a-qdma", FSL_DMA_STREAM_ID), > SET_GPU_ICID("fsl,ls1028a-gpu", FSL_GPU_STREAM_ID), > SET_DISPLAY_ICID(FSL_DISPLAY_STREAM_ID), > +#ifdef CONFIG_FSL_CAAM > SET_SEC_JR_ICID_ENTRY(0, FSL_SEC_JR1_STREAM_ID), > SET_SEC_JR_ICID_ENTRY(1, FSL_SEC_JR2_STREAM_ID), > SET_SEC_JR_ICID_ENTRY(2, FSL_SEC_JR3_STREAM_ID), > @@ -28,6 +29,7 @@ struct icid_id_table icid_tbl[] = { > SET_SEC_RTIC_ICID_ENTRY(3, FSL_SEC_STREAM_ID), > SET_SEC_DECO_ICID_ENTRY(0, FSL_SEC_STREAM_ID), > SET_SEC_DECO_ICID_ENTRY(1, FSL_SEC_STREAM_ID), > +#endif > }; > > int icid_tbl_sz = ARRAY_SIZE(icid_tbl); > diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c > index 49e27553b1..23743ae10c 100644 > --- a/arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c > +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c > @@ -13,6 +13,7 @@ struct icid_id_table icid_tbl[] = { > SET_USB_ICID(1, "snps,dwc3", FSL_USB1_STREAM_ID), > SET_USB_ICID(2, "snps,dwc3", FSL_USB2_STREAM_ID), > SET_SATA_ICID(1, "fsl,ls1088a-ahci", FSL_SATA1_STREAM_ID), > +#ifdef CONFIG_FSL_CAAM > SET_SEC_JR_ICID_ENTRY(0, FSL_SEC_JR1_STREAM_ID), > SET_SEC_JR_ICID_ENTRY(1, FSL_SEC_JR2_STREAM_ID), > SET_SEC_JR_ICID_ENTRY(2, FSL_SEC_JR3_STREAM_ID), > @@ -25,6 +26,7 @@ struct icid_id_table icid_tbl[] = { > SET_SEC_DECO_ICID_ENTRY(1, FSL_SEC_STREAM_ID), > SET_SEC_DECO_ICID_ENTRY(2, FSL_SEC_STREAM_ID), > SET_SEC_DECO_ICID_ENTRY(3, FSL_SEC_STREAM_ID), > +#endif > }; > > int icid_tbl_sz = ARRAY_SIZE(icid_tbl); >
>-----Original Message----- >From: Laurentiu Tudor >Sent: Friday, October 18, 2019 7:34 PM >To: u-boot@lists.denx.de; Priyanka Jain <priyanka.jain@nxp.com> >Cc: Horia Geanta <horia.geanta@nxp.com> >Subject: Re: [PATCH v2 1/6] armv8: fsl-layerscape: guard caam specific defines > >Hi Priyanka, > >On 18.10.2019 12:01, Laurentiu Tudor wrote: >> From: Laurentiu Tudor <laurentiu.tudor@nxp.com> >> >> These macros should only be used when CONFIG_FSL_CAAM is present. >> >> Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com> >> Reviewed-by: Horia Geant?? <horia.geanta@nxp.com> > >Looks like our mail server messed Horia's name here. Do you think you could >fix by hand when you'll pick up the patch? Will take care <snip> --priyankajain
>-----Original Message----- >From: Laurentiu Tudor <laurentiu.tudor@nxp.com> >Sent: Friday, October 18, 2019 2:32 PM >To: u-boot@lists.denx.de; Priyanka Jain <priyanka.jain@nxp.com> >Cc: Horia Geanta <horia.geanta@nxp.com>; Laurentiu Tudor ><laurentiu.tudor@nxp.com> >Subject: [PATCH v2 1/6] armv8: fsl-layerscape: guard caam specific defines > >From: Laurentiu Tudor <laurentiu.tudor@nxp.com> > >These macros should only be used when CONFIG_FSL_CAAM is present. > >Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com> >Reviewed-by: Horia Geant?? <horia.geanta@nxp.com> >--- >Changes in v2: > - added Reviewed-by tag > > arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c | 2 ++ >arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c | 2 ++ > 2 files changed, 4 insertions(+) > >diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c >b/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c >index d9d125e8ba..9462298fbf 100644 >--- a/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c >+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c >@@ -18,6 +18,7 @@ struct icid_id_table icid_tbl[] = { > SET_QDMA_ICID("fsl,ls1028a-qdma", FSL_DMA_STREAM_ID), > SET_GPU_ICID("fsl,ls1028a-gpu", FSL_GPU_STREAM_ID), > SET_DISPLAY_ICID(FSL_DISPLAY_STREAM_ID), >+#ifdef CONFIG_FSL_CAAM > SET_SEC_JR_ICID_ENTRY(0, FSL_SEC_JR1_STREAM_ID), > SET_SEC_JR_ICID_ENTRY(1, FSL_SEC_JR2_STREAM_ID), > SET_SEC_JR_ICID_ENTRY(2, FSL_SEC_JR3_STREAM_ID), @@ -28,6 +29,7 >@@ struct icid_id_table icid_tbl[] = { > SET_SEC_RTIC_ICID_ENTRY(3, FSL_SEC_STREAM_ID), > SET_SEC_DECO_ICID_ENTRY(0, FSL_SEC_STREAM_ID), > SET_SEC_DECO_ICID_ENTRY(1, FSL_SEC_STREAM_ID), >+#endif > }; > > int icid_tbl_sz = ARRAY_SIZE(icid_tbl); diff --git a/arch/arm/cpu/armv8/fsl- >layerscape/ls1088_ids.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c >index 49e27553b1..23743ae10c 100644 >--- a/arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c >+++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c >@@ -13,6 +13,7 @@ struct icid_id_table icid_tbl[] = { > SET_USB_ICID(1, "snps,dwc3", FSL_USB1_STREAM_ID), > SET_USB_ICID(2, "snps,dwc3", FSL_USB2_STREAM_ID), > SET_SATA_ICID(1, "fsl,ls1088a-ahci", FSL_SATA1_STREAM_ID), >+#ifdef CONFIG_FSL_CAAM > SET_SEC_JR_ICID_ENTRY(0, FSL_SEC_JR1_STREAM_ID), > SET_SEC_JR_ICID_ENTRY(1, FSL_SEC_JR2_STREAM_ID), > SET_SEC_JR_ICID_ENTRY(2, FSL_SEC_JR3_STREAM_ID), @@ -25,6 +26,7 >@@ struct icid_id_table icid_tbl[] = { > SET_SEC_DECO_ICID_ENTRY(1, FSL_SEC_STREAM_ID), > SET_SEC_DECO_ICID_ENTRY(2, FSL_SEC_STREAM_ID), > SET_SEC_DECO_ICID_ENTRY(3, FSL_SEC_STREAM_ID), >+#endif > }; > > int icid_tbl_sz = ARRAY_SIZE(icid_tbl); >-- >2.17.1 Slight updates in subject and/or description of few patches done. Series applied to fsl-qoriq master, awaiting upstream. Thanks priyankajain
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c index d9d125e8ba..9462298fbf 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c @@ -18,6 +18,7 @@ struct icid_id_table icid_tbl[] = { SET_QDMA_ICID("fsl,ls1028a-qdma", FSL_DMA_STREAM_ID), SET_GPU_ICID("fsl,ls1028a-gpu", FSL_GPU_STREAM_ID), SET_DISPLAY_ICID(FSL_DISPLAY_STREAM_ID), +#ifdef CONFIG_FSL_CAAM SET_SEC_JR_ICID_ENTRY(0, FSL_SEC_JR1_STREAM_ID), SET_SEC_JR_ICID_ENTRY(1, FSL_SEC_JR2_STREAM_ID), SET_SEC_JR_ICID_ENTRY(2, FSL_SEC_JR3_STREAM_ID), @@ -28,6 +29,7 @@ struct icid_id_table icid_tbl[] = { SET_SEC_RTIC_ICID_ENTRY(3, FSL_SEC_STREAM_ID), SET_SEC_DECO_ICID_ENTRY(0, FSL_SEC_STREAM_ID), SET_SEC_DECO_ICID_ENTRY(1, FSL_SEC_STREAM_ID), +#endif }; int icid_tbl_sz = ARRAY_SIZE(icid_tbl); diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c index 49e27553b1..23743ae10c 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c @@ -13,6 +13,7 @@ struct icid_id_table icid_tbl[] = { SET_USB_ICID(1, "snps,dwc3", FSL_USB1_STREAM_ID), SET_USB_ICID(2, "snps,dwc3", FSL_USB2_STREAM_ID), SET_SATA_ICID(1, "fsl,ls1088a-ahci", FSL_SATA1_STREAM_ID), +#ifdef CONFIG_FSL_CAAM SET_SEC_JR_ICID_ENTRY(0, FSL_SEC_JR1_STREAM_ID), SET_SEC_JR_ICID_ENTRY(1, FSL_SEC_JR2_STREAM_ID), SET_SEC_JR_ICID_ENTRY(2, FSL_SEC_JR3_STREAM_ID), @@ -25,6 +26,7 @@ struct icid_id_table icid_tbl[] = { SET_SEC_DECO_ICID_ENTRY(1, FSL_SEC_STREAM_ID), SET_SEC_DECO_ICID_ENTRY(2, FSL_SEC_STREAM_ID), SET_SEC_DECO_ICID_ENTRY(3, FSL_SEC_STREAM_ID), +#endif }; int icid_tbl_sz = ARRAY_SIZE(icid_tbl);