Convert CONFIG_BOOTCOUNT_LIMIT to Kconfig

[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 5ed46588dd8cfd655743bfbb3b6b309557870d47..d308b0e408614685a95fc240cbf264ae0023d9a8 100644 (file)
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -54,10 +54,6 @@
 /* Console I/O Buffer Size */
 #define CONFIG_SYS_CBSIZE              1024
 
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE \
-                                       + sizeof(CONFIG_SYS_PROMPT) + 16)
-
 /* Boot Argument Buffer Size */
 #define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
 
@@ -101,11 +97,8 @@
 /* I2C Configuration */
 #define CONFIG_I2C
 #define CONFIG_SYS_I2C
-#define CONFIG_SYS_OMAP24_I2C_SPEED    100000
-#define CONFIG_SYS_OMAP24_I2C_SLAVE    1
 
 /* Defines for SPL */
-#define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_TEXT_BASE           0x402F0400
 #define CONFIG_SPL_MAX_SIZE            (SRAM_SCRATCH_SPACE_ADDR - \
                                         CONFIG_SPL_TEXT_BASE)
@@ -119,7 +112,6 @@
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS     0x20000
 
-#define CONFIG_SPL_NAND_AM33XX_BCH
 #define CONFIG_SPL_NAND_BASE
 #define CONFIG_SPL_NAND_DRIVERS
 #define CONFIG_SPL_NAND_ECC
@@ -157,7 +149,6 @@
  * header. That is 0x800FFFC0--0x80100000 should not be used for any
  * other needs.
  */
-#define CONFIG_SYS_TEXT_BASE           0x80100000
 #define CONFIG_SYS_SPL_MALLOC_START    0x80208000
 #define CONFIG_SYS_SPL_MALLOC_SIZE     0x100000
 
@@ -173,22 +164,13 @@
 /*
  * USB configuration
  */
-#define CONFIG_USB_MUSB_DSPS
-#define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
-#undef CONFIG_USB_GADGET_DUALSPEED
 
 #define CONFIG_AM335X_USB0
 #define CONFIG_AM335X_USB0_MODE        MUSB_PERIPHERAL
 #define CONFIG_AM335X_USB1
 #define CONFIG_AM335X_USB1_MODE MUSB_HOST
 
-#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_USB_MUSB_GADGET */
-
 /* USB DRACO ID as default */
 #define CONFIG_USBD_HS
 
@@ -317,10 +299,8 @@
  *|      mtdoops |   8.000 MiB | 0x  c80000..0x 147ffff |
  *|       rootfs | 235.500 MiB | 0x 1480000..0x fffffff |
  *-------------------------------------------------------
- */
-#define MTDIDS_NAME_STR                "omap2-nand.0"
-#define MTDIDS_DEFAULT         "nand0=" MTDIDS_NAME_STR
-#define MTDPARTS_DEFAULT_V1    "mtdparts=" MTDIDS_NAME_STR ":" \
+
+                                       "mtdparts=omap2-nand.0:" \
                                        "128k(spl),"            \
                                        "128k(spl.backup1),"    \
                                        "128k(spl.backup2),"    \
@@ -331,6 +311,7 @@
                                        "5120k(kernel_b),"      \
                                        "8192k(mtdoops),"       \
                                        "-(rootfs)"
+ */
 
 #define DFU_ALT_INFO_NAND_V1 \
        "spl part 0 1;" \
@@ -393,7 +374,7 @@
                "bootm ${kloadaddr}\0"
 
 /*
- * Variant 2 partition layout
+ * Variant 2 partition layout (default)
  * chip-size = 256MiB or 512 MiB
  *|         name |        size |           address area |
  *-------------------------------------------------------
@@ -410,17 +391,6 @@
  *-------------------------------------------------------
  */
 
-#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)," \
-                                       "512k(mtdoops)," \
-                                       "-(rootfs)"
-
 #define DFU_ALT_INFO_NAND_V2 \
        "spl part 0 1;" \
        "spl.backup1 part 0 2;" \
@@ -498,9 +468,8 @@
  *|      mtdoops | 512.000 KiB | 0x12f60000..0x12fdffff |
  *|configuration | 104.125 MiB | 0x12fe0000..0x1fffffff |
  *-------------------------------------------------------
- */
 
-#define MTDPARTS_DEFAULT_V3    "mtdparts=" MTDIDS_NAME_STR ":" \
+                                       "mtdparts=omap2-nand.0:" \
                                        "128k(spl),"            \
                                        "128k(spl.backup1),"    \
                                        "128k(spl.backup2),"    \
@@ -512,8 +481,8 @@
                                        "512k(mtdoops),"        \
                                        "-(configuration)"
 
-#define CONFIG_NAND_OMAP_GPMC
-#define CONFIG_NAND_OMAP_ELM
+ */
+
 #define CONFIG_SYS_NAND_BASE           (0x08000000)    /* physical address */
                                                        /* to access nand at */
                                                        /* CS0 */
@@ -529,7 +498,6 @@
 #define CONFIG_RESET_TO_RETRY
 #define CONFIG_BOOT_RETRY_TIME 60
 
-#define CONFIG_BOOTCOUNT_LIMIT
 #define CONFIG_BOOTCOUNT_ENV
 
 #endif /* ! __CONFIG_SIEMENS_AM33X_COMMON_H */