Merge branch 'master' of git://git.denx.de/u-boot

[platform/kernel/u-boot.git] / include / configs / ti_armv7_common.h

diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
index 1a4b6d9..586bd2b 100644 (file)
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -56,14 +56,17 @@
        "fdt_addr_r=0x88000000\0" \
        "rdaddr=0x88080000\0" \
        "ramdisk_addr_r=0x88080000\0" \
+       "scriptaddr=0x80000000\0" \
+       "pxefile_addr_r=0x80100000\0" \
        "bootm_size=0x10000000\0"
 
 #define DEFAULT_MMC_TI_ARGS \
        "mmcdev=0\0" \
        "mmcrootfstype=ext4 rootwait\0" \
-       "args_mmc=setenv bootargs console=${console} " \
+       "finduuid=part uuid mmc 0:2 uuid\0" \
+       "args_mmc=run finduuid;setenv bootargs console=${console} " \
                "${optargs} " \
-               "root=${mmcroot} " \
+               "root=PARTUUID=${uuid} rw " \
                "rootfstype=${mmcrootfstype}\0"
 
 /*