MLK-14366 mx6sllevk: Update board codes to align with v2016.03

Update mx6sll EVK board codes for features:
1. Add SD/MMC dynamical device detect.
2. Add wdog set for kernel.
3. Add mfgtool environments.
4. Modify SD/MMC environment offset.

Signed-off-by: Ye Li <ye.li@nxp.com>

diff --git a/board/freescale/mx6sllevk/mx6sllevk.c b/board/freescale/mx6sllevk/mx6sllevk.c
index c0ad89b..26d5979 100644 (file)
--- a/board/freescale/mx6sllevk/mx6sllevk.c
+++ b/board/freescale/mx6sllevk/mx6sllevk.c
@@ -200,8 +200,14 @@ int board_init(void)
 
 int board_late_init(void)
 {
+#ifdef CONFIG_ENV_IS_IN_MMC
+       board_late_mmc_env_init();
+#endif
+
        imx_iomux_v3_setup_multiple_pads(wdog_pads, ARRAY_SIZE(wdog_pads));
 
+       set_wdog_reset((struct wdog_regs *)WDOG1_BASE_ADDR);
+
        return 0;
 }
 

diff --git a/include/configs/mx6sllevk.h b/include/configs/mx6sllevk.h
index 8003fa7..7e38a05 100644 (file)
--- a/include/configs/mx6sllevk.h
+++ b/include/configs/mx6sllevk.h
@@ -32,7 +32,20 @@
 #define CONFIG_SYS_I2C_SPEED             100000
 #endif
 
+#define CONFIG_MFG_ENV_SETTINGS \
+       "mfgtool_args=setenv bootargs console=${console},${baudrate} " \
+               "rdinit=/linuxrc " \
+               "g_mass_storage.stall=0 g_mass_storage.removable=1 " \
+               "g_mass_storage.file=/fat g_mass_storage.ro=1 " \
+               "g_mass_storage.idVendor=0x066F g_mass_storage.idProduct=0x37FF "\
+               "g_mass_storage.iSerialNumber=\"\" "\
+               "\0" \
+       "initrd_addr=0x83800000\0" \
+       "initrd_high=0xffffffff\0" \
+       "bootcmd_mfg=run mfgtool_args;bootz ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \
+
 #define CONFIG_EXTRA_ENV_SETTINGS \
+       CONFIG_MFG_ENV_SETTINGS \
        "epdc_waveform=epdc_splash.bin\0" \
        "script=boot.scr\0" \
        "image=zImage\0" \
@@ -134,7 +147,7 @@
 #define CONFIG_SYS_MMC_ENV_PART                0   /* user partition */
 #define CONFIG_MMCROOT                 "/dev/mmcblk0p2"  /* USDHC1 */
 
-#define CONFIG_ENV_OFFSET              (12 * SZ_64K)
+#define CONFIG_ENV_OFFSET              (13 * SZ_64K)
 #define CONFIG_ENV_IS_IN_MMC
 
 /* MMC Configs */