diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-07-19 00:38:23 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-07-19 00:38:23 +0200 |
| commit | a694610d3361465d4c8d27dde72ab8b63d31115e (patch) | |
| tree | 063d03bcf75538fe45f940eda5b1e6f1859a96fb /include/configs/PM520.h | |
| parent | 5669ed4557edf2714203aa8625c9fcd5a753b338 (diff) | |
| parent | 2419169f5749d7af501b3b77a5336d1d535320de (diff) | |
| download | blackbird-obmc-uboot-a694610d3361465d4c8d27dde72ab8b63d31115e.tar.gz blackbird-obmc-uboot-a694610d3361465d4c8d27dde72ab8b63d31115e.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
Diffstat (limited to 'include/configs/PM520.h')
| -rw-r--r-- | include/configs/PM520.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/include/configs/PM520.h b/include/configs/PM520.h index ff73ef9a29..f9687d2743 100644 --- a/include/configs/PM520.h +++ b/include/configs/PM520.h @@ -86,12 +86,6 @@ #define CONFIG_USB_STORAGE #endif -#if !defined(CONFIG_BOOT_ROM) -/* DoC requires legacy NAND for now */ -#define CONFIG_NAND_LEGACY -#endif - - /* * BOOTP options */ @@ -117,10 +111,6 @@ #define CONFIG_CMD_SNTP #define CONFIG_CMD_USB -#if !defined(CONFIG_BOOT_ROM) -#define CONFIG_CMD_DOC -#endif - #if defined(CONFIG_MPC5200) #define CONFIG_CMD_PCI #endif @@ -186,15 +176,6 @@ #define CONFIG_RTC_PCF8563 #define CONFIG_SYS_I2C_RTC_ADDR 0x51 -/* - * Disk-On-Chip configuration - */ - -#define CONFIG_SYS_DOC_SHORT_TIMEOUT -#define CONFIG_SYS_MAX_DOC_DEVICE 1 /* Max number of DOC devices */ - -#define CONFIG_SYS_DOC_SUPPORT_2000 -#define CONFIG_SYS_DOC_SUPPORT_MILLENNIUM #define CONFIG_SYS_DOC_BASE 0xE0000000 #define CONFIG_SYS_DOC_SIZE 0x00100000 |
