global: Migrate CONFIG_SYS_FSL* symbols to the CFG_SYS namespace

[platform/kernel/u-boot.git] / board / wandboard / spl.c

diff --git a/board/wandboard/spl.c b/board/wandboard/spl.c
index 000cb10..717e02a 100644 (file)
--- a/board/wandboard/spl.c
+++ b/board/wandboard/spl.c
@@ -5,22 +5,24 @@
  *         Richard Hu <hakahu@gmail.com>
  */
 
+#include <common.h>
+#include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
+#include <linux/delay.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/video.h>
 #include <mmc.h>
-#include <fsl_esdhc.h>
+#include <fsl_esdhc_imx.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <spl.h>
 
-#if defined(CONFIG_SPL_BUILD)
 #include <asm/arch/mx6-ddr.h>
 /*
  * Driving strength:
@@ -474,7 +476,7 @@ int board_mmc_getcd(struct mmc *mmc)
        return ret;
 }
 
-int board_mmc_init(bd_t *bis)
+int board_mmc_init(struct bd_info *bis)
 {
        int ret;
        u32 index = 0;
@@ -485,7 +487,7 @@ int board_mmc_init(bd_t *bis)
         * mmc0                    SOM MicroSD
         * mmc1                    Carrier board MicroSD
         */
-       for (index = 0; index < CONFIG_SYS_FSL_USDHC_NUM; ++index) {
+       for (index = 0; index < CFG_SYS_FSL_USDHC_NUM; ++index) {
                switch (index) {
                case 0:
                        SETUP_IOMUX_PADS(usdhc3_pads);
@@ -502,7 +504,7 @@ int board_mmc_init(bd_t *bis)
                default:
                        printf("Warning: you configured more USDHC controllers"
                               "(%d) then supported by the board (%d)\n",
-                              index + 1, CONFIG_SYS_FSL_USDHC_NUM);
+                              index + 1, CFG_SYS_FSL_USDHC_NUM);
                        return -EINVAL;
                }
 
@@ -513,5 +515,3 @@ int board_mmc_init(bd_t *bis)
 
        return 0;
 }
-
-#endif