summaryrefslogtreecommitdiff
path: root/include/configs/mx6sabre_common.h
diff options
context:
space:
mode:
authorYe.Li <B37916@freescale.com>2014-06-04 14:18:08 +0800
committerYe.Li <B37916@freescale.com>2014-06-17 11:13:40 +0800
commit7afab9185b970c03eba732640e3f3bfe78dc2fbb (patch)
treea2a189cbf934c5a20744244d4b57c07c9c1234da /include/configs/mx6sabre_common.h
parent580011f86caf137d59a487694f6f7da042164e05 (diff)
downloadu-boot-imx-7afab9185b970c03eba732640e3f3bfe78dc2fbb.zip
u-boot-imx-7afab9185b970c03eba732640e3f3bfe78dc2fbb.tar.gz
u-boot-imx-7afab9185b970c03eba732640e3f3bfe78dc2fbb.tar.bz2
ENGR00315894-12 i.mx6:sabreauto/sabresd: Change the MMC settings
1. Change CONFIG_MMCROOT to mmcblk0p2. Kernel always sets the first availiable MMC/SD device to mmcblk0 2. Make the MMC ENV DEV/PART independent of ENV_IS_IN_MMC 3. Add the CONFIG_SYS_MMC_ENV_PART to 0 (user area) for u-boot env saving. CONFIG_SYS_MMC_ENV_PART: was used to tell the u-boot which emmc (boot)partition to be used for the env_mmc.Usually, the emmc card will have 2 boot partitions, boot1 and boot2. 0: means user area 1: means boot partition 1 2: means boot partition 2 If user want to use the boot partition to store the u-boot env, please change the CONFIG_SYS_MMC_ENV_PART to which boot partition you want. 4. Add the CONFIG_SYS_MMC_IMG_LOAD_PART for the partition number where the kernel and DTB will load from. At default, it is the first partition in VFAT format. Signed-off-by: Ye.Li <B37916@freescale.com>
Diffstat (limited to 'include/configs/mx6sabre_common.h')
-rw-r--r--include/configs/mx6sabre_common.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index a514615..199def2 100644
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012 Freescale Semiconductor, Inc.
+ * Copyright (C) 2012-2014 Freescale Semiconductor, Inc.
*
* Configuration settings for the Freescale i.MX6Q SabreSD board.
*
@@ -86,6 +86,7 @@
#define CONFIG_LOADADDR 0x12000000
#define CONFIG_SYS_TEXT_BASE 0x17800000
+#define CONFIG_SYS_MMC_IMG_LOAD_PART 1
#ifdef CONFIG_SYS_BOOT_NAND
#define CONFIG_MFG_NAND_PARTITION "mtdparts=gpmi-nand:16m(boot),16m(kernel),16m(dtb),-(rootfs) "
@@ -162,7 +163,7 @@
"fdt_high=0xffffffff\0" \
"initrd_high=0xffffffff\0" \
"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
- "mmcpart=1\0" \
+ "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
"mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
"update_sd_firmware=" \
"if test ${ip_dyn} = yes; then " \
@@ -340,7 +341,7 @@
#endif
#if defined(CONFIG_ENV_IS_IN_MMC)
-#define CONFIG_ENV_OFFSET (6 * 64 * 1024)
+#define CONFIG_ENV_OFFSET (8 * 64 * 1024)
#elif defined(CONFIG_ENV_IS_IN_SPI_FLASH)
#define CONFIG_ENV_OFFSET (768 * 1024)
#define CONFIG_ENV_SECT_SIZE (64 * 1024)