Commit graph

665 commits

Author SHA1 Message Date
Stefan Roese
8809a2713b rtc: Fix merging problem
Signed-off-by: Stefan Roese <sr@denx.de>
2007-12-11 11:46:01 +01:00
Stefan Roese
9caeaadf50 Merge commit 'u-boot/master' into for-1.3.1
Conflicts:

	drivers/rtc/Makefile
2007-12-11 11:34:54 +01:00
Stefan Roese
9692c2734a CFI: Coding style cleanup
Signed-off-by: Stefan Roese <sr@denx.de>
2007-12-08 08:25:09 +01:00
Michael Schwingen
81b20ccc2d CFI: support JEDEC flash roms in CFI-flash framework
The following patch adds support for non-CFI flash ROMS, by hooking into the
CFI flash code and using most of its code, as recently discussed here in the
thread "Mixing CFI and non-CFI flashs".

Signed-off-by: Michael Schwingen <michael@schwingen.org>
Signed-off-by: Stefan Roese <sr@denx.de>
2007-12-08 08:16:50 +01:00
Nobuhiro Iwamatsu
29592ecba3 sh: Moved driver of the SuperH dependence
The composition of the directory in the drivers/ changed.
I moved SuperH serial driver and marubun PCMCIA driver.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
2007-12-07 01:25:38 +09:00
Nobuhiro Iwamatsu
521dcd30b9 Merge git://www.denx.de/git/u-boot
Conflicts:

	drivers/Makefile
2007-12-07 01:20:16 +09:00
Nobuhiro Iwamatsu
33ecdc2f9d sh: Add marubun's pcmcia driver
Marubun pcmcia is a chip for PCMCIA used with SuperH.
Of course, this can be used even by other architectures.
When use this driver, came to be able to use CompactFlash
and Ethernet.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
2007-11-29 01:17:43 +09:00
Nobuhiro Iwamatsu
febd86b969 sh: Update SuperH SCIF driver
- Changed volatile unsigned to vu_.
- Changed Makefile for kconfig.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
2007-11-29 01:17:31 +09:00
Nobuhiro Iwamatsu
7fc792895b Merge git://www.denx.de/git/u-boot
Conflicts:

	drivers/Makefile
2007-11-29 00:56:37 +09:00
Jean-Christophe PLAGNIOL-VILLARD
59829cc189 drivers/mtd : move mtd drivers to drivers/mtd
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2007-11-25 23:28:52 +01:00
Jean-Christophe PLAGNIOL-VILLARD
318c0b9043 drivers/misc : move misc drivers to drivers/misc
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2007-11-25 23:28:51 +01:00
Jean-Christophe PLAGNIOL-VILLARD
33daf5b785 drivers/block : move block drivers to drivers/block
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2007-11-25 23:28:51 +01:00
Jean-Christophe PLAGNIOL-VILLARD
0c698dcaa7 drivers/rtc : move rtc drivers to drivers/rtc
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2007-11-25 23:28:50 +01:00
Jean-Christophe PLAGNIOL-VILLARD
f868cc5a50 drivers/hwmon : move hardware monitor drviers to drivers/hwmon
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2007-11-25 23:28:50 +01:00
Jean-Christophe PLAGNIOL-VILLARD
16b195c82a drivers/input : move input drivers to drivers/input
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2007-11-25 23:28:49 +01:00
Jean-Christophe PLAGNIOL-VILLARD
e455866629 drivers/usb : move usb drivers to drivers/usb
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2007-11-25 23:27:38 +01:00
Jean-Christophe PLAGNIOL-VILLARD
1378df792a drivers/serial : move serial drivers to drivers/serial
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2007-11-25 23:24:16 +01:00
Jean-Christophe PLAGNIOL-VILLARD
2439e4bfa1 drivers/net : move net drivers to drivers/net
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2007-11-25 18:35:17 +01:00
Jean-Christophe PLAGNIOL-VILLARD
352d259130 drivers/video : move video drivers to drivers/video
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2007-11-25 18:35:11 +01:00
Jean-Christophe PLAGNIOL-VILLARD
7364621718 drivers/pcmcia : move pcmcia drivers to drivers/pcmcia
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2007-11-24 20:35:56 +01:00
Jean-Christophe PLAGNIOL-VILLARD
93a686ee9c drivers/pci : move pci drivers to drivers/pci
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2007-11-24 20:35:55 +01:00
Jean-Christophe PLAGNIOL-VILLARD
080c646dbf drivers/i2c : move i2c drivers to drivers/i2c
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2007-11-20 20:14:18 +01:00
Grant Likely
f92edbd8a0 Merge branch 'origin' into kconfig-for-1.3.1 2007-11-20 08:19:56 -07:00
Wolfgang Denk
e8da58f2bc Fix build problems with mp2usb board
Signed-off-by: Wolfgang Denk <wd@denx.de>
2007-11-19 12:59:14 +01:00
Wolfgang Denk
8412d814ce Fix compiler warnings for ARM systems.
Signed-off-by: Wolfgang Denk <wd@denx.de>
2007-11-18 17:11:09 +01:00
Wolfgang Denk
409ecdc0bb Fix compiler warnings for PPC systems. Update CHANGELOG.
Signed-off-by: Wolfgang Denk <wd@denx.de>
2007-11-18 16:36:27 +01:00
Grant Likely
efe33035ac Merge branch 'origin' into kconfig-for-1.3.1
Conflicts:

	drivers/Makefile
2007-11-16 21:01:19 -07:00
Grant Likely
4d4faae65e Group PCI and PCMCIA drivers in drivers/Makefile
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2007-11-15 11:31:23 -07:00
Grant Likely
5798f87dc1 Group block/flash drivers in drivers/Makefile
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2007-11-15 11:22:48 -07:00
Grant Likely
df58c81551 Group USB drivers in drivers/Makefile
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2007-11-15 11:22:48 -07:00
Grant Likely
5dbb6ed622 Group i2c drivers in drivers/Makefile
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2007-11-15 11:22:37 -07:00
Grant Likely
ec00c76de0 Group console drivers in drivers/Makefile
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2007-11-15 11:21:54 -07:00
Grant Likely
754f230aa0 Group network drivers in drivers/Makefile
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2007-11-15 11:06:02 -07:00
Grant Likely
f0037c56b0 Build: split COBJS value into multiple lines
This change is in preparation for condtitionial compile support in the
build system.  By spliting them all into seperate lines now, subsequent
patches that change 'COBJS-y += ' into 'COBJS-$(CONFIG_<blah>) += ' will
be less invasive and easier to review

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2007-11-15 11:05:18 -07:00
Roy Zang
1f103105a3 Implement general ULi 526x Ethernet driver support in U-boot
This patch implements general ULi 526x Ethernet driver.
Until now, it is the only native Ethernet port on
MPC8610HPCD board, but it could be used on other boards
with ULi 526x Ethernet port as well.

Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
Signed-off-by: Zhang Wei <wei.zhang@freescale.com>
Acked-by: Jon Loeliger <jdl@freescale.com>
Signed-off-by: Ben Warren <bwarren@qstreams.com>
2007-11-06 10:26:39 -05:00
Vlad Lungu
ec22755799 Trimmed some variables in ne2000.c
Signed-off-by: Vlad Lungu <vlad@comsys.ro>
2007-11-03 22:23:10 +01:00
Wolfgang Denk
f0516920f6 Merge branch 'master' of /home/wd/git/u-boot/custodians 2007-11-02 15:09:10 +01:00
Wolfgang Denk
dbf3317623 Merge branch 'master' of git://www.denx.de/git/u-boot-arm 2007-11-01 22:57:33 +01:00
Wolfgang Denk
5b746c3ea8 Merge branch 'master' of /home/wd/git/u-boot/custodians 2007-11-01 22:55:23 +01:00
Ed Swarthout
cb8250fe4b fsl_pci_init enable COMMAND_MEMORY if inbound window
Patch 16e23c3f removed PCSRBAR allocation.  But passing zero windows
to pciauto_setup_device has the side effect of not getting
COMMAND_MEMORY set.

Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
2007-10-24 00:29:23 +02:00
Wolfgang Denk
41b4d282d3 Coding style: keep lists sorted; update CHANGELOG
Signed-off-by: Wolfgang Denk <wd@denx.de>
2007-10-23 16:50:03 +02:00
Jean-Christophe PLAGNIOL-VILLARD
58b74b05c6 Fix missing drivers makefile entries ds1722.c mw_eeprom.c
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2007-10-23 16:44:04 +02:00
Peter Pearse
7a9348728e Move PL01* serial drivers to drivers/serial and adjust Makefiles. 2007-10-23 10:22:16 +01:00
Wolfgang Denk
05bf4919c1 Minor coding style cleanup; update CHANGELOG
Signed-off-by: Wolfgang Denk <wd@denx.de>
2007-10-21 01:01:17 +02:00
Vlad Lungu
ff285ca07e Fix NE2000 driver:
Fixed typo in ne2000.h, thinko re n2k_inb() usage, don't try
to do anything in eth_stop() if eth_init() was not called.
Simplified RX path in order to avoid timeouts on really really
fast NE2000 cards (read: qemu with internal tftp), NetLoop() is
clever enough to cope with 1 packet per eth_rx().

Signed-off-by: Vlad Lungu <vlad@comsys.ro>
2007-10-21 00:54:02 +02:00
Dan Wilson
5c7ea64bb7 tsec driver should clear RHALT on startup
This was causing problems for some people.

Signed-off-by: Alain Gravel <agravel@fulcrummicro.com>
Signed-off-by: Dan Wilson <dwilson@fulcrummicro.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>
2007-10-19 11:33:48 -05:00
Wolfgang Denk
9e8362b689 Merge branch 'master' of git://www.denx.de/git/u-boot-usb 2007-10-15 20:55:51 +02:00
Wolfgang Denk
8f05a661e9 Merge branch 'merge' of git://www.denx.de/git/u-boot-microblaze 2007-10-13 22:57:43 +02:00
Wolfgang Denk
23c56f97ca Merge branch 'master' of git://www.denx.de/git/u-boot-nand-flash 2007-10-13 21:40:23 +02:00
Wolfgang Denk
de74b9eeac Coding Style cleanup.
Signed-off-by: Wolfgang Denk <wd@denx.de>
2007-10-13 21:15:39 +02:00
Peter Pearse
e81a95a9e7 Merge with git://www.denx.de/git/u-boot.git 2007-10-04 11:00:44 +01:00
Timo Ketola
785c13477b Bugfix: Use only one PTD for one endpoint
Original isp116x-hcd code prepared multiple PTDs for longer than 16
byte transfers for one endpoint. That is unnecessary because the
ISP116x is able to split long data from one PTD into multiple
transactions based on the buffer size of the endpoint. It also caused
serious problems if the endpoint NAKed some of the transactions. In
that case ISP116x wouldn't notice that the other PTDs were for the same
endpoint and would try the other PTDs possibly out of order. That would
break the whole transfer.

This patch makes isp116x_submit_job to use one PTD for one transfer.

Signed-off-by: Timo Ketola <timo.ketola@exertus.fi>
Signed-off-by: Markus Klotzbuecher <mk@denx.de>
2007-10-02 09:32:54 +02:00
Michal Simek
0731cbae6c [PATCH] Change macro name for UartLite
because PowerPC 405 can use UartLite as console
2007-09-24 00:25:11 +02:00
Michal Simek
b90c045f03 synchronizition with mainline 2007-09-24 00:08:37 +02:00
Michal Simek
6b6f287a33 Merge ../u-boot 2007-09-24 00:04:22 +02:00
Nobuhiro Iwamatsu
b8685affe6 Merge git://www.denx.de/git/u-boot
Conflicts:

	CREDITS
2007-09-23 01:29:43 +09:00
Peter Pearse
bd86220f58 Move coloured led API to status_led.h
Improve indentation in drivers/at45.c
2007-09-18 13:07:54 +01:00
Peter Pearse
afd477b227 Merge with git://www.denx.de/git/u-boot.git 2007-09-18 11:12:58 +01:00
Markus Klotzbuecher
f930922f06 Merge with git://www.denx.de/git/u-boot.git 2007-09-17 17:12:45 +02:00
David Saada
97213f3241 Description: Add NEC's PCI OHCI module ID to the USB OHCI driver
Signed-off-by: David Saada <david.saada@ecitele.com>
2007-09-17 17:04:47 +02:00
Stefan Roese
30363e98fa Small whitespace cleanup of OneNAND patch
Signed-off-by: Stefan Roese <sr@denx.de>
2007-09-17 08:20:47 +02:00
Kyungmin Park
17aa280045 OneNAND support (take #2)
[PATCH 2/3] OneNAND support (take #2)

OneNAND support at U-Boot

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
2007-09-17 08:18:42 +02:00
Kyungmin Park
916527f480 OneNAND support (take #2)
[PATCH 1/3] OneNAND support (take #2)

OneNAND support at U-Boot

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
2007-09-17 08:18:30 +02:00
urwithsughosh@gmail.com
cd2d1602c5 Typo fix in tsec.c
Fixup for the break statement in wrong place.

[Patch by urwithsughosh@gmail.com]
Acked-by: Andy Fleming <afleming@freescale.com>
Signed-off-by:	Wolfgang Denk <wd@denx.de>
2007-09-15 21:41:58 +02:00
Matthias Fuchs
5bd7fe9aeb Fix do_div() usage in nand process output
Fix usage of do_div() in nand erase|read|write process output.

The last patch to nand_util.c introduced do_div() instead of libgcc's
implementation. But do_div() returns the quotient in its first
macro parameter and not as result.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
2007-09-15 21:38:38 +02:00
Wolfgang Denk
1218abf1b5 Fix cases where DECLARE_GLOBAL_DATA_PTR was not declared as global
Signed-off-by: Wolfgang Denk <wd@denx.de>
2007-09-15 20:48:41 +02:00
Michal Simek
9c73f4b811 Merge git://www.denx.de/git/u-boot 2007-09-11 00:29:27 +02:00
Peter Pearse
470ffef72c Merge with git://www.denx.de/git/u-boot.git 2007-09-07 13:26:51 +01:00
stefano babic
5e5803e119 PXA270: Added support for TrizepsIV board.
This patch add support for the Trizeps IV module (520Mhz).

Signed-off-by: Stefano Babic <sbabic@denx.de>
2007-09-07 01:06:19 +02:00
Jason Jin
1d2ca446e1 Add BUILD_DIR support for bios emulator.
Signed-off-by: Jason Jin <Jason.jin@freescale.com>
2007-09-07 00:52:44 +02:00
Gary Jennejohn
041a2554ad Add support for Sil680 IDE controller.
o add drivers/sil680.c to support the Sil680 IDE-controller.
o drivers/Makefile: add sil680.o.

Signed-off-by: Gary Jennejohn <garyj@denx.de>
2007-09-06 23:53:11 +02:00
Peter Pearse
6e4bf9b24e Ran Lindent on drivers/at45.c 2007-09-04 14:25:51 +01:00
Stefan Roese
1d1ab638f8 Merge with git://www.denx.de/git/u-boot.git 2007-09-02 14:02:19 +02:00
Gary Jennejohn
81b73dec16 ppc4xx: (Re-)Enable CONFIG_PCI_PNP on AMCC 440EPx Sequoia
The 440EPx has a problem when the PCI_CACHE_LINE_SIZE register is
set to non-zero, because it doesn't support MRM (memory-read-
multiple) correctly. We now added the possibility to configure
this register in the board config file, so that the default value
of 8 can be overridden.

Here the details of this patch:

o drivers_pci_auto.c: introduce CFG_PCI_CACHE_LINE_SIZE to allow
  board-specific settings. As an example the sequoia board requires 0.
  Idea from Stefan Roese <sr@denx.de>.
o board/amcc/sequoia/init.S: add a TLB mapping at 0xE8000000 for the
  PCI IO-space. Obtained from Stefan Roese <sr@denx.de>.
o include/configs/sequoia.h: turn CONFIG_PCI_PNP back on and set
  CFG_PCI_CACHE_LINE_SIZE to 0.

Signed-off-by: Gary Jennejohn <garyj@denx.de>
Signed-off-by: Stefan Roese <sr@denx.de>
2007-08-31 15:21:46 +02:00
Ed Swarthout
1900fbf255 Revert "Fix MPC8544DS PCIe3 scsi."
This reverts commit 9468e680.
Commit 16e23c3f5d removing allocation of PCSRBAR is sufficient.

Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
2007-08-30 09:33:12 +02:00
Kumar Gala
9468e6804b Fix MPC8544DS PCIe3 scsi.
<ed.swarthout@freescale.com>

The problem is pciauto_setup_device() getting called from fsl_pci_init.c
is allocating memory space it doesn't need.

Signed-off-by: Ed Swarthout <ed.swarthout@freescale.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>
2007-08-29 00:16:54 -05:00
stefano babic
5f47094857 Fix MAC address setting in DM9000 driver.
The logic to check if there is a correct MAC address in the DM9000
EEPROM, added in the last patch, is wrong. Now the MAC address is
always taken from the environment, even if a suitable MAC is present
in the EEPROM.

Signed-off-by: Stefano Babic <sbabic@denx.de>
2007-08-29 02:13:09 +02:00
Martin Krause
4a8527ef08 MPC5xxx: fix some compiler warnings in USB code
Fix the following warnings:
- usb.c:xx: warning: function declaration isn't a prototype
- usb_ohci.c:xxx: warning: passing argument 1 of '__fswab32' makes integer
  from pointer wihtout a cast

Signed-off-by: Martin Krause <martin.krase@tqs.de>
2007-08-29 02:09:58 +02:00
Ed Swarthout
16e23c3f5d fsl_pci_init - Remove self PCSRBAR allocation
CPU physical address space was being wasted by allocating a
PCSRBAR PCI inbound region to it's memory space.

As a rule, PCSRBAR should be left alone since it does not affect
transactions from self and other masters may have changed it.

Signed-off-by: Ed Swarthout <ed.swarthout@freescale.com>
2007-08-29 02:08:50 +02:00
Wolfgang Denk
3e66c07800 Fix some build errors.
Signed-off-by: Wolfgang Denk <wd@denx.de>
2007-08-19 10:27:34 +02:00
Wolfgang Denk
909627dca4 Merge with /home/wd/git/u-boot/custodian/u-boot-coldfire 2007-08-18 21:56:57 +02:00
Shinya Kuribayashi
815b5bd5b1 PCI_READ_VIA_DWORD_OP: Fix *val uninitialized bug
This patch has been sent on:
- 6 Jun 2007

Many users of PCI config read routines tend to ignore the function
ret value, and are only concerned about the contents of *val. Based
on this, pci_hose_read_config_{byte,word}_via_dword should initialize
the *val on dword read error.

Without this fix, for example, we'll go on scanning bus with vendor or
header_type uninitialized. This brings many unnecessary config trials.

Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
2007-08-18 21:38:45 +02:00
TsiChungLiew
8ae158cd87 ColdFire: Add M54455EVB for MCF5445x
Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
2007-08-16 17:43:23 -06:00
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
Michal Simek
78cff50edb [FIX] Changes for bios_emulator code for others architecture 2007-08-16 10:46:28 +02:00
Michal Simek
6e0e2253f0 [FIX] Remove unused include file 2007-08-16 10:45:09 +02:00
Michal Simek
5b4de9309d [FIX] Resolve problem with warnings
microblaze toolchain don't support PRAGMA PACK.
2007-08-15 21:15:05 +02:00
Michal Simek
19909edb97 Merge git://www.denx.de/git/u-boot into merge 2007-08-15 21:06:52 +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
Michal Simek
85fad497b3 Merge git://www.denx.de/git/u-boot 2007-08-07 22:12:05 +02:00
Michal Simek
706714d97a [FIX] remove cute code 2007-08-06 23:41:53 +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
Michal Simek
a274ca4f6d [FIX] Coding style cleanup 2007-08-05 22:33:05 +02:00
Michal Simek
45b3fd2815 Merge git://www.denx.de/git/u-boot 2007-08-05 16:46:23 +02:00
Michal Simek
af8377d4eb [FIX] Xilinx Uartlite driver
Because PPC405 can use UARTLITE serial interface and
Microblaze can use Uart16550 serial interface not only Uartlite.
2007-08-05 16:13:31 +02:00
Michal Simek
537091b4ee [PATCH] Added support for Xilinx Emac community driver 2007-08-05 15:53:50 +02:00
Andy Fleming
c7e717ebc2 Add Marvell 1149 PHY support to the TSEC 2007-08-03 04:05:25 -05:00
Andy Fleming
6bf6f114dc Merge branch 'testing' into working
Conflicts:

	CHANGELOG
	fs/fat/fat.c
	include/configs/MPC8560ADS.h
	include/configs/pcs440ep.h
	net/eth.c
2007-08-03 02:23:23 -05:00
Stefan Roese
c7e8410e3c Merge with /home/stefan/git/u-boot/u-boot-coldfire-freescale 2007-07-16 11:51:41 +02:00
Michal Simek
0c0a9cda1b [PATCH] Support for Xilinx EmacLite controller 2007-07-16 00:31:07 +02:00
Heiko Schocher
fad6340715 make show_boot_progress () weak.
Signed-off-by: Heiko Schocher <hs@denx.de>
2007-07-13 09:54:17 +02:00
Andy Fleming
5a56af3b52 Remove erroneous errata code from Marvel 88E1111S driver
The Marvel 88E1111S driver for the TSEC was copied from the
88E1101 driver, and included a fix for an erratum which does not
exist on that part.  Now it is removed

Signed-off-by: Andy Fleming <afleming@freescale.com>
2007-07-11 18:19:07 -05:00
Andy Fleming
2a3cee43c3 tsec: Fix PHY code to match first driver
Jarrold Wen noticed that the generic PHY code always matches
under the current implementation.  Change it so the first match
wins, and *only* unknown PHYs trigger the generic driver

Signed-off-by: Andy Fleming <afleming@freescale.com>
2007-07-11 18:19:06 -05:00
Andy Fleming
7507d56cca Fix Marvell 88e1145 PHY init code
Fix a bug in the Marvell 88e1145 PHY init code in the TSEC driver
where the reset was being done after the errata code instead of
before.

Signed-off-by: Haiying Wang <haiying.wang@freescale.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>
2007-07-11 17:52:50 -05:00