| #
1a247ba7 |
| 06-Jun-2008 |
Jon Loeliger <jdl@freescale.com> |
Merge commit 'wd/master'
|
| #
10a33679 |
| 03-Jun-2008 |
Stefan Roese <sr@denx.de> |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
|
| #
9d2459f3 |
| 02-Jun-2008 |
Wolfgang Denk <wd@denx.de> |
Merge remote branch 'u-boot-ppc4xx/master'
|
| #
42fd5f87 |
| 24-May-2008 |
Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> |
Merging Stelian Pop AT91 patches
Merge branch 'testing-V2'
Conflicts:
board/atmel/at91cap9adk/Makefile
Fixing copyright
board/atmel/
Merging Stelian Pop AT91 patches
Merge branch 'testing-V2'
Conflicts:
board/atmel/at91cap9adk/Makefile
Fixing copyright
board/atmel/at91sam9260ek/Makefile
Fixing copyright
board/atmel/at91sam9260ek/u-boot.lds
Delete no more needed ld script
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
show more ...
|
| #
97f7d27c |
| 21-May-2008 |
Stefan Roese <sr@denx.de> |
Merge branch 'quad100hd'
|
| #
0ad4770f |
| 20-May-2008 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'socrates' of /home/wd/git/u-boot/projects
|
| #
eddc7c46 |
| 20-May-2008 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'lwmon5' of /home/wd/git/u-boot/projects
|
| #
53677ef1 |
| 20-May-2008 |
Wolfgang Denk <wd@denx.de> |
Big white-space cleanup.
This commit gets rid of a huge amount of silly white-space issues.
Especially, all sequences of SPACEs followed by TAB characters get
removed (unless they ap
Big white-space cleanup.
This commit gets rid of a huge amount of silly white-space issues.
Especially, all sequences of SPACEs followed by TAB characters get
removed (unless they appear in print statements).
Also remove all embedded "vim:" and "vi:" statements which hide
indentation problems.
Signed-off-by: Wolfgang Denk <wd@denx.de>
show more ...
|
| #
65dcfa79 |
| 11-May-2008 |
Wolfgang Denk <wd@denx.de> |
Revert "pci: Add CONFIG_PCI_SKIP_HOST_BRIDGE config option"
This reverts commit 55774b512fdf63c0516d441cc5da7c54bbffb7f2
which broke many PowerPC boards.
|
| #
36f32675 |
| 07-May-2008 |
Becky Bruce <bgill@freescale.com> |
Update pci code to use phys_addr_t
Physical addrs need to be represented by phys_addr_t, not
unsigned long. Otherwise, systems that use CONFIG_PHYS_64BIT
are going to fail mightily.
Update pci code to use phys_addr_t
Physical addrs need to be represented by phys_addr_t, not
unsigned long. Otherwise, systems that use CONFIG_PHYS_64BIT
are going to fail mightily.
Signed-off-by: Becky Bruce <becky.bruce@freescale.com>
show more ...
|
| #
4b7a6dd8 |
| 25-Apr-2008 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of /home/wd/git/u-boot/lwmon5
Conflicts:
common/cmd_bootm.c
common/cmd_log.c
include/common.h
post/board/lwmon5/Mak
Merge branch 'master' of /home/wd/git/u-boot/lwmon5
Conflicts:
common/cmd_bootm.c
common/cmd_log.c
include/common.h
post/board/lwmon5/Makefile
post/board/lwmon5/dsp.c
post/board/lwmon5/dspic.c
post/board/lwmon5/fpga.c
post/board/lwmon5/gdc.c
post/board/lwmon5/sysmon.c
post/board/lwmon5/watchdog.c
Signed-off-by: Wolfgang Denk <wd@denx.de>
show more ...
|
| #
27f33e9f |
| 26-Mar-2008 |
Bartlomiej Sieka <tur@semihalf.com> |
Merge branch 'new-image' of git://www.denx.de/git/u-boot-testing
Conflicts:
common/cmd_bootm.c
cpu/mpc8xx/cpu.c
Signed-off-by: Bartlomiej Sieka <tur@sem
Merge branch 'new-image' of git://www.denx.de/git/u-boot-testing
Conflicts:
common/cmd_bootm.c
cpu/mpc8xx/cpu.c
Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
show more ...
|
| #
b38d7fc2 |
| 24-Mar-2008 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of /home/wd/git/u-boot/master/
|
| #
55774b51 |
| 07-Mar-2008 |
Nobuhiro Iwamatsu <iwamatsu@nigauri.org> |
pci: Add CONFIG_PCI_SKIP_HOST_BRIDGE config option
In current source code, when the device number of PCI is 0, process PCI
bridge without fail. However, when the device number is 0, it i
pci: Add CONFIG_PCI_SKIP_HOST_BRIDGE config option
In current source code, when the device number of PCI is 0, process PCI
bridge without fail. However, when the device number is 0, it is not PCI
always bridge. There are times when device of PCI allocates.
When CONFIG_PCI_SKIP_HOST_BRIDGE is enable, this problem is solved when
use this patch.
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Acked-by: Stefan Roese <sr@denx.de>
show more ...
|
| #
6a40ef62 |
| 09-Jan-2008 |
Markus Klotzbuecher <mk@denx.de> |
Merge git://www.denx.de/git/u-boot
Conflicts:
board/tqm5200/tqm5200.c
|
| #
74ac5fac |
| 08-Jan-2008 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'inka4x0-ng' of /home/m8/git/u-boot/
|
| #
4985ca5a |
| 07-Jan-2008 |
Peter Pearse <peter.pearse@arm.com> |
Merge with git://www.denx.de/git/u-boot.git
|
| #
9caeaadf |
| 11-Dec-2007 |
Stefan Roese <sr@denx.de> |
Merge commit 'u-boot/master' into for-1.3.1
Conflicts:
drivers/rtc/Makefile
|
| #
f743931f |
| 06-Dec-2007 |
Jon Loeliger <jdl@freescale.com> |
Merge commit 'wd/master'
|
| #
521dcd30 |
| 06-Dec-2007 |
Nobuhiro Iwamatsu <iwamatsu@nigauri.org> |
Merge git://www.denx.de/git/u-boot
Conflicts:
drivers/Makefile
|
| #
fe08fb65 |
| 26-Nov-2007 |
Wolfgang Denk <wd@denx.de> |
Merge commit '87ddedd'
|
| #
93a686ee |
| 20-Nov-2007 |
Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> |
drivers/pci : move pci drivers to drivers/pci
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
|