common: Move CONFIG_BOOTARGS to Kconfig

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

diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h
index 05ddb3a4a037e21ba42e6406caa8d5acfafa0a83..6de9d204b6f33d3334fd5febe9b89b283d674242 100644 (file)
--- a/include/configs/sbc8349.h
+++ b/include/configs/sbc8349.h
@@ -15,8 +15,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_DISPLAY_BOARDINFO
-
 /*
  * High Level Configuration Options
  */
@@ -52,8 +50,6 @@
 #endif
 #endif
 
-#undef CONFIG_BOARD_EARLY_INIT_F               /* call board_pre_init */
-
 #define CONFIG_SYS_IMMR                0xE0000000
 
 #undef CONFIG_SYS_DRAM_TEST            /* memory test, takes time */
@@ -332,8 +328,6 @@
 #undef PCI_ONE_PCI1
 #endif
 
-#define CONFIG_PCI_PNP         /* do pci plug-and-play */
-
 #undef CONFIG_EEPRO100
 #undef CONFIG_TULIP
 
@@ -376,7 +370,6 @@
  * Environment
  */
 #ifndef CONFIG_SYS_RAMBOOT
-       #define CONFIG_ENV_IS_IN_FLASH  1
        #define CONFIG_ENV_ADDR         (CONFIG_SYS_MONITOR_BASE + 0x40000)
        #define CONFIG_ENV_SECT_SIZE    0x20000 /* 128K(one sector) for env */
        #define CONFIG_ENV_SIZE         0x2000
@@ -386,8 +379,6 @@
 #define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)
 
 #else
-       #define CONFIG_SYS_NO_FLASH     1       /* Flash is not usable now */
-       #define CONFIG_ENV_IS_NOWHERE   1       /* Store ENV in memory only */
        #define CONFIG_ENV_ADDR         (CONFIG_SYS_MONITOR_BASE - 0x1000)
        #define CONFIG_ENV_SIZE         0x2000
 #endif
@@ -395,7 +386,6 @@
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   1       /* allow baudrate change */
 
-
 /*
  * BOOTP options
  */
@@ -404,17 +394,9 @@
 #define CONFIG_BOOTP_GATEWAY
 #define CONFIG_BOOTP_HOSTNAME
 
-
 /*
  * Command line configuration.
  */
-#define CONFIG_CMD_I2C
-#define CONFIG_CMD_MII
-#define CONFIG_CMD_PING
-
-#if defined(CONFIG_PCI)
-    #define CONFIG_CMD_PCI
-#endif
 
 #undef CONFIG_WATCHDOG                 /* watchdog disabled */
 
@@ -524,7 +506,6 @@
        HID0_ENABLE_M_BIT |\
        HID0_ENABLE_ADDRESS_BROADCAST) */
 
-
 #define CONFIG_SYS_HID2 HID2_HBE
 
 #define CONFIG_HIGH_BATS       1       /* High BATs supported */
@@ -647,11 +628,6 @@
                                /* default location for tftp and bootm */
 #define CONFIG_LOADADDR                800000
 
-#define CONFIG_BOOTDELAY       6       /* -1 disables auto-boot */
-#undef  CONFIG_BOOTARGS                /* the boot command will set bootargs */
-
-#define CONFIG_BAUDRATE         115200
-
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        "netdev=eth0\0"                                                 \
        "hostname=sbc8349\0"                                            \