Browse Source

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>
Otavio Salvador 12 years ago
parent
commit
38d4a6042b

+ 2 - 2
board/schulercontrol/sc_sps_1/sc_sps_1.c

@@ -85,8 +85,8 @@ int board_mmc_init(bd_t *bis)
 #ifdef	CONFIG_CMD_NET
 #ifdef	CONFIG_CMD_NET
 int board_eth_init(bd_t *bis)
 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;
 	int ret;
 
 
 	ret = cpu_eth_init(bis);
 	ret = cpu_eth_init(bis);

+ 2 - 2
board/schulercontrol/sc_sps_1/spl_boot.c

@@ -156,10 +156,10 @@ const iomux_cfg_t iomux_setup[] = {
 
 
 void board_init_ll(void)
 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;
 	dram_vals[0x74 >> 2] = 0x0f02010a;
 }
 }

+ 1 - 1
boards.cfg

@@ -182,7 +182,7 @@ magnesium                    arm         arm926ejs   imx27lite           logicpd
 apx4devkit                   arm         arm926ejs   apx4devkit          bluegiga       mxs		apx4devkit
 apx4devkit                   arm         arm926ejs   apx4devkit          bluegiga       mxs		apx4devkit
 m28evk                       arm         arm926ejs   m28evk              denx           mxs		m28evk
 m28evk                       arm         arm926ejs   m28evk              denx           mxs		m28evk
 mx28evk                      arm         arm926ejs   mx28evk             freescale      mxs		mx28evk
 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                      arm         arm926ejs   nhk8815             st             nomadik
 nhk8815_onenand              arm         arm926ejs   nhk8815             st             nomadik       nhk8815:BOOT_ONENAND
 nhk8815_onenand              arm         arm926ejs   nhk8815             st             nomadik       nhk8815:BOOT_ONENAND
 omap5912osk                  arm         arm926ejs   -                   ti             omap
 omap5912osk                  arm         arm926ejs   -                   ti             omap

+ 2 - 2
include/configs/sc_sps_1.h

@@ -54,8 +54,8 @@
  */
  */
 #define CONFIG_SPL
 #define CONFIG_SPL
 #define CONFIG_SPL_NO_CPU_SUPPORT_CODE
 #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_LIBCOMMON_SUPPORT
 #define CONFIG_SPL_LIBGENERIC_SUPPORT
 #define CONFIG_SPL_LIBGENERIC_SUPPORT
 #define CONFIG_SPL_GPIO_SUPPORT
 #define CONFIG_SPL_GPIO_SUPPORT