| #
326ea986 |
| 31-Jul-2013 |
Stefano Babic <sbabic@denx.de> |
Merge git://git.denx.de/u-boot-arm
Conflicts:
board/freescale/mx6qsabrelite/Makefile
board/freescale/mx6qsabrelite/mx6qsabrelite.c
include/configs/mx6qsabrelite.h
Signed-off-by: Stefano Babic <s
Merge git://git.denx.de/u-boot-arm
Conflicts:
board/freescale/mx6qsabrelite/Makefile
board/freescale/mx6qsabrelite/mx6qsabrelite.c
include/configs/mx6qsabrelite.h
Signed-off-by: Stefano Babic <sbabic@denx.de>
show more ...
|
| #
8b485ba1 |
| 25-Jul-2013 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge branch 'u-boot/master' into u-boot-arm/master
|
| #
1a459660 |
| 08-Jul-2013 |
Wolfgang Denk <wd@denx.de> |
Add GPL-2.0+ SPDX-License-Identifier to source files
Signed-off-by: Wolfgang Denk <wd@denx.de>
[trini: Fixup common/cmd_io.c]
Signed-off-by: Tom Rini <trini@ti.com>
|
| #
cb547320 |
| 17-Dec-2008 |
Haavard Skinnemoen <haavard.skinnemoen@atmel.com> |
Merge branch 'fixes' into cleanups
Conflicts:
board/atmel/atngw100/atngw100.c
board/atmel/atstk1000/atstk1000.c
cpu/at32ap/at32ap700x/gpio.c
include/asm-avr32/arch-at32ap700x/clk.h
include/con
Merge branch 'fixes' into cleanups
Conflicts:
board/atmel/atngw100/atngw100.c
board/atmel/atstk1000/atstk1000.c
cpu/at32ap/at32ap700x/gpio.c
include/asm-avr32/arch-at32ap700x/clk.h
include/configs/atngw100.h
include/configs/atstk1002.h
include/configs/atstk1003.h
include/configs/atstk1004.h
include/configs/atstk1006.h
include/configs/favr-32-ezkit.h
include/configs/hammerhead.h
include/configs/mimc200.h
show more ...
|
| #
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>
|
| #
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
|
| #
639221c7 |
| 09-Jul-2007 |
Jon Loeliger <jdl@freescale.com> |
include/: Remove obsolete references to CONFIG_COMMANDS
Mostly removed from comments here.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
|
| #
72a074ce |
| 12-Jun-2007 |
Jon Loeliger <jdl@jdl.com> |
include/ non-config: 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 c
include/ non-config: 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 ...
|
| #
012771d8 |
| 08-Mar-2002 |
wdenk <wdenk> |
Initial revision
|