]> git.ipfire.org Git - people/ms/u-boot.git/blobdiff - include/configs/siemens-am33x-common.h
projects / people / ms / u-boot.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
configs: Re-sync CONFIG_USB_MUSB_HOST
[people/ms/u-boot.git] / include / configs / siemens-am33x-common.h
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index b61f6a0277835b80cc45d54ff12d12157ffaaa0a..6af373e986bd6b2602e771b3d828c03d640bd9dd 100644 (file)
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -26,9 +26,6 @@
 #define CONFIG_ENV_SIZE                        (0x2000)
 #define CONFIG_SYS_MALLOC_LEN          (16 * 1024 * 1024)
 #define CONFIG_SYS_LONGHELP            /* undef to save memory */
-#define CONFIG_SYS_HUSH_PARSER         /* use "hush" command parser */
-#define CONFIG_SYS_PROMPT              "U-Boot# "
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
 #define CONFIG_BOARD_LATE_INIT
 #define CONFIG_SYS_NO_FLASH
 #ifdef CONFIG_SIEMENS_MACH_TYPE
@@ -42,14 +39,10 @@
 #define CONFIG_SYS_CACHELINE_SIZE       64
 
 /* commands to include */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
-#define CONFIG_CMD_ECHO
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_TIME
 
-#define CONFIG_SYS_GENERIC_BOARD
 
 #define CONFIG_ENV_VARS_UBOOT_CONFIG
 #ifndef CONFIG_SPL_BUILD
@@ -102,7 +95,6 @@
 #define CONFIG_SPI
 #define CONFIG_OMAP3_SPI
 #define CONFIG_MTD_DEVICE
-#define CONFIG_SPI_FLASH_WINBOND
 #define CONFIG_CMD_SF
 #define CONFIG_SF_DEFAULT_SPEED                (75000000)
 
@@ -118,9 +110,7 @@
 #define CONFIG_SYS_PTV                 2       /* Divisor: 2^(PTV+1) => 8 */
 
 /* NS16550 Configuration */
-#define CONFIG_SYS_NS16550
 #define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SERIAL_MULTI
 #define CONFIG_SYS_NS16550_REG_SIZE    (-4)
 #define CONFIG_SYS_NS16550_CLK         (48000000)
 #define CONFIG_SYS_NS16550_COM1                0x44e09000
@@ -136,7 +126,7 @@
 #define CONFIG_I2C
 #define CONFIG_CMD_I2C
 #define CONFIG_SYS_I2C
-#define CONFIG_SYS_OMAP24_I2C_SPEED    OMAP_I2C_STANDARD
+#define CONFIG_SYS_OMAP24_I2C_SPEED    100000
 #define CONFIG_SYS_OMAP24_I2C_SLAVE    1
 #define CONFIG_SYS_I2C_OMAP24XX
 
@@ -229,39 +219,30 @@
  */
 #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_MUSB_PIO_ONLY
+#define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 #undef CONFIG_USB_GADGET_DUALSPEED
-#define CONFIG_USB_GADGET_VBUS_DRAW    2
-#define CONFIG_MUSB_HOST
 
 #define CONFIG_AM335X_USB0
 #define CONFIG_AM335X_USB0_MODE        MUSB_PERIPHERAL
 #define CONFIG_AM335X_USB1
 #define CONFIG_AM335X_USB1_MODE MUSB_HOST
-#ifdef CONFIG_MUSB_HOST
+#ifdef CONFIG_USB_MUSB_HOST
 #define CONFIG_CMD_USB
 #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"
-#endif /* CONFIG_MUSB_GADGET */
-
-#define CONFIG_USB_GADGET
-#define CONFIG_USBDOWNLOAD_GADGET
+#endif /* CONFIG_USB_MUSB_GADGET */
 
 /* USB DRACO ID as default */
 #define CONFIG_USBD_HS
-#define CONFIG_G_DNL_VENDOR_NUM 0x0908
-#define CONFIG_G_DNL_PRODUCT_NUM 0x02d2
-#define CONFIG_G_DNL_MANUFACTURER "Siemens AG"
 
 /* USB Device Firmware Update support */
-#define CONFIG_DFU_FUNCTION
+#define CONFIG_USB_FUNCTION_DFU
 #define CONFIG_DFU_NAND
 #define CONFIG_CMD_DFU
 #define CONFIG_SYS_DFU_DATA_BUF_SIZE   (1 << 20)
@@ -483,7 +464,7 @@
 
 /*
  * Variant 2 partition layout
- * chip-size = 256MiB
+ * chip-size = 256MiB or 512 MiB
  *|         name |        size |           address area |
  *-------------------------------------------------------
  *|          spl | 128.000 KiB | 0x       0..0x   1ffff |
@@ -493,23 +474,23 @@
  *|       u-boot |   1.875 MiB | 0x   80000..0x  25ffff |
  *|   uboot.env0 | 512.000 KiB | 0x  260000..0x  2Dffff |
  *|   uboot.env1 | 512.000 KiB | 0x  2E0000..0x  35ffff |
- *|       rootfs | 148.000 MiB | 0x  360000..0x 975ffff |
- *|      mtdoops | 512.000 KiB | 0x 9760000..0x 98Dffff |
- *|configuration | 104.125 MiB | 0x 97E0000..0x fffffff |
+ *|      mtdoops | 512.000 KiB | 0x  360000..0x  3dffff |
+ *| (256) rootfs | 252.125 MiB | 0x  3E0000..0x fffffff |
+ *| (512) rootfs | 508.125 MiB | 0x  3E0000..0x1fffffff |
  *-------------------------------------------------------
  */
 
 #define MTDPARTS_DEFAULT_V2    "mtdparts=" MTDIDS_NAME_STR ":" \
-                                       "128k(spl),"            \
-                                       "128k(spl.backup1),"    \
-                                       "128k(spl.backup2),"    \
-                                       "128k(spl.backup3),"    \
-                                       "1920k(u-boot),"        \
-                                       "512k(u-boot.env0),"    \
-                                       "512k(u-boot.env1),"    \
-                                       "148m(rootfs),"         \
-                                       "512k(mtdoops),"        \
-                                       "-(configuration)"
+                                       "128k(spl)," \
+                                       "128k(spl.backup1)," \
+                                       "128k(spl.backup2)," \
+                                       "128k(spl.backup3)," \
+                                       "1920k(u-boot)," \
+                                       "512k(u-boot.env0)," \
+                                       "512k(u-boot.env1)," \
+                                       "512k(mtdoops)," \
+                                       "-(rootfs)"
+
 
 #define DFU_ALT_INFO_NAND_V2 \
        "spl part 0 1;" \
@@ -519,8 +500,7 @@
        "u-boot part 0 5;" \
        "u-boot.env0 part 0 6;" \
        "u-boot.env1 part 0 7;" \
-       "rootfs partubi 0 8;" \
-       "configuration partubi 0 10"
+       "rootfs partubi 0 9" \
 
 #define CONFIG_ENV_SETTINGS_NAND_V2 \
        "nand_active_ubi_vol=rootfs_a\0" \
@@ -537,7 +517,7 @@
                        "setenv nand_active_ubi_vol ${rootfs_name}_b;" \
                "fi;" \
                "setenv nand_root ubi0:${nand_active_ubi_vol} rw " \
-               "ubi.mtd=7,2048 ubi.mtd=9,2048;" \
+               "ubi.mtd=rootfs,2048;" \
                "setenv bootargs ${bootargs} " \
                "root=${nand_root} noinitrd ${mtdparts} " \
                "rootfstype=${nand_root_fs_type} ip=${ip_method} " \
@@ -622,7 +602,6 @@
 #define CONFIG_OMAP_GPIO
 
 /* Gpio cmd support */
-#define CONFIG_CMD_GPIO
 
 /* Watchdog */
 #define CONFIG_HW_WATCHDOG
@@ -634,8 +613,4 @@
 #define CONFIG_BOOTCOUNT_LIMIT
 #define CONFIG_BOOTCOUNT_ENV
 
-/* Enable Device-Tree (FDT) support */
-#define CONFIG_OF_LIBFDT
-#define CONFIG_CMD_FDT
-
 #endif /* ! __CONFIG_SIEMENS_AM33X_COMMON_H */
"Das U-Boot" Source Tree