diff options
| author | wdenk <wdenk> | 2003-06-03 23:54:09 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2003-06-03 23:54:09 +0000 |
| commit | 682011ff6968198da14b89e40d9f55b00f6d91f7 (patch) | |
| tree | 18793a72134a5262daf281ab0b904ab16f5337ac /cpu/mpc8260 | |
| parent | 7a8e9bed17d7924a9c5c4699b1f6a3a0359524ed (diff) | |
| download | u-boot-imx-682011ff6968198da14b89e40d9f55b00f6d91f7.zip u-boot-imx-682011ff6968198da14b89e40d9f55b00f6d91f7.tar.gz u-boot-imx-682011ff6968198da14b89e40d9f55b00f6d91f7.tar.bz2 | |
* Patches by Udi Finkelstein, 2 June 2003:
- Added support for custom keyboards, initialized by defining a
board-specific drv_keyboard_init as well as defining CONFIG_KEYBOARD .
- Added support for the RBC823 board.
- cpu/mpc8xx/lcd.c now automatically calculates the
Horizontal Pixel Count field.
* Fix alignment problem in BOOTP (dhcp_leasetime option)
[pointed out by Nicolas Lacressonnière, 2 Jun 2003]
* Patch by Mark Rakes, 14 May 2003:
add support for Intel e1000 gig cards.
* Patch by Nye Liu, 3 Jun 2003:
fix critical typo in MAMR definition (include/mpc8xx.h)
* Fix requirement to align U-Boot image on 16 kB boundaries on PPC.
* Patch by Klaus Heydeck, 2 Jun 2003
Minor changes for KUP4K configuration
Diffstat (limited to 'cpu/mpc8260')
| -rw-r--r-- | cpu/mpc8260/pci.c | 2 | ||||
| -rw-r--r-- | cpu/mpc8260/start.S | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cpu/mpc8260/pci.c b/cpu/mpc8260/pci.c index 6d16c04..013d48a 100644 --- a/cpu/mpc8260/pci.c +++ b/cpu/mpc8260/pci.c @@ -170,7 +170,7 @@ #endif #ifndef CFG_PCI_MSTR_MEMIO_SIZE -#define PCI_MSTR_MEMIO_SIZE 0x20000000 /* 512MB */ +#define PCI_MSTR_MEMIO_SIZE 0x10000000 /* 256 MB */ #else #define PCI_MSTR_MEMIO_SIZE CFG_PCI_MSTR_MEMIO_SIZE #endif diff --git a/cpu/mpc8260/start.S b/cpu/mpc8260/start.S index a5b8b5f..0e6b963 100644 --- a/cpu/mpc8260/start.S +++ b/cpu/mpc8260/start.S @@ -1028,7 +1028,7 @@ trap_init: lwz r7, GOT(_start) lwz r8, GOT(_end_of_vectors) - rlwinm r9, r7, 0, 18, 31 /* _start & 0x3FFF */ + li r9, 0x100 /* reset vector always at 0x100 */ cmplw 0, r7, r8 bgelr /* return if r7>=r8 - just in case */ |