* [U-Boot] [PATCH 1/3] mxs: Replace i.MX233 by i.MX23 on copyright header
@ 2012-08-19 14:58 Otavio Salvador
2012-08-19 14:58 ` [U-Boot] [PATCH 2/3] mxs: Only build internal Ethernet controller for i.MX28 Otavio Salvador
` (3 more replies)
0 siblings, 4 replies; 11+ messages in thread
From: Otavio Salvador @ 2012-08-19 14:58 UTC (permalink / raw)
To: u-boot
All other header are going to use i.MX23 so we change this for
consistency.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
arch/arm/include/asm/arch-mxs/sys_proto.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/include/asm/arch-mxs/sys_proto.h b/arch/arm/include/asm/arch-mxs/sys_proto.h
index 4610363..9e4a4c9 100644
--- a/arch/arm/include/asm/arch-mxs/sys_proto.h
+++ b/arch/arm/include/asm/arch-mxs/sys_proto.h
@@ -1,5 +1,5 @@
/*
- * Freescale i.MX233/i.MX28 specific functions
+ * Freescale i.MX23/i.MX28 specific functions
*
* Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com>
* on behalf of DENX Software Engineering GmbH
--
1.7.10.4
^ permalink raw reply related [flat|nested] 11+ messages in thread* [U-Boot] [PATCH 2/3] mxs: Only build internal Ethernet controller for i.MX28 2012-08-19 14:58 [U-Boot] [PATCH 1/3] mxs: Replace i.MX233 by i.MX23 on copyright header Otavio Salvador @ 2012-08-19 14:58 ` Otavio Salvador 2012-08-19 15:06 ` Marek Vasut 2012-08-19 14:58 ` [U-Boot] [PATCH 3/3] mxs: Rename 'mx28_dram_init' to 'mxs_dram_init' Otavio Salvador ` (2 subsequent siblings) 3 siblings, 1 reply; 11+ messages in thread From: Otavio Salvador @ 2012-08-19 14:58 UTC (permalink / raw) To: u-boot The internal Ethernet controller is only available on i.MX28 processors so it needs to use CONFIG_MX28 guardian to avoid having this code called in others. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> --- arch/arm/cpu/arm926ejs/mxs/mxs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/cpu/arm926ejs/mxs/mxs.c b/arch/arm/cpu/arm926ejs/mxs/mxs.c index c028e5e..a1769fd 100644 --- a/arch/arm/cpu/arm926ejs/mxs/mxs.c +++ b/arch/arm/cpu/arm926ejs/mxs/mxs.c @@ -246,7 +246,7 @@ int do_mx28_showclocks(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) /* * Initializes on-chip ethernet controllers. */ -#ifdef CONFIG_CMD_NET +#if defined(CONFIG_MX28) && defined(CONFIG_CMD_NET) int cpu_eth_init(bd_t *bis) { struct mxs_clkctrl_regs *clkctrl_regs = -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH 2/3] mxs: Only build internal Ethernet controller for i.MX28 2012-08-19 14:58 ` [U-Boot] [PATCH 2/3] mxs: Only build internal Ethernet controller for i.MX28 Otavio Salvador @ 2012-08-19 15:06 ` Marek Vasut 0 siblings, 0 replies; 11+ messages in thread From: Marek Vasut @ 2012-08-19 15:06 UTC (permalink / raw) To: u-boot Dear Otavio Salvador, > The internal Ethernet controller is only available on i.MX28 > processors so it needs to use CONFIG_MX28 guardian to avoid having > this code called in others. > > Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> > --- > arch/arm/cpu/arm926ejs/mxs/mxs.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm/cpu/arm926ejs/mxs/mxs.c > b/arch/arm/cpu/arm926ejs/mxs/mxs.c index c028e5e..a1769fd 100644 > --- a/arch/arm/cpu/arm926ejs/mxs/mxs.c > +++ b/arch/arm/cpu/arm926ejs/mxs/mxs.c > @@ -246,7 +246,7 @@ int do_mx28_showclocks(cmd_tbl_t *cmdtp, int flag, int > argc, char *const argv[]) /* > * Initializes on-chip ethernet controllers. > */ > -#ifdef CONFIG_CMD_NET > +#if defined(CONFIG_MX28) && defined(CONFIG_CMD_NET) > int cpu_eth_init(bd_t *bis) > { > struct mxs_clkctrl_regs *clkctrl_regs = Acked-by: Marek Vasut <marex@denx.de> Best regards, Marek Vasut ^ permalink raw reply [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH 3/3] mxs: Rename 'mx28_dram_init' to 'mxs_dram_init' 2012-08-19 14:58 [U-Boot] [PATCH 1/3] mxs: Replace i.MX233 by i.MX23 on copyright header Otavio Salvador 2012-08-19 14:58 ` [U-Boot] [PATCH 2/3] mxs: Only build internal Ethernet controller for i.MX28 Otavio Salvador @ 2012-08-19 14:58 ` Otavio Salvador 2012-08-19 15:07 ` Marek Vasut 2012-08-24 5:49 ` Veli-Pekka Peltola 2012-08-19 15:05 ` [U-Boot] [PATCH 1/3] mxs: Replace i.MX233 by i.MX23 on copyright header Marek Vasut 2012-08-27 5:46 ` Stefano Babic 3 siblings, 2 replies; 11+ messages in thread From: Otavio Salvador @ 2012-08-19 14:58 UTC (permalink / raw) To: u-boot The DRAM initialization, after SPL has complete, is exactly the same for all mxs SoCs so we should name it accordinly. The following boards has been changed: * apx4devkit * m28evk * mx28evk * sc_sps_1 Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> --- arch/arm/cpu/arm926ejs/mxs/mxs.c | 4 ++-- arch/arm/include/asm/arch-mxs/sys_proto.h | 2 +- board/bluegiga/apx4devkit/apx4devkit.c | 2 +- board/denx/m28evk/m28evk.c | 2 +- board/freescale/mx28evk/mx28evk.c | 2 +- board/schulercontrol/sc_sps_1/sc_sps_1.c | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm/cpu/arm926ejs/mxs/mxs.c b/arch/arm/cpu/arm926ejs/mxs/mxs.c index a1769fd..c8cda6a 100644 --- a/arch/arm/cpu/arm926ejs/mxs/mxs.c +++ b/arch/arm/cpu/arm926ejs/mxs/mxs.c @@ -320,13 +320,13 @@ void imx_get_mac_from_fuse(int dev_id, unsigned char *mac) } #endif -int mx28_dram_init(void) +int mxs_dram_init(void) { struct mxs_spl_data *data = (struct mxs_spl_data *) ((CONFIG_SYS_TEXT_BASE - sizeof(struct mxs_spl_data)) & ~0xf); if (data->mem_dram_size == 0) { - printf("MX28:\n" + printf("MXS:\n" "Error, the RAM size passed up from SPL is 0!\n"); hang(); } diff --git a/arch/arm/include/asm/arch-mxs/sys_proto.h b/arch/arm/include/asm/arch-mxs/sys_proto.h index 9e4a4c9..fc84808 100644 --- a/arch/arm/include/asm/arch-mxs/sys_proto.h +++ b/arch/arm/include/asm/arch-mxs/sys_proto.h @@ -69,6 +69,6 @@ struct mxs_spl_data { uint32_t mem_dram_size; }; -int mx28_dram_init(void); +int mxs_dram_init(void); #endif /* __SYS_PROTO_H__ */ diff --git a/board/bluegiga/apx4devkit/apx4devkit.c b/board/bluegiga/apx4devkit/apx4devkit.c index 5a1042e..ae48ab5 100644 --- a/board/bluegiga/apx4devkit/apx4devkit.c +++ b/board/bluegiga/apx4devkit/apx4devkit.c @@ -55,7 +55,7 @@ int board_early_init_f(void) int dram_init(void) { - return mx28_dram_init(); + return mxs_dram_init(); } int board_init(void) diff --git a/board/denx/m28evk/m28evk.c b/board/denx/m28evk/m28evk.c index 74da3ea..9473d10 100644 --- a/board/denx/m28evk/m28evk.c +++ b/board/denx/m28evk/m28evk.c @@ -72,7 +72,7 @@ int board_init(void) int dram_init(void) { - return mx28_dram_init(); + return mxs_dram_init(); } #ifdef CONFIG_CMD_MMC diff --git a/board/freescale/mx28evk/mx28evk.c b/board/freescale/mx28evk/mx28evk.c index 1320277..867d3c8 100644 --- a/board/freescale/mx28evk/mx28evk.c +++ b/board/freescale/mx28evk/mx28evk.c @@ -64,7 +64,7 @@ int board_early_init_f(void) int dram_init(void) { - return mx28_dram_init(); + return mxs_dram_init(); } int board_init(void) diff --git a/board/schulercontrol/sc_sps_1/sc_sps_1.c b/board/schulercontrol/sc_sps_1/sc_sps_1.c index 5f58e0b..fda191a 100644 --- a/board/schulercontrol/sc_sps_1/sc_sps_1.c +++ b/board/schulercontrol/sc_sps_1/sc_sps_1.c @@ -72,7 +72,7 @@ int board_init(void) int dram_init(void) { - return mx28_dram_init(); + return mxs_dram_init(); } #ifdef CONFIG_CMD_MMC -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH 3/3] mxs: Rename 'mx28_dram_init' to 'mxs_dram_init' 2012-08-19 14:58 ` [U-Boot] [PATCH 3/3] mxs: Rename 'mx28_dram_init' to 'mxs_dram_init' Otavio Salvador @ 2012-08-19 15:07 ` Marek Vasut 2012-08-23 23:06 ` Otavio Salvador 2012-08-24 5:49 ` Veli-Pekka Peltola 1 sibling, 1 reply; 11+ messages in thread From: Marek Vasut @ 2012-08-19 15:07 UTC (permalink / raw) To: u-boot Dear Otavio Salvador, > The DRAM initialization, after SPL has complete, is exactly the same > for all mxs SoCs so we should name it accordinly. Acked-by: Marek Vasut <marex@denx.de> > The following boards has been changed: > > * apx4devkit > * m28evk > * mx28evk > * sc_sps_1 > > Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> > --- > arch/arm/cpu/arm926ejs/mxs/mxs.c | 4 ++-- > arch/arm/include/asm/arch-mxs/sys_proto.h | 2 +- > board/bluegiga/apx4devkit/apx4devkit.c | 2 +- > board/denx/m28evk/m28evk.c | 2 +- > board/freescale/mx28evk/mx28evk.c | 2 +- > board/schulercontrol/sc_sps_1/sc_sps_1.c | 2 +- > 6 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/arch/arm/cpu/arm926ejs/mxs/mxs.c > b/arch/arm/cpu/arm926ejs/mxs/mxs.c index a1769fd..c8cda6a 100644 > --- a/arch/arm/cpu/arm926ejs/mxs/mxs.c > +++ b/arch/arm/cpu/arm926ejs/mxs/mxs.c > @@ -320,13 +320,13 @@ void imx_get_mac_from_fuse(int dev_id, unsigned char > *mac) } > #endif > > -int mx28_dram_init(void) > +int mxs_dram_init(void) > { > struct mxs_spl_data *data = (struct mxs_spl_data *) > ((CONFIG_SYS_TEXT_BASE - sizeof(struct mxs_spl_data)) & ~0xf); > > if (data->mem_dram_size == 0) { > - printf("MX28:\n" > + printf("MXS:\n" > "Error, the RAM size passed up from SPL is 0!\n"); > hang(); > } > diff --git a/arch/arm/include/asm/arch-mxs/sys_proto.h > b/arch/arm/include/asm/arch-mxs/sys_proto.h index 9e4a4c9..fc84808 100644 > --- a/arch/arm/include/asm/arch-mxs/sys_proto.h > +++ b/arch/arm/include/asm/arch-mxs/sys_proto.h > @@ -69,6 +69,6 @@ struct mxs_spl_data { > uint32_t mem_dram_size; > }; > > -int mx28_dram_init(void); > +int mxs_dram_init(void); > > #endif /* __SYS_PROTO_H__ */ > diff --git a/board/bluegiga/apx4devkit/apx4devkit.c > b/board/bluegiga/apx4devkit/apx4devkit.c index 5a1042e..ae48ab5 100644 > --- a/board/bluegiga/apx4devkit/apx4devkit.c > +++ b/board/bluegiga/apx4devkit/apx4devkit.c > @@ -55,7 +55,7 @@ int board_early_init_f(void) > > int dram_init(void) > { > - return mx28_dram_init(); > + return mxs_dram_init(); > } > > int board_init(void) > diff --git a/board/denx/m28evk/m28evk.c b/board/denx/m28evk/m28evk.c > index 74da3ea..9473d10 100644 > --- a/board/denx/m28evk/m28evk.c > +++ b/board/denx/m28evk/m28evk.c > @@ -72,7 +72,7 @@ int board_init(void) > > int dram_init(void) > { > - return mx28_dram_init(); > + return mxs_dram_init(); > } > > #ifdef CONFIG_CMD_MMC > diff --git a/board/freescale/mx28evk/mx28evk.c > b/board/freescale/mx28evk/mx28evk.c index 1320277..867d3c8 100644 > --- a/board/freescale/mx28evk/mx28evk.c > +++ b/board/freescale/mx28evk/mx28evk.c > @@ -64,7 +64,7 @@ int board_early_init_f(void) > > int dram_init(void) > { > - return mx28_dram_init(); > + return mxs_dram_init(); > } > > int board_init(void) > diff --git a/board/schulercontrol/sc_sps_1/sc_sps_1.c > b/board/schulercontrol/sc_sps_1/sc_sps_1.c index 5f58e0b..fda191a 100644 > --- a/board/schulercontrol/sc_sps_1/sc_sps_1.c > +++ b/board/schulercontrol/sc_sps_1/sc_sps_1.c > @@ -72,7 +72,7 @@ int board_init(void) > > int dram_init(void) > { > - return mx28_dram_init(); > + return mxs_dram_init(); > } > > #ifdef CONFIG_CMD_MMC ^ permalink raw reply [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH 3/3] mxs: Rename 'mx28_dram_init' to 'mxs_dram_init' 2012-08-19 15:07 ` Marek Vasut @ 2012-08-23 23:06 ` Otavio Salvador 2012-08-24 7:57 ` Stefano Babic 0 siblings, 1 reply; 11+ messages in thread From: Otavio Salvador @ 2012-08-23 23:06 UTC (permalink / raw) To: u-boot Ping? On Sun, Aug 19, 2012 at 12:07 PM, Marek Vasut <marek.vasut@gmail.com> wrote: > Dear Otavio Salvador, > >> The DRAM initialization, after SPL has complete, is exactly the same >> for all mxs SoCs so we should name it accordinly. > > Acked-by: Marek Vasut <marex@denx.de> > >> The following boards has been changed: >> >> * apx4devkit >> * m28evk >> * mx28evk >> * sc_sps_1 >> >> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> >> --- >> arch/arm/cpu/arm926ejs/mxs/mxs.c | 4 ++-- >> arch/arm/include/asm/arch-mxs/sys_proto.h | 2 +- >> board/bluegiga/apx4devkit/apx4devkit.c | 2 +- >> board/denx/m28evk/m28evk.c | 2 +- >> board/freescale/mx28evk/mx28evk.c | 2 +- >> board/schulercontrol/sc_sps_1/sc_sps_1.c | 2 +- >> 6 files changed, 7 insertions(+), 7 deletions(-) >> >> diff --git a/arch/arm/cpu/arm926ejs/mxs/mxs.c >> b/arch/arm/cpu/arm926ejs/mxs/mxs.c index a1769fd..c8cda6a 100644 >> --- a/arch/arm/cpu/arm926ejs/mxs/mxs.c >> +++ b/arch/arm/cpu/arm926ejs/mxs/mxs.c >> @@ -320,13 +320,13 @@ void imx_get_mac_from_fuse(int dev_id, unsigned char >> *mac) } >> #endif >> >> -int mx28_dram_init(void) >> +int mxs_dram_init(void) >> { >> struct mxs_spl_data *data = (struct mxs_spl_data *) >> ((CONFIG_SYS_TEXT_BASE - sizeof(struct mxs_spl_data)) & ~0xf); >> >> if (data->mem_dram_size == 0) { >> - printf("MX28:\n" >> + printf("MXS:\n" >> "Error, the RAM size passed up from SPL is 0!\n"); >> hang(); >> } >> diff --git a/arch/arm/include/asm/arch-mxs/sys_proto.h >> b/arch/arm/include/asm/arch-mxs/sys_proto.h index 9e4a4c9..fc84808 100644 >> --- a/arch/arm/include/asm/arch-mxs/sys_proto.h >> +++ b/arch/arm/include/asm/arch-mxs/sys_proto.h >> @@ -69,6 +69,6 @@ struct mxs_spl_data { >> uint32_t mem_dram_size; >> }; >> >> -int mx28_dram_init(void); >> +int mxs_dram_init(void); >> >> #endif /* __SYS_PROTO_H__ */ >> diff --git a/board/bluegiga/apx4devkit/apx4devkit.c >> b/board/bluegiga/apx4devkit/apx4devkit.c index 5a1042e..ae48ab5 100644 >> --- a/board/bluegiga/apx4devkit/apx4devkit.c >> +++ b/board/bluegiga/apx4devkit/apx4devkit.c >> @@ -55,7 +55,7 @@ int board_early_init_f(void) >> >> int dram_init(void) >> { >> - return mx28_dram_init(); >> + return mxs_dram_init(); >> } >> >> int board_init(void) >> diff --git a/board/denx/m28evk/m28evk.c b/board/denx/m28evk/m28evk.c >> index 74da3ea..9473d10 100644 >> --- a/board/denx/m28evk/m28evk.c >> +++ b/board/denx/m28evk/m28evk.c >> @@ -72,7 +72,7 @@ int board_init(void) >> >> int dram_init(void) >> { >> - return mx28_dram_init(); >> + return mxs_dram_init(); >> } >> >> #ifdef CONFIG_CMD_MMC >> diff --git a/board/freescale/mx28evk/mx28evk.c >> b/board/freescale/mx28evk/mx28evk.c index 1320277..867d3c8 100644 >> --- a/board/freescale/mx28evk/mx28evk.c >> +++ b/board/freescale/mx28evk/mx28evk.c >> @@ -64,7 +64,7 @@ int board_early_init_f(void) >> >> int dram_init(void) >> { >> - return mx28_dram_init(); >> + return mxs_dram_init(); >> } >> >> int board_init(void) >> diff --git a/board/schulercontrol/sc_sps_1/sc_sps_1.c >> b/board/schulercontrol/sc_sps_1/sc_sps_1.c index 5f58e0b..fda191a 100644 >> --- a/board/schulercontrol/sc_sps_1/sc_sps_1.c >> +++ b/board/schulercontrol/sc_sps_1/sc_sps_1.c >> @@ -72,7 +72,7 @@ int board_init(void) >> >> int dram_init(void) >> { >> - return mx28_dram_init(); >> + return mxs_dram_init(); >> } >> >> #ifdef CONFIG_CMD_MMC -- Otavio Salvador O.S. Systems E-mail: otavio at ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br ^ permalink raw reply [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH 3/3] mxs: Rename 'mx28_dram_init' to 'mxs_dram_init' 2012-08-23 23:06 ` Otavio Salvador @ 2012-08-24 7:57 ` Stefano Babic 0 siblings, 0 replies; 11+ messages in thread From: Stefano Babic @ 2012-08-24 7:57 UTC (permalink / raw) To: u-boot On 24/08/2012 01:06, Otavio Salvador wrote: > Ping? > Hi Otavio, Marek has already acked it, we get the ACK from Veli-Pekkola this morning. I have put the series in my "ready to be merged" queue. It will be merged soon. Regards, Stefano > On Sun, Aug 19, 2012 at 12:07 PM, Marek Vasut <marek.vasut@gmail.com> wrote: >> Dear Otavio Salvador, >> >>> The DRAM initialization, after SPL has complete, is exactly the same >>> for all mxs SoCs so we should name it accordinly. >> >> Acked-by: Marek Vasut <marex@denx.de> >> >>> The following boards has been changed: >>> >>> * apx4devkit >>> * m28evk >>> * mx28evk >>> * sc_sps_1 >>> >>> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> >>> --- >>> arch/arm/cpu/arm926ejs/mxs/mxs.c | 4 ++-- >>> arch/arm/include/asm/arch-mxs/sys_proto.h | 2 +- >>> board/bluegiga/apx4devkit/apx4devkit.c | 2 +- >>> board/denx/m28evk/m28evk.c | 2 +- >>> board/freescale/mx28evk/mx28evk.c | 2 +- >>> board/schulercontrol/sc_sps_1/sc_sps_1.c | 2 +- >>> 6 files changed, 7 insertions(+), 7 deletions(-) >>> >>> diff --git a/arch/arm/cpu/arm926ejs/mxs/mxs.c >>> b/arch/arm/cpu/arm926ejs/mxs/mxs.c index a1769fd..c8cda6a 100644 >>> --- a/arch/arm/cpu/arm926ejs/mxs/mxs.c >>> +++ b/arch/arm/cpu/arm926ejs/mxs/mxs.c >>> @@ -320,13 +320,13 @@ void imx_get_mac_from_fuse(int dev_id, unsigned char >>> *mac) } >>> #endif >>> >>> -int mx28_dram_init(void) >>> +int mxs_dram_init(void) >>> { >>> struct mxs_spl_data *data = (struct mxs_spl_data *) >>> ((CONFIG_SYS_TEXT_BASE - sizeof(struct mxs_spl_data)) & ~0xf); >>> >>> if (data->mem_dram_size == 0) { >>> - printf("MX28:\n" >>> + printf("MXS:\n" >>> "Error, the RAM size passed up from SPL is 0!\n"); >>> hang(); >>> } >>> diff --git a/arch/arm/include/asm/arch-mxs/sys_proto.h >>> b/arch/arm/include/asm/arch-mxs/sys_proto.h index 9e4a4c9..fc84808 100644 >>> --- a/arch/arm/include/asm/arch-mxs/sys_proto.h >>> +++ b/arch/arm/include/asm/arch-mxs/sys_proto.h >>> @@ -69,6 +69,6 @@ struct mxs_spl_data { >>> uint32_t mem_dram_size; >>> }; >>> >>> -int mx28_dram_init(void); >>> +int mxs_dram_init(void); >>> >>> #endif /* __SYS_PROTO_H__ */ >>> diff --git a/board/bluegiga/apx4devkit/apx4devkit.c >>> b/board/bluegiga/apx4devkit/apx4devkit.c index 5a1042e..ae48ab5 100644 >>> --- a/board/bluegiga/apx4devkit/apx4devkit.c >>> +++ b/board/bluegiga/apx4devkit/apx4devkit.c >>> @@ -55,7 +55,7 @@ int board_early_init_f(void) >>> >>> int dram_init(void) >>> { >>> - return mx28_dram_init(); >>> + return mxs_dram_init(); >>> } >>> >>> int board_init(void) >>> diff --git a/board/denx/m28evk/m28evk.c b/board/denx/m28evk/m28evk.c >>> index 74da3ea..9473d10 100644 >>> --- a/board/denx/m28evk/m28evk.c >>> +++ b/board/denx/m28evk/m28evk.c >>> @@ -72,7 +72,7 @@ int board_init(void) >>> >>> int dram_init(void) >>> { >>> - return mx28_dram_init(); >>> + return mxs_dram_init(); >>> } >>> >>> #ifdef CONFIG_CMD_MMC >>> diff --git a/board/freescale/mx28evk/mx28evk.c >>> b/board/freescale/mx28evk/mx28evk.c index 1320277..867d3c8 100644 >>> --- a/board/freescale/mx28evk/mx28evk.c >>> +++ b/board/freescale/mx28evk/mx28evk.c >>> @@ -64,7 +64,7 @@ int board_early_init_f(void) >>> >>> int dram_init(void) >>> { >>> - return mx28_dram_init(); >>> + return mxs_dram_init(); >>> } >>> >>> int board_init(void) >>> diff --git a/board/schulercontrol/sc_sps_1/sc_sps_1.c >>> b/board/schulercontrol/sc_sps_1/sc_sps_1.c index 5f58e0b..fda191a 100644 >>> --- a/board/schulercontrol/sc_sps_1/sc_sps_1.c >>> +++ b/board/schulercontrol/sc_sps_1/sc_sps_1.c >>> @@ -72,7 +72,7 @@ int board_init(void) >>> >>> int dram_init(void) >>> { >>> - return mx28_dram_init(); >>> + return mxs_dram_init(); >>> } >>> >>> #ifdef CONFIG_CMD_MMC > > > -- ===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de ===================================================================== ^ permalink raw reply [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH 3/3] mxs: Rename 'mx28_dram_init' to 'mxs_dram_init' 2012-08-19 14:58 ` [U-Boot] [PATCH 3/3] mxs: Rename 'mx28_dram_init' to 'mxs_dram_init' Otavio Salvador 2012-08-19 15:07 ` Marek Vasut @ 2012-08-24 5:49 ` Veli-Pekka Peltola 1 sibling, 0 replies; 11+ messages in thread From: Veli-Pekka Peltola @ 2012-08-24 5:49 UTC (permalink / raw) To: u-boot Hi Otavio, On 08/19/2012 05:58 PM, Otavio Salvador wrote: > The DRAM initialization, after SPL has complete, is exactly the same > for all mxs SoCs so we should name it accordinly. > > The following boards has been changed: > > * apx4devkit > * m28evk > * mx28evk > * sc_sps_1 > > Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Acked-by: Veli-Pekka Peltola <veli-pekka.peltola@bluegiga.com> > --- > arch/arm/cpu/arm926ejs/mxs/mxs.c | 4 ++-- > arch/arm/include/asm/arch-mxs/sys_proto.h | 2 +- > board/bluegiga/apx4devkit/apx4devkit.c | 2 +- > board/denx/m28evk/m28evk.c | 2 +- > board/freescale/mx28evk/mx28evk.c | 2 +- > board/schulercontrol/sc_sps_1/sc_sps_1.c | 2 +- > 6 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/arch/arm/cpu/arm926ejs/mxs/mxs.c b/arch/arm/cpu/arm926ejs/mxs/mxs.c > index a1769fd..c8cda6a 100644 > --- a/arch/arm/cpu/arm926ejs/mxs/mxs.c > +++ b/arch/arm/cpu/arm926ejs/mxs/mxs.c > @@ -320,13 +320,13 @@ void imx_get_mac_from_fuse(int dev_id, unsigned char *mac) > } > #endif > > -int mx28_dram_init(void) > +int mxs_dram_init(void) > { > struct mxs_spl_data *data = (struct mxs_spl_data *) > ((CONFIG_SYS_TEXT_BASE - sizeof(struct mxs_spl_data)) & ~0xf); > > if (data->mem_dram_size == 0) { > - printf("MX28:\n" > + printf("MXS:\n" > "Error, the RAM size passed up from SPL is 0!\n"); > hang(); > } > diff --git a/arch/arm/include/asm/arch-mxs/sys_proto.h b/arch/arm/include/asm/arch-mxs/sys_proto.h > index 9e4a4c9..fc84808 100644 > --- a/arch/arm/include/asm/arch-mxs/sys_proto.h > +++ b/arch/arm/include/asm/arch-mxs/sys_proto.h > @@ -69,6 +69,6 @@ struct mxs_spl_data { > uint32_t mem_dram_size; > }; > > -int mx28_dram_init(void); > +int mxs_dram_init(void); > > #endif /* __SYS_PROTO_H__ */ > diff --git a/board/bluegiga/apx4devkit/apx4devkit.c b/board/bluegiga/apx4devkit/apx4devkit.c > index 5a1042e..ae48ab5 100644 > --- a/board/bluegiga/apx4devkit/apx4devkit.c > +++ b/board/bluegiga/apx4devkit/apx4devkit.c > @@ -55,7 +55,7 @@ int board_early_init_f(void) > > int dram_init(void) > { > - return mx28_dram_init(); > + return mxs_dram_init(); > } > > int board_init(void) > diff --git a/board/denx/m28evk/m28evk.c b/board/denx/m28evk/m28evk.c > index 74da3ea..9473d10 100644 > --- a/board/denx/m28evk/m28evk.c > +++ b/board/denx/m28evk/m28evk.c > @@ -72,7 +72,7 @@ int board_init(void) > > int dram_init(void) > { > - return mx28_dram_init(); > + return mxs_dram_init(); > } > > #ifdef CONFIG_CMD_MMC > diff --git a/board/freescale/mx28evk/mx28evk.c b/board/freescale/mx28evk/mx28evk.c > index 1320277..867d3c8 100644 > --- a/board/freescale/mx28evk/mx28evk.c > +++ b/board/freescale/mx28evk/mx28evk.c > @@ -64,7 +64,7 @@ int board_early_init_f(void) > > int dram_init(void) > { > - return mx28_dram_init(); > + return mxs_dram_init(); > } > > int board_init(void) > diff --git a/board/schulercontrol/sc_sps_1/sc_sps_1.c b/board/schulercontrol/sc_sps_1/sc_sps_1.c > index 5f58e0b..fda191a 100644 > --- a/board/schulercontrol/sc_sps_1/sc_sps_1.c > +++ b/board/schulercontrol/sc_sps_1/sc_sps_1.c > @@ -72,7 +72,7 @@ int board_init(void) > > int dram_init(void) > { > - return mx28_dram_init(); > + return mxs_dram_init(); > } > > #ifdef CONFIG_CMD_MMC > ^ permalink raw reply [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH 1/3] mxs: Replace i.MX233 by i.MX23 on copyright header 2012-08-19 14:58 [U-Boot] [PATCH 1/3] mxs: Replace i.MX233 by i.MX23 on copyright header Otavio Salvador 2012-08-19 14:58 ` [U-Boot] [PATCH 2/3] mxs: Only build internal Ethernet controller for i.MX28 Otavio Salvador 2012-08-19 14:58 ` [U-Boot] [PATCH 3/3] mxs: Rename 'mx28_dram_init' to 'mxs_dram_init' Otavio Salvador @ 2012-08-19 15:05 ` Marek Vasut 2012-08-19 15:07 ` Otavio Salvador 2012-08-27 5:46 ` Stefano Babic 3 siblings, 1 reply; 11+ messages in thread From: Marek Vasut @ 2012-08-19 15:05 UTC (permalink / raw) To: u-boot Dear Otavio Salvador, > All other header are going to use i.MX23 so we change this for > consistency. > > Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> > --- > arch/arm/include/asm/arch-mxs/sys_proto.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm/include/asm/arch-mxs/sys_proto.h > b/arch/arm/include/asm/arch-mxs/sys_proto.h index 4610363..9e4a4c9 100644 > --- a/arch/arm/include/asm/arch-mxs/sys_proto.h > +++ b/arch/arm/include/asm/arch-mxs/sys_proto.h > @@ -1,5 +1,5 @@ > /* > - * Freescale i.MX233/i.MX28 specific functions > + * Freescale i.MX23/i.MX28 specific functions It's MX233 though, no? > * Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com> > * on behalf of DENX Software Engineering GmbH Best regards, Marek Vasut ^ permalink raw reply [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH 1/3] mxs: Replace i.MX233 by i.MX23 on copyright header 2012-08-19 15:05 ` [U-Boot] [PATCH 1/3] mxs: Replace i.MX233 by i.MX23 on copyright header Marek Vasut @ 2012-08-19 15:07 ` Otavio Salvador 0 siblings, 0 replies; 11+ messages in thread From: Otavio Salvador @ 2012-08-19 15:07 UTC (permalink / raw) To: u-boot On Sun, Aug 19, 2012 at 12:05 PM, Marek Vasut <marek.vasut@gmail.com> wrote: > Dear Otavio Salvador, > >> All other header are going to use i.MX23 so we change this for >> consistency. >> >> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> >> --- >> arch/arm/include/asm/arch-mxs/sys_proto.h | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/arch/arm/include/asm/arch-mxs/sys_proto.h >> b/arch/arm/include/asm/arch-mxs/sys_proto.h index 4610363..9e4a4c9 100644 >> --- a/arch/arm/include/asm/arch-mxs/sys_proto.h >> +++ b/arch/arm/include/asm/arch-mxs/sys_proto.h >> @@ -1,5 +1,5 @@ >> /* >> - * Freescale i.MX233/i.MX28 specific functions >> + * Freescale i.MX23/i.MX28 specific functions > > It's MX233 though, no? Yes but Fabio has asked me to use MX23 as done for the others (we don't use MX535 or so ... just to be consistent. >> * Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com> >> * on behalf of DENX Software Engineering GmbH > > Best regards, > Marek Vasut -- Otavio Salvador O.S. Systems E-mail: otavio at ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br ^ permalink raw reply [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH 1/3] mxs: Replace i.MX233 by i.MX23 on copyright header 2012-08-19 14:58 [U-Boot] [PATCH 1/3] mxs: Replace i.MX233 by i.MX23 on copyright header Otavio Salvador ` (2 preceding siblings ...) 2012-08-19 15:05 ` [U-Boot] [PATCH 1/3] mxs: Replace i.MX233 by i.MX23 on copyright header Marek Vasut @ 2012-08-27 5:46 ` Stefano Babic 3 siblings, 0 replies; 11+ messages in thread From: Stefano Babic @ 2012-08-27 5:46 UTC (permalink / raw) To: u-boot On 19/08/2012 16:58, Otavio Salvador wrote: > All other header are going to use i.MX23 so we change this for > consistency. > > Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> > --- > arch/arm/include/asm/arch-mxs/sys_proto.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm/include/asm/arch-mxs/sys_proto.h b/arch/arm/include/asm/arch-mxs/sys_proto.h > index 4610363..9e4a4c9 100644 > --- a/arch/arm/include/asm/arch-mxs/sys_proto.h > +++ b/arch/arm/include/asm/arch-mxs/sys_proto.h > @@ -1,5 +1,5 @@ > /* > - * Freescale i.MX233/i.MX28 specific functions > + * Freescale i.MX23/i.MX28 specific functions > * > * Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com> > * on behalf of DENX Software Engineering GmbH > Applied (whole series) to u-boot-imx, thanks. Best regards, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de ===================================================================== ^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2012-08-27 5:46 UTC | newest] Thread overview: 11+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-08-19 14:58 [U-Boot] [PATCH 1/3] mxs: Replace i.MX233 by i.MX23 on copyright header Otavio Salvador 2012-08-19 14:58 ` [U-Boot] [PATCH 2/3] mxs: Only build internal Ethernet controller for i.MX28 Otavio Salvador 2012-08-19 15:06 ` Marek Vasut 2012-08-19 14:58 ` [U-Boot] [PATCH 3/3] mxs: Rename 'mx28_dram_init' to 'mxs_dram_init' Otavio Salvador 2012-08-19 15:07 ` Marek Vasut 2012-08-23 23:06 ` Otavio Salvador 2012-08-24 7:57 ` Stefano Babic 2012-08-24 5:49 ` Veli-Pekka Peltola 2012-08-19 15:05 ` [U-Boot] [PATCH 1/3] mxs: Replace i.MX233 by i.MX23 on copyright header Marek Vasut 2012-08-19 15:07 ` Otavio Salvador 2012-08-27 5:46 ` Stefano Babic
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox