arm/rpi: Enable dcache

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

diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h
index 7a046a9dfb727dc986b462640b7760f3665d119e..bdedef5374f959ec74f7bb4e5c86b0945aeff268 100644 (file)
--- a/include/configs/UCP1020.h
+++ b/include/configs/UCP1020.h
@@ -47,7 +47,6 @@
 #define CONFIG_ETHPRIME                "eTSEC3"
 
 #ifndef CONFIG_SPI_FLASH
-#define CONFIG_SPI_FLASH       y
 #endif
 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
 
@@ -89,7 +88,6 @@
 #define CONFIG_ETHPRIME                "eTSEC1"
 
 #ifndef CONFIG_SPI_FLASH
-#define CONFIG_SPI_FLASH       y
 #endif
 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
 
@@ -424,7 +422,6 @@
 #define CONFIG_PCI_PNP /* do pci plug-and-play */
 #define CONFIG_E1000   /* Defind e1000 pci Ethernet card*/
 #define CONFIG_CMD_PCI
-#define CONFIG_CMD_NET
 
 #define CONFIG_PCI_SCAN_SHOW   /* show pci devices on startup */
 #define CONFIG_DOS_PARTITION
@@ -493,8 +490,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_I2C
@@ -627,17 +622,6 @@
 /* default location for tftp and bootm */
 #define CONFIG_LOADADDR                1000000
 
-/*
- * Autobooting
- */
-#define CONFIG_AUTOBOOT_KEYED
-#define CONFIG_AUTOBOOT_STOP_STR       "\x1b"
-#define DEBUG_BOOTKEYS                 0
-#undef CONFIG_AUTOBOOT_DELAY_STR
-#undef CONFIG_BOOTARGS
-#define CONFIG_AUTOBOOT_PROMPT "Autobooting in %d seconds, "   \
-                               "press \"<Esc>\" to stop\n", bootdelay
-
 #define CONFIG_BOOTARGS        /* the boot command will set bootargs */
 
 #define CONFIG_BAUDRATE        115200