Merge branch 'master' of git://www.denx.de/git/u-boot-imx

[u-boot] / include / configs / inka4x0.h

diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h
index 56c7ca9b0193a20c46cd21b332570a4a6b38f4bd..c3e1cae6cb3f3c905ca76377f7237606feb77a97 100644 (file)
--- a/include/configs/inka4x0.h
+++ b/include/configs/inka4x0.h
@@ -18,7 +18,6 @@
 
 #define CONFIG_MPC5200         1       /* This is an MPC5200 CPU       */
 #define CONFIG_INKA4X0         1       /* INKA4x0 board                */
-#define CONFIG_DISPLAY_BOARDINFO
 
 /*
  * Valid values for CONFIG_SYS_TEXT_BASE are:
@@ -40,7 +39,6 @@
  * Serial console configuration
  */
 #define CONFIG_PSC_CONSOLE     1       /* console is on PSC1   */
-#define CONFIG_BAUDRATE                115200  /* ... at 115200 bps    */
 #define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200, 230400 }
 
 /*
@@ -48,8 +46,6 @@
  * 0x40000000 - 0x4fffffff - PCI Memory
  * 0x50000000 - 0x50ffffff - PCI IO Space
  */
-#define CONFIG_PCI             1
-#define CONFIG_PCI_PNP         1
 #define CONFIG_PCI_SCAN_SHOW   1
 #define CONFIG_PCIAUTO_SKIP_HOST_BRIDGE        1
 
@@ -64,9 +60,6 @@
 #define CONFIG_SYS_XLB_PIPELINING      1
 
 /* Partitions */
-#define CONFIG_MAC_PARTITION
-#define CONFIG_DOS_PARTITION
-#define CONFIG_ISO_PARTITION
 
 /*
  * BOOTP options