diff options
| author | wdenk <wdenk> | 2004-02-22 23:46:08 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2004-02-22 23:46:08 +0000 |
| commit | 3c74e32a98187c792edcea3e0e39150de5a8dda6 (patch) | |
| tree | feb1a080a1332a3bfc383282ba9a6e4cfe6f8f4a /include/configs | |
| parent | cf56e1101957c09cb4aafcf28a89658c4649c511 (diff) | |
| download | talos-obmc-uboot-3c74e32a98187c792edcea3e0e39150de5a8dda6.tar.gz talos-obmc-uboot-3c74e32a98187c792edcea3e0e39150de5a8dda6.zip | |
* Patch by Travis Sawyer, 09 Feb 2004:
o 440GX:
- Fix PCI Indirect access for type 1 config cycles with ppc440.
- Add phymode for 440 enet
- fix pci pre init
o XPedite1K:
- Change board_pre_init to board_early_init_f
- Add user flash to bus controller setup
- Fix pci pre init
- Fix is_pci_host to check GPIO for monarch bit
- Force xpedite1k to pci conventional mode (via #define option)
* Patch by Brad Kemp, 4 Feb 2004:
- handle the machine check that is generated during the PCI scans
on 82xx processors.
- define the registers used in the IMMR by the PCI subsystem.
* Patch by Pierre Aubert, 03 Feb 2004:
cpu/mpc5xxx/start.S: copy MBAR into SPR311
* Patch by Jeff Angielski, 03 Feb 2004:
Fix copy & paste error in cpu/mpc8260/pci.c
* Patch by Reinhard Meyer, 24 Jan 2004:
Fix typo in cpu/mpc5xxx/pci_mpc5200.c
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/XPEDITE1K.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/configs/XPEDITE1K.h b/include/configs/XPEDITE1K.h index 845449cc63..8bdd293261 100644 --- a/include/configs/XPEDITE1K.h +++ b/include/configs/XPEDITE1K.h @@ -37,7 +37,7 @@ #define CONFIG_4xx 1 /* ... PPC4xx family */ #define CONFIG_440 1 #define CONFIG_440_GX 1 /* 440 GX */ -#define CONFIG_BOARD_PRE_INIT 1 /* Call board_pre_init */ +#define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_pre_init */ #undef CFG_DRAM_TEST /* Disable-takes long time! */ #define CONFIG_SYS_CLK_FREQ 33333333 /* external freq to pll */ @@ -235,7 +235,7 @@ extern void out32(unsigned int, unsigned long); #define CFG_PCI_SUBSYS_VENDORID 0x1014 /* IBM */ #define CFG_PCI_SUBSYS_DEVICEID 0xcafe /* Whatever */ - +#define CFG_PCI_FORCE_PCI_CONV /* Force PCI Conventional Mode */ /* * For booting Linux, the board info and command line data * have to be in the first 8 MB of memory, since this is |
