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

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

diff --git a/include/configs/vct.h b/include/configs/vct.h
index 6489e08173ca0a4bc0f110b1b420ef1954560bf3..b1dccdf666f546eb59c0aaae4d991c88d78fbb42 100644 (file)
--- a/include/configs/vct.h
+++ b/include/configs/vct.h
@@ -25,14 +25,11 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_DISPLAY_BOARDINFO
-
 #define CPU_CLOCK_RATE                 324000000 /* Clock for the MIPS core */
 #define CONFIG_SYS_MIPS_TIMER_FREQ     (CPU_CLOCK_RATE / 2)
 
 #define CONFIG_SKIP_LOWLEVEL_INIT      /* SDRAM is initialized by the bootstrap code */
 
-#define CONFIG_SYS_TEXT_BASE           0x87000000
 #define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_MONITOR_LEN         (256 << 10)
 #define CONFIG_SYS_MALLOC_LEN          (1 << 20)
@@ -41,8 +38,6 @@
 
 #if !defined(CONFIG_VCT_NAND) && !defined(CONFIG_VCT_ONENAND)
 #define CONFIG_VCT_NOR
-#else
-#define CONFIG_SYS_NO_FLASH
 #endif
 
 /*
@@ -59,7 +54,6 @@
 #define CONFIG_SYS_NS16550_COM1                UART_1_BASE
 #define CONFIG_CONS_INDEX              1
 #define CONFIG_SYS_NS16550_CLK         921600
-#define CONFIG_BAUDRATE                        115200
 
 /*
  * SDRAM
@@ -100,16 +94,11 @@
 #endif
 
 #if defined(CONFIG_CMD_USB)
-#define CONFIG_USB_STORAGE
-#define CONFIG_DOS_PARTITION
-#define CONFIG_ISO_PARTITION
-
 #define CONFIG_SUPPORT_VFAT
 
 /*
  * USB/EHCI
  */
-#define CONFIG_USB_EHCI                        /* Enable EHCI USB support      */
 #define CONFIG_USB_EHCI_VCT            /* on VCT platform              */
 #define CONFIG_EHCI_MMIO_BIG_ENDIAN
 #define CONFIG_EHCI_DESC_BIG_ENDIAN
@@ -144,7 +133,6 @@
 #define CONFIG_SYS_MAXARGS     16              /* max number of command args   */
 #define CONFIG_TIMESTAMP                       /* Print image info with timestamp */
 #define CONFIG_CMDLINE_EDITING                 /* add command line history     */
-#define CONFIG_SYS_CONSOLE_INFO_QUIET          /* don't print console @ startup*/
 
 /*
  * FLASH and environment organization
@@ -204,13 +192,6 @@
 #define        CONFIG_ENV_SIZE                 (128 << 10)     /* erase size */
 #endif /* CONFIG_VCT_ONENAND */
 
-/*
- * Cache Configuration
- */
-#define CONFIG_SYS_DCACHE_SIZE         16384
-#define CONFIG_SYS_ICACHE_SIZE         16384
-#define CONFIG_SYS_CACHELINE_SIZE      32
-
 /*
  * I2C/EEPROM
  */
@@ -248,7 +229,6 @@ int vct_gpio_get(int pin);
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS  10   /* and takes up to 10 msec */
 
 #define CONFIG_BOOTCOMMAND     "run test3"
-#define CONFIG_BOOTDELAY       5       /* autoboot after 5 seconds     */
 
 /*
  * UBI configuration
@@ -256,7 +236,6 @@ int vct_gpio_get(int pin);
 #if defined(CONFIG_VCT_ONENAND)
 #define CONFIG_SYS_USE_UBI
 #define        CONFIG_CMD_JFFS2
-#define        CONFIG_CMD_UBI
 #define        CONFIG_RBTREE
 #define CONFIG_MTD_DEVICE              /* needed for mtdparts commands */
 #define CONFIG_MTD_PARTITIONS
@@ -275,7 +254,6 @@ int vct_gpio_get(int pin);
  * (NOR/OneNAND) usage and Linux kernel booting.
  */
 #if defined(CONFIG_VCT_SMALL_IMAGE)
-#undef CONFIG_CMD_BEDBUG
 #undef CONFIG_CMD_EEPROM
 #undef CONFIG_CMD_EEPROM
 #undef CONFIG_CMD_IRQ