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 6c5fa3b7a38b7fb74c77a59020903fca0c1766fb..ebb572e3f05f27375aa00b123863579db0f2700e 100644 (file)
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -114,6 +114,12 @@
 /* DDR - I use Micron DDR */
 #define CONFIG_OMAP3_MICRON_DDR                1
 
+/* Enable Multi Bus support for I2C */
+#define CONFIG_I2C_MULTI_BUS           1
+
+/* Probe all devices */
+#define CONFIG_SYS_I2C_NOPROBES                {{0x0, 0x0}}
+
 /* USB */
 #define CONFIG_MUSB_UDC                        1
 #define CONFIG_USB_OMAP3               1
@@ -132,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>
@@ -206,32 +211,40 @@
 #define CONFIG_BOOTDELAY               2
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
-       "loadaddr=0x82000000\0" \
+       "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" \
        "buddy=none "\
+       "optargs=\0" \
+       "camera=none\0" \
        "vram=12M\0" \
-       "dvimode=1024x768MR-16@60\0" \
+       "dvimode=640x480MR-16@60\0" \
        "defaultdisplay=dvi\0" \
        "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} " \
+               "${optargs} " \
                "mpurate=${mpurate} " \
                "buddy=${buddy} "\
+               "camera=${camera} "\
                "vram=${vram} " \
                "omapfb.mode=dvi:${dvimode} " \
                "omapdss.def_disp=${defaultdisplay} " \
                "root=${mmcroot} " \
                "rootfstype=${mmcrootfstype}\0" \
        "nandargs=setenv bootargs console=${console} " \
+               "${optargs} " \
                "mpurate=${mpurate} " \
                "buddy=${buddy} "\
+               "camera=${camera} "\
                "vram=${vram} " \
                "omapfb.mode=dvi:${dvimode} " \
                "omapdss.def_disp=${defaultdisplay} " \
@@ -241,6 +254,16 @@
        "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
        "importbootenv=echo Importing environment from mmc ...; " \
                "env import -t $loadaddr $filesize\0" \
+       "ramargs=setenv bootargs console=${console} " \
+               "${optargs} " \
+               "mpurate=${mpurate} " \
+               "buddy=${buddy} "\
+               "vram=${vram} " \
+               "omapfb.mode=dvi:${dvimode} " \
+               "omapdss.def_disp=${defaultdisplay} " \
+               "root=${ramroot} " \
+               "rootfstype=${ramrootfstype}\0" \
+       "loadramdisk=fatload mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \
        "loaduimagefat=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \
        "loaduimage=ext2load mmc ${mmcdev}:2 ${loadaddr} /boot/uImage\0" \
        "mmcboot=echo Booting from mmc ...; " \
@@ -250,6 +273,9 @@
                "run nandargs; " \
                "nand read ${loadaddr} 280000 400000; " \
                "bootm ${loadaddr}\0" \
+       "ramboot=echo Booting from ramdisk ...; " \
+               "run ramargs; " \
+               "bootm ${loadaddr}\0" \
 
 #define CONFIG_BOOTCOMMAND \
        "if mmc rescan ${mmcdev}; then " \