diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-04-05 23:04:30 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-04-05 23:04:30 +0200 |
| commit | 712ac6a1a6909a58d6549fb220cc921a7e9f9979 (patch) | |
| tree | 7391a68d2b81d9a9096e170b97bbfe0ed81c2c7f /include/configs/integratorap.h | |
| parent | 23e4af49e066a53cd3e3659b68ef90572d88de84 (diff) | |
| parent | c6fadb9c73a6a3e0c7f20696e978304a593a8d2d (diff) | |
| download | blackbird-obmc-uboot-712ac6a1a6909a58d6549fb220cc921a7e9f9979.tar.gz blackbird-obmc-uboot-712ac6a1a6909a58d6549fb220cc921a7e9f9979.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include/configs/integratorap.h')
| -rw-r--r-- | include/configs/integratorap.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h index 9231e64039..38c024953e 100644 --- a/include/configs/integratorap.h +++ b/include/configs/integratorap.h @@ -142,7 +142,7 @@ * PCI definitions */ -/*#define CONFIG_PCI /--* include pci support */ +#ifdef CONFIG_PCI /* pci support */ #undef CONFIG_PCI_PNP #define CONFIG_PCI_SCAN_SHOW 1 /* show pci devices on startup */ #define DEBUG @@ -150,7 +150,6 @@ #define CONFIG_EEPRO100 #define CONFIG_SYS_RX_ETH_BUFFER 8 /* use 8 rx buffer on eepro100 */ - #define INTEGRATOR_BOOT_ROM_BASE 0x20000000 #define INTEGRATOR_HDR0_SDRAM_BASE 0x80000000 @@ -278,6 +277,7 @@ #define INTEGRATOR_SC_PCIENABLE \ (INTEGRATOR_SC_BASE + INTEGRATOR_SC_PCIENABLE_OFFSET) +#endif /* CONFIG_PCI */ /*----------------------------------------------------------------------- * There are various dependencies on the core module (CM) fitted * Users should refer to their CM user guide |
