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

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

diff --git a/include/configs/intip.h b/include/configs/intip.h
index 60c9e2c..c5af365 100644 (file)
--- a/include/configs/intip.h
+++ b/include/configs/intip.h
@@ -46,11 +46,8 @@
 #define CONFIG_BOARD_EARLY_INIT_R      1       /* Call board_early_init_r */
 #define CONFIG_MISC_INIT_R             1       /* Call misc_init_r */
 #define CONFIG_BOARD_TYPES             1       /* support board types */
-#define CONFIG_FIT
 #define CFG_ALT_MEMTEST
 
-#undef CONFIG_ZERO_BOOTDELAY_CHECK     /* ignore keypress on bootdelay==0 */
-
 /*
  * Base addresses -- Note these are effective addresses where the
  * actual resources get mapped (not physical addresses)
@@ -254,7 +251,6 @@
  * USB-OHCI
  */
 #define CONFIG_USB_OHCI_NEW
-#define CONFIG_USB_STORAGE
 #undef CONFIG_SYS_OHCI_BE_CONTROLLER   /* 460EX has little endian descriptors*/
 #define CONFIG_SYS_OHCI_SWAP_REG_ACCESS        /* 460EX has little endian register */
 #define CONFIG_SYS_OHCI_USE_NPS                /* force NoPowerSwitching mode */
@@ -282,12 +278,8 @@
 #define CONFIG_CMD_CHIP_CONFIG
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DTT
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_FAT
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_SDRAM
-#define CONFIG_CMD_SNTP
-#define CONFIG_CMD_USB
 
 /* Partitions */
 #define CONFIG_MAC_PARTITION
@@ -312,7 +304,6 @@
 #define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x1014  /* IBM */
 #define CONFIG_SYS_PCI_SUBSYS_DEVICEID 0xcafe  /* Whatever */
 
-
 /*
  * External Bus Controller (EBC) Setup
  */
@@ -327,7 +318,6 @@
  * 0xfc00.0000 -> 4.cc00.0000
  */
 
-
 /* Memory Bank 0 (NOR-FLASH) initialization */
 #define CONFIG_SYS_EBC_PB0AP           0x10055e00
 #define CONFIG_SYS_EBC_PB0CR           (CONFIG_SYS_BOOT_BASE_ADDR | 0x9a000)