#
e99e9575 |
| 31-Aug-2008 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'Makefile' of git://git.denx.de/u-boot-arm
|
#
08ab4e17 |
| 30-Aug-2008 |
Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> |
fs: Move conditional compilation to Makefile Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
|
#
b8685aff |
| 22-Sep-2007 |
Nobuhiro Iwamatsu <iwamatsu@nigauri.org> |
Merge git://www.denx.de/git/u-boot Conflicts: CREDITS
|
#
93f79834 |
| 21-Aug-2007 |
Stefan Roese <sr@denx.de> |
Merge with /home/stefan/git/u-boot/u-boot-ppc4xx
|
#
b706d635 |
| 15-Aug-2007 |
Stefan Roese <sr@denx.de> |
Merge with git://www.denx.de/git/u-boot.git
|
#
d61ea148 |
| 15-Aug-2007 |
Stefan Roese <sr@denx.de> |
Merge with git://www.denx.de/git/u-boot.git
|
#
3b3bff4c |
| 14-Aug-2007 |
Stefan Roese <sr@denx.de> |
Merge with git://www.denx.de/git/u-boot.git
|
#
d1bc6c8d |
| 13-Aug-2007 |
Ben Warren <bwarren@qstreams.com> |
Sync'd u-boot-net with mainline Merge git://www.denx.de/git/u-boot Conflicts: drivers/bcm570x.c drivers/tigon3.c
|
#
375c2c9e |
| 13-Aug-2007 |
Haavard Skinnemoen <hskinnemoen@atmel.com> |
Merge commit 'upstream/master'
|
#
2c4faea8 |
| 09-Aug-2007 |
Wolfgang Denk <wd@denx.de> |
Merge with /home/wd/git/u-boot/custodian/u-boot-mpc83xx
|
#
78549bbf |
| 07-Aug-2007 |
Markus Klotzbuecher <mk@denx.de> |
Merge with git://www.denx.de/git/u-boot.git
|
#
85fad497 |
| 07-Aug-2007 |
Michal Simek <monstr@monstr.eu> |
Merge git://www.denx.de/git/u-boot
|
#
b23b5475 |
| 07-Aug-2007 |
Wolfgang Denk <wd@denx.de> |
Merge with /home/tur/git/u-boot#cm5200-si
|
#
f2c2a937 |
| 05-Aug-2007 |
Wolfgang Denk <wd@denx.de> |
Merge with /home/wd/git/u-boot/custodian/u-boot-testing
|
#
6bf6f114 |
| 03-Aug-2007 |
Andy Fleming <afleming@freescale.com> |
Merge branch 'testing' into working Conflicts: CHANGELOG fs/fat/fat.c include/configs/MPC8560ADS.h include/configs/pcs440ep.h
Merge branch 'testing' into working Conflicts: CHANGELOG fs/fat/fat.c include/configs/MPC8560ADS.h include/configs/pcs440ep.h net/eth.c
show more ...
|
#
f40a7f3e |
| 10-Jul-2007 |
Jon Loeliger <jdl@freescale.com> |
fs/: Remove lingering references to CFG_CMD_* symbols. Fixed some broken instances of "#ifdef CMD_CFG_IDE" too. Those always evaluated TRUE, and thus were always compiled even when I
fs/: Remove lingering references to CFG_CMD_* symbols. Fixed some broken instances of "#ifdef CMD_CFG_IDE" too. Those always evaluated TRUE, and thus were always compiled even when IDE really wasn't defined/wanted. Signed-off-by: Jon Loeliger <jdl@freescale.com>
show more ...
|
#
dd60d122 |
| 09-Jul-2007 |
Jon Loeliger <jdl@freescale.com> |
fs/: Remove obsolete references to CONFIG_COMMANDS Signed-off-by: Jon Loeliger <jdl@freescale.com>
|
#
4e109ae9 |
| 11-Jun-2007 |
Jon Loeliger <jdl@jdl.com> |
fs/: Augment CONFIG_COMMANDS tests with defined(CONFIG_CMD_*). This is a compatibility step that allows both the older form and the new form to co-exist for a while until the older can
fs/: Augment CONFIG_COMMANDS tests with defined(CONFIG_CMD_*). This is a compatibility step that allows both the older form and the new form to co-exist for a while until the older can be removed entirely. All transformations are of the form: Before: #if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT) After: #if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT) || defined(CONFIG_CMD_AUTOSCRIPT) Signed-off-by: Jon Loeliger <jdl@freescale.com>
show more ...
|
#
038ccac5 |
| 24-Feb-2006 |
Bartlomiej Sieka <tur@semihalf.com> |
Merge with /home/wd/git/u-boot/testing-NAND/ to add new NAND handling.
|
#
ea1fba13 |
| 16-Oct-2005 |
Wolfgang Denk <wd@pollux.denx.de> |
Merge with /home/sr/git/u-boot
|
#
84bd92bd |
| 15-Oct-2005 |
Wolfgang Denk <wd@pollux.denx.de> |
Merge with /home/m8/git/u-boot
|
#
77ddac94 |
| 13-Oct-2005 |
Wolfgang Denk <wd@pollux.denx.de> |
Cleanup for GCC-4.x
|
#
fe8c2806 |
| 02-Nov-2002 |
wdenk <wdenk> |
Initial revision
|