powerpc/85xx: Fix NAND SPL support

[oweals/u-boot.git] / include / configs / omap3_beagle.h

diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index 18c6debc010f31c90f87e8d3fa64c4f63714c460..ebb572e3f05f27375aa00b123863579db0f2700e 100644 (file)
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -118,7 +118,7 @@
 #define CONFIG_I2C_MULTI_BUS           1
 
 /* Probe all devices */
-#define CONFIG_SYS_I2C_NOPROBES                {0x0, 0x0}
+#define CONFIG_SYS_I2C_NOPROBES                {{0x0, 0x0}}
 
 /* USB */
 #define CONFIG_MUSB_UDC                        1
@@ -138,7 +138,6 @@
 #define CONFIG_USB_ETHER_SMSC95XX
 #define CONFIG_USB_ETHER_ASIX
 
-#define CONFIG_NET_MULTI
 
 /* commands to include */
 #include <config_cmd_default.h>
@@ -215,7 +214,6 @@
        "loadaddr=0x80200000\0" \
        "rdaddr=0x81000000\0" \
        "usbtty=cdc_acm\0" \
-       "usbethaddr=de:ad:be:ef\0" \
        "bootfile=uImage.beagle\0" \
        "console=ttyS2,115200n8\0" \
        "mpurate=auto\0" \
@@ -228,8 +226,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" \
        "ramroot=/dev/ram0 rw ramdisk_size=65536 initrd=0x81000000,64M\0" \
        "ramrootfstype=ext2\0" \
        "mmcargs=setenv bootargs console=${console} " \