Convert CONFIG_BOOTP_BOOTPATH et al to Kconfig

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

diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
index 1561d54c9a8676df6dd6e8265bfdec35f7e51d66..d54831c7df2a2c540a8d0548e9d38cd72fd95323 100644 (file)
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -53,7 +53,7 @@
 
 #define DEFAULT_FIT_TI_ARGS \
        "boot_fit=0\0" \
-       "fit_loadaddr=0x88000000\0" \
+       "fit_loadaddr=0x87000000\0" \
        "fit_bootfile=fitImage\0" \
        "update_to_fit=setenv loadaddr ${fit_loadaddr}; setenv bootfile ${fit_bootfile}\0" \
        "loadfit=run args_mmc; bootm ${loadaddr}#${fdtfile};\0" \
@@ -113,22 +113,15 @@
  * console baudrate of 115200 and use the default baud rate table.
  */
 #define CONFIG_SYS_MALLOC_LEN          SZ_32M
-#define CONFIG_ENV_VARS_UBOOT_CONFIG   /* Strongly encouraged */
 #define CONFIG_ENV_OVERWRITE           /* Overwrite ethaddr / serial# */
 
 /* As stated above, the following choices are optional. */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
 
 /* We set the max number of command args high to avoid HUSH bugs. */
 #define CONFIG_SYS_MAXARGS             64
 
 /* 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
 
@@ -139,17 +132,6 @@
  */
 #if defined(CONFIG_SPI_BOOT) || defined(CONFIG_NOR) || defined(CONFIG_NAND) || defined(CONFIG_NAND_DAVINCI)
 #define CONFIG_MTD_DEVICE              /* Required for mtdparts */
-#define CONFIG_CMD_MTDPARTS
-#endif
-
-#define CONFIG_SUPPORT_RAW_INITRD
-
-/*
- * Common filesystems support.  When we have removable storage we
- * enabled a number of useful commands and support.
- */
-#if defined(CONFIG_MMC) || defined(CONFIG_USB_STORAGE)
-#define CONFIG_FAT_WRITE
 #endif
 
 /*
@@ -160,7 +142,6 @@
  */
 #if !defined(CONFIG_NOR_BOOT) && \
        !(defined(CONFIG_QSPI_BOOT) && defined(CONFIG_AM43XX))
-#define CONFIG_SPL_FRAMEWORK
 
 /*
  * We also support Falcon Mode so that the Linux kernel can be booted
@@ -179,9 +160,6 @@
  * of the BSS area.  We suggest that the stack be placed at 32MiB after the
  * start of DRAM to allow room for all of the above (handled in Kconfig).
  */
-#ifndef CONFIG_SYS_TEXT_BASE
-#define CONFIG_SYS_TEXT_BASE           0x80800000
-#endif
 #ifndef CONFIG_SPL_BSS_START_ADDR
 #define CONFIG_SPL_BSS_START_ADDR      0x80a00000
 #define CONFIG_SPL_BSS_MAX_SIZE                0x80000         /* 512 KB */
@@ -207,16 +185,12 @@
 #define CONFIG_SPL_FS_LOAD_ARGS_NAME           "args"
 
 /* RAW SD card / eMMC */
-#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR        0x900   /* address 0x120000 */
-#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR  0x80    /* address 0x10000 */
-#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0x80    /* 64KiB */
-
-/* spl export command */
-#define CONFIG_CMD_SPL
+#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR        0x1700  /* address 0x2E0000 */
+#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR  0x1500  /* address 0x2A0000 */
+#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0x200   /* 256KiB */
 #endif
 
 /* General parts of the framework, required. */
-#define CONFIG_SPL_BOARD_INIT
 
 #ifdef CONFIG_NAND
 #define CONFIG_SPL_NAND_BASE