* [U-Boot] [PATCH] sc_sps_1: Adjust board config to use 'mxs' SoC code
@ 2012-08-09 14:12 Otavio Salvador
2012-08-09 14:17 ` Stefano Babic
2012-08-10 6:49 ` Stefano Babic
0 siblings, 2 replies; 4+ messages in thread
From: Otavio Salvador @ 2012-08-09 14:12 UTC (permalink / raw)
To: u-boot
Fix build failure due the move of mx28 code to 'mxs' SoC.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
board/schulercontrol/sc_sps_1/sc_sps_1.c | 4 ++--
board/schulercontrol/sc_sps_1/spl_boot.c | 4 ++--
boards.cfg | 2 +-
include/configs/sc_sps_1.h | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/board/schulercontrol/sc_sps_1/sc_sps_1.c b/board/schulercontrol/sc_sps_1/sc_sps_1.c
index 0fee289..5f58e0b 100644
--- a/board/schulercontrol/sc_sps_1/sc_sps_1.c
+++ b/board/schulercontrol/sc_sps_1/sc_sps_1.c
@@ -85,8 +85,8 @@ int board_mmc_init(bd_t *bis)
#ifdef CONFIG_CMD_NET
int board_eth_init(bd_t *bis)
{
- struct mx28_clkctrl_regs *clkctrl_regs =
- (struct mx28_clkctrl_regs *)MXS_CLKCTRL_BASE;
+ struct mxs_clkctrl_regs *clkctrl_regs =
+ (struct mxs_clkctrl_regs *)MXS_CLKCTRL_BASE;
int ret;
ret = cpu_eth_init(bis);
diff --git a/board/schulercontrol/sc_sps_1/spl_boot.c b/board/schulercontrol/sc_sps_1/spl_boot.c
index 4d2151d..7fcbc18 100644
--- a/board/schulercontrol/sc_sps_1/spl_boot.c
+++ b/board/schulercontrol/sc_sps_1/spl_boot.c
@@ -156,10 +156,10 @@ const iomux_cfg_t iomux_setup[] = {
void board_init_ll(void)
{
- mx28_common_spl_init(iomux_setup, ARRAY_SIZE(iomux_setup));
+ mxs_common_spl_init(iomux_setup, ARRAY_SIZE(iomux_setup));
}
-void mx28_adjust_memory_params(uint32_t *dram_vals)
+void mxs_adjust_memory_params(uint32_t *dram_vals)
{
dram_vals[0x74 >> 2] = 0x0f02010a;
}
diff --git a/boards.cfg b/boards.cfg
index f7708f1..4f88006 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -174,7 +174,7 @@ magnesium arm arm926ejs imx27lite logicpd
apx4devkit arm arm926ejs apx4devkit bluegiga mxs apx4devkit
m28evk arm arm926ejs m28evk denx mxs m28evk
mx28evk arm arm926ejs mx28evk freescale mxs mx28evk
-sc_sps_1 arm arm926ejs - schulercontrol mx28
+sc_sps_1 arm arm926ejs sc_sps_1 schulercontrol mxs
nhk8815 arm arm926ejs nhk8815 st nomadik
nhk8815_onenand arm arm926ejs nhk8815 st nomadik nhk8815:BOOT_ONENAND
omap5912osk arm arm926ejs - ti omap
diff --git a/include/configs/sc_sps_1.h b/include/configs/sc_sps_1.h
index 4feb271..f0b6f2b 100644
--- a/include/configs/sc_sps_1.h
+++ b/include/configs/sc_sps_1.h
@@ -54,8 +54,8 @@
*/
#define CONFIG_SPL
#define CONFIG_SPL_NO_CPU_SUPPORT_CODE
-#define CONFIG_SPL_START_S_PATH "arch/arm/cpu/arm926ejs/mx28"
-#define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/arm926ejs/mx28/u-boot-spl.lds"
+#define CONFIG_SPL_START_S_PATH "arch/arm/cpu/arm926ejs/mxs"
+#define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds"
#define CONFIG_SPL_LIBCOMMON_SUPPORT
#define CONFIG_SPL_LIBGENERIC_SUPPORT
#define CONFIG_SPL_GPIO_SUPPORT
--
1.7.10.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH] sc_sps_1: Adjust board config to use 'mxs' SoC code
2012-08-09 14:12 [U-Boot] [PATCH] sc_sps_1: Adjust board config to use 'mxs' SoC code Otavio Salvador
@ 2012-08-09 14:17 ` Stefano Babic
2012-08-09 20:19 ` Marek Vasut
2012-08-10 6:49 ` Stefano Babic
1 sibling, 1 reply; 4+ messages in thread
From: Stefano Babic @ 2012-08-09 14:17 UTC (permalink / raw)
To: u-boot
On 09/08/2012 16:12, Otavio Salvador wrote:
> Fix build failure due the move of mx28 code to 'mxs' SoC.
>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
> board/schulercontrol/sc_sps_1/sc_sps_1.c | 4 ++--
> board/schulercontrol/sc_sps_1/spl_boot.c | 4 ++--
> boards.cfg | 2 +-
> include/configs/sc_sps_1.h | 4 ++--
> 4 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/board/schulercontrol/sc_sps_1/sc_sps_1.c b/board/schulercontrol/sc_sps_1/sc_sps_1.c
> index 0fee289..5f58e0b 100644
> --- a/board/schulercontrol/sc_sps_1/sc_sps_1.c
> +++ b/board/schulercontrol/sc_sps_1/sc_sps_1.c
> @@ -85,8 +85,8 @@ int board_mmc_init(bd_t *bis)
> #ifdef CONFIG_CMD_NET
> int board_eth_init(bd_t *bis)
> {
> - struct mx28_clkctrl_regs *clkctrl_regs =
> - (struct mx28_clkctrl_regs *)MXS_CLKCTRL_BASE;
> + struct mxs_clkctrl_regs *clkctrl_regs =
> + (struct mxs_clkctrl_regs *)MXS_CLKCTRL_BASE;
> int ret;
>
Of course, you are right. I think I changed myself V2 of Marek's patch,
and I did not with V3.
Acked-by: Stefano Babic <sbabic@denx.de>
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] 4+ messages in thread
* [U-Boot] [PATCH] sc_sps_1: Adjust board config to use 'mxs' SoC code
2012-08-09 14:17 ` Stefano Babic
@ 2012-08-09 20:19 ` Marek Vasut
0 siblings, 0 replies; 4+ messages in thread
From: Marek Vasut @ 2012-08-09 20:19 UTC (permalink / raw)
To: u-boot
Dear Stefano Babic,
> On 09/08/2012 16:12, Otavio Salvador wrote:
> > Fix build failure due the move of mx28 code to 'mxs' SoC.
> >
> > Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> > ---
> >
> > board/schulercontrol/sc_sps_1/sc_sps_1.c | 4 ++--
> > board/schulercontrol/sc_sps_1/spl_boot.c | 4 ++--
> > boards.cfg | 2 +-
> > include/configs/sc_sps_1.h | 4 ++--
> > 4 files changed, 7 insertions(+), 7 deletions(-)
> >
> > diff --git a/board/schulercontrol/sc_sps_1/sc_sps_1.c
> > b/board/schulercontrol/sc_sps_1/sc_sps_1.c index 0fee289..5f58e0b 100644
> > --- a/board/schulercontrol/sc_sps_1/sc_sps_1.c
> > +++ b/board/schulercontrol/sc_sps_1/sc_sps_1.c
> > @@ -85,8 +85,8 @@ int board_mmc_init(bd_t *bis)
> >
> > #ifdef CONFIG_CMD_NET
> > int board_eth_init(bd_t *bis)
> > {
> >
> > - struct mx28_clkctrl_regs *clkctrl_regs =
> > - (struct mx28_clkctrl_regs *)MXS_CLKCTRL_BASE;
> > + struct mxs_clkctrl_regs *clkctrl_regs =
> > + (struct mxs_clkctrl_regs *)MXS_CLKCTRL_BASE;
> >
> > int ret;
>
> Of course, you are right. I think I changed myself V2 of Marek's patch,
> and I did not with V3.
>
> Acked-by: Stefano Babic <sbabic@denx.de>
Please apply.
> Best regards,
> Stefano Babic
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH] sc_sps_1: Adjust board config to use 'mxs' SoC code
2012-08-09 14:12 [U-Boot] [PATCH] sc_sps_1: Adjust board config to use 'mxs' SoC code Otavio Salvador
2012-08-09 14:17 ` Stefano Babic
@ 2012-08-10 6:49 ` Stefano Babic
1 sibling, 0 replies; 4+ messages in thread
From: Stefano Babic @ 2012-08-10 6:49 UTC (permalink / raw)
To: u-boot
On 09/08/2012 16:12, Otavio Salvador wrote:
> Fix build failure due the move of mx28 code to 'mxs' SoC.
>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
Applied 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] 4+ messages in thread
end of thread, other threads:[~2012-08-10 6:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-08-09 14:12 [U-Boot] [PATCH] sc_sps_1: Adjust board config to use 'mxs' SoC code Otavio Salvador
2012-08-09 14:17 ` Stefano Babic
2012-08-09 20:19 ` Marek Vasut
2012-08-10 6:49 ` Stefano Babic
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.