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
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
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