Commit Graph

470 Commits

Author SHA1 Message Date
TsiChungLiew
ab77bc547b ColdFire: MCF5329 Update and cleanup
Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
2007-08-16 17:43:19 -06:00
John Rigby
81735b2568 Merge branch 'denx-coldfire' into coldfire-aug2007 2007-08-16 17:40:03 -06:00
Andy Fleming
7613afda77 Don't wait for disconnected TSECs
The TSEC driver's PHY code waits a long time for autonegotiation to
complete, even if the link is down.  The PHY knows the link is
down or up before autonegotiation completes, so we can short-circuit
the process if the link is down.

Signed-off-by: Andy Fleming <afleming@freescale.com>
2007-08-16 12:12:53 +02:00
Andy Fleming
b96c83d4ae Fix numerous bugs in the 8568 UEC support
Actually, fixed a large bug in the UEC for *all* platforms.
How did this ever work?

uec_init() did not follow the spec for eth_init(), and returned
0 on success.  Switch it to return the link like tsec_init()
(and 0 on error)

The immap for the 8568 was defined based on MPC8568, rather than
CONFIG_MPC8568

CONFIG_QE was off

CONFIG_ETHPRIME was set to "Freescale GETH".  Now is "FSL UEC0"

Fixed a comment about the ranges for CONFIG_ETHPRIME if TSEC_ENET is
enabled

Signed-off-by: Andy Fleming <afleming@freescale.com>
2007-08-16 12:12:51 +02:00
Andy Fleming
3a79013e2a Define tsec flag values in config files
The tsec_info structure and array has a "flags" field for each
ethernet controller.  This field is the only reason there are
settings.  Switch to defining TSECn_FLAGS for each controller
in the config header, and we can greatly simplify the array, and
also simplify the addition of future boards.

Signed-off-by: Andy Fleming <afleming@freescale.com>
2007-08-16 12:12:49 +02:00
Wolfgang Denk
592391a6e5 Merge with /home/wd/git/u-boot/master 2007-08-16 12:04:37 +02:00
Michal Simek
002275a3ed Bios emulator - fix microblaze toolchain problem
microblaze CPU have problem with bios_emulator code.
Microblaze toolchain doesn't support PRAGMA PACK.

Signed-off-by: Michal Simek <monstr@monstr.eu>
2007-08-16 11:55:27 +02:00
Stefan Roese
b706d63559 Merge with git://www.denx.de/git/u-boot.git 2007-08-15 21:06:27 +02:00
Stefan Roese
d61ea14885 Merge with git://www.denx.de/git/u-boot.git 2007-08-15 14:51:27 +02:00
Ed Swarthout
594e79838c Fix malloc size error in ahci_init_one.
Typically this causes scsi init to corrupt the
devlist and break the coninfo command.
Fix a compiler size warning.

Signed-off-by: Jason Jin <jason.jin@freescale.com>
Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
Acked-by: Andy Fleming <afleming@freescale.com>
2007-08-14 21:30:32 +02:00
Wolfgang Denk
f01dbb5424 Coding style cleanup. Update CHANGELOG.
Signed-off-by: Wolfgang Denk <wd@denx.de>
2007-08-14 18:42:36 +02:00
Peter Pearse
e54b970173 Supply spi interface in at45.c 2007-08-14 15:40:00 +01: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
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
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
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
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
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
Haavard Skinnemoen
375c2c9e57 Merge commit 'upstream/master' 2007-08-13 16:34:33 +02:00
Ed Swarthout
2e4d94f1e3 fsl_pci_init cleanup.
Do not enable normal errors created during probe (master abort, perr,
and pcie Invalid Configuration access).

Add CONFIG_PCI_NOSCAN board option to prevent bus scan.

Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
Acked-by: Andy Fleming <afleming@freescale.com>
2007-08-10 11:39:37 -05:00
Ed Swarthout
936b3e69b6 pciauto_setup_device bars_num fix
Passing bars_num=0 to pciauto_setup_device should assign no bars.

Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
Acked-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
Acked-by: Andy Fleming <afleming@freescale.com>
2007-08-10 11:09:00 -05:00
Wolfgang Denk
3a82d59154 Merge with git+ssh://atlas/home/wd/git/u-boot/master 2007-08-10 10:35:10 +02:00
Dirk Behme
3a6d56c209 Make use of generic 64bit division in nand_util.c
Use generic 64bit division in nand_util.c. This makes nand_util.c
independent of any toolchain 64bit division.

Signed-off-by: Dirk Behme <dirk.behme@gmail.com>
2007-08-10 10:33:43 +02:00
Dave Liu
ff9658d704 mpc83xx: Fix the align bug of SDMA buffer
According to the latest user manual, the SDMA temporary
buffer base address must be 4KB aligned.

Signed-off-by: Dave Liu <daveliu@freescale.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
2007-08-10 01:12:03 -05:00
Timur Tabi
e739bc9579 FSL I2C driver programs the two I2C busses differently
The i2c_init() function in fsl_i2c.c programs the two I2C busses differently.
The second I2C bus has its slave address programmed incorrectly and is
missing a 5-us delay.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
2007-08-10 01:12:03 -05:00
Wolfgang Denk
b0d2962faf Merge with git+ssh://atlas/home/wd/git/u-boot/master 2007-08-09 23:49:30 +02:00
Jason Jin
0dc4279b08 Minor fix for bios emulator makefile
Add $(obj) to LIB avoiding objects be built in the source dir

Signed-off-by: Jason Jin <Jason.jin@freescale.com>
2007-08-09 23:32:58 +02:00
Jason Jin
ce981dc857 Add CONFIG_BIOSEMU define to guard all the bios emulator code
Signed-off-by: Jason Jin <Jason.jin@freescale.com>

This patch fix the compile issue on the board that did not enable the bios emulator
2007-08-09 23:24:15 +02:00
Zach Sadecki
ed81064335 tsec: fix multiple PHY support
The change entitled "Reduce CONFIG_MPC8YXX_TSECx to CONFIG_TSECx"
broke multiple PHY support in tsec.c.  This fixes it.

Signed-off-by: Zach Sadecki <Zach.Sadecki@ripcode.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
2007-08-09 22:47:31 +02:00
Joe Hamman
dcb84b7208 tsec: Allow Ten Bit Interface address to be configurable
Allow the address of the Ten Bit Interface (TBI) to be changed in the
event of a conflict with another device.

Signed-off by: Joe Hamman <joe.hamman@embeddedspecialties.com>
2007-08-09 22:10:44 +02:00
TsiChungLiew
8d1d66af54 Added uart_gpio_conf() in serial_init(), seperated uart port configuration from cpu_init() to uart_gpio_conf()
Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
2007-08-08 09:47:25 +02:00
TsiChungLiew
9e737d8476 Declared attributes of void __mii_init(void) as an alias for int mii_init(void)
Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
2007-08-08 09:47:10 +02:00
TsiChungLiew
9998bd37ea Renamed CONFIG_MCFSERIAL to CONFIG_MCFUART
Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
2007-08-08 09:46:55 +02:00
Markus Klotzbuecher
78549bbf44 Merge with git://www.denx.de/git/u-boot.git 2007-08-07 22:30:29 +02:00
Wolfgang Denk
ec06b2731b Merge with /home/wd/git/u-boot/custodian/u-boot-testing 2007-08-06 15:59:45 +02:00
Wolfgang Denk
9c7e4b0621 Coding style cleanup. Update CHANGELOG.
Signed-off-by: Wolfgang Denk <wd@denx.de>
2007-08-06 02:17:36 +02:00
Jason Jin
ece92f8505 This is a BIOS emulator, porting from SciTech for u-boot, mainly for
ATI video card BIOS. and can be used for x86 code emulation by some
modifications.

Signed-off-by: Jason Jin <Jason.jin@freescale.com>
2007-08-06 01:28:15 +02:00
Jason Jin
5072188aca This is a framebuffer driver for ATI video card, can work for PCI9200,
X300, X700, X800 ATI video cards.

Signed-off-by: Zhang Wei <wei.zhang@freescale.com>
Signed-off-by: Jason Jin <Jason.jin@freescale.com>
2007-08-06 01:27:46 +02:00
Wolfgang Denk
f2c2a937d8 Merge with /home/wd/git/u-boot/custodian/u-boot-testing 2007-08-06 01:11:08 +02:00
Wolfgang Denk
5728be389e Coding style cleanup. Update CHANGELOG.
Signed-off-by: Wolfgang Denk <wd@denx.de>
2007-08-06 01:01:49 +02:00
Wolfgang Denk
46919751ea Merge with /home/wd/git/u-boot/custodian/u-boot-mpc85xx 2007-08-06 00:55:51 +02:00
Ed Swarthout
63cec5814f Make MPC8641's PCI/PCI-E driver a common driver for many FSL parts.
All of the PCI/PCI-Express driver and initialization code that
was in the MPC8641HPCN port has now been moved into the common
drivers/fsl_pci_init.c.  In a subsequent patch, this will be
utilized by the 85xx ports as well.

Common PCI-E IMMAP register blocks for FSL 85xx/86xx are added.

Also enable the second PCI-Express controller on 8641
by getting its BATS and CFG_ setup right.

Fixed a u16 vendor compiler warning in AHCI driver too.

Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
Signed-off-by: Zhang Wei <wei.zhang@freescale.com>
Signed-off-by: Jon Loeliger <jdl@freescale.com>
2007-08-06 00:22:24 +02:00
Andy Fleming
c7e717ebc2 Add Marvell 1149 PHY support to the TSEC 2007-08-03 04:05:25 -05:00