#
f0983371 |
| 15-Jan-2010 |
Wolfgang Denk <wd@denx.de> |
JFFS2: drop support for LZARI compression mode Support for LZARI compression mode was added based on a MTD CVS snapshot of March 13, 2005. However, fs/jffs2/compr_lzari.c contains co
JFFS2: drop support for LZARI compression mode Support for LZARI compression mode was added based on a MTD CVS snapshot of March 13, 2005. However, fs/jffs2/compr_lzari.c contains contradictory licensing terms: the original copyright clause says "All rights reserved. Permission granted for non-commercial use.", but later reference to the file 'LICENCE' in the jffs2 directory was added which says GPL v2 or later. As no boards ever used LZARI compression, and this file is also not present in recent MTD code, we resolve this conflict by removing the conflicting file and references to it. Also copy the referenced but missing file 'LICENCE' from the current MTD source tree. Signed-off-by: Wolfgang Denk <wd@denx.de>
show more ...
|
#
cb32ed1f |
| 04-Aug-2009 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'next' of git://git.denx.de/u-boot-coldfire
|
#
84efbf4d |
| 22-Jul-2009 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://git.denx.de/u-boot-arm
|
#
a694610d |
| 18-Jul-2009 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
|
#
be33b046 |
| 01-Apr-2009 |
Scott Wood <scottwood@freescale.com> |
Remove legacy NAND and disk on chip code. Legacy NAND had been scheduled for removal. Any boards that use this were already not building in the previous release due to an #error.
Remove legacy NAND and disk on chip code. Legacy NAND had been scheduled for removal. Any boards that use this were already not building in the previous release due to an #error. The disk on chip code in common/cmd_doc.c relies on legacy NAND, and it has also been removed. There is newer disk on chip code in drivers/mtd/nand; someone with access to hardware and sufficient time and motivation can try to get that working, but for now disk on chip is not supported. Signed-off-by: Scott Wood <scottwood@freescale.com>
show more ...
|
#
156feb90 |
| 23-Feb-2009 |
Haavard Skinnemoen <haavard.skinnemoen@atmel.com> |
Merge branch 'mimc200' into next Conflicts: board/mimc/mimc200/mimc200.c include/configs/mimc200.h
|
#
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
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 ...
|
#
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>
|
#
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>
|
#
ce0eb703 |
| 25-Aug-2008 |
Kim Phillips <kim.phillips@freescale.com> |
Merge branch 'next'
|
#
d3c23a79 |
| 20-Aug-2008 |
Haavard Skinnemoen <haavard.skinnemoen@atmel.com> |
Merge branch 'next' of git://git.denx.de/u-boot-avr32 Conflicts: MAINTAINERS
|
#
28ac6719 |
| 14-Aug-2008 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
|
#
becbbc7b |
| 14-Aug-2008 |
Stefan Roese <sr@denx.de> |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot into next
|
#
2fd0aad4 |
| 13-Aug-2008 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'Makefile' of git://git.denx.de/u-boot-arm
|
#
cc4a0cee |
| 12-Aug-2008 |
Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> |
drivers/mtd/nand: Move conditional compilation to Makefile rename CFG_NAND_LEGACY to CONFIG_NAND_LEGACY Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
|
#
42246dac |
| 17-Jul-2008 |
Stefan Roese <sr@denx.de> |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot into next
|
#
1d28d48e |
| 15-Jul-2008 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
|
#
b64f190b |
| 14-Jul-2008 |
Wolfgang Denk <wd@denx.de> |
Fix printf() format issues with sizeof_t types by using %zu Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Wolfgang Denk <wd@denx.de>
|
#
1a247ba7 |
| 06-Jun-2008 |
Jon Loeliger <jdl@freescale.com> |
Merge commit 'wd/master'
|
#
10a33679 |
| 03-Jun-2008 |
Stefan Roese <sr@denx.de> |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
|
#
9d2459f3 |
| 02-Jun-2008 |
Wolfgang Denk <wd@denx.de> |
Merge remote branch 'u-boot-ppc4xx/master'
|
#
42fd5f87 |
| 24-May-2008 |
Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> |
Merging Stelian Pop AT91 patches Merge branch 'testing-V2' Conflicts: board/atmel/at91cap9adk/Makefile Fixing copyright board/atmel/
Merging Stelian Pop AT91 patches Merge branch 'testing-V2' Conflicts: board/atmel/at91cap9adk/Makefile Fixing copyright board/atmel/at91sam9260ek/Makefile Fixing copyright board/atmel/at91sam9260ek/u-boot.lds Delete no more needed ld script Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
show more ...
|