diff options
author | Wolfgang Denk <wd@denx.de> | 2011-01-12 23:54:32 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2011-01-12 23:54:32 +0100 |
commit | d52595f69edabc22032dfff52fc0e20c50298565 (patch) | |
tree | 0b8c11ebde3c065d26408136cb7caa532c0b2078 /include/configs | |
parent | 1ad98ad66e5bb8a46a186a92f180bb9592d47673 (diff) | |
parent | 7e4c3a41ce2e9ace8bbca125a81f7397ba91e536 (diff) | |
download | u-boot-imx-d52595f69edabc22032dfff52fc0e20c50298565.zip u-boot-imx-d52595f69edabc22032dfff52fc0e20c50298565.tar.gz u-boot-imx-d52595f69edabc22032dfff52fc0e20c50298565.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Diffstat (limited to 'include/configs')
-rw-r--r-- | include/configs/lwmon5.h | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h index aedf495..a1ead70 100644 --- a/include/configs/lwmon5.h +++ b/include/configs/lwmon5.h @@ -440,7 +440,6 @@ #define CONFIG_CMD_MII #define CONFIG_CMD_NET #define CONFIG_CMD_NFS -#define CONFIG_CMD_PCI #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO #define CONFIG_CMD_SDRAM @@ -488,22 +487,6 @@ #define CONFIG_MX_CYCLIC 1 /* enable mdc/mwc commands */ #define CONFIG_VERSION_VARIABLE 1 /* include version env variable */ -/* - * PCI stuff - */ -/* General PCI */ -#define CONFIG_PCI /* include pci support */ -#undef CONFIG_PCI_PNP /* do (not) pci plug-and-play */ -#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */ -#define CONFIG_SYS_PCI_TARGBASE 0x80000000 /* PCIaddr mapped to CONFIG_SYS_PCI_MEMBASE*/ - -/* Board-specific PCI */ -#define CONFIG_SYS_PCI_TARGET_INIT -#define CONFIG_SYS_PCI_MASTER_INIT - -#define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x10e8 /* AMCC */ -#define CONFIG_SYS_PCI_SUBSYS_ID 0xcafe /* Whatever */ - #ifndef DEBUG #define CONFIG_HW_WATCHDOG 1 /* Use external HW-Watchdog */ #endif |