| #
ce0eb703 |
| 25-Aug-2008 |
Kim Phillips <kim.phillips@freescale.com> |
Merge branch 'next'
|
| #
7772c13b |
| 06-Aug-2008 |
Haavard Skinnemoen <haavard.skinnemoen@atmel.com> |
Merge branch 'favr-32' of git://git.denx.de/u-boot-avr32
Conflicts:
MAINTAINERS
MAKEALL
Makefile
|
| #
f2302d44 |
| 06-Aug-2008 |
Stefan Roese <sr@denx.de> |
Fix merge problems
Signed-off-by: Stefan Roese <sr@denx.de>
|
| #
9314a342 |
| 01-Aug-2008 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of /home/wd/git/u-boot/master/
|
| #
35d3bd3c |
| 31-Jul-2008 |
TsiChung Liew <Tsi-Chung.Liew@freescale.com> |
Fix compilation error for MCF5275
Rename OBJ to COBJ in board/platform/Makefile
Signed-off-by: TsiChung Liew <Tsi-Chung.Liew@freescale.com>
|
| #
4b326101 |
| 14-Jul-2008 |
Stefan Roese <sr@denx.de> |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot into next
|
| #
0740ac26 |
| 13-Jul-2008 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://git.denx.de/u-boot-coldfire
|
| #
af577da5 |
| 13-Jul-2008 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
|
| #
a07351fd |
| 13-Jul-2008 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://git.denx.de/u-boot-at91
|
| #
184f1b40 |
| 11-Jul-2008 |
Wolfgang Denk <wd@denx.de> |
Fixed some out-of-tree build issues
Signed-off-by: Wolfgang Denk <wd@denx.de>
|
| #
859f2435 |
| 10-Jul-2008 |
Jon Loeliger <jdl@freescale.com> |
Merge commit 'wd/master'
|
| #
9692cab7 |
| 09-Jul-2008 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://www.denx.de/git/u-boot-net
|
| #
7c6237b3 |
| 07-Jul-2008 |
Stefan Roese <sr@denx.de> |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
|
| #
4e0018f1 |
| 06-Jul-2008 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://www.denx.de/git/u-boot-at91
|
| #
b223017f |
| 06-Jul-2008 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://www.denx.de/git/u-boot-avr32
|
| #
3070a9a3 |
| 06-Jul-2008 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xx
|
| #
d86a0a6f |
| 05-Jul-2008 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of ssh+git://mercury.denx.de/home/wd/git/u-boot/master
Conflicts:
board/amirix/ap1000/serial.c
board/exbitgen/exbitgen.c
board/
Merge branch 'master' of ssh+git://mercury.denx.de/home/wd/git/u-boot/master
Conflicts:
board/amirix/ap1000/serial.c
board/exbitgen/exbitgen.c
board/exbitgen/flash.c
board/ml2/serial.c
board/xilinx/ml300/serial.c
Signed-off-by: Wolfgang Denk <wd@denx.de>
show more ...
|
| #
a30cc5a3 |
| 02-Jul-2008 |
Wolfgang Denk <wd@denx.de> |
Cleanup: fix out-of-tree building for some boards
Signed-off-by: Wolfgang Denk <wd@denx.de>
|
| #
461fa68d |
| 02-Jul-2008 |
Wolfgang Denk <wd@denx.de> |
Cleanup: replace hard-wired $(AR) 'crv' settings by $(ARFLAGS)
Signed-off-by: Wolfgang Denk <wd@denx.de>
|
| #
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 ...
|
| #
aeff6d50 |
| 07-Apr-2008 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://www.denx.de/git/u-boot-fdt
|
| #
a1b215e2 |
| 07-Apr-2008 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://www.denx.de/git/u-boot-at91
|
| #
f9eabcb3 |
| 07-Apr-2008 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://www.denx.de/git/u-boot-net
|
| #
2c78febd |
| 07-Apr-2008 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://www.denx.de/git/u-boot-coldfire
|
| #
545c8e0a |
| 24-Jan-2008 |
Matthew Fettke <[matthew.fettke@gmail.com]> |
ColdFire: Added M5275EVB support.
Signed-off-by: Matthew Fettke <mfettke@videon-central.com>
Signed-off-by: TsiChung Liew <Tsi-Chung.Liew@freescale.com>
Acked-by: John Rigby <jrigby@
ColdFire: Added M5275EVB support.
Signed-off-by: Matthew Fettke <mfettke@videon-central.com>
Signed-off-by: TsiChung Liew <Tsi-Chung.Liew@freescale.com>
Acked-by: John Rigby <jrigby@freescale.com>
show more ...
|