Merge git://git.denx.de/u-boot-socfpga

[oweals/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 1a4b6d9900a2d84a05fbda72cee510581a183f9f..32bb805f781aa592f10c49d4a16c351b35adda27 100644 (file)
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -17,9 +17,6 @@
 #ifndef __CONFIG_TI_ARMV7_COMMON_H__
 #define __CONFIG_TI_ARMV7_COMMON_H__
 
-/* Common define for many platforms. */
-#define CONFIG_SYS_GENERIC_BOARD
-
 /*
  * We typically do not contain NOR flash.  In the cases where we do, we
  * undefine this later.
@@ -56,14 +53,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"
 
 /*