* [PATCH] ARM: nxp i.MX8MM evk: make locally used data static
@ 2020-11-12 15:03 Sascha Hauer
2020-11-12 18:00 ` Lucas Stach
0 siblings, 1 reply; 3+ messages in thread
From: Sascha Hauer @ 2020-11-12 15:03 UTC (permalink / raw)
To: Barebox List
Make locally used data static so that it doesn't conflict with other
data with the same name.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/boards/nxp-imx8mp-evk/lpddr4-timing.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/arch/arm/boards/nxp-imx8mp-evk/lpddr4-timing.c b/arch/arm/boards/nxp-imx8mp-evk/lpddr4-timing.c
index bc4c10fe8d..3028bc084c 100644
--- a/arch/arm/boards/nxp-imx8mp-evk/lpddr4-timing.c
+++ b/arch/arm/boards/nxp-imx8mp-evk/lpddr4-timing.c
@@ -7,7 +7,7 @@
#include <soc/imx8m/ddr.h>
#include <soc/imx8m/lpddr4_define.h>
-struct dram_cfg_param ddr_ddrc_cfg[] = {
+static struct dram_cfg_param ddr_ddrc_cfg[] = {
/** Initialize DDRC registers **/
{ 0x3d400304, 0x1 },
{ 0x3d400030, 0x1 },
@@ -117,7 +117,7 @@ struct dram_cfg_param ddr_ddrc_cfg[] = {
};
/* PHY Initialize Configuration */
-struct dram_cfg_param ddr_ddrphy_cfg[] = {
+static struct dram_cfg_param ddr_ddrphy_cfg[] = {
{ 0x100a0, 0x0 },
{ 0x100a1, 0x1 },
{ 0x100a2, 0x2 },
@@ -326,7 +326,7 @@ struct dram_cfg_param ddr_ddrphy_cfg[] = {
};
/* ddr phy trained csr */
-struct dram_cfg_param ddr_ddrphy_trained_csr[] = {
+static struct dram_cfg_param ddr_ddrphy_trained_csr[] = {
{ 0x200b2, 0x0 },
{ 0x1200b2, 0x0 },
{ 0x2200b2, 0x0 },
@@ -1049,7 +1049,7 @@ struct dram_cfg_param ddr_ddrphy_trained_csr[] = {
};
/* P0 message block paremeter for training firmware */
-struct dram_cfg_param ddr_fsp0_cfg[] = {
+static struct dram_cfg_param ddr_fsp0_cfg[] = {
{ 0xd0000, 0x0 },
{ 0x54003, 0xfa0 },
{ 0x54004, 0x2 },
@@ -1088,7 +1088,7 @@ struct dram_cfg_param ddr_fsp0_cfg[] = {
};
/* P1 message block paremeter for training firmware */
-struct dram_cfg_param ddr_fsp1_cfg[] = {
+static struct dram_cfg_param ddr_fsp1_cfg[] = {
{ 0xd0000, 0x0 },
{ 0x54002, 0x101 },
{ 0x54003, 0x190 },
@@ -1128,7 +1128,7 @@ struct dram_cfg_param ddr_fsp1_cfg[] = {
};
/* P2 message block paremeter for training firmware */
-struct dram_cfg_param ddr_fsp2_cfg[] = {
+static struct dram_cfg_param ddr_fsp2_cfg[] = {
{ 0xd0000, 0x0 },
{ 0x54002, 0x102 },
{ 0x54003, 0x64 },
@@ -1168,7 +1168,7 @@ struct dram_cfg_param ddr_fsp2_cfg[] = {
};
/* P0 2D message block paremeter for training firmware */
-struct dram_cfg_param ddr_fsp0_2d_cfg[] = {
+static struct dram_cfg_param ddr_fsp0_2d_cfg[] = {
{ 0xd0000, 0x0 },
{ 0x54003, 0xfa0 },
{ 0x54004, 0x2 },
@@ -1209,7 +1209,7 @@ struct dram_cfg_param ddr_fsp0_2d_cfg[] = {
};
/* DRAM PHY init engine image */
-struct dram_cfg_param ddr_phy_pie[] = {
+static struct dram_cfg_param ddr_phy_pie[] = {
{ 0xd0000, 0x0 },
{ 0x90000, 0x10 },
{ 0x90001, 0x400 },
@@ -1801,7 +1801,7 @@ struct dram_cfg_param ddr_phy_pie[] = {
{ 0xd0000, 0x1 }
};
-struct dram_fsp_msg ddr_dram_fsp_msg[] = {
+static struct dram_fsp_msg ddr_dram_fsp_msg[] = {
{
/* P0 4000mts 1D */
.drate = 4000,
--
2.20.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] ARM: nxp i.MX8MM evk: make locally used data static
2020-11-12 15:03 [PATCH] ARM: nxp i.MX8MM evk: make locally used data static Sascha Hauer
@ 2020-11-12 18:00 ` Lucas Stach
2020-11-13 7:42 ` Sascha Hauer
0 siblings, 1 reply; 3+ messages in thread
From: Lucas Stach @ 2020-11-12 18:00 UTC (permalink / raw)
To: Sascha Hauer, Barebox List
Am Donnerstag, den 12.11.2020, 16:03 +0100 schrieb Sascha Hauer:
> Make locally used data static so that it doesn't conflict with other
> data with the same name.
>
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
> arch/arm/boards/nxp-imx8mp-evk/lpddr4-timing.c | 18 +++++++++-------
Subject says i.MX8MM EVK, but the code change is in i.MX8MP EVK.
Regards,
Lucas
> --
> 1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/arch/arm/boards/nxp-imx8mp-evk/lpddr4-timing.c b/arch/arm/boards/nxp-imx8mp-evk/lpddr4-timing.c
> index bc4c10fe8d..3028bc084c 100644
> --- a/arch/arm/boards/nxp-imx8mp-evk/lpddr4-timing.c
> +++ b/arch/arm/boards/nxp-imx8mp-evk/lpddr4-timing.c
> @@ -7,7 +7,7 @@
> #include <soc/imx8m/ddr.h>
> #include <soc/imx8m/lpddr4_define.h>
>
> -struct dram_cfg_param ddr_ddrc_cfg[] = {
> +static struct dram_cfg_param ddr_ddrc_cfg[] = {
> /** Initialize DDRC registers **/
> { 0x3d400304, 0x1 },
> { 0x3d400030, 0x1 },
> @@ -117,7 +117,7 @@ struct dram_cfg_param ddr_ddrc_cfg[] = {
> };
>
> /* PHY Initialize Configuration */
> -struct dram_cfg_param ddr_ddrphy_cfg[] = {
> +static struct dram_cfg_param ddr_ddrphy_cfg[] = {
> { 0x100a0, 0x0 },
> { 0x100a1, 0x1 },
> { 0x100a2, 0x2 },
> @@ -326,7 +326,7 @@ struct dram_cfg_param ddr_ddrphy_cfg[] = {
> };
>
> /* ddr phy trained csr */
> -struct dram_cfg_param ddr_ddrphy_trained_csr[] = {
> +static struct dram_cfg_param ddr_ddrphy_trained_csr[] = {
> { 0x200b2, 0x0 },
> { 0x1200b2, 0x0 },
> { 0x2200b2, 0x0 },
> @@ -1049,7 +1049,7 @@ struct dram_cfg_param ddr_ddrphy_trained_csr[] = {
> };
>
> /* P0 message block paremeter for training firmware */
> -struct dram_cfg_param ddr_fsp0_cfg[] = {
> +static struct dram_cfg_param ddr_fsp0_cfg[] = {
> { 0xd0000, 0x0 },
> { 0x54003, 0xfa0 },
> { 0x54004, 0x2 },
> @@ -1088,7 +1088,7 @@ struct dram_cfg_param ddr_fsp0_cfg[] = {
> };
>
> /* P1 message block paremeter for training firmware */
> -struct dram_cfg_param ddr_fsp1_cfg[] = {
> +static struct dram_cfg_param ddr_fsp1_cfg[] = {
> { 0xd0000, 0x0 },
> { 0x54002, 0x101 },
> { 0x54003, 0x190 },
> @@ -1128,7 +1128,7 @@ struct dram_cfg_param ddr_fsp1_cfg[] = {
> };
>
> /* P2 message block paremeter for training firmware */
> -struct dram_cfg_param ddr_fsp2_cfg[] = {
> +static struct dram_cfg_param ddr_fsp2_cfg[] = {
> { 0xd0000, 0x0 },
> { 0x54002, 0x102 },
> { 0x54003, 0x64 },
> @@ -1168,7 +1168,7 @@ struct dram_cfg_param ddr_fsp2_cfg[] = {
> };
>
> /* P0 2D message block paremeter for training firmware */
> -struct dram_cfg_param ddr_fsp0_2d_cfg[] = {
> +static struct dram_cfg_param ddr_fsp0_2d_cfg[] = {
> { 0xd0000, 0x0 },
> { 0x54003, 0xfa0 },
> { 0x54004, 0x2 },
> @@ -1209,7 +1209,7 @@ struct dram_cfg_param ddr_fsp0_2d_cfg[] = {
> };
>
> /* DRAM PHY init engine image */
> -struct dram_cfg_param ddr_phy_pie[] = {
> +static struct dram_cfg_param ddr_phy_pie[] = {
> { 0xd0000, 0x0 },
> { 0x90000, 0x10 },
> { 0x90001, 0x400 },
> @@ -1801,7 +1801,7 @@ struct dram_cfg_param ddr_phy_pie[] = {
> { 0xd0000, 0x1 }
> };
>
> -struct dram_fsp_msg ddr_dram_fsp_msg[] = {
> +static struct dram_fsp_msg ddr_dram_fsp_msg[] = {
> {
> /* P0 4000mts 1D */
> .drate = 4000,
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] ARM: nxp i.MX8MM evk: make locally used data static
2020-11-12 18:00 ` Lucas Stach
@ 2020-11-13 7:42 ` Sascha Hauer
0 siblings, 0 replies; 3+ messages in thread
From: Sascha Hauer @ 2020-11-13 7:42 UTC (permalink / raw)
To: Lucas Stach; +Cc: Barebox List
On Thu, Nov 12, 2020 at 07:00:05PM +0100, Lucas Stach wrote:
> Am Donnerstag, den 12.11.2020, 16:03 +0100 schrieb Sascha Hauer:
> > Make locally used data static so that it doesn't conflict with other
> > data with the same name.
> >
> > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> > ---
> > arch/arm/boards/nxp-imx8mp-evk/lpddr4-timing.c | 18 +++++++++-------
>
> Subject says i.MX8MM EVK, but the code change is in i.MX8MP EVK.
Fixed, thanks
Sascha
>
> Regards,
> Lucas
>
> > --
> > 1 file changed, 9 insertions(+), 9 deletions(-)
> >
> > diff --git a/arch/arm/boards/nxp-imx8mp-evk/lpddr4-timing.c b/arch/arm/boards/nxp-imx8mp-evk/lpddr4-timing.c
> > index bc4c10fe8d..3028bc084c 100644
> > --- a/arch/arm/boards/nxp-imx8mp-evk/lpddr4-timing.c
> > +++ b/arch/arm/boards/nxp-imx8mp-evk/lpddr4-timing.c
> > @@ -7,7 +7,7 @@
> > #include <soc/imx8m/ddr.h>
> > #include <soc/imx8m/lpddr4_define.h>
> >
> > -struct dram_cfg_param ddr_ddrc_cfg[] = {
> > +static struct dram_cfg_param ddr_ddrc_cfg[] = {
> > /** Initialize DDRC registers **/
> > { 0x3d400304, 0x1 },
> > { 0x3d400030, 0x1 },
> > @@ -117,7 +117,7 @@ struct dram_cfg_param ddr_ddrc_cfg[] = {
> > };
> >
> > /* PHY Initialize Configuration */
> > -struct dram_cfg_param ddr_ddrphy_cfg[] = {
> > +static struct dram_cfg_param ddr_ddrphy_cfg[] = {
> > { 0x100a0, 0x0 },
> > { 0x100a1, 0x1 },
> > { 0x100a2, 0x2 },
> > @@ -326,7 +326,7 @@ struct dram_cfg_param ddr_ddrphy_cfg[] = {
> > };
> >
> > /* ddr phy trained csr */
> > -struct dram_cfg_param ddr_ddrphy_trained_csr[] = {
> > +static struct dram_cfg_param ddr_ddrphy_trained_csr[] = {
> > { 0x200b2, 0x0 },
> > { 0x1200b2, 0x0 },
> > { 0x2200b2, 0x0 },
> > @@ -1049,7 +1049,7 @@ struct dram_cfg_param ddr_ddrphy_trained_csr[] = {
> > };
> >
> > /* P0 message block paremeter for training firmware */
> > -struct dram_cfg_param ddr_fsp0_cfg[] = {
> > +static struct dram_cfg_param ddr_fsp0_cfg[] = {
> > { 0xd0000, 0x0 },
> > { 0x54003, 0xfa0 },
> > { 0x54004, 0x2 },
> > @@ -1088,7 +1088,7 @@ struct dram_cfg_param ddr_fsp0_cfg[] = {
> > };
> >
> > /* P1 message block paremeter for training firmware */
> > -struct dram_cfg_param ddr_fsp1_cfg[] = {
> > +static struct dram_cfg_param ddr_fsp1_cfg[] = {
> > { 0xd0000, 0x0 },
> > { 0x54002, 0x101 },
> > { 0x54003, 0x190 },
> > @@ -1128,7 +1128,7 @@ struct dram_cfg_param ddr_fsp1_cfg[] = {
> > };
> >
> > /* P2 message block paremeter for training firmware */
> > -struct dram_cfg_param ddr_fsp2_cfg[] = {
> > +static struct dram_cfg_param ddr_fsp2_cfg[] = {
> > { 0xd0000, 0x0 },
> > { 0x54002, 0x102 },
> > { 0x54003, 0x64 },
> > @@ -1168,7 +1168,7 @@ struct dram_cfg_param ddr_fsp2_cfg[] = {
> > };
> >
> > /* P0 2D message block paremeter for training firmware */
> > -struct dram_cfg_param ddr_fsp0_2d_cfg[] = {
> > +static struct dram_cfg_param ddr_fsp0_2d_cfg[] = {
> > { 0xd0000, 0x0 },
> > { 0x54003, 0xfa0 },
> > { 0x54004, 0x2 },
> > @@ -1209,7 +1209,7 @@ struct dram_cfg_param ddr_fsp0_2d_cfg[] = {
> > };
> >
> > /* DRAM PHY init engine image */
> > -struct dram_cfg_param ddr_phy_pie[] = {
> > +static struct dram_cfg_param ddr_phy_pie[] = {
> > { 0xd0000, 0x0 },
> > { 0x90000, 0x10 },
> > { 0x90001, 0x400 },
> > @@ -1801,7 +1801,7 @@ struct dram_cfg_param ddr_phy_pie[] = {
> > { 0xd0000, 0x1 }
> > };
> >
> > -struct dram_fsp_msg ddr_dram_fsp_msg[] = {
> > +static struct dram_fsp_msg ddr_dram_fsp_msg[] = {
> > {
> > /* P0 4000mts 1D */
> > .drate = 4000,
>
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-11-13 7:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-12 15:03 [PATCH] ARM: nxp i.MX8MM evk: make locally used data static Sascha Hauer
2020-11-12 18:00 ` Lucas Stach
2020-11-13 7:42 ` Sascha Hauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox