| #
f61f1e15 |
| 21-Oct-2008 |
Stefan Roese <sr@denx.de> |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
|
| #
50bd0057 |
| 21-Oct-2008 |
Markus Klotzbuecher <mk@denx.de> |
Merge git://git.denx.de/u-boot into x1
Conflicts:
drivers/usb/usb_ohci.c
|
| #
f82642e3 |
| 18-Oct-2008 |
Wolfgang Denk <wd@denx.de> |
Merge 'next' branch
Conflicts:
board/freescale/mpc8536ds/mpc8536ds.c
include/configs/mgcoge.h
Signed-off-by: Wolfgang Denk <wd@denx.de>
|
| #
6d0f6bcf |
| 16-Oct-2008 |
Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> |
rename CFG_ macros to CONFIG_SYS
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
|
| #
225f0eaa |
| 12-Sep-2008 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of /home/wd/git/u-boot/custodians
|
| #
afbc5263 |
| 12-Sep-2008 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'Makefile-next' of git://git.denx.de/u-boot-arm
|
| #
0e8d1586 |
| 10-Sep-2008 |
Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> |
rename CFG_ENV macros to CONFIG_ENV
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
|
| #
93f6d725 |
| 10-Sep-2008 |
Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> |
rename CFG_ENV_IS_NOWHERE in CONFIG_ENV_IS_NOWHERE
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
|
| #
650a9e7a |
| 09-Sep-2008 |
Andy Fleming <afleming@freescale.com> |
Merge branch 'denx'
|
| #
48d0192f |
| 08-Sep-2008 |
Andreas Engel <andreas.engel@ericsson.com> |
Moved conditional compile into Makefile
Signed-off-by: Andreas Engel <andreas.engel@ericsson.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 |
| 14-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'
|
| #
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
|
| #
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
net/eth.c
|
| #
079a136c |
| 10-Jul-2007 |
Jon Loeliger <jdl@freescale.com> |
include/configs/[p-z]* + misc: Cleanup BOOTP and lingering CFG_CMD_*.
Explicitly add in default CONFIG_BOOTP_* options where cmd_confdefs.h
used to be included but CONFIG_BOOTP_MASK was not defined.
include/configs/[p-z]* + misc: Cleanup BOOTP and lingering CFG_CMD_*.
Explicitly add in default CONFIG_BOOTP_* options where cmd_confdefs.h
used to be included but CONFIG_BOOTP_MASK was not defined.
Remove lingering references to CFG_CMD_* symbols.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
show more ...
|
| #
2fd90ce5 |
| 10-Jul-2007 |
Jon Loeliger <jdl@freescale.com> |
include/configs/[a-m]*: Directly use CONFIG_BOOTP_* symbols rather than CONFIG_BOOTP_MASK.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
|
| #
1d2c6bc4 |
| 05-Jul-2007 |
Jon Loeliger <jdl@jdl.com> |
include/configs: Use new CONFIG_CMD_* in various i* named board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
|
| #
9b880bd4 |
| 04-Oct-2005 |
Wolfgang Denk <wd@pollux.denx.de> |
Update ARM Integrator boards:
Correct addessing errors in platform files.
Split off common core module data from Integrator header files to
include/armcoremodule.h.
Patch by Peter Pearse, 04 Oct 2005
|