diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-12-10 22:45:34 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-12-10 22:45:34 +0100 |
| commit | 84d018268a8af1d9f271b398748652c5112e951a (patch) | |
| tree | 65572a9581dd795061b424a01ca118870fc52a66 /include/configs | |
| parent | a612ae37595b2b4af71c992d38a3bc17c1c866e2 (diff) | |
| parent | 71bdf829a0952b76710f945375a72181d61fd4c2 (diff) | |
| download | u-boot-imx-84d018268a8af1d9f271b398748652c5112e951a.zip u-boot-imx-84d018268a8af1d9f271b398748652c5112e951a.tar.gz u-boot-imx-84d018268a8af1d9f271b398748652c5112e951a.tar.bz2 | |
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
* 'agust@denx.de' of git://git.denx.de/u-boot-staging:
Update pci_ids.h from current Linux sources
omap: overo: Use ubifs instead of jffs2 for nand
omap: TWL4030 Bump VMMC1 interface voltage from 3V to 3.15V
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/omap3_overo.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index 0874716..79eb466 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -163,8 +163,8 @@ "mmcdev=0\0" \ "mmcroot=/dev/mmcblk0p2 rw\0" \ "mmcrootfstype=ext3 rootwait\0" \ - "nandroot=/dev/mtdblock4 rw\0" \ - "nandrootfstype=jffs2\0" \ + "nandroot=ubi0:rootfs ubi.mtd=4\0" \ + "nandrootfstype=ubifs\0" \ "mmcargs=setenv bootargs console=${console} " \ "${optargs} " \ "mpurate=${mpurate} " \ |