| #
3b93020d |
| 09-Jan-2008 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of /home/wd/git/u-boot/master/
|
| #
6a40ef62 |
| 09-Jan-2008 |
Markus Klotzbuecher <mk@denx.de> |
Merge git://www.denx.de/git/u-boot
Conflicts:
board/tqm5200/tqm5200.c
|
| #
0133502e |
| 27-Dec-2007 |
Matthias Fuchs <matthias.fuchs@esd-electronics.com> |
Improve configuration of FPGA subsystem
This patch removes the FPGA subsystem configuration through
the CONFIG_FPGA bitmask configuration option.
See README for the new options:
CONFIG_FPGA,
CON
Improve configuration of FPGA subsystem
This patch removes the FPGA subsystem configuration through
the CONFIG_FPGA bitmask configuration option.
See README for the new options:
CONFIG_FPGA,
CONFIG_FPGA_<vendor>,
CONFIG_FPGA_<family>
Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
show more ...
|
| #
4985ca5a |
| 07-Jan-2008 |
Peter Pearse <peter.pearse@arm.com> |
Merge with git://www.denx.de/git/u-boot.git
|
| #
2c353642 |
| 03-Jan-2008 |
Jon Loeliger <jdl@freescale.com> |
Merge commit 'wd/master'
|
| #
feaa43f3 |
| 29-Dec-2007 |
Stefan Roese <sr@denx.de> |
Merge branch 'for-1.3.2-ver2'
Conflicts:
cpu/ppc4xx/fdt.c
include/configs/kilauea.h
include/configs/sequoia.h
Signed-off-by: Stefan Roese <sr@denx.de>
|
| #
bb701283 |
| 27-Dec-2007 |
Stefan Roese <sr@denx.de> |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot into for-1.3.2-ver2
|
| #
58bbc77e |
| 26-Dec-2007 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of /home/wd/git/u-boot/custodians
|
| #
f77ac3d6 |
| 26-Dec-2007 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://www.denx.de/git/u-boot-avr32
|
| #
09ea0de0 |
| 01-Nov-2007 |
Haavard Skinnemoen <hskinnemoen@atmel.com> |
README: Remove ATSTK1000 daughterboard list
As noted by Kim Phillips, these lists tend to become out of date.
Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
|
| #
9caeaadf |
| 11-Dec-2007 |
Stefan Roese <sr@denx.de> |
Merge commit 'u-boot/master' into for-1.3.1
Conflicts:
drivers/rtc/Makefile
|
| #
7fc79289 |
| 28-Nov-2007 |
Nobuhiro Iwamatsu <iwamatsu@nigauri.org> |
Merge git://www.denx.de/git/u-boot
Conflicts:
drivers/Makefile
|
| #
5c568d6a |
| 13-Nov-2007 |
Stefan Roese <sr@denx.de> |
Merge branch 'master' of git://www.denx.de/git/u-boot
|
| #
59e79659 |
| 07-Nov-2007 |
Jon Loeliger <jdl@freescale.com> |
Merge commit 'remotes/wd/master'
|
| #
607b3ae2 |
| 07-Nov-2007 |
Jon Loeliger <jdl@freescale.com> |
Merge commit 'remotes/wd/master' into newmaster
|
| #
881cf02f |
| 06-Nov-2007 |
Ben Warren <bwarren@saruman.qstreams.net> |
Merge git://www.denx.de/git/u-boot
|
| #
e881cb56 |
| 02-Nov-2007 |
Bruce Adler <bruce.adler@ccpu.com> |
fix wording in README
Changed the wording to properly describe the shadowing
of the environment from ROM to RAM
Signed-off-by: Bruce Adler <bruce.adler@acm.org>
|
| #
b90296fc |
| 02-Oct-2007 |
Haavard Skinnemoen <hskinnemoen@atmel.com> |
Merge commit 'origin/master'
|
| #
b8685aff |
| 22-Sep-2007 |
Nobuhiro Iwamatsu <iwamatsu@nigauri.org> |
Merge git://www.denx.de/git/u-boot
Conflicts:
CREDITS
|
| #
f930922f |
| 17-Sep-2007 |
Markus Klotzbuecher <mk@denx.de> |
Merge with git://www.denx.de/git/u-boot.git
|
| #
9c73f4b8 |
| 10-Sep-2007 |
Michal Simek <monstr@monstr.eu> |
Merge git://www.denx.de/git/u-boot
|
| #
1d1ab638 |
| 02-Sep-2007 |
Stefan Roese <sr@denx.de> |
Merge with git://www.denx.de/git/u-boot.git
|
| #
3bb342fc |
| 10-Aug-2007 |
Kim Phillips <kim.phillips@freescale.com> |
fdt: remove unused OF_FLAT_TREE_MAX_SIZE references
and make some minor corrections to the FDT part of the README.
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
|
| #
93f79834 |
| 21-Aug-2007 |
Stefan Roese <sr@denx.de> |
Merge with /home/stefan/git/u-boot/u-boot-ppc4xx
|
| #
909627dc |
| 18-Aug-2007 |
Wolfgang Denk <wd@denx.de> |
Merge with /home/wd/git/u-boot/custodian/u-boot-coldfire
|