Merge with http://www.denx.de/git/u-boot.git

Merge branch 'origin'

Conflicts:

CHANGELOG

Add crc of data to jffs2 (in jffs2_1pass_build_lists()).
Patch by Rick Bronson, 15 Jun 2005

Merge with /home/wd/git/u-boot/master
Code cleanup.

Merge the new NAND code (testing-NAND brach); see doc/README.nand
Rewrite of NAND code based on what is in 2.6.12 Linux kernel
Patch by Ladislav Michl, 29 Jun 2005

[Merge with /home/tur/nand/u-boot]

Re-factoring the legacy NAND code (legacy NAND now only in board-specific
code and in SoC code). Boards using the old way have CFG_NAND_LEGACY and
BOARDLIBS = drivers/nand_legacy/libnand_legacy.a add

Re-factoring the legacy NAND code (legacy NAND now only in board-specific
code and in SoC code). Boards using the old way have CFG_NAND_LEGACY and
BOARDLIBS = drivers/nand_legacy/libnand_legacy.a added. Build breakage for
NETTA.ERR and NETTA_ISDN - will go away when the new NAND support is
implemented for these boards.

show more ...

Merge /home/tur/nand/u-boot/
This is a first version of the testing-NAND branch merged back to main.

Merge with /home/wd/git/u-boot/testing-NAND/ to add new NAND handling.

Merge with /home/m8/git/u-boot

Cleanup for GCC-4.x

Added support for TQM834x boards.

Update of new NAND code
Patch by Ladislav Michl, 13 Sep 2005

Merge with pollux.denx.org:/home/git/u-boot/.git

Fix return values of the jffs2 commands ls/fsload/fsinfo,
so we can use them to, e.g., check the existence of a file with
"if ls foo; then this; else that; fi" in the hush shell
Patch by Andreas Enge

Fix return values of the jffs2 commands ls/fsload/fsinfo,
so we can use them to, e.g., check the existence of a file with
"if ls foo; then this; else that; fi" in the hush shell
Patch by Andreas Engel, 16 August 2005

show more ...

Merge with /home/wd/git/u-boot/master

Merge with pollux.denx.org:/home/git/u-boot/.git

Add configuration for IFM AEV FIFO board.
Minor coding style cleanup.

Add common (with Linux) MTD partition scheme and "mtdparts" command
Old, obsolete and duplicated code was cleaned up and replace by the
new partitioning method. There are two possible approaches now:

Add common (with Linux) MTD partition scheme and "mtdparts" command
Old, obsolete and duplicated code was cleaned up and replace by the
new partitioning method. There are two possible approaches now:
* define a single, static partition
* use mtdparts command line option and dynamic partitioning
Default is static partitioning.

show more ...

It's better to handle LZO and LZARI compression mdoes for JFFS2 with
a single #define.

Major upate of JFFS2 code; now in sync with snapshot of MTD CVS of
March 13, 2005); new configuration options CONFIG_JFFS2_LZO and
CONFIG_JFFS2_LZARI are added. Both are undefined by default.

Fix problem with symbolic links in JFFS2 code.

Patch by Klaus Heydeck, 12 May 2004:
Using external watchdog for KUP4 boards in mpc8xx/cpu.c;
load_sernum_ethaddr() for KUP4 boards in lib_ppc/board.c;
various changes to KUP4 board specific files

* Fix memory leak in the NAND-specific JFFS2 code

* Fix SL811 USB controller when attached to a USB hub

* Fix minor NAND JFFS2 related issue

* Fixes for SL811 USB controller:
- implement workaround for broken memory stick
- improve error handling

* Increase packet send timeout to 10 ms in cpu/mpc

* Fix minor NAND JFFS2 related issue

* Fixes for SL811 USB controller:
- implement workaround for broken memory stick
- improve error handling

* Increase packet send timeout to 10 ms in cpu/mpc8xx/scc.c to better
cope with congested networks.

show more ...

* Back out Patch by Christian Hohnstaedt, 23 Apr 2004:
(JFFS2 speed enhancements) because of using non-public
data (PHYS_FLASH_SECT_SIZE)

* Patch by Travis Sawyer, 23 Apr 2004:
Fix VSC/CIS 820

* Back out Patch by Christian Hohnstaedt, 23 Apr 2004:
(JFFS2 speed enhancements) because of using non-public
data (PHYS_FLASH_SECT_SIZE)

* Patch by Travis Sawyer, 23 Apr 2004:
Fix VSC/CIS 8201 phy descrambler interoperability timing due to
errata from Vitesse Semiconductor.

show more ...