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

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

diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h
index 153646f940dba6f9ab4292bd54b91eb685627eab..572e6b176671e824a30fd0af9d33544fad1b41d2 100644 (file)
--- a/include/configs/sequoia.h
+++ b/include/configs/sequoia.h
@@ -54,7 +54,6 @@
 #define CONFIG_4xx_DCACHE              /* enable dcache                */
 #endif
 
-#define CONFIG_BOARD_EARLY_INIT_F 1    /* Call board_early_init_f      */
 #define CONFIG_MISC_INIT_R     1       /* Call misc_init_r             */
 
 /*
@@ -219,9 +218,6 @@
 #endif /* CONFIG_440EPX */
 
 /* Partitions */
-#define CONFIG_MAC_PARTITION
-#define CONFIG_DOS_PARTITION
-#define CONFIG_ISO_PARTITION
 
 /*
  * Commands additional to the ones defined in amcc-common.h
@@ -271,9 +267,7 @@
  * PCI stuff
  */
 /* General PCI */
-#define CONFIG_PCI                     /* include pci support          */
 #define CONFIG_PCI_INDIRECT_BRIDGE     /* indirect PCI bridge support */
-#define CONFIG_PCI_PNP                 /* do pci plug-and-play         */
 #define CONFIG_SYS_PCI_CACHE_LINE_SIZE 0       /* to avoid problems with PNP   */
 #define CONFIG_PCI_SCAN_SHOW           /* show pci devices on startup  */
 #define CONFIG_SYS_PCI_TARGBASE        0x80000000      /* PCIaddr mapped to    */
@@ -408,7 +402,6 @@
 #define CONFIG_ATI_RADEON_FB           /* use radeon framebuffer driver */
 #define VIDEO_IO_OFFSET                        0xe8000000
 #define CONFIG_SYS_ISA_IO_BASE_ADDRESS         VIDEO_IO_OFFSET
-#define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_CMD_BMP