configs: Re-sync with cmd/Kconfig

[people/ms/u-boot.git] / include / configs / baltos.h

diff --git a/include/configs/baltos.h b/include/configs/baltos.h
index 31de97f2860efb2cf292e43a8156d937bfc1a427..4f3909af04420a417e4b4b40ea906b122c248792 100644 (file)
--- a/include/configs/baltos.h
+++ b/include/configs/baltos.h
@@ -16,6 +16,7 @@
 #ifndef __CONFIG_BALTOS_H
 #define __CONFIG_BALTOS_H
 
+#include <linux/sizes.h>
 #include <configs/ti_am335x_common.h>
 
 #define MACH_TYPE_TIAM335EVM           3589    /* Until the next sync */
@@ -39,7 +40,7 @@
 #define CONFIG_CMD_PART
 
 /* FIT support */
-#define CONFIG_OF_BOARD_SETUP
+#define CONFIG_SYS_BOOTM_LEN         SZ_64M
 
 /* UBI Support */
 #define CONFIG_CMD_MTDPARTS
@@ -54,8 +55,9 @@
 #undef CONFIG_SYS_OMAP24_I2C_SPEED
 #define CONFIG_SYS_OMAP24_I2C_SPEED 1000
 
+#undef CONFIG_SPL_OS_BOOT
 #ifdef CONFIG_NAND
-#define CONFIG_SYS_NAND_U_BOOT_OFFS    0x000c0000
+#define CONFIG_SYS_NAND_U_BOOT_OFFS    0x00080000
 #ifdef CONFIG_SPL_OS_BOOT
 #define CONFIG_CMD_SPL_NAND_OFS 0x00080000 /* os parameters */
 #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00200000 /* kernel offset */
@@ -78,7 +80,9 @@
                "ubifsmount ubi0:kernel; " \
                "ubifsload $loadaddr kernel-fit.itb;" \
                "ubifsumount; " \
-               "bootm ${loadaddr}#conf${board_name}\0"
+               "bootm ${loadaddr}#conf${board_name}; " \
+               "if test $? -ne 0; then echo Using default FIT config; " \
+               "bootm ${loadaddr}; fi;\0"
 #else
 #define NANDARGS ""
 #endif
@@ -194,7 +198,6 @@
        "run mmcboot;" \
        "run nandboot;"
 
-
 /* NS16550 Configuration */
 #define CONFIG_SYS_NS16550_COM1                0x44e09000      /* Base EVM has UART0 */
 #define CONFIG_SYS_NS16550_COM2                0x48022000      /* UART1 */
@@ -208,7 +211,6 @@
 #define CONFIG_ENV_EEPROM_IS_ON_I2C
 #define CONFIG_SYS_I2C_EEPROM_ADDR     0x50    /* Main EEPROM */
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2
-#define CONFIG_SYS_I2C_MULTI_EEPROMS
 
 /* PMIC support */
 #define CONFIG_POWER_TPS65910
@@ -234,6 +236,7 @@
 
 #ifdef CONFIG_NAND
 #define CONFIG_NAND_OMAP_GPMC
+#define CONFIG_NAND_OMAP_GPMC_PREFETCH
 #define CONFIG_NAND_OMAP_ELM
 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
 #define CONFIG_SYS_NAND_PAGE_COUNT     (CONFIG_SYS_NAND_BLOCK_SIZE / \
@@ -267,38 +270,25 @@
  */
 #define CONFIG_USB_MUSB_DSPS
 #define CONFIG_ARCH_MISC_INIT
-#define CONFIG_MUSB_GADGET
-#define CONFIG_MUSB_PIO_ONLY
-#define CONFIG_MUSB_DISABLE_BULK_COMBINE_SPLIT
-#define CONFIG_USB_GADGET
-#define CONFIG_USBDOWNLOAD_GADGET
-#define CONFIG_USB_GADGET_DUALSPEED
-#define CONFIG_USB_GADGET_VBUS_DRAW    2
-#define CONFIG_MUSB_HOST
+#define CONFIG_USB_MUSB_PIO_ONLY
+#define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 #define CONFIG_AM335X_USB0
-#define CONFIG_AM335X_USB0_MODE        MUSB_PERIPHERAL
+#define CONFIG_AM335X_USB0_MODE        MUSB_HOST
 #define CONFIG_AM335X_USB1
-#define CONFIG_AM335X_USB1_MODE MUSB_HOST
+#define CONFIG_AM335X_USB1_MODE MUSB_OTG
 
-#ifdef CONFIG_MUSB_HOST
-#define CONFIG_CMD_USB
+#ifdef CONFIG_USB_MUSB_HOST
 #define CONFIG_USB_STORAGE
 #endif
 
-#ifdef CONFIG_MUSB_GADGET
+#ifdef CONFIG_USB_MUSB_GADGET
 #define CONFIG_USB_ETHER
 #define CONFIG_USB_ETH_RNDIS
 #define CONFIG_USBNET_HOST_ADDR        "de:ad:be:af:00:00"
-
-/* USB TI's IDs */
-#define CONFIG_G_DNL_VENDOR_NUM 0x0403
-#define CONFIG_G_DNL_PRODUCT_NUM 0xBD00
-#define CONFIG_G_DNL_MANUFACTURER "Texas Instruments"
-#endif /* CONFIG_MUSB_GADGET */
+#endif /* CONFIG_USB_MUSB_GADGET */
 
 #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT)
 /* disable host part of MUSB in SPL */
-#undef CONFIG_MUSB_HOST
 /* disable EFI partitions and partition UUID support */
 #undef CONFIG_PARTITION_UUIDS
 #undef CONFIG_EFI_PARTITION
@@ -314,7 +304,6 @@
 #define CONFIG_PHY_ADDR                        0
 #define CONFIG_PHY_SMSC
 #define CONFIG_MII
-#define CONFIG_CMD_MII
 #define CONFIG_PHY_ATHEROS
 
 /* NAND support */