Convert CONFIG_BOOTP_BOOTPATH et al to Kconfig

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

diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index bfd4e5fe3f8ead983df3c7a63223a71b01eb5b51..3491944f93a1c2cb74e1ed9abb0699f1cd5db1ce 100644 (file)
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -20,8 +20,6 @@
 /* High Level Configuration Options */
 #define CONFIG_SOCRATES                1
 
-#define        CONFIG_SYS_TEXT_BASE    0xfff80000
-
 #define CONFIG_PCI_INDIRECT_BRIDGE
 
 #define CONFIG_TSEC_ENET               /* tsec ethernet support        */
@@ -152,7 +150,6 @@
 
 #define CONFIG_SYS_NAND_BASE           (CONFIG_SYS_FPGA_BASE + 0x70)
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
-#define CONFIG_CMD_NAND
 
 /* LIME GDC */
 #define CONFIG_SYS_LIME_BASE           0xc8000000
@@ -188,9 +185,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE  \
        {300, 600, 1200, 2400, 4800, 9600, 19200, 38400,115200}
 
-#define CONFIG_CMDLINE_EDITING 1       /* add command line history     */
-#define CONFIG_AUTO_COMPLETE   1       /* add autocompletion support */
-
 /*
  * I2C
  */
@@ -248,7 +242,6 @@
 
 /* Options are: TSEC[0,1] */
 #define CONFIG_ETHPRIME                "TSEC0"
-#define CONFIG_PHY_GIGE                1       /* Include GbE speed/duplex detection */
 
 #define CONFIG_HAS_ETH0
 #define CONFIG_HAS_ETH1
@@ -256,7 +249,6 @@
 /*
  * Environment
  */
-#define CONFIG_ENV_IS_IN_FLASH 1
 #define CONFIG_ENV_SECT_SIZE   0x20000 /* 128K(one sector) for env     */
 #define CONFIG_ENV_ADDR                (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE)
 #define CONFIG_ENV_SIZE                0x4000
@@ -272,38 +264,14 @@
  * BOOTP options
  */
 #define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
-
-/*
- * Command line configuration.
- */
-#define CONFIG_CMD_SDRAM
-#define CONFIG_CMD_REGINFO
-
-#if defined(CONFIG_PCI)
-    #define CONFIG_CMD_PCI
-#endif
 
 #undef CONFIG_WATCHDOG                 /* watchdog disabled            */
 
 /*
  * Miscellaneous configurable options
  */
-#define CONFIG_SYS_LONGHELP                    /* undef to save memory         */
 #define CONFIG_SYS_LOAD_ADDR   0x2000000       /* default load address         */
 
-#if defined(CONFIG_CMD_KGDB)
-    #define CONFIG_SYS_CBSIZE  1024            /* Console I/O Buffer Size      */
-#else
-    #define CONFIG_SYS_CBSIZE  256             /* Console I/O Buffer Size      */
-#endif
-
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buf Size   */
-#define CONFIG_SYS_MAXARGS     16              /* max number of command args   */
-#define CONFIG_SYS_BARGSIZE    CONFIG_SYS_CBSIZE       /* Boot Argument Buffer Size    */
-
 /*
  * For booting Linux, the board info and command line data
  * have to be in the first 8 MB of memory, since this is
@@ -322,8 +290,6 @@
        "echo Welcome on the ABB Socrates Board;" \
        "echo"
 
-#undef CONFIG_BOOTARGS         /* the boot command will set bootargs   */
-
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        "netdev=eth0\0"                                                 \
        "consdev=ttyS0\0"                                               \