sc_sps_1: Adjust board config to use 'mxs' SoC code
PATCH 1/1 sc_sps_1: Adjust board config to use 'mxs' SoC code
Fix build failure due the move of mx28 code to 'mxs' SoC.
Signed-off-by Otavio Salvador <[email protected]>
--- 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(-)
board/schulercontrol/sc_sps_1/sc_sps_1.c +2 -2
@@ -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);
board/schulercontrol/sc_sps_1/spl_boot.c +2 -2
@@ -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 ; }
boards.cfg +1 -1
@@ -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
include/configs/sc_sps_1.h +2 -2
@@ -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
Signature · 1 line
1.7.10.4
PATCH 1/1 sc_sps_1: Adjust board config to use 'mxs' SoC code
Quoted 15 lines · Otavio Salvador
Fix build failure due the move of mx28 code to 'mxs' SoC.
Signed-off-by Otavio Salvador <[email protected]>--- 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(-)board/schulercontrol/sc_sps_1/sc_sps_1.c +0
-0
board/schulercontrol/sc_sps_1/sc_sps_1.c int board_mmc_init(bd_t *bis) · line 91
Quoted 9 lines
board/schulercontrol/sc_sps_1/sc_sps_1.c +2
-2@@ -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 <[email protected]>
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 =====================================================================
PATCH 1/1 sc_sps_1: Adjust board config to use 'mxs' SoC code
Dear Stefano Babic,
Quoted 27 lines · Otavio Salvador
Quoted 26 lines
Fix build failure due the move of mx28 code to 'mxs' SoC.
Signed-off-by Otavio Salvador <[email protected]>---
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(-)(quoted diff) +0
-0
b/board/schulercontrol/sc_sps_1/sc_sps_1.cindex 0fee289..5f58e0b 100644board/schulercontrol/sc_sps_1/sc_sps_1.c +2
-2@@ -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 ;
Quoted 6 lines
Quoted 1 line
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 <[email protected]>
Please apply.
Quoted 2 lines
Best regards,
Stefano Babic
Best regards,
Marek Vasut
PATCH 1/1 sc_sps_1: Adjust board config to use 'mxs' SoC code
In reply to Otavio SalvadorQuoted 4 lines · Otavio Salvador
Fix build failure due the move of mx28 code to 'mxs' SoC.
Signed-off-by Otavio Salvador <[email protected]>---
Applied 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 =====================================================================