usb: gadget: Move CONFIG_USB_GADGET to Kconfig

[platform/kernel/u-boot.git] / include / configs / omap3_logic.h

diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
index 1e00455..304e1ce 100644 (file)
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -30,11 +30,17 @@
 
 #include <configs/ti_omap3_common.h>
 
+/* Override default SPL info to minimize empty space and allow BCH8 in SPL */
+#undef CONFIG_SPL_TEXT_BASE
+#undef CONFIG_SPL_MAX_SIZE
+#define CONFIG_SPL_TEXT_BASE   0x40200000
+#define CONFIG_SPL_MAX_SIZE    (64 * 1024)
+
 /* Display CPU and Board information */
 
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO
-
+#define CONFIG_BOARD_LATE_INIT
 #define CONFIG_MISC_INIT_R             /* misc_init_r dumps the die id */
 #define CONFIG_CMDLINE_TAG             /* enable passing of ATAGs */
 #define CONFIG_SETUP_MEMORY_TAGS
@@ -66,8 +72,6 @@
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP
 
-#define CONFIG_YAFFS2
-
 /* I2C */
 #define CONFIG_SYS_I2C_OMAP34XX
 #define CONFIG_SYS_I2C_EEPROM_ADDR     0x50    /* EEPROM AT24C64      */
@@ -81,7 +85,6 @@
 #define CONFIG_USB_GADGET_DUALSPEED
 #define CONFIG_USB_ETHER
 #define CONFIG_USB_ETHER_RNDIS
-#define CONFIG_USB_GADGET
 #define CONFIG_USB_GADGET_VBUS_DRAW    0
 #define CONFIG_USB_GADGET_DOWNLOAD
 #define CONFIG_G_DNL_VENDOR_NUM                0x0451
@@ -176,6 +179,8 @@
        "mmcdev=0\0" \
        "mmcroot=/dev/mmcblk0p2 rw\0" \
        "mmcrootfstype=ext4 rootwait\0" \
+       "nandroot=ubi0:rootfs rw ubi.mtd=fs noinitrd\0" \
+       "nandrootfstype=ubifs rootwait\0" \
        "autoboot=mmc dev ${mmcdev}; if mmc rescan; then " \
                        "if run loadbootscript; then " \
                                "run bootscript; " \
@@ -217,6 +222,10 @@
                "${optargs} " \
                "root=${mmcroot} " \
                "rootfstype=${mmcrootfstype}\0" \
+       "nandargs=run setconsole; setenv bootargs console=${console} " \
+               "${optargs} " \
+               "root=${nandroot} " \
+               "rootfstype=${nandrootfstype}\0" \
        "fdtaddr=0x86000000\0" \
        "loadfdtimage=mmc rescan; " \
                "fatload mmc ${mmcdev} ${fdtaddr} ${fdtimage}\0" \
@@ -286,7 +295,7 @@
 /* SMSC922x Ethernet */
 #if defined(CONFIG_CMD_NET)
 #define CONFIG_SMC911X
-#define CONFIG_SMC911X_16_BIT
+#define CONFIG_SMC911X_32_BIT
 #define CONFIG_SMC911X_BASE    0x08000000
 #endif /* (CONFIG_CMD_NET) */