mxs: Replace i.MX233 by i.MX23 on copyright header
Subsystems (2)
PATCH 1/3 mxs: Replace i.MX233 by i.MX23 on copyright header
All other header are going to use i.MX23 so we change this for consistency.
--- arch/arm/include/asm/arch-mxs/sys_proto.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/include/asm/arch-mxs/sys_proto.h +1 -1
@@ -1,5 +1,5 @@/* -* Freescale i.MX233/i.MX28 specific functions +* Freescale i.MX23/i.MX28 specific functions * * Copyright (C) 2011 Marek Vasut <[email protected]> * on behalf of DENX Software Engineering GmbH
Signature · 1 line
1.7.10.4
PATCH 2/3 mxs: Only build internal Ethernet controller for i.MX28
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.
--- arch/arm/cpu/arm926ejs/mxs/mxs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/cpu/arm926ejs/mxs/mxs.c +1 -1
@@ -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 =
Signature · 1 line
1.7.10.4
PATCH 2/3 mxs: Only build internal Ethernet controller for i.MX28
Dear Otavio Salvador,
Quoted 17 lines
The internal Ethernet controller is only available on i.MX28 processors so it needs to use
CONFIG_MX28guardian to avoid having this code called in others.Signed-off-by Otavio Salvador <[email protected]>--- arch/arm/cpu/arm926ejs/mxs/mxs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)(quoted diff) +0
-0
b/arch/arm/cpu/arm926ejs/mxs/mxs.cindex c028e5e..a1769fd 100644arch/arm/cpu/arm926ejs/mxs/mxs.c +0
-0@@ -246,7 +246,7 @@ int do_mx28_showclocks(cmd_tbl_t *cmdtp, int flag, intargc, char *const argv[]) /*
* Initializes on-chip ethernet controllers.
*/
arch/arm/cpu/arm926ejs/mxs/mxs.c int do_mx28_showclocks(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) · line 252
Quoted 5 lines
arch/arm/cpu/arm926ejs/mxs/mxs.c +1
-1-#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 =
Best regards,
Marek Vasut
PATCH 3/3 mxs: Rename 'mx28_dram_init' to 'mxs_dram_init'
In reply to Otavio SalvadorThe 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
--- 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(-)
arch/arm/cpu/arm926ejs/mxs/mxs.c +2 -2
@@ -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 (); }
arch/arm/include/asm/arch-mxs/sys_proto.h +1 -1
@@ -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__ */
board/bluegiga/apx4devkit/apx4devkit.c +1 -1
@@ -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 )
board/denx/m28evk/m28evk.c +1 -1
@@ -72,7 +72,7 @@ int board_init(void)int dram_init (void ) { -return mx28_dram_init (); +return mxs_dram_init (); }#ifdef CONFIG_CMD_MMC
board/freescale/mx28evk/mx28evk.c +1 -1
@@ -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 )
board/schulercontrol/sc_sps_1/sc_sps_1.c +1 -1
@@ -72,7 +72,7 @@ int board_init(void)int dram_init (void ) { -return mx28_dram_init (); +return mxs_dram_init (); }#ifdef CONFIG_CMD_MMC
Signature · 1 line
1.7.10.4
PATCH 3/3 mxs: Rename 'mx28_dram_init' to 'mxs_dram_init'
Dear Otavio Salvador,
Quoted 2 lines
The DRAM initialization, after SPL has complete, is exactly the same for all mxs SoCs so we should name it accordinly.
Quoted 101 lines
The following boards has been changed:
* apx4devkit
* m28evk
* mx28evk
*sc_sps_1Signed-off-by Otavio Salvador <[email protected]>--- 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(-)(quoted diff) +0
-0
b/arch/arm/cpu/arm926ejs/mxs/mxs.cindex a1769fd..c8cda6a 100644arch/arm/cpu/arm926ejs/mxs/mxs.c +2
-2@@ -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 (); }(quoted diff) +0
-0
b/arch/arm/include/asm/arch-mxs/sys_proto.hindex 9e4a4c9..fc84808 100644arch/arm/include/asm/arch-mxs/sys_proto.h +1
-1@@ -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__ */ (quoted diff) +0
-0
b/board/bluegiga/apx4devkit/apx4devkit.cindex 5a1042e..ae48ab5 100644board/bluegiga/apx4devkit/apx4devkit.c +1
-1@@ -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 )board/denx/m28evk/m28evk.c +1
-1@@ -72,7 +72,7 @@ int board_init(void)int dram_init (void ) { -return mx28_dram_init (); +return mxs_dram_init (); }#ifdef CONFIG_CMD_MMC (quoted diff) +0
-0
b/board/freescale/mx28evk/mx28evk.cindex 1320277..867d3c8 100644board/freescale/mx28evk/mx28evk.c +1
-1@@ -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 )(quoted diff) +0
-0
b/board/schulercontrol/sc_sps_1/sc_sps_1.cindex 5f58e0b..fda191a 100644board/schulercontrol/sc_sps_1/sc_sps_1.c +1
-1@@ -72,7 +72,7 @@ int board_init(void)int dram_init (void ) { -return mx28_dram_init (); +return mxs_dram_init (); }#ifdef CONFIG_CMD_MMC
PATCH 3/3 mxs: Rename 'mx28_dram_init' to 'mxs_dram_init'
Ping?
Quoted 108 lines · Marek Vasut
Dear Otavio Salvador,
Quoted 2 lines
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 <[email protected]>Quoted 101 lines
The following boards has been changed:
* apx4devkit
* m28evk
* mx28evk
*sc_sps_1Signed-off-by Otavio Salvador <[email protected]>--- 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(-)(quoted diff) +0
-0
b/arch/arm/cpu/arm926ejs/mxs/mxs.cindex a1769fd..c8cda6a 100644arch/arm/cpu/arm926ejs/mxs/mxs.c +2
-2@@ -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 (); }(quoted diff) +0
-0
b/arch/arm/include/asm/arch-mxs/sys_proto.hindex 9e4a4c9..fc84808 100644arch/arm/include/asm/arch-mxs/sys_proto.h +1
-1@@ -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__ */ (quoted diff) +0
-0
b/board/bluegiga/apx4devkit/apx4devkit.cindex 5a1042e..ae48ab5 100644board/bluegiga/apx4devkit/apx4devkit.c +1
-1@@ -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 )board/denx/m28evk/m28evk.c +1
-1@@ -72,7 +72,7 @@ int board_init(void)int dram_init (void ) { -return mx28_dram_init (); +return mxs_dram_init (); }#ifdef CONFIG_CMD_MMC (quoted diff) +0
-0
b/board/freescale/mx28evk/mx28evk.cindex 1320277..867d3c8 100644board/freescale/mx28evk/mx28evk.c +1
-1@@ -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 )(quoted diff) +0
-0
b/board/schulercontrol/sc_sps_1/sc_sps_1.cindex 5f58e0b..fda191a 100644board/schulercontrol/sc_sps_1/sc_sps_1.c +1
-1@@ -72,7 +72,7 @@ int board_init(void)int dram_init (void ) { -return mx28_dram_init (); +return mxs_dram_init (); }#ifdef CONFIG_CMD_MMC
Signature · 3 lines
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
PATCH 3/3 mxs: Rename 'mx28_dram_init' to 'mxs_dram_init'
Quoted 2 lines · Otavio Salvador
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
Quoted 112 lines · Marek Vasut
Quoted 108 lines
Dear Otavio Salvador,
Quoted 2 lines
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 <[email protected]>Quoted 101 lines
The following boards has been changed:
* apx4devkit
* m28evk
* mx28evk
*sc_sps_1Signed-off-by Otavio Salvador <[email protected]>--- 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(-)(quoted diff) +0
-0
b/arch/arm/cpu/arm926ejs/mxs/mxs.cindex a1769fd..c8cda6a 100644arch/arm/cpu/arm926ejs/mxs/mxs.c +2
-2@@ -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 (); }(quoted diff) +0
-0
b/arch/arm/include/asm/arch-mxs/sys_proto.hindex 9e4a4c9..fc84808 100644arch/arm/include/asm/arch-mxs/sys_proto.h +1
-1@@ -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__ */ (quoted diff) +0
-0
b/board/bluegiga/apx4devkit/apx4devkit.cindex 5a1042e..ae48ab5 100644board/bluegiga/apx4devkit/apx4devkit.c +1
-1@@ -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 )board/denx/m28evk/m28evk.c +1
-1@@ -72,7 +72,7 @@ int board_init(void)int dram_init (void ) { -return mx28_dram_init (); +return mxs_dram_init (); }#ifdef CONFIG_CMD_MMC (quoted diff) +0
-0
b/board/freescale/mx28evk/mx28evk.cindex 1320277..867d3c8 100644board/freescale/mx28evk/mx28evk.c +1
-1@@ -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 )(quoted diff) +0
-0
b/board/schulercontrol/sc_sps_1/sc_sps_1.cindex 5f58e0b..fda191a 100644board/schulercontrol/sc_sps_1/sc_sps_1.c +1
-1@@ -72,7 +72,7 @@ int board_init(void)int dram_init (void ) { -return mx28_dram_init (); +return mxs_dram_init (); }#ifdef CONFIG_CMD_MMC
Signature · 5 lines
===================================================================== 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 =====================================================================
PATCH 3/3 mxs: Rename 'mx28_dram_init' to 'mxs_dram_init'
In reply to Otavio SalvadorHi Otavio,
Quoted 11 lines · Otavio Salvador
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_1Signed-off-by Otavio Salvador <[email protected]>
Quoted 94 lines
--- 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(-)arch/arm/cpu/arm926ejs/mxs/mxs.c +2
-2@@ -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 (); }arch/arm/include/asm/arch-mxs/sys_proto.h +1
-1@@ -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__ */ board/bluegiga/apx4devkit/apx4devkit.c +1
-1@@ -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 )board/denx/m28evk/m28evk.c +1
-1@@ -72,7 +72,7 @@ int board_init(void)int dram_init (void ) { -return mx28_dram_init (); +return mxs_dram_init (); }#ifdef CONFIG_CMD_MMC board/freescale/mx28evk/mx28evk.c +1
-1@@ -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 )board/schulercontrol/sc_sps_1/sc_sps_1.c +1
-1@@ -72,7 +72,7 @@ int board_init(void)int dram_init (void ) { -return mx28_dram_init (); +return mxs_dram_init (); }#ifdef CONFIG_CMD_MMC
PATCH 1/3 mxs: Replace i.MX233 by i.MX23 on copyright header
In reply to Otavio SalvadorDear Otavio Salvador,
Quoted 13 lines
All other header are going to use i.MX23 so we change this for consistency.
Signed-off-by Otavio Salvador <[email protected]>--- arch/arm/include/asm/arch-mxs/sys_proto.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)(quoted diff) +0
-0
b/arch/arm/include/asm/arch-mxs/sys_proto.hindex 4610363..9e4a4c9 100644
arch/arm/include/asm/arch-mxs/sys_proto.h line 2
Quoted 3 lines
arch/arm/include/asm/arch-mxs/sys_proto.h +1
-1@@ -1,5 +1,5 @@/* -* Freescale i.MX233/i.MX28 specific functions +* Freescale i.MX23/i.MX28 specific functions
It's MX233 though, no?
arch/arm/include/asm/arch-mxs/sys_proto.h line 5
Quoted 2 lines
arch/arm/include/asm/arch-mxs/sys_proto.h +0
-0* Copyright (C) 2011 Marek Vasut <[email protected]> * on behalf of DENX Software Engineering GmbH
Best regards,
Marek Vasut
PATCH 1/3 mxs: Replace i.MX233 by i.MX23 on copyright header
Quoted 10 lines · Marek Vasut
Dear Otavio Salvador,
Quoted 8 lines
All other header are going to use i.MX23 so we change this for consistency.
Signed-off-by Otavio Salvador <[email protected]>--- arch/arm/include/asm/arch-mxs/sys_proto.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 10 lines
arch/arm/include/asm/arch-mxs/sys_proto.h line 2
Quoted 8 lines
(quoted diff) +0
-0
b/arch/arm/include/asm/arch-mxs/sys_proto.hindex 4610363..9e4a4c9 100644arch/arm/include/asm/arch-mxs/sys_proto.h +1
-1@@ -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.
Quoted 5 lines
arch/arm/include/asm/arch-mxs/sys_proto.h line 5
Quoted 2 lines
arch/arm/include/asm/arch-mxs/sys_proto.h +0
-0* Copyright (C) 2011 Marek Vasut <[email protected]> * on behalf of DENX Software Engineering GmbH Best regards,
Marek Vasut
Signature · 3 lines
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
PATCH 1/3 mxs: Replace i.MX233 by i.MX23 on copyright header
In reply to Otavio SalvadorQuoted 14 lines · Otavio Salvador
All other header are going to use i.MX23 so we change this for consistency.
Signed-off-by Otavio Salvador <[email protected]>--- arch/arm/include/asm/arch-mxs/sys_proto.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/arm/include/asm/arch-mxs/sys_proto.h +0
-0
arch/arm/include/asm/arch-mxs/sys_proto.h line 5
Quoted 6 lines
arch/arm/include/asm/arch-mxs/sys_proto.h +1
-1@@ -1,5 +1,5 @@/* -* Freescale i.MX233/i.MX28 specific functions +* Freescale i.MX23/i.MX28 specific functions * * Copyright (C) 2011 Marek Vasut <[email protected]> * on behalf of DENX Software Engineering GmbH
Applied (whole series) to u-boot-imx, thanks.
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== 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 =====================================================================