imx: reorganize IMX code as other SOCs

[u-boot] / board / engicam / icorem6_rqs / icorem6_rqs.c

diff --git a/board/engicam/icorem6_rqs/icorem6_rqs.c b/board/engicam/icorem6_rqs/icorem6_rqs.c
index 854a34ed235b29554644e0b06c69be87d9e9bbc8..10a947173032e510ccb9da8a3dcfee1938e2777c 100644 (file)
--- a/board/engicam/icorem6_rqs/icorem6_rqs.c
+++ b/board/engicam/icorem6_rqs/icorem6_rqs.c
@@ -18,17 +18,11 @@
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
 
-DECLARE_GLOBAL_DATA_PTR;
-
-int board_init(void)
-{
-       /* Address of boot parameters */
-       gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
+#include "../common/board.h"
 
-       return 0;
-}
+DECLARE_GLOBAL_DATA_PTR;
 
 #ifdef CONFIG_ENV_IS_IN_MMC
 int board_mmc_get_env_dev(int devno)
@@ -36,55 +30,14 @@ int board_mmc_get_env_dev(int devno)
        /* dev 0 for SD/eSD, dev 1 for MMC/eMMC */
        return (devno == 3) ? 1 : 0;
 }
-
-static void mmc_late_init(void)
-{
-       char cmd[32];
-       char mmcblk[32];
-       u32 dev_no = mmc_get_env_dev();
-
-       setenv_ulong("mmcdev", dev_no);
-
-       /* Set mmcblk env */
-       sprintf(mmcblk, "/dev/mmcblk%dp2 rootwait rw", dev_no);
-       setenv("mmcroot", mmcblk);
-
-       sprintf(cmd, "mmc dev %d", dev_no);
-       run_command(cmd, 0);
-}
 #endif
 
-int board_late_init(void)
+void setenv_fdt_file(void)
 {
-       switch ((imx6_src_get_boot_mode() & IMX6_BMODE_MASK) >>
-                       IMX6_BMODE_SHIFT) {
-       case IMX6_BMODE_SD:
-       case IMX6_BMODE_ESD:
-       case IMX6_BMODE_MMC:
-       case IMX6_BMODE_EMMC:
-#ifdef CONFIG_ENV_IS_IN_MMC
-               mmc_late_init();
-#endif
-               setenv("modeboot", "mmcboot");
-               break;
-       default:
-               setenv("modeboot", "");
-               break;
-       }
-
        if (is_mx6dq())
                setenv("fdt_file", "imx6q-icore-rqs.dtb");
        else if(is_mx6dl() || is_mx6solo())
                setenv("fdt_file", "imx6dl-icore-rqs.dtb");
-
-       return 0;
-}
-
-int dram_init(void)
-{
-       gd->ram_size = imx_ddr_size();
-
-       return 0;
 }
 
 #ifdef CONFIG_SPL_BUILD