Merge git://git.denx.de/u-boot-video

[oweals/u-boot.git] / include / configs / sbc8548.h

diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h
index f5a5b6194053ca80a4c1b83c4c6f9882ce4bec45..51c0ad65b1af4db90601b69edd60a028e89af161 100644 (file)
--- a/include/configs/sbc8548.h
+++ b/include/configs/sbc8548.h
@@ -36,7 +36,6 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_SBC8548         1       /* SBC8548 board specific */
 
 /*
  * If you want to boot from the SODIMM flash, instead of the soldered
@@ -44,14 +43,6 @@
  */
 #undef CONFIG_SYS_ALT_BOOT
 
-#ifndef CONFIG_SYS_TEXT_BASE
-#ifdef CONFIG_SYS_ALT_BOOT
-#define CONFIG_SYS_TEXT_BASE   0xfff00000
-#else
-#define CONFIG_SYS_TEXT_BASE   0xfffa0000
-#endif
-#endif
-
 #undef CONFIG_RIO
 
 #ifdef CONFIG_PCI
@@ -62,7 +53,6 @@
 #define CONFIG_FSL_PCIE_RESET   1      /* need PCIe reset errata */
 #endif
 
-#define CONFIG_TSEC_ENET               /* tsec ethernet support */
 #define CONFIG_ENV_OVERWRITE
 
 #define CONFIG_INTERRUPTS              /* enable pci, srio, ddr interrupts */
@@ -395,7 +385,6 @@
 #define CONFIG_SYS_MALLOC_LEN          (1024 * 1024) /* Reserved for malloc */
 
 /* Serial Port */
-#define CONFIG_CONS_INDEX      1
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE    1
 #define CONFIG_SYS_NS16550_CLK         (400000000 / CONFIG_SYS_CLK_DIV)
@@ -479,13 +468,11 @@
 
 /* Options are: eTSEC[0-3] */
 #define CONFIG_ETHPRIME                "eTSEC0"
-#define CONFIG_PHY_GIGE                1       /* Include GbE speed/duplex detection */
 #endif /* CONFIG_TSEC_ENET */
 
 /*
  * Environment
  */
-#define CONFIG_ENV_IS_IN_FLASH 1
 #define CONFIG_ENV_SIZE                0x2000
 #if CONFIG_SYS_TEXT_BASE == 0xfff00000 /* Boot from 64MB SODIMM */
 #define CONFIG_ENV_ADDR                (CONFIG_SYS_MONITOR_BASE + 0x80000)
@@ -504,36 +491,13 @@
  * BOOTP options
  */
 #define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
-
-/*
- * Command line configuration.
- */
-#define CONFIG_CMD_REGINFO
-
-#if defined(CONFIG_PCI)
-    #define CONFIG_CMD_PCI
-#endif
 
 #undef CONFIG_WATCHDOG                 /* watchdog disabled */
 
 /*
  * Miscellaneous configurable options
  */
-#define CONFIG_CMDLINE_EDITING                 /* undef to save memory */
-#define CONFIG_AUTO_COMPLETE                   /* add autocompletion support */
-#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 Buffer 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
@@ -556,7 +520,7 @@
 
 #define CONFIG_IPADDR   192.168.0.55
 
-#define CONFIG_HOSTNAME         sbc8548
+#define CONFIG_HOSTNAME         "sbc8548"
 #define CONFIG_ROOTPATH         "/opt/eldk/ppc_85xx"
 #define CONFIG_BOOTFILE         "/uImage"
 #define CONFIG_UBOOTPATH /u-boot.bin   /* TFTP server */
@@ -567,10 +531,6 @@
 
 #define CONFIG_LOADADDR        1000000 /*default location for tftp and bootm*/
 
-#undef CONFIG_BOOTARGS         /* the boot command will set bootargs*/
-
-#define CONFIG_BAUDRATE        115200
-
 #define        CONFIG_EXTRA_ENV_SETTINGS                               \
 "netdev=eth0\0"                                                \
 "uboot=" __stringify(CONFIG_UBOOTPATH) "\0"                            \