Commit Graph

309 Commits

Author SHA1 Message Date
Bartlomiej Sieka
86b116b1b1 cm1_qp1 -> cm5200: single U-Boot image for modules from the cm5200 family.
Add the ability for modules from the Schindler cm5200 family to use a
single U-Boot image:
- rename cm1_qp1 to cm5200
- add run-time module detection
- parametrize SDRAM configuration according to the module we are running on

Few minor, board-specific fixes included in this patch:
- better MAC address handling
- updated default environment ('update' command uses +{filesize} now)
- improved error messages in the auto-update code
- allow booting U-Boot from RAM (CFG_RAMBOOT)

Signed-off-by: Grzegorz Bernacki <gjb@semihalf.com>
Signed-off-by: Piotr Kruszynski <ppk@semihalf.com>
Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
2007-08-03 12:08:16 +02:00
Wolfgang Denk
cdd917a43d Fix build errors and warnings / code cleanup.
Signed-off-by: Wolfgang Denk <wd@denx.de>
2007-08-02 00:48:45 +02:00
Rafal Jaworowski
8993e54b6f [ADS5121] Support for the ADS5121 board
The following MPC5121e subsystems are supported:

- low-level CPU init
- NOR Boot Flash (common CFI driver)
- DDR SDRAM
- FEC
- I2C
- Watchdog

Signed-off-by: Grzegorz Bernacki <gjb@semihalf.com>
Signed-off-by: Rafal Jaworowski <raj@semihalf.com>
Signed-off-by: Jan Wrobel <wrr@semihalf.com>
2007-07-27 14:43:59 +02:00
John Otken
d4024bb72d ppc4xx: Add support for AMCC 405EP Taihu board
Signed-off-by: John Otken <john@softadvances.com>
2007-07-26 17:49:11 +02:00
Stefan Roese
c883f6ea32 Coding style cleanup
Signed-off-by: Stefan Roese <sr@denx.de>
2007-07-16 13:11:12 +02:00
Stefan Roese
c7e8410e3c Merge with /home/stefan/git/u-boot/u-boot-coldfire-freescale 2007-07-16 11:51:41 +02:00
Bartlomiej Sieka
fa1df30892 CM1.QP1: Support for the Schindler CM1.QP1 board.
Signed-off-by: Piotr Kruszynski <ppk@semihalf.com>
Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
2007-07-11 20:11:07 +02:00
John Rigby
98c80b462f Merge branch 'master' into u-boot-5329-early 2007-07-10 14:58:41 -06:00
TsiChungLiew
be296e31c4 Revert file mode
Changed MAKEALL file mode to executable, removed executable file mode from Makefile

Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
2007-07-10 14:29:08 -06:00
Jon Loeliger
46175d9764 Add MPC8568MDS to MAKEALL 85xx target.
It was missing from the original port submission.

Signed-off-by: Jon Loeliger <jdl@freescale.com>
2007-07-05 03:41:34 +02:00
Wolfgang Denk
98c440bee6 Merge with /home/wd/git/u-boot/custodian/u-boot-testing 2007-07-03 15:07:56 +02:00
TsiChung Liew
8e585f02f8 Added M5329AFEE and M5329BFEE Platforms
Added board/freescale/m5329evb, cpu/mcf532x, drivers/net,
drivers/serial,  immap_5329.h, m5329.h, mcfrtc.h,
include/configs/M5329EVB.h, lib_m68k/interrupts.c, and
rtc/mcfrtc.c

Modified CREDITS, MAKEFILE, Makefile, README, common/cmd_bdinfo.c,
common/cmd_mii.c, include/asm-m68k/byteorder.h, include/asm-m68k/fec.h,
include/asm-m68k/io.h, include/asm-m68k/mcftimer.h,
include/asm-m68k/mcfuart.h, include/asm-m68k/ptrace.h,
include/asm-m68k/u-boot.h, lib_m68k/Makefile, lib_m68k/board.c,
lib_m68k/time.c, net/eth.c and rtc/Makefile

Signed-off-by: TsiChung Liew <Tsi-Chung.Liew@freescale.com>
2007-06-18 15:17:56 -06:00
Stefan Roese
b765ffb773 [ppc4xx] Add initial lwmon5 board support
This patch adds initial support for the Liebherr lwmon5 board euqipped
with an AMCC 440EPx PowerPC.

Signed-off-by: Stefan Roese <sr@denx.de>
2007-06-15 08:18:01 +02:00
Wolfgang Denk
d1246a4bb1 Merge with /home/wd/git/u-boot/custodian/u-boot-arm 2007-06-06 16:18:01 +02:00
Stefan Roese
c440bfe6d6 ppc4xx: Add NAND booting support for AMCC Acadia (405EZ) eval board
This patch adds NAND booting support for the AMCC Acadia eval board.

Please make sure to configure jumper J7 to position 2-3 when booting
from NOR, and to position 1-2 when booting for NAND.

I also added a board command to configure the I2C bootstrap EEPROM
values. Right now only 267MHz is support for booting either via NOR
or NAND FLASH. Here the usage:

=> bootstrap 267 nor	;to configure the board for 267MHz NOR booting
=> bootstrap 267 nand	;to configure the board for 267MHz NNAND booting

Signed-off-by: Stefan Roese <sr@denx.de>
2007-06-06 11:42:13 +02:00
Stefan Roese
f3679aa13d Merge with /home/stefan/git/u-boot/bamboo-nand 2007-06-01 16:15:34 +02:00
Stefan Roese
cf959c7d66 ppc4xx: Add NAND booting support for AMCC Bamboo (440EP) eval board
This patch adds NAND booting support for the AMCC Bamboo eval board.
Since the NAND-SPL boot image is limited to 4kbytes, this version
only supports the onboard 64MBytes of DDR. The DIMM modules can't be
supported, since the setup code for I2C DIMM autodetection and
configuration is too big for this NAND bootloader.

Signed-off-by: Stefan Roese <sr@denx.de>
2007-06-01 15:27:11 +02:00
Jon Loeliger
822d55365b Add LIST_86xx MAKEALL target for PowerPC builds.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
2007-05-23 21:54:08 +02:00
Peter Pearse
fdda367561 Merge with git://www.denx.de/git/u-boot.git 2007-05-18 14:33:23 +01:00
Wolfgang Denk
256176d3d5 Merge with /home/wd/git/u-boot/custodian/u-boot-mpc83xx 2007-05-16 01:12:04 +02:00
Peter Pearse
b0d8f5bf0d New board SMN42 branch 2007-05-09 11:37:56 +01:00
Wolfgang Denk
885ec89b64 Add STX GP3 SSA board to MAKEALL script; update CHANGELOG.
Signed-off-by: Wolfgang Denk <wd@denx.de>
2007-05-05 18:05:02 +02:00
Kim Phillips
068aab660b mpc83xx: fix trivial error in MAKEALL
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
2007-05-03 19:43:52 -05:00
Kim Phillips
5c5d324293 mpc83xx: minor fixups for 8313rdb introduction 2007-04-25 12:34:38 -05:00
Andy Fleming
81f481ca70 Enable 8544 support
* Add support to the Makefile
* Add 8544 configuration support to the tsec driver
* Add 8544 SVR numbers to processor.h

Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
Signed-off-by: Jon Loeliger <jdl@freescale.com>
2007-04-23 19:58:28 -05:00
Wolfgang Denk
43f6226db0 Merge with /home/wd/git/u-boot/custodian/u-boot-74xx-7xx 2007-04-18 17:00:09 +02:00
Wolfgang Denk
c8f2280162 Merge with /home/wd/git/u-boot/custodian/u-boot-microblaze 2007-04-04 02:05:48 +02:00
Michal Simek
1798049522 Support for XUPV2P board
Reset support
BSP autoconfig support
2007-03-26 01:39:07 +02:00
Wolfgang Denk
44ba464b99 Code cleanup / re-insert previous Copyright entries.
Signed-off-by: Wolfgang Denk <wd@denx.de>
2007-03-22 00:13:12 +01:00
Wolfgang Denk
a17824c749 Merge with /home/wd/git/u-boot/custodian/u-boot-blackfin 2007-03-22 00:00:03 +01:00
Stefan Roese
fc1e45ce6e Merge with /home/stefan/git/u-boot/acadia 2007-03-21 14:38:25 +01:00
Stefan Roese
16c0cc1c82 [PATCH] Add AMCC Acadia (405EZ) eval board support
This patch adds support for the new AMCC Acadia eval board.

Please note that this Acadia/405EZ support is still in a beta stage.
Still lot's of cleanup needed but we need a preliminary release now.

Signed-off-by: Stefan Roese <sr@denx.de>
2007-03-21 13:39:57 +01:00
Aubrey Li
654589873d [Blackfin][PATCH] Add BF561 EZKIT board support 2007-03-20 18:16:24 +08:00
Aubrey Li
26bf7deca3 [Blackfin][PATCH] Add BF537 stamp board support 2007-03-19 01:24:52 +08:00
Michal Simek
cfc67116a7 [Microblaze][PATCH] part 2
timer support
interrupt controller support
flash support
ethernet support
cache support
board information support
env support
booting image support

adding support for Xilinx ML401
2007-03-11 13:48:24 +01:00
Aubrey.Li
ef26a08fef [Blackfin][PATCH-2/2] Common files changed to support bf533 platform 2007-03-09 13:40:56 +08:00
Wolfgang Denk
eb92f61355 Minor cleanup. 2007-03-08 22:52:51 +01:00
Timur Tabi
7a78f148d6 mpc83xx: Add support for the MPC8349E-mITX-GP
Add support for the MPC8349E-mITX-GP, a stripped-down version of the
MPC8349E-mITX.  Bonus features include support for low-boot (BMS bit in
HRCW is 0) for the ITX and a README for the ITX and the ITX-GP.

Signed-off-by: Timur Tabi <timur@freescale.com>
2007-03-02 11:05:54 -06:00
Kim Phillips
ae246dc6c1 mpc83xx: add MPC832XEMDS and sbc8349 to MAKEALL 2007-03-02 11:05:53 -06:00
roy zang
00b574bdc8 Merge branch 'master' into hpc2
Conflicts:

	drivers/Makefile
Fix the merge conflict in file drivers/Makefile
Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
2007-02-28 16:46:48 +08:00
Stefan Roese
90b0cf47eb Merge with /home/stefan/git/u-boot/denx-merge-sr 2007-02-20 10:58:04 +01:00
Stefan Roese
4745acaa1a [PATCH] Add support for the AMCC Katmai (440SPe) eval board
Signed-off-by: Stefan Roese <sr@denx.de>
2007-02-20 10:57:08 +01:00
Wolfgang Denk
bc2b9c3383 Merge with /home/tur/git/u-boot#motionpro 2007-02-16 23:44:55 +01:00
roy zang
30bddf2c46 Merge branch 'master' into hpc2 2007-02-12 11:24:27 +08:00
Bartlomiej Sieka
53d4a4983f [Motion-PRO] Preliminary support for the Motion-PRO board. 2007-02-09 10:45:42 +01:00
Stefan Roese
8b7d1f0ab7 [PATCH] Add support for esd mecp5200 board
Signed-off-by: Reinhard Arlt <reinhard.arlt@esd-electronics.com>
2007-01-31 16:37:34 +01:00
roy zang
c1c52e38d3 Merge branch 'master' into hpc2 2007-01-30 16:43:18 +08:00
Gary Jennejohn
6bd2447ee4 Add port for the lpc2292sodimm evaluation board from EmbeddedArtists 2007-01-24 12:16:56 +01:00
roy zang
ee460917af Merge branch 'master' into hpc2
Conflicts:

	drivers/cfi_flash.c

The patch by Heiko Schocher <hs@pollux.denx.de> on Jan, 19, 2007
fixes cfi_driver bug for mpc7448hpc2 board. The default cfi_driver can support
mpc7448hpc2 board.
2007-01-22 13:15:35 +08:00
Stefan Roese
9d8d5a5bfb [PATCH] Add support for Prodrive SCPU (PDNB3 variant) board
Signed-off-by: Stefan Roese <sr@denx.de>
2007-01-18 16:05:47 +01:00
Stefan Roese
3a83ee3021 Merge with /home/stefan/git/u-boot/denx-merge-sr 2007-01-18 10:27:26 +01:00
Stefan Roese
5fb692cae5 [PATCH] Add support for AMCC Taishan PPC440GX eval board
Signed-off-by: Stefan Roese <sr@denx.de>
2007-01-18 10:25:34 +01:00
Wolfgang Denk
6d3e010723 Raname solidcard3 into sc3; add redundant env for sc3 2007-01-16 18:30:50 +01:00
roy zang
a41969e09b Merge branch 'master' into hpc2 2007-01-04 11:10:05 +08:00
Wolfgang Denk
82e5236a8b Minor code cleanup; update CHANGELOG. 2006-12-22 10:30:26 +01:00
Bartlomiej Sieka
daa6e418bc Preliminary support for the iDMR board (ColdFire). 2006-12-20 00:27:32 +01:00
roy zang
e0b369e4f7 Fix the confilcts when merging 'master' into hpc2.
The conflicts due to a new mpc7448 p3m7448 board is in the main tree.

Merge branch 'master' into hpc2

Conflicts:

	MAKEALL
	cpu/74xx_7xx/cpu.c
	cpu/74xx_7xx/cpu_init.c
	cpu/74xx_7xx/speed.c
2006-12-01 12:09:33 +08:00
Wolfgang Denk
ab07b6c221 Merge with http://opensource.freescale.com/pub/scm/u-boot-83xx.git 2006-11-30 02:01:32 +01:00
Stefan Roese
1eac2a7141 [PATCH] Add support for Prodrive P3M750 & P3M7448 (P3Mx) boards
This patch adds support for the Prodrive P3M750 (PPC750 & MV64460)
and the P3M7448 (MPC7448 & MV64460) PMC modules. Both modules are
quite similar and share the same board directory "prodrive/p3mx"
and the same config file "p3mx.h".

Signed-off-by: Stefan Roese <sr@denx.de>
2006-11-29 16:14:05 +01:00
Kim Phillips
32081125a0 Merge http://www.denx.de/git/u-boot 2006-11-28 23:35:49 -06:00
roy zang
6bd87c0aee Solve the copyright conflicts when merging 'master' into hpc2.
Merge branch 'master' into hpc2

Conflicts:

	drivers/cfi_flash.c
2006-11-29 09:45:03 +08:00
Stefan Roese
48c7d6dba9 Merge with /home/stefan/git/u-boot/denx 2006-11-27 14:11:22 +01:00
Stefan Roese
dfc8a9ee00 Merge with /home/stefan/git/u-boot/denx 2006-11-10 07:48:47 +01:00
Dave Liu
5f8204394e mpc83xx: Add MPC8360EMDS basic board support
Add support for the Freescale MPC8360EMDS board.
Includes DDR, DUART, Local Bus, PCI.
2006-11-03 19:42:21 -06:00
Timur Tabi
2ad6b513b3 mpc83xx: Add support for the MPC8349E-mITX
PREREQUISITE PATCHES:

* This patch can only be applied after the following patches have been applied:

  1) DNX#2006090742000024 "Add support for multiple I2C buses"
  2) DNX#2006090742000033 "Multi-bus I2C implementation of MPC834x"
  3) DNX#2006091242000041 "Additional MPC8349 support for multibus i2c"
  4) DNX#2006091242000078 "Add support for variable flash memory sizes on 83xx systems"
  5) DNX#2006091242000069 "Add support for Errata DDR6 on MPC 834x systems"

CHANGELOG:

* Add support for the Freescale MPC8349E-mITX reference design platform.
  The second TSEC (Vitesse 7385 switch) is not supported at this time.

Signed-off-by: Timur Tabi <timur@freescale.com>
2006-11-03 19:42:20 -06:00
roy zang
4c52783b3d General code modification for mpc7448hpc2 board support.
1. Add 7447A and 7448 processor support.
2. Add the following flags.

CFG_CONFIG_BUS_CLK : If the 74xx bus frequency can be configured dynamically
(such as by switch on board), this flag should be set.

CFG_EXCEPTION_AFTER_RELOCATE: If an exception occurs after the u-boot
relocates to RAM, this flag should be set.

CFG_SERIAL_HANG_IN_EXCEPTION: If the print out function will cause the
system hang in exception, this flag should be set.

There is a design issue for tsi108/109 pci configure  read. When pci scan
the slots, if there is no pci card, the tsi108/9 will cause a machine
check exception for mpc7448 processor.

Signed-off-by: Alexandre Bounine <alexandreb@tundra.com>
Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
2006-11-02 18:49:51 +08:00
Wolfgang Denk
6ccec4492e Add ATSTK1000 and ATSTK1002 board support
Patch by Haavard Skinnemoen, 06 Sep 2006

This patch adds support for the ATSTK1000 with the ATSTK1002 CPU
daughterboard.

ATSTK1000 is a full-featured development board for AT32AP CPUs. It
has two ethernet ports, a high quality QVGA LCD panel, a loudspeaker,
and connectors for USART, PS/2, VGA, USB, MMC/SD cards and
CompactFlash cards. For more information, please see this page:

http://www.atmel.com/dyn/products/tools.asp?family_id=682

The ATSTK1002 is a daughterboard for the ATSTK1000 supporting the
AT32AP7000 chip.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
2006-10-24 14:42:37 +02:00
Wolfgang Denk
82165a334b Merge with /home/tur/proj/051_uboot_linux_v38b/u-boot 2006-10-18 22:27:57 +02:00
Bartlomiej Sieka
4707fb50cc Preliminary patch adding support for the MarelV38B board. 2006-10-13 21:09:09 +02:00
Wolfgang Denk
8d4ac79436 Add support for EP82xxM boards
Patch by Aaron Sells, 20 Jun 2006
2006-10-09 00:35:30 +02:00
Stefan Roese
64cd52efd1 Merge with /home/stefan/git/u-boot/denx 2006-09-18 10:48:03 +02:00
Wolfgang Denk
98e43917dc Merge with /home/m8/git/u-boot 2006-09-09 22:53:06 +02:00
Stefan Roese
2d658967e1 Fix build problem cpu/ppc4xx/ndfc.c
Patch by Stefan Roese, 07 Sep 2006
2006-09-07 13:09:53 +02:00
Marian Balakowicz
4f0645eb79 Fix LOG_DIR directory creation error.
Add support for automatic creation of BUILD_DIR directory.
2006-09-07 12:05:53 +02:00
Stefan Roese
887e2ec9ec Add support for AMCC Sequoia PPC440EPx eval board
- Add support for PPC440EPx & PPC440GRx
- Add support for PPC440EP(x)/GR(x) NAND controller
  in cpu/ppc4xx directory
- Add NAND boot functionality for Sequoia board,
  please see doc/README.nand-boot-ppc440 for details
- This Sequoia NAND image doesn't support environment
  in NAND for now. This will be added in a short while.
Patch by Stefan Roese, 07 Sep 2006
2006-09-07 11:51:23 +02:00
Marian Balakowicz
f93286397e Add support for a saving build objects in a separate directory.
Modifications are based on the linux kernel approach and
support two use cases:

  1) Add O= to the make command line
  'make O=/tmp/build all'

  2) Set environement variable BUILD_DIR to point to the desired location
  'export BUILD_DIR=/tmp/build'
  'make'

The second approach can also be used with a MAKEALL script
'export BUILD_DIR=/tmp/build'
'./MAKEALL'

Command line 'O=' setting overrides BUILD_DIR environent variable.

When none of the above methods is used the local build is performed and
the object files are placed in the source directory.
2006-09-01 19:49:50 +02:00
Wolfgang Denk
5196a7a03b Minor cleanup 2006-08-18 23:27:33 +02:00
Marian Balakowicz
6d3bc9b8cf Add support for WTK FO300 board (TQM5200 based). 2006-08-18 19:14:46 +02:00
Wolfgang Denk
144f7795ee Disabled kvme080 board in MAKEALL because of build problems. 2006-07-21 15:21:40 +02:00
Wolfgang Denk
32cb2c70c4 Add support for friendly-arm SBC-2410X board
Patch by JinHua Luo, 01 Sep 2005
2006-07-21 11:31:42 +02:00
Wolfgang Denk
53dd6ce4f0 Add support for KVME080 board
Patch by Sangmoon Kim, 18 Aug 2005
2006-07-21 11:29:20 +02:00
Wolfgang Denk
5078cce81c * Cleanup TQM5200 board configurations:
- make highboot configurations use environment at high end, too,
    to avoid flash fragmentation
  - always use redundand environment
  - don't enable video code for modules without graphics controller
  - provide useful (though different) mtdparts settings
  - get rid of CONFIG_CS_AUTOCONF which was always set anyway

* Extend mkconfig tool to print more useful target name
2006-07-21 11:16:34 +02:00
Wolfgang Denk
45a212c4d7 Add support for new TQM5200 revisions
- Support for TQM5200S (short version without graphic controller)
- Support for modules with 'N' type S29GL128N Spansion flashes
  (requires changes to flash layout)
- Support for MPC5200B cpu (mostly support for second SDRAM bank)
2006-07-19 17:52:30 +02:00
Markus Klotzbuecher
090eb73510 Add support for TQM885D board.
Patch by Martin Krause, 20 Mar 2006

Signed-off-by: Martin Krause <martin.krause@tqs.de>
2006-07-12 15:26:01 +02:00
Markus Klotzbuecher
b02d0177c1 Support for spc1920 board.
Patch by Markus Klotzbuecher, 12 Jul 2006
2006-07-12 08:48:24 +02:00
Wolfgang Denk
0095b787fe Merge with /home/m8/git/u-boot 2006-07-05 10:03:52 +02:00
Marian Balakowicz
ce05de2950 Add AMCC bamboo board to MAKEALL build script. 2006-07-04 08:47:23 +02:00
Wolfgang Denk
3b5f61a025 Merge with /home/m8/git/u-boot 2006-06-30 19:32:25 +02:00
Marian Balakowicz
f6e5739a68 Merge: Add support for AMCC 440SPe CPU based eval board (Yucca). 2006-06-30 18:19:42 +02:00
Marian Balakowicz
6c5879f380 Add support for AMCC 440SPe CPU based eval board (Yucca). 2006-06-30 16:30:46 +02:00
Wolfgang Denk
a63c31cff5 Cleanup trab board for GCC-4.x 2006-06-26 10:54:52 +02:00
Wolfgang Denk
f73e73ba0e Merge with /home/hs/U-Boot/u-boot-dev 2006-06-20 00:12:59 +02:00
Heiko Schocher
f5e0d03970 Add support for wrPPMC7xx/74xx boards
Patch from Richard Danter, 12 Aug 2005
2006-06-19 11:02:41 +02:00
Wolfgang Denk
0c32d96ddd Add support for gth2 board
Patch by Thomas Lange, Aug 11 2005
2006-06-16 17:32:31 +02:00
Wolfgang Denk
cd65a3dc87 Adjust TQM5200 make targets
Make the automatic CS configuration the default.
The dedicated configurations CONFIG_TQM5200_AA, CONFIG_TQM5200_AB
and CONFIG_TQM5200_AC are removed.
"TQM5200_config" is now the default for STK52XX.200 base boards.
On a STK52XX.100 base board "TQM5200_STK100_config" must be used.
Patch by Martin Krause, 07 Nov 2005
2006-06-16 16:11:34 +02:00
Wolfgang Denk
4176c79964 Merge with /home/hs/U-Boot/u-boot-dev 2006-06-10 19:27:47 +02:00
Scott McNutt
9cc8337832 Nios II - Add Altera EP1C20, EP1S10 and EP1S40 boards
Patch by Scott McNutt, 08 Jun 2006
2006-06-08 13:37:39 -04:00
Stefan Roese
a4c8d1389f Add support for PCS440EP board
Patch by Stefan Roese, 02 Jun 2006
2006-06-02 16:20:36 +02:00
Wolfgang Denk
ba94a1bba3 * Update Intel IXP4xx support
- Add IXP4xx NPE ethernet MAC support
- Add support for Intel IXDPG425 board
- Add support for Prodrive PDNB3 board
- Add IRQ support
Patch by Stefan Roese, 23 May 2006

[This patch does not include cpu/ixp/npe/IxNpeMicrocode.c which still
 sufferes from licensing issues. Blame Intel.]
2006-05-30 15:56:48 +02:00
Wolfgang Denk
1cfefe8cb6 Merge with /home/m8/git/u-boot 2006-05-09 13:46:55 +02:00