configs: Migrate CONFIG_USB_STORAGE

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

diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h
index 660646e..c1abcb6 100644 (file)
--- a/include/configs/cyrus.h
+++ b/include/configs/cyrus.h
@@ -11,8 +11,6 @@
 
 #define CONFIG_CYRUS
 
-#define CONFIG_PHYS_64BIT
-
 #if !defined(CONFIG_PPC_P5020) && !defined(CONFIG_PPC_P5040)
 #error Must call Cyrus CONFIG with a specific CPU enabled.
 #endif
@@ -446,7 +444,6 @@
 #define CONFIG_HAS_FSL_MPH_USB
 
 #if defined(CONFIG_HAS_FSL_DR_USB) || defined(CONFIG_HAS_FSL_MPH_USB)
-#define CONFIG_USB_STORAGE
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_FSL
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
@@ -505,7 +502,6 @@
 /* default location for tftp and bootm */
 #define CONFIG_LOADADDR                1000000
 
-#define CONFIG_BOOTDELAY       10      /* -1 disables auto-boot */
 
 #define CONFIG_BAUDRATE        115200
 
@@ -521,7 +517,7 @@
 "ubootaddr=" __stringify(CONFIG_SYS_TEXT_BASE) "\0"                    \
 "consoledev=ttyS0\0"                                   \
 "ramdiskaddr=2000000\0"                                        \
-"fdtaddr=c00000\0"                                     \
+"fdtaddr=1e00000\0"                                    \
 "bdev=sda3\0"
 
 #define CONFIG_HDBOOT                                  \