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

[platform/kernel/u-boot.git] / include / configs / aria.h

diff --git a/include/configs/aria.h b/include/configs/aria.h
index b08e90c..94f6605 100644 (file)
--- a/include/configs/aria.h
+++ b/include/configs/aria.h
@@ -309,7 +309,6 @@
 #error CONFIG_PSC_CONSOLE must be 3
 #endif
 
-#define CONFIG_BAUDRATE                        115200  /* ... at 115200 bps */
 #define CONFIG_SYS_BAUDRATE_TABLE  \
        {300, 600, 1200, 2400, 4800, 9600, 19200, 38400,115200}
 
@@ -337,8 +336,6 @@
 #define CONFIG_SYS_PCI_IO_PHYS         0x84000000
 #define CONFIG_SYS_PCI_IO_SIZE         0x01000000      /* 16M */
 
-#define CONFIG_PCI_PNP                 /* do pci plug-and-play */
-
 #define CONFIG_PCI_SCAN_SHOW           /* show pci devices on startup */
 
 #endif
@@ -405,12 +402,6 @@
 #define CONFIG_CMD_PCI
 #endif
 
-#if defined(CONFIG_CMD_IDE) || defined(CONFIG_CMD_EXT2)
-#define CONFIG_DOS_PARTITION
-#define CONFIG_MAC_PARTITION
-#define CONFIG_ISO_PARTITION
-#endif /* defined(CONFIG_CMD_IDE) */
-
 /*
  * Dynamic MTD partition support
  */
@@ -505,8 +496,6 @@
 
 #undef  CONFIG_BOOTARGS                        /* the boot command will set bootargs */
 
-#define CONFIG_BAUDRATE                115200
-
 #define CONFIG_PREBOOT "echo;" \
        "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
        "echo"