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/MIP405.h | |
parent | 5669ed4557edf2714203aa8625c9fcd5a753b338 (diff) | |
parent | 2419169f5749d7af501b3b77a5336d1d535320de (diff) | |
download | u-boot-imx-a694610d3361465d4c8d27dde72ab8b63d31115e.zip u-boot-imx-a694610d3361465d4c8d27dde72ab8b63d31115e.tar.gz u-boot-imx-a694610d3361465d4c8d27dde72ab8b63d31115e.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
Diffstat (limited to 'include/configs/MIP405.h')
-rw-r--r-- | include/configs/MIP405.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h index da9b1cf..7ac9342 100644 --- a/include/configs/MIP405.h +++ b/include/configs/MIP405.h @@ -84,12 +84,9 @@ #if !defined(CONFIG_MIP405T) #define CONFIG_CMD_USB - #define CONFIG_CMD_DOC #endif -#define CONFIG_NAND_LEGACY - #define CONFIG_SYS_HUSH_PARSER #define CONFIG_SYS_PROMPT_HUSH_PS2 "> " /************************************************************** @@ -384,13 +381,6 @@ #define CONFIG_ISO_PARTITION /* Experimental */ /************************************************************ - * Disk-On-Chip configuration - ************************************************************/ -#define CONFIG_SYS_MAX_DOC_DEVICE 1 /* Max number of DOC devices */ -#define CONFIG_SYS_DOC_SHORT_TIMEOUT -#define CONFIG_SYS_DOC_SUPPORT_2000 -#define CONFIG_SYS_DOC_SUPPORT_MILLENNIUM -/************************************************************ * Keyboard support ************************************************************/ #undef CONFIG_ISA_KEYBOARD |