Commit graph

27160 commits

Author SHA1 Message Date
Andy Fleming
073e1b5099 Fix initrd/dtb interaction
The original code would wrongly relocate the blob to be right before
the initrd if it existed.  The blob *must* be within CFG_BOOTMAPSZ,
if it is defined.  So we make two changes:

1) flag the blob for relocation whenever its address is above BOOTMAPSZ

2) If the blob is being relocated, relocate it before kbd, not initrd

Signed-off-by: Andy Fleming <afleming@freescale.com>
2007-08-14 17:38:19 +02:00
Peter Pearse
e54b970173 Supply spi interface in at45.c 2007-08-14 15:40:00 +01:00
Stefan Roese
3b3bff4cbf Merge with git://www.denx.de/git/u-boot.git 2007-08-14 16:36:29 +02:00
Stefan Roese
4ce846ec59 POST: Fix merge problem
Signed-off-by: Stefan Roese <sr@denx.de>
2007-08-14 15:12:01 +02:00
Stefan Roese
429d9571f6 Coding style cleanup
Signed-off-by: Stefan Roese <sr@denx.de>
2007-08-14 15:03:17 +02:00
Stefan Roese
34886bbea2 Merge with /home/stefan/git/u-boot/zeus 2007-08-14 15:00:42 +02:00
Stefan Roese
779e975117 ppc4xx: Add initial Zeus (PPC405EP) board support
Signed-off-by: Stefan Roese <sr@denx.de>
2007-08-14 14:44:41 +02:00
Stefan Roese
c5a172a5fd POST: Add option for external ethernet loopback test
When CFG_POST_ETHER_EXT_LOOPBACK is defined, the ethernet POST
is not done using an internal loopback connection, but by assuming
that an external loopback connector is plugged into the board.

Signed-off-by: Stefan Roese <sr@denx.de>
2007-08-14 14:41:55 +02:00
Stefan Roese
eb2b4010ae POST: Add ppc405 support to cache and UART POST
Signed-off-by: Stefan Roese <sr@denx.de>
2007-08-14 14:39:44 +02:00
Peter Pearse
0c42f36f15 Replace lost end of at45.c. 2007-08-14 10:46:32 +01:00
Peter Pearse
65d7ada645 Update Makefiles for merged and split at45.c. 2007-08-14 10:30:06 +01:00
Peter Pearse
3454cece2d Delete the merged files. 2007-08-14 10:21:06 +01:00
Peter Pearse
dcbfd2e564 Add the files. 2007-08-14 10:14:05 +01:00
Peter Pearse
d4fc6012fd Add MACH_TYPE records for several AT91 boards.
Merge to two at45.c files into a common file, split to at45.c and spi.c
Fix spelling error in DM9161 PHY Support.
Initialize at91rm9200 board (and set LED).
Add PIO control for at91rm9200dk LEDs and Mux.
Change dataflash partition boundaries to be compatible with Linux 2.6.

Signed-off-by:	Peter Pearse <peter.pearse@arm.com>
Signed-off-by:	Ulf Samuelsson <ulf@atmel.com>
2007-08-14 10:10:52 +01:00
Wolfgang Denk
4ef35e53c6 Coding style cleanup, update CHANGELOG
Signed-off-by: Wolfgang Denk <wd@denx.de>
2007-08-14 09:54:46 +02:00
Wolfgang Denk
bf9583e544 Merge with /home/wd/git/u-boot/custodian/u-boot-mpc85xx 2007-08-14 09:53:38 +02:00
Wolfgang Denk
85eb5caf6b Coding style cleanup; rebuild CHANGELOG 2007-08-14 09:47:27 +02:00
Randy Vinson
7f3f2bd2dc 85xxCDS: Add make targets for legacy systems.
The PCI ID select values on the Arcadia main board differ depending
on the version of the hardware. The standard configuration supports
Rev 3.1. The legacy target supports Rev 2.x.

Signed-off-by Randy Vinson <rvinson@mvista.com>
2007-08-14 01:51:39 -05:00
Andy Fleming
e41094c7e3 85xxCDS: Enable the VIA PCI-to-ISA bridge.
Author: Randy Vinson <rvinson@linuxbox.(none)>

Enable the PCI-to-ISA bridge in the VIA Southbridge located on the
Arcadia main board.

Signed-off-by: Randy Vinson <rvinson@mvista.com>
Signed-off-by: York Sun <yorksun@freescale.com>
2007-08-14 01:50:09 -05:00
Andy Fleming
da9d4610d7 Add support for UEC to 8568
Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>
2007-08-14 01:47:44 -05:00
Haiying Wang
c59e4091ff Add PCI support for MPC8568MDS board
This patch is against u-boot-mpc85xx.git of www.denx.com

Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
Signed-off-by: Ebony Zhu <ebony.zhu@freescale.com>
2007-08-14 01:46:08 -05:00
Haiying Wang
d111d6382c Empirically set cpo and clk_adjust for mpc85xx DDR2 support
This patch is against u-boot-mpc85xx.git of www.denx.com

Setting cpo to 0x9 for frequencies higher than 333MHz is verified on
both MPC8548CDS board and MPC8568MDS board, especially for supporting
533MHz DDR2.

Setting clk_adjust to 0x6(3/4 late cycle) for MPC8568MDS board is for
DDR2 on all current board versions especially ver 1.92 or later to bring
up.

Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
2007-08-14 01:45:51 -05:00
Kumar Gala
3db0bef59e Use an absolute address when jumping out of 4k boot page
On e500 when we leave the 4k boot page we should use an absolute address since
we don't know where the board code may want us to be really running at.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
2007-08-14 01:45:09 -05:00
Andy Fleming
39980c610c MPC85xx BA bits not set for 3-bit bank address DIMM
The current implementation does not set the number of bank address bits
(BA) in the processor. The default assumes 2 logical bank bits. This
works fine for a DIMM that uses devices with 4 internal banks (SPD
byte17 = 0x4) but needs to be set appropriately for a DIMM that uses
devices with 8 internal banks (SPD byte17 = 0x8).

Signed-off-by: Greg Davis <DavisG@embeddedplanet.com>
2007-08-14 01:44:55 -05:00
Andy Fleming
6c543597bb Fix minor 85xx warnings
Some patches had inserted warnings into the build:
* mpc8560ads declared data without using it
* cpu_init declared ecm and immap without using it in all CONFIGs
* MPC8548CDS.h had its default filenames changed so that they contained
  "\m" in the paths.  Made the defaults not Windows-specific (or
  anything-specific)

Signed-off-by: Andy Fleming <afleming@freescale.com>
2007-08-14 01:39:14 -05:00
Ed Swarthout
f2cff6b104 8548cds PCIE support.
Make the early L1 cache stack region guarded to prevent speculative
fetches outside the locked range.

Use _PHYS defines, not _MEM for cpu-side PCI memory mapped regions.
init.S whitespace cleanup.

Allow TEXT_BASE value to be specified on command line.  This allows it
to be set to 0xfffc0000 which cuts the uboot binary in half.

Clear and enable lbc and ecm errors.

Update last_busno in device-tree for pci and pcie.

Remove load of obsolete cpu/mpc85xx/pci.0

Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
Acked-by: Andy Fleming <afleming@freescale.com>
2007-08-14 01:39:00 -05:00
Ed Swarthout
837f1ba05c 8544ds PCIE support
PCI1 LAW mapping should use CFG_PCI1_MEM_PHY and not _BASE address.

Enable LBC and ECM errors and clear error registers.

Add tftpflash env var to get uboot from tftp server and flash it.

Add pci/pcie convenience env vars to display register space:
  "run pcie3regs" to see all pcie3 ccsr registers
  "run pcie3cfg" to see all cfg registers
Whitespace cleanup and MPC8544DS.h

Enable CONFIG_INTERRUPTS.

Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
Acked-by: Andy Fleming <afleming@freescale.com>
2007-08-14 01:38:40 -05:00
Andy Fleming
61a21e980a 85xx start.S cleanup and exception support
From: Ed Swarthout <Ed.Swarthout@freescale.com>

Support external interrupts from platform to eliminate system hangs.
Define CONFIG_INTERRUPTS board configure option to enable.
Enable ecm, ddr, lbc, and pci/pcie error interrupts in PIC.

Remove extra cpu initialization redundant with hardware initialization.
Whitespace cleanup.

Define and use _START_OFFSET consistent with other processors using
ppc_asm.tmpl

Move additional code from .text to boot page to make room for
exception vectors at start of image.

Handle Machine Check, External and Critical exceptions.

Fix e500 machine check error determination in traps.c

TEXT_BASE can now be 0xfffc_0000 - which cuts binary image in half.

Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
Acked-by: Andy Fleming <afleming@freescale.com>
2007-08-14 01:34:21 -05:00
Andy Fleming
7bd30fc4a6 Add MPC8544DS README
Signed-off-by: Andy Fleming <afleming@freescale.com>
2007-08-14 01:33:18 -05:00
Ed Swarthout
40c7f9b0de 85xx allow debugger to configure ddr.
Only check for mpc8548 rev 1 when compiled for 8548.

Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
Acked-by: Andy Fleming <afleming@freescale.com>
2007-08-14 01:22:01 -05:00
Ed Swarthout
29372ff38c mpc85xx L2 cache reporting and SRAM relocation option.
Allow debugger to override flash cs0/cs1 settings to enable alternate
boot regions

Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
Acked-by: Andy Fleming <afleming@freescale.com>
2007-08-14 01:21:55 -05:00
Ed Swarthout
41f0f8fb1a e500 needs ppc_asm.tmp MCK_EXCEPTION
Always define MCK_EXCEPTION macro - so e500 can use it too.

Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
Acked-by: Andy Fleming <afleming@freescale.com>
2007-08-14 01:21:22 -05:00
David Updegraff
53a5c424bf multicast tftp: RFC2090
Implemented IETF RFC2090, Multicast TFTP.  Initial implementation
on Realtek RTL8139 and Freescale TSEC.

Signed-off-by: David Updegraff <dave@cray.com>
Signed-off-by: Ben Warren <bwarren@qstreams.com>
2007-08-13 23:22:31 -04:00
Wilson Callan
5d110f0aa6 New CONFIG_BOOTP_SERVERIP option
Added CONFIG_BOOTP_SERVERIP to allow the tftp server to be different
from the bootp server

Signed-off-by: Wilson Callan <wcallan@savantav.com>
Signed-off-by: Ben Warren <bwarren@qstreams.com>
2007-08-13 23:07:53 -04:00
Mike Rapoport
50cca8b976 Add ability to take MAC address from the environment to DM9000 driver
Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Ben Warren <bwarren@qstreams.com>
2007-08-13 23:06:34 -04:00
Ben Warren
d1bc6c8d5f Sync'd u-boot-net with mainline
Merge git://www.denx.de/git/u-boot

Conflicts:

	drivers/bcm570x.c
	drivers/tigon3.c
2007-08-13 21:26:03 -04:00
Wolfgang Denk
8a92b7c60b Merge with /home/wd/git/u-boot/custodian/u-boot-mpc86xx 2007-08-13 22:00:25 +02:00
Wolfgang Denk
be5d72d10d Minor coding style cleanup. Update CHANGELOG.
Signed-off-by: Wolfgang Denk <wd@denx.de>
2007-08-13 21:57:53 +02:00
Jon Loeliger
8e2dd87eee Merge commit 'remotes/wd/master'
Conflicts:

	MAKEALL

With any luck, this is the last MAKEALL merge conflict!
2007-08-13 11:01:52 -05:00
Joe Hamman
cca34967cb Modify SBC8641D to use new Freescale PCI routines
PCI-Express sockets 1 and 2 verified working with Intel Pro/1000 PT
adapter.

Signed-off-by: Joe Hamman <joe.hamman@embeddedspecialties.com>
Signde-off-by: Jon Loeliger <jdl@freescale.com>
2007-08-13 10:54:44 -05:00
Haavard Skinnemoen
a08458303e atmel_mci: Fix data timeout value
Calculate the data timeout based on values from the CSD instead of
just using a hardcoded DTOR value. This is a backport of a similar fix
in BSP 2.0, with one additional fix: the DTOCYC value is rounded up
instead of down.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
2007-08-13 17:35:16 +02:00
Haavard Skinnemoen
0ba8eed28b AVR32: Include <div64.h> instead of <asm/div64.h>
include/asm-avr32/div64.h was recently moved to include/div64.h, but
cpu/at32ap/interrupts.c wasn't properly updated (an earlier version of
the patch was merged perhaps?)

This patch updates cpu/at32ap/interrupts.c so that the avr32 port
compiles again.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
2007-08-13 17:22:31 +02:00
Haavard Skinnemoen
375c2c9e57 Merge commit 'upstream/master' 2007-08-13 16:34:33 +02:00
Haavard Skinnemoen
f0d1246ed7 atmel_mci: Use 512 byte blocksize if possible
Instead of always using the largest blocksize the card supports, check
if it can support smaller block sizes and use 512 bytes if possible.
Most cards do support this, and other parts of u-boot seem to have
trouble with block sizes different from 512 bytes.

Also enable underrun/overrun protection.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
Acked-by: Hans-Christian Egtvedt <hcegtvedt@atmel.com>
2007-08-13 16:33:52 +02:00
Stefan Roese
273db7e1bd ppc4xx: Fix problem in PLL clock calculation
This patch was originall provided by David Mitchell <dmitchell@amcc.com>
and fixes a bug in the PLL clock calculation.

Signed-off-by: Stefan Roese <sr@denx.de>
2007-08-13 09:05:33 +02:00
Wolfgang Denk
9986bc3e40 Update CHANGELOG 2007-08-12 21:34:50 +02:00
Wolfgang Denk
77d19a8bf3 Minor alignment of output, 2nd try.
Also update CHANGELOG

Signed-off-by: Wolfgang Denk <wd@denx.de>
2007-08-12 21:34:34 +02:00
Wolfgang Denk
6b309f22a7 Minor alignment of output
Signed-off-by: Wolfgang Denk <wd@denx.de>
2007-08-12 20:35:49 +02:00
Wolfgang Denk
6f6d7b9c85 Cleanup output on ADS5121 board
Signed-off-by: Wolfgang Denk
2007-08-12 18:28:18 +02:00
Wolfgang Denk
0cfc9d6ad1 Merge with git+ssh://gemini_vpn/home/wd/git/u-boot/master 2007-08-12 18:12:38 +02:00