arm: mvebu: add multiple usb-hostcontroller support for AXP

[karo-tx-uboot.git] / include / configs / integratorcp.h

diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h
index 608719a7eacb7725a3cfac08521397a8b7d6acc0..af69ad99c4cda87fcad3cebd07036d9b6811687b 100644 (file)
--- a/include/configs/integratorcp.h
+++ b/include/configs/integratorcp.h
@@ -18,7 +18,6 @@
 #include "integrator-common.h"
 
 /* Integrator CP-specific configuration */
-#define CONFIG_ARCH_CINTEGRATOR
 #define CONFIG_SYS_HZ_CLOCK            1000000 /* Timer 1 is clocked at 1Mhz */
 
 /*
@@ -29,20 +28,9 @@
 #define CONFIG_SMC91111_BASE    0xC8000000
 #undef CONFIG_SMC91111_EXT_PHY
 
-/* PL011 configuration */
-#define CONFIG_PL011_SERIAL
-#define CONFIG_PL011_CLOCK     14745600
-#define CONFIG_PL01x_PORTS     { (void *)CONFIG_SYS_SERIAL0, (void *)CONFIG_SYS_SERIAL1 }
-#define CONFIG_CONS_INDEX      0
-#define CONFIG_BAUDRATE                38400
-#define CONFIG_SYS_SERIAL0             0x16000000
-#define CONFIG_SYS_SERIAL1             0x17000000
-
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_BOOTDELAY       2
 #define CONFIG_BOOTARGS        "root=/dev/mtdblock0 console=ttyAMA0 console=tty ip=dhcp netdev=27,0,0xfc800000,0xfc800010,eth0 video=clcdfb:0"
 #define CONFIG_BOOTCOMMAND "tftpboot ; bootm"
@@ -53,30 +41,10 @@
 /*
  * Miscellaneous configurable options
  */
-#define CONFIG_SYS_PROMPT      "Integrator-CP # "      /* Monitor Command Prompt */
-
-/*
- * FLASH and environment organization
- * Top varies according to amount fitted
- * Reserve top 4 blocks of flash
- * - ARM Boot Monitor
- * - Unused
- * - SIB block
- * - U-Boot environment
- *
- * Base is always 0x24000000
- */
-#define CONFIG_SYS_FLASH_BASE          0x24000000
-#define CONFIG_SYS_FLASH_CFI           1
-#define CONFIG_FLASH_CFI_DRIVER                1
-#define CONFIG_SYS_MAX_FLASH_SECT      64
-#define CONFIG_SYS_MAX_FLASH_BANKS     1               /* max number of memory banks */
 #define PHYS_FLASH_SIZE                        0x01000000      /* 16MB */
-#define CONFIG_SYS_FLASH_ERASE_TOUT    (2*CONFIG_SYS_HZ)       /* Timeout for Flash Erase */
-#define CONFIG_SYS_FLASH_WRITE_TOUT    (2*CONFIG_SYS_HZ)       /* Timeout for Flash Write */
-
-#define CONFIG_SYS_MONITOR_LEN         0x00100000
+#define CONFIG_SYS_MAX_FLASH_SECT      64
 #define CONFIG_ENV_IS_IN_FLASH 1
+#define CONFIG_SYS_MONITOR_LEN         0x00100000
 
 /*
  * Move up the U-Boot & monitor area if more flash is fitted.