| #
0a6deb32 |
| 30-Apr-2012 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
* 'agust@denx.de' of git://git.denx.de/u-boot-staging:
lin_gadget: use common linux/compat.h
linux/compat.h: rename from linux/mt
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
* 'agust@denx.de' of git://git.denx.de/u-boot-staging:
lin_gadget: use common linux/compat.h
linux/compat.h: rename from linux/mtd/compat.h
lin_gadget: use common mdelay
gunzip: rename z{alloc, free} to gz{alloc, free}
fs/fat: align disk buffers on cache line to enable DMA and cache
part_dos: align disk buffers on cache line to enable DMA and cache
show more ...
|
| #
e3ed0575 |
| 09-Apr-2012 |
Mike Frysinger <vapier@gentoo.org> |
gunzip: rename z{alloc, free} to gz{alloc, free}
This allows us to add a proper zalloc() func (one that does a zeroing
alloc), and removes duplicate prototypes.
Signed-off-by: Mike Frysinger <vapie
gunzip: rename z{alloc, free} to gz{alloc, free}
This allows us to add a proper zalloc() func (one that does a zeroing
alloc), and removes duplicate prototypes.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
show more ...
|
| #
a31e091a |
| 04-Apr-2009 |
Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> |
rename include/zlib.h to include/u-boot/zlib.h
Some systems have zlib.h installed in /usr/include/. This isn't the
desired file for u-boot code - we want the one in include/zlib.h.
This rename will
rename include/zlib.h to include/u-boot/zlib.h
Some systems have zlib.h installed in /usr/include/. This isn't the
desired file for u-boot code - we want the one in include/zlib.h.
This rename will avoid the conflict.
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
show more ...
|
| #
e99e9575 |
| 31-Aug-2008 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'Makefile' of git://git.denx.de/u-boot-arm
|
| #
08ab4e17 |
| 31-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>
|
| #
3596d55e |
| 29-Mar-2008 |
Gerald Van Baren <vanbaren@cideas.com> |
Merge git://www.denx.de/git/u-boot into uboot
|
| #
b951f8d3 |
| 26-Mar-2008 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master_merge_new-image' of /home/tur/git/u-boot
|
| #
27f33e9f |
| 26-Mar-2008 |
Bartlomiej Sieka <tur@semihalf.com> |
Merge branch 'new-image' of git://www.denx.de/git/u-boot-testing
Conflicts:
common/cmd_bootm.c
cpu/mpc8xx/cpu.c
Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
|
| #
e95bcc36 |
| 16-Mar-2008 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master
Conflicts:
drivers/rtc/Makefile
Signed-off-by: Wolfgang Denk <wd@denx.de>
|
| #
0210cff3 |
| 15-Mar-2008 |
Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> |
cramfs: Fix ifdef
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
|
| #
321359f2 |
| 08-Jan-2008 |
Marian Balakowicz <m8@semihalf.com> |
[new uImage] Move gunzip() common code to common/gunzip.c
Move gunzip(), zalloc() and zfree() to a separate file.
Share zalloc() and zfree() with cramfs uncompress routine.
Signed-off-by: Marian Ba
[new uImage] Move gunzip() common code to common/gunzip.c
Move gunzip(), zalloc() and zfree() to a separate file.
Share zalloc() and zfree() with cramfs uncompress routine.
Signed-off-by: Marian Balakowicz <m8@semihalf.com>
show more ...
|
| #
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
|
| #
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 |
| 12-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
be removed en
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 ...
|
| #
dd875c76 |
| 03-Jan-2004 |
wdenk <wdenk> |
* Patch by Robert Schwebel, 15 Dec 2003:
add support for cramfs (uses JFFS2 command interface)
|