diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-02-02 19:29:59 +0100 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-02-02 19:29:59 +0100 |
commit | e5f5c4a977c411c0cd3899a4f9487eea77a0e150 (patch) | |
tree | 391225b279509f4403eb6d5e973f0b25e789a8af /include/configs/mx6qsabre_common.h | |
parent | 7cb70a34b976e68f6348ea0718780e8f38901482 (diff) | |
parent | 81ca840976e8e418ae8decaf03ea01f59b1b5be2 (diff) | |
download | talos-obmc-uboot-e5f5c4a977c411c0cd3899a4f9487eea77a0e150.tar.gz talos-obmc-uboot-e5f5c4a977c411c0cd3899a4f9487eea77a0e150.zip |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Diffstat (limited to 'include/configs/mx6qsabre_common.h')
-rw-r--r-- | include/configs/mx6qsabre_common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/configs/mx6qsabre_common.h b/include/configs/mx6qsabre_common.h index cda4512905..d76357c70f 100644 --- a/include/configs/mx6qsabre_common.h +++ b/include/configs/mx6qsabre_common.h @@ -91,7 +91,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_ENV_PART) "\0" \ "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ "mmcargs=setenv bootargs console=${console},${baudrate} " \ "root=${mmcroot}\0" \ |