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/PCIPPC2.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/PCIPPC2.h')
-rw-r--r-- | include/configs/PCIPPC2.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/include/configs/PCIPPC2.h b/include/configs/PCIPPC2.h index 5951d00..99a8c4a 100644 --- a/include/configs/PCIPPC2.h +++ b/include/configs/PCIPPC2.h @@ -75,7 +75,6 @@ #define CONFIG_CMD_BSP #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP -#define CONFIG_CMD_DOC #define CONFIG_CMD_ELF #define CONFIG_CMD_NFS #define CONFIG_CMD_PCI @@ -84,8 +83,6 @@ #define CONFIG_PCI 1 #define CONFIG_PCI_PNP 1 /* PCI plug-and-play */ -#define CONFIG_NAND_LEGACY - /* * Miscellaneous configurable options */ @@ -251,15 +248,6 @@ #define BOOTFLAG_WARM 0x02 /* Software reboot */ /*----------------------------------------------------------------------- - * Disk-On-Chip configuration - */ - -#define CONFIG_SYS_MAX_DOC_DEVICE 1 /* Max number of DOC devices */ - -#define CONFIG_SYS_DOC_SUPPORT_2000 -#undef CONFIG_SYS_DOC_SUPPORT_MILLENNIUM - -/*----------------------------------------------------------------------- RTC m48t59 */ #define CONFIG_RTC_MK48T59 |