Convert CONFIG_BOOTCOUNT_LIMIT to Kconfig

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

diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h
index df81f7d78e7f217a735b2097b0ca78e3e31ccfc1..bd41a566411c7ecd599a4768f38cf82f0aebdd02 100644 (file)
--- a/include/configs/cm_t335.h
+++ b/include/configs/cm_t335.h
@@ -16,7 +16,6 @@
 #include <configs/ti_am335x_common.h>
 
 #undef CONFIG_SPI
-#undef CONFIG_BOOTCOUNT_LIMIT
 #undef CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC
 
 #undef CONFIG_MAX_RAM_BANK_SIZE
@@ -43,8 +42,8 @@
                "bootm ${loadaddr}\0"
 
 #define NANDARGS \
-       "mtdids=" MTDIDS_DEFAULT "\0" \
-       "mtdparts=" MTDPARTS_DEFAULT "\0" \
+       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
+       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "nandroot=ubi0:rootfs rw\0" \
        "nandrootfstype=ubifs\0" \
        "nandargs=setenv bootargs console=${console} " \
@@ -97,7 +96,6 @@
 #define CONFIG_SYS_I2C_EEPROM_BUS      0
 
 /* SPL */
-#define CONFIG_SPL_LDSCRIPT            "arch/arm/mach-omap2/u-boot-spl.lds"
 
 /* Network. */
 #define CONFIG_PHY_ATHEROS
@@ -126,11 +124,6 @@
 #undef CONFIG_SYS_NAND_U_BOOT_OFFS
 #define CONFIG_SYS_NAND_U_BOOT_OFFS    0x200000
 
-#define MTDIDS_DEFAULT                 "nand0=nand"
-#define MTDPARTS_DEFAULT               "mtdparts=nand:2m(spl)," \
-                                       "1m(u-boot),1m(u-boot-env)," \
-                                       "1m(dtb),4m(splash)," \
-                                       "6m(kernel),-(rootfs)"
 #define CONFIG_ENV_OFFSET              0x300000 /* environment starts here */
 #define CONFIG_SYS_ENV_SECT_SIZE       (128 << 10)     /* 128 KiB */
 #define CONFIG_SYS_NAND_ONFI_DETECTION