diff options
| author | Jason Liu <r64343@freescale.com> | 2013-06-03 09:54:28 +0800 |
|---|---|---|
| committer | Jason Liu <r64343@freescale.com> | 2013-06-03 10:09:58 +0800 |
| commit | 972a5cf2579aef35c0369b1afd266d5eaa371321 (patch) | |
| tree | a2713519ab76d87e39576436f0fb6ddadffb60a1 | |
| parent | 351f06ca341e604d7079d52812bb2bc6a3067289 (diff) | |
| download | u-boot-imx-972a5cf2579aef35c0369b1afd266d5eaa371321.zip u-boot-imx-972a5cf2579aef35c0369b1afd266d5eaa371321.tar.gz u-boot-imx-972a5cf2579aef35c0369b1afd266d5eaa371321.tar.bz2 | |
ENGR00265233 config/i.mx6: fix the abuse of CONFIG_SYS_MMC_ENV_PART
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
The patch fix the abuse of CONFIG_SYS_MMC_ENV_PART, which detached
the emmc boot partition number and the mmc partition to store the
boot image such as uImage/dtb or bootscripts.
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.
This patch also fixed 2 small display format issue for CONFIG_LOADADDR
and CONFIG_SYS_TEXT_BASE.
Signed-off-by: Jason Liu <r64343@freescale.com>
| -rw-r--r-- | include/configs/mx6qsabre_common.h | 7 | ||||
| -rw-r--r-- | include/configs/mx6qsabreauto.h | 2 | ||||
| -rw-r--r-- | include/configs/mx6qsabresd.h | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/include/configs/mx6qsabre_common.h b/include/configs/mx6qsabre_common.h index 6ebc671..cb6d1bc 100644 --- a/include/configs/mx6qsabre_common.h +++ b/include/configs/mx6qsabre_common.h @@ -81,8 +81,9 @@ #define CONFIG_BOOTDELAY 1 -#define CONFIG_LOADADDR 0x12000000 -#define CONFIG_SYS_TEXT_BASE 0x17800000 +#define CONFIG_LOADADDR 0x12000000 +#define CONFIG_SYS_TEXT_BASE 0x17800000 +#define CONFIG_SYS_MMC_IMG_LOAD_PART 1 #define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ @@ -95,7 +96,7 @@ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \ - "mmcpart=" __stringify(CONFIG_SYS_MMC_ENV_PART) "\0" \ + "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \ "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ "smp=" CONFIG_SYS_NOSMP "\0"\ "mmcargs=setenv bootargs console=${console},${baudrate} ${smp} " \ diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h index 71aacaf..7f21c64 100644 --- a/include/configs/mx6qsabreauto.h +++ b/include/configs/mx6qsabreauto.h @@ -35,7 +35,7 @@ #define CONFIG_SYS_FSL_USDHC_NUM 2 #define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_MMC_ENV_PART 1 /* Boot partition 1 */ +#define CONFIG_SYS_MMC_ENV_PART 0 /* user partition */ #ifdef CONFIG_SYS_USE_SPINOR #define CONFIG_SF_DEFAULT_CS (1|(IMX_GPIO_NR(3, 19)<<8)) diff --git a/include/configs/mx6qsabresd.h b/include/configs/mx6qsabresd.h index a702d2b..860dd4a 100644 --- a/include/configs/mx6qsabresd.h +++ b/include/configs/mx6qsabresd.h @@ -27,7 +27,7 @@ #define CONFIG_SYS_FSL_USDHC_NUM 3 #define CONFIG_SYS_MMC_ENV_DEV 1 /* SDHC3 */ -#define CONFIG_SYS_MMC_ENV_PART 1 /* Boot partition 1 */ +#define CONFIG_SYS_MMC_ENV_PART 0 /* user partition */ #ifdef CONFIG_SYS_USE_SPINOR #define CONFIG_SF_DEFAULT_CS (0|(IMX_GPIO_NR(4, 9)<<8)) |