diff options
| author | Tom Rini <trini@ti.com> | 2013-07-12 14:36:48 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-07-12 14:36:48 (GMT) |
| commit | fbbbc86e8ebac4f42f4ca39ceba80cea27c983bc (patch) | |
| tree | 9c91526cefd027d9bd964572d4f92bd2d1376c5d /include/configs/mx51evk.h | |
| parent | d72da1582895ca226b995758426ec3769b54a9b8 (diff) | |
| parent | efc284e32503b240dbd35c6e8b8d098d702b4be7 (diff) | |
| download | u-boot-fsl-qoriq-fbbbc86e8ebac4f42f4ca39ceba80cea27c983bc.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Fix a trivial conflict in arch/arm/dts/exynos5250.dtsi about gpio and
serial.
Conflicts:
arch/arm/dts/exynos5250.dtsi
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'include/configs/mx51evk.h')
| -rw-r--r-- | include/configs/mx51evk.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index 13d1839..4383375d 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -162,8 +162,8 @@ "boot_fdt=try\0" \ "ip_dyn=yes\0" \ "mmcdev=0\0" \ - "mmcpart=2\0" \ - "mmcroot=/dev/mmcblk0p3 rootwait rw\0" \ + "mmcpart=1\0" \ + "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \ "mmcargs=setenv bootargs console=ttymxc0,${baudrate} " \ "root=${mmcroot}\0" \ "loadbootscript=" \ |