Merge git://www.denx.de/git/u-boot-marvell

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

diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index c578b491a9692bc6b6e0aa34c56eb17c9b3d4322..6480116699317ba3076e3ec97ba0836678b2970b 100644 (file)
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -18,14 +18,10 @@
 #define __CONFIG_H
 
 /* High Level Configuration Options */
-#define CONFIG_BOOKE           1       /* BOOKE                        */
-#define CONFIG_E500            1       /* BOOKE e500 family            */
-#define CONFIG_MPC8544         1
 #define CONFIG_SOCRATES                1
 
 #define        CONFIG_SYS_TEXT_BASE    0xfff80000
 
-#define CONFIG_PCI
 #define CONFIG_PCI_INDIRECT_BRIDGE
 
 #define CONFIG_TSEC_ENET               /* tsec ethernet support        */
@@ -33,8 +29,6 @@
 #define CONFIG_MISC_INIT_R     1       /* Call misc_init_r             */
 #define CONFIG_BOARD_EARLY_INIT_R 1    /* Call board_early_init_r      */
 
-#define CONFIG_FSL_LAW         1       /* Use common FSL init code */
-
 /*
  * Only possible on E500 Version 2 or newer cores.
  */
@@ -74,7 +68,6 @@
 #define CONFIG_SYS_CCSRBAR_PHYS_LOW    CONFIG_SYS_CCSRBAR
 
 /* DDR Setup */
-#define CONFIG_SYS_FSL_DDR2
 #undef CONFIG_FSL_DDR_INTERACTIVE
 #define CONFIG_SPD_EEPROM              /* Use SPD EEPROM for DDR setup */
 #define CONFIG_DDR_SPD
@@ -86,7 +79,6 @@
 #define CONFIG_SYS_SDRAM_BASE          CONFIG_SYS_DDR_SDRAM_BASE
 #define CONFIG_VERY_BIG_RAM
 
-#define CONFIG_NUM_DDR_CONTROLLERS     1
 #define CONFIG_DIMM_SLOTS_PER_CTLR     1
 #define CONFIG_CHIP_SELECTS_PER_CTRL   2
 
@@ -170,15 +162,10 @@
 
 #define CONFIG_VIDEO_MB862xx
 #define CONFIG_VIDEO_MB862xx_ACCEL
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
-#define CONFIG_CONSOLE_EXTRA_INFO
 #define VIDEO_FB_16BPP_PIXEL_SWAP
 #define VIDEO_FB_16BPP_WORD_SWAP
-#define CONFIG_VGA_AS_SINGLE_DEVICE
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
-#define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_VIDEO_BMP_GZIP
 #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (2 << 20)       /* decompressed img */
@@ -250,7 +237,6 @@
 #define CONFIG_SYS_PCI1_IO_SIZE        0x01000000      /* 16M                  */
 
 #if defined(CONFIG_PCI)
-#define CONFIG_PCI_PNP                 /* do pci plug-and-play         */
 #undef CONFIG_PCI_SCAN_SHOW            /* show pci devices on startup  */
 #endif /* CONFIG_PCI */