Merge git://git.denx.de/u-boot-fsl-qoriq

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

diff --git a/include/configs/o2dnt-common.h b/include/configs/o2dnt-common.h
index 4d79165..8a414c3 100644 (file)
--- a/include/configs/o2dnt-common.h
+++ b/include/configs/o2dnt-common.h
@@ -49,8 +49,6 @@
  * 0x40000000 - 0x4fffffff - PCI Memory
  * 0x50000000 - 0x50ffffff - PCI IO Space
  */
-#undef CONFIG_PCI
-#define CONFIG_PCI_PNP         1
 
 #define CONFIG_PCI_MEM_BUS     0x40000000
 #define CONFIG_PCI_MEM_PHYS    CONFIG_PCI_MEM_BUS
@@ -63,9 +61,6 @@
 #define CONFIG_SYS_XLB_PIPELINING      1
 
 /* Partitions */
-#define CONFIG_MAC_PARTITION
-#define CONFIG_DOS_PARTITION
-#define CONFIG_ISO_PARTITION
 
 #define CONFIG_TIMESTAMP       /* Print image info with timestamp */
 
@@ -94,8 +89,8 @@
 
 #undef CONFIG_BOOTARGS
 
-#if !defined(CONFIG_CONSOLE_DEV)
-#define CONFIG_CONSOLE_DEV     "ttyPSC1"
+#if !defined(CONSOLE_DEV)
+#define CONSOLE_DEV    "ttyPSC1"
 #endif
 
 /*
@@ -130,7 +125,7 @@
        "addmem=setenv bootargs ${bootargs} ${memlimit}\0"              \
        "addmisc=sete bootargs ${bootargs} ${miscargs}\0"               \
        "addtty=sete bootargs ${bootargs} console="                     \
-               CONFIG_CONSOLE_DEV ",${baudrate}\0"                     \
+               CONSOLE_DEV ",${baudrate}\0"                    \
        "bootfile="CONFIG_BOARD_NAME"/uImage_"CONFIG_BOARD_NAME"_act\0" \
        "kernel_addr_r=600000\0"                                        \
        "initrd_high=0x03e00000\0"                                      \