aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2012-08-09 04:12:44 +0000
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2012-08-14 00:36:30 +0200
commita1cd53c6b6e2e7fbf4ffa20d3548646e4c94efe5 (patch)
tree7dcf72b984a72cf792bb1bda130410431ff39b32
parent7b5921dc22caf214ef69bc84de7769abdde49e99 (diff)
downloadu-boot-linaro-stable-a1cd53c6b6e2e7fbf4ffa20d3548646e4c94efe5.tar.gz
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 <otavio@ossystems.com.br> Acked-by: Stefano Babic <sbabic@denx.de>
-rw-r--r--board/schulercontrol/sc_sps_1/sc_sps_1.c4
-rw-r--r--board/schulercontrol/sc_sps_1/spl_boot.c4
-rw-r--r--boards.cfg2
-rw-r--r--include/configs/sc_sps_1.h4
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 0fee28980..5f58e0b08 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 4d2151d47..7fcbc1840 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 d445574e0..6342ecefd 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -177,7 +177,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 4feb271d4..f0b6f2b00 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