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

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

diff --git a/include/configs/ipek01.h b/include/configs/ipek01.h
index 41ced15..1aeded1 100644 (file)
--- a/include/configs/ipek01.h
+++ b/include/configs/ipek01.h
@@ -43,18 +43,12 @@
 /*
  * Video configuration for LIME GDC
  */
-#define CONFIG_VIDEO
 #ifdef CONFIG_VIDEO
 #define CONFIG_VIDEO_MB862xx
 #define CONFIG_VIDEO_MB862xx_ACCEL
 #define VIDEO_FB_16BPP_WORD_SWAP
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
-#define CONFIG_CONSOLE_EXTRA_INFO
-#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 */
@@ -69,8 +63,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_PCI_MEM_BUS     0x40000000
@@ -85,13 +77,9 @@
 #define CONFIG_EEPRO100                1
 #define CONFIG_SYS_RX_ETH_BUFFER       8  /* use 8 rx buffer on eepro100  */
 
-/* Partitions */
-#define CONFIG_DOS_PARTITION
-
 /* USB */
 #define CONFIG_USB_OHCI_NEW
 #define CONFIG_SYS_OHCI_BE_CONTROLLER
-#define CONFIG_USB_STORAGE
 
 #define CONFIG_SYS_USB_OHCI_CPU_INIT
 #define CONFIG_SYS_USB_OHCI_REGS_BASE          MPC5XXX_USB
@@ -101,27 +89,19 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #ifdef CONFIG_VIDEO
 #define CONFIG_CMD_BMP         /* BMP support */
 #endif
 #define CONFIG_CMD_DATE                /* support for RTC, date/time...*/
-#define CONFIG_CMD_DHCP                /* DHCP Support */
-#define CONFIG_CMD_FAT         /* FAT support */
-#define CONFIG_CMD_I2C         /* I2C serial bus support */
 #define CONFIG_CMD_IDE         /* IDE harddisk support */
 #define CONFIG_CMD_IRQ         /* irqinfo */
-#define CONFIG_CMD_MII         /* MII support */
 #define CONFIG_CMD_PCI         /* pciinfo */
-#define CONFIG_CMD_USB         /* USB Support */
 
 #define CONFIG_SYS_LOWBOOT     1
 
 /*
  * Autobooting
  */
-#define CONFIG_BOOTDELAY       5       /* autoboot after 5 seconds */
 
 #define CONFIG_PREBOOT "echo;" \
        "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
@@ -171,9 +151,6 @@
 /*
  * Open firmware flat tree support
  */
-#define CONFIG_OF_LIBFDT       1
-#define CONFIG_OF_BOARD_SETUP  1
-
 #define OF_CPU                 "PowerPC,5200@0"
 #define OF_SOC                 "soc5200@f0000000"
 #define OF_TBCLK               (bd->bi_busfreq / 4)
@@ -295,8 +272,6 @@
 
 #define CONFIG_SYS_LOAD_ADDR           0x100000 /* default load address */
 
-#define CONFIG_LOOPW
-
 /*
  * Various low-level settings
  */