diff options
| author | Ye.Li <B37916@freescale.com> | 2014-06-06 11:31:43 +0800 |
|---|---|---|
| committer | Ye.Li <B37916@freescale.com> | 2014-06-17 11:13:43 +0800 |
| commit | 1c29dc80ab7d8fa9dede5998286ce17f408740f4 (patch) | |
| tree | 20884c2daf3de53c0087c774a443047977429621 | |
| parent | 36b3b610b9b8c16a20071ad0b9f1e65917b0330d (diff) | |
| download | u-boot-imx-1c29dc80ab7d8fa9dede5998286ce17f408740f4.zip u-boot-imx-1c29dc80ab7d8fa9dede5998286ce17f408740f4.tar.gz u-boot-imx-1c29dc80ab7d8fa9dede5998286ce17f408740f4.tar.bz2 | |
ENGR00315894-28 i.mx6:sabreauto/sabresd/arm2/evk Enable the CONFIG_SUPPORT_EMMC_BOOT
Since we need to support eMMC plugin card on SD slots,
enable the CONFIG_SUPPORT_EMMC_BOOT for all imx6 boards and
remove the EMMC_ENV script.
Signed-off-by: Ye.Li <B37916@freescale.com>
| -rw-r--r-- | include/configs/mx6qarm2.h | 2 | ||||
| -rw-r--r-- | include/configs/mx6sabre_common.h | 25 | ||||
| -rw-r--r-- | include/configs/mx6sabresd.h | 2 | ||||
| -rw-r--r-- | include/configs/mx6slevk.h | 2 |
4 files changed, 6 insertions, 25 deletions
diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h index 8ec32ca..b36d509 100644 --- a/include/configs/mx6qarm2.h +++ b/include/configs/mx6qarm2.h @@ -52,6 +52,8 @@ #define CONFIG_CMD_FAT #define CONFIG_DOS_PARTITION +#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */ + #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index 5d879e0..f7d0d35 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -63,6 +63,8 @@ #define CONFIG_CMD_FAT #define CONFIG_DOS_PARTITION +#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */ + #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII @@ -102,28 +104,6 @@ #define CONFIG_MFG_NAND_PARTITION "" #endif -#ifdef CONFIG_SUPPORT_EMMC_BOOT -#define EMMC_ENV \ - "emmcdev=2\0" \ - "update_emmc_firmware=" \ - "if test ${ip_dyn} = yes; then " \ - "setenv get_cmd dhcp; " \ - "else " \ - "setenv get_cmd tftp; " \ - "fi; " \ - "if ${get_cmd} ${update_sd_firmware_filename}; then " \ - "if mmc dev ${emmcdev} && " \ - "mmc open ${emmcdev} 1; then " \ - "setexpr fw_sz ${filesize} / 0x200; " \ - "setexpr fw_sz ${fw_sz} + 1; " \ - "mmc write ${loadaddr} 0x2 ${fw_sz}; " \ - "mmc close ${emmcdev} 1; " \ - "fi; " \ - "fi\0" -#else -#define EMMC_ENV "" -#endif - #define CONFIG_MFG_ENV_SETTINGS \ "mfgtool_args=setenv bootargs console=" CONFIG_CONSOLE_DEV ",115200 " \ "rdinit=/linuxrc " \ @@ -200,7 +180,6 @@ "mmc write ${loadaddr} 0x2 ${fw_sz}; " \ "fi; " \ "fi\0" \ - EMMC_ENV \ "smp=" CONFIG_SYS_NOSMP "\0"\ "mmcargs=setenv bootargs console=${console},${baudrate} ${smp} " \ "root=${mmcroot}\0" \ diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h index 8312d18..3b730db 100644 --- a/include/configs/mx6sabresd.h +++ b/include/configs/mx6sabresd.h @@ -17,8 +17,6 @@ #define CONFIG_CONSOLE_DEV "ttymxc0" #define CONFIG_MMCROOT "/dev/mmcblk0p2" -#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */ - #include "mx6sabre_common.h" /* USB Configs */ diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index eb47a1c..c278edc 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -54,6 +54,8 @@ #define CONFIG_CMD_FAT #define CONFIG_DOS_PARTITION +#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */ + #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII |