platform/kernel/u-boot.git
16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-mips
Wolfgang Denk [Fri, 9 May 2008 20:19:29 +0000 (22:19 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-mips

16 years agoMerge branch 'master' of /home/wd/git/u-boot/master/
Wolfgang Denk [Fri, 9 May 2008 20:19:16 +0000 (22:19 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/master/

16 years agoMerge branch 'master' of /home/wd/git/u-boot/master/
Wolfgang Denk [Fri, 9 May 2008 20:18:58 +0000 (22:18 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/master/

16 years agoFix readline_into_buffer() with CONFIG_CMDLINE_EDITING before relocating
James Yang [Mon, 5 May 2008 15:22:53 +0000 (10:22 -0500)]
Fix readline_into_buffer() with CONFIG_CMDLINE_EDITING before relocating

When CONFIG_CMDLINE_EDITING is enabled, readline_into_buffer() doesn't
work before relocating to RAM because command history is written into
a global array that is not writable before relocation.  This patch
defers to the no-editing and no-history code in readline_into_buffer()
if it is called before relocation.

Signed-off-by: James Yang <James.Yang@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agocosmetic: Adjust coding style for switch statements to be consistent
Detlev Zundel [Mon, 5 May 2008 14:11:22 +0000 (16:11 +0200)]
cosmetic: Adjust coding style for switch statements to be consistent

Signed-off-by: Detlev Zundel <dzu@denx.de>
16 years agoFix disk type output in disk/part.c
Detlev Zundel [Mon, 5 May 2008 14:11:21 +0000 (16:11 +0200)]
Fix disk type output in disk/part.c

Signed-off-by: Detlev Zundel <dzu@denx.de>
16 years agoMail address change, documentation modified
Vlad Lungu [Mon, 5 May 2008 11:20:03 +0000 (14:20 +0300)]
Mail address change, documentation modified

Signed-off-by: Vlad Lungu <vlad.lungu@windrvier.com>
16 years agomicroblaze: Repare intc handling
Michal Simek [Sun, 4 May 2008 13:42:41 +0000 (15:42 +0200)]
microblaze: Repare intc handling

Signed-off-by: Michal Simek <monstr@monstr.eu>
16 years agoinclude/gitignore: update to all architectures
Jean-Christophe PLAGNIOL-VILLARD [Sun, 4 May 2008 13:17:52 +0000 (15:17 +0200)]
include/gitignore: update to all architectures

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agoide: Remove spurious second include of io.h
Marcel Ziswiler [Mon, 5 May 2008 00:12:06 +0000 (02:12 +0200)]
ide: Remove spurious second include of io.h

Removed the second include, with all the #ifdef around as suggested by Wolfgang.

Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
16 years agoFix some typos
Adrian Filipi [Tue, 6 May 2008 20:46:37 +0000 (16:46 -0400)]
Fix some typos

This patch fixes three typos.
The first is a repetition of CONFIG_CMD_BSP.
The second makes the #endif comment match its #if.
The third is a spelling error.

Signed-off-by: Adrian Filipi <adrian.filipi@eurotech.com>
16 years agoRecognize 'powerpc' As an Alias for IH_ARCH_PPC
Grant Erickson [Sun, 4 May 2008 23:45:01 +0000 (16:45 -0700)]
Recognize 'powerpc' As an Alias for IH_ARCH_PPC

Add support for the recognition of 'powerpc' as an alias for the PowerPC
architecture type since Linux is already trending in that direction,
preferring 'powerpc' to 'ppc'.

Signed-off-by: Grant Erickson <gerickson@nuovations.com>
16 years ago7450 and 86xx L2 cache invalidate bug corrections
Wheatley Travis [Fri, 2 May 2008 20:35:15 +0000 (13:35 -0700)]
7450 and 86xx L2 cache invalidate bug corrections

The 7610 and related parts have an L2IP bit in the L2CR that is
monitored to signal when the L2 cache invalidate is complete whereas the
7450 and related parts utilize L2I for this purpose. However, the
current code does not account for this difference. Additionally the 86xx
L2 cache invalidate code used an "andi" instruction where an "andis"
instruction should have been used.

This patch addresses both of these bugs.

Signed-off-by: Travis Wheatley <travis.wheatley@freescale.com>
Acked-By: Jon Loeliger <jdl@freescale.com>
16 years agoAvoid infinite loop "Generating include/autoconf.mk"
Wolfgang Denk [Fri, 9 May 2008 08:16:13 +0000 (10:16 +0200)]
Avoid infinite loop "Generating include/autoconf.mk"

Fix a bogus circular dependency that caused an infinite loop of
"Generating include/autoconf.mk" again and again.

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoppc4xx: Kilauea: Fix incorrect FPGA FIFO address
Stefan Roese [Thu, 8 May 2008 09:10:46 +0000 (11:10 +0200)]
ppc4xx: Kilauea: Fix incorrect FPGA FIFO address

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoppc4xx: Add fdt support to all remaining AMCC PPC4xx eval boards
Stefan Roese [Thu, 8 May 2008 09:05:15 +0000 (11:05 +0200)]
ppc4xx: Add fdt support to all remaining AMCC PPC4xx eval boards

This patch adds fdt (flattened device tree) support to all remaining AMCC
eval boards. Most newer boards already support device tree. With this patch,
all AMCC boards now enable device tree passing from U-Boot to Linux
arch/powerpc kernels.

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoppc4xx: Add weak default ft_board_setup() routine
Stefan Roese [Thu, 8 May 2008 09:01:09 +0000 (11:01 +0200)]
ppc4xx: Add weak default ft_board_setup() routine

This patch adds a default ft_board_setup() routine to the 4xx fdt code.
This routine is defined as weak and can be overwritten by a board specific
one if needed.

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoppc4xx: acadia: Add fdt support and fix section overlap problem
Stefan Roese [Thu, 8 May 2008 08:48:58 +0000 (10:48 +0200)]
ppc4xx: acadia: Add fdt support and fix section overlap problem

This patch adds fdt (flattened device tree) support to the AMCC
Acadia eval board. This increases the image size and it doesn't
fit anymore into 256kByte. Since we didn't want to remove features
from the configuration, we decided to increase the U-Boot image size
(add one flash sector).

Also changed the default environment definition to make it
independent of such changes.

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoppc4xx: Add device tree support to AMCC Yosemite
Ira Snyder [Tue, 29 Apr 2008 18:18:54 +0000 (11:18 -0700)]
ppc4xx: Add device tree support to AMCC Yosemite

Add support for booting with a device tree blob. This is needed to boot
ARCH=powerpc kernels. Also add support for setting the eth0 mac address
via the ethaddr variable.

Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoppc4xx: Fix typos in 460GT/EX FBDV array
Dave Mitchell [Wed, 7 May 2008 16:00:23 +0000 (09:00 -0700)]
ppc4xx: Fix typos in 460GT/EX FBDV array

Corrected two typos in the 460GT/EX FBDV array.

Signed-off-by: Dave Mitchell <dmitchell@amcc.com>
Signed-off-by: Stefan Roese <sr@denx.de>
16 years ago[MIPS] cpu/mips/cache.S: Fix build warning
Shinya Kuribayashi [Tue, 6 May 2008 04:22:52 +0000 (13:22 +0900)]
[MIPS] cpu/mips/cache.S: Fix build warning

Some old GNU assemblers, such as v2.14 (ELDK 3.1.1), v2.16 (ELDK 4.1.0),
warns illegal global symbol references by bal (and jal also) instruction.
This does not happen with the latest binutils v2.18.

Here's an example on gth2_config:

mips_4KC-gcc  -D__ASSEMBLY__ -g  -Os   -D__KERNEL__ -DTEXT_BASE=0x90000000 -I/home/skuribay/devel/u-boot.git/include -fno-builtin -ffreestanding -nostdinc -isy
stem /opt/eldk311/usr/bin/../lib/gcc-lib/mips-linux/3.3.3/include -pipe  -DCONFIG_MIPS -D__MIPS__ -G 0 -mabicalls -fpic -pipe -msoft-float -march=4kc -mtune=4k
c -EB -c -o cache.o cache.S
cache.S: Assembler messages:
cache.S:243: Warning: Pretending global symbol used as branch target is local.
cache.S:250: Warning: Pretending global symbol used as branch target is local.

In principle, gas might be sensitive to global symbol references in PIC
code because they should be processed through GOT (global offset table).
But if `bal' instruction is used, it results in PC-based offset jump.
This is the cause of this warning.

In practice, we know it doesn't matter whether PC-based reference or GOT-
based. As for this case, both will work before/after relocation. But let's
fix the code.

This patch explicitly sets up a target address, then jump there.
Here's an example of disassembled code with/without this patch.

 90000668:       1485ffef        bne     a0,a1,90000628 <mips_cache_reset+0x20>
 9000066c:       ac80fffc        sw      zero,-4(a0)
 90000670:       01402821        move    a1,t2
-90000674:       0411ffba        bal     90000560 <mips_init_icache>
-90000678:       01803021        move    a2,t4
-9000067c:       01602821        move    a1,t3
-90000680:       0411ffcc        bal     900005b4 <mips_init_dcache>
-90000684:       01a03021        move    a2,t5
-90000688:       03000008        jr      t8
-9000068c:       00000000        nop
+90000674:       01803021        move    a2,t4
+90000678:       8f8f83ec        lw      t7,-31764(gp)
+9000067c:       01e0f809        jalr    t7
+90000680:       00000000        nop
+90000684:       01602821        move    a1,t3
+90000688:       01a03021        move    a2,t5
+9000068c:       8f8f81e0        lw      t7,-32288(gp)
+90000690:       01e0f809        jalr    t7
+90000694:       00000000        nop
+90000698:       03000008        jr      t8
+9000069c:       00000000        nop

Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
16 years agoMerge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master
Wolfgang Denk [Mon, 5 May 2008 11:25:04 +0000 (13:25 +0200)]
Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master

16 years agoAllow building mips versions with ELDK 3.1.1
Vlad Lungu [Mon, 5 May 2008 11:04:00 +0000 (14:04 +0300)]
Allow building mips versions with ELDK 3.1.1

.gpword works only with local symbols on certain binutils versions

Signed-off-by: Vlad Lungu <vlad.lungu@windrvier.com>
16 years agoMAKEALL: add inka4x0 board
Wolfgang Denk [Mon, 5 May 2008 10:52:36 +0000 (12:52 +0200)]
MAKEALL: add inka4x0 board

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agokb9202 board: fix build problem.
Wolfgang Denk [Sun, 4 May 2008 19:34:23 +0000 (21:34 +0200)]
kb9202 board: fix build problem.

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoPrepare for v1.3.3-rc3
Wolfgang Denk [Sun, 4 May 2008 10:10:33 +0000 (12:10 +0200)]
Prepare for v1.3.3-rc3

Update ChNAGELOG, minor white space cleanup.

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoMerge branch 'master' of /home/wd/git/u-boot/master/
Wolfgang Denk [Sat, 3 May 2008 23:03:30 +0000 (01:03 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/master/

16 years agodrivers/net/tsec.c: Fix typo.
Wolfgang Denk [Sat, 3 May 2008 22:35:15 +0000 (00:35 +0200)]
drivers/net/tsec.c: Fix typo.

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoversion_autogenerated.h: use printf rather than echo -n
Mike Frysinger [Sat, 3 May 2008 01:45:12 +0000 (21:45 -0400)]
version_autogenerated.h: use printf rather than echo -n

Some systems are dumb and do not implement the -n flag to echo (like OS X).
Convert the Makefile to use printf as this should work everywhere.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agofix building when saveenv is disabled in some setups
Mike Frysinger [Fri, 2 May 2008 22:17:50 +0000 (18:17 -0400)]
fix building when saveenv is disabled in some setups

If you enable environment in the flash, but disable the embedded
option, and you disable the saveenv command, then the #if nested
logic will trigger a compile failure:
env_flash.c: In function 'env_relocate_spec':
env_flash.c:399: error: 'flash_addr' undeclared (first use in this function)
The fix is to add CMD_SAVEENV ifdef protection like everywhere else.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
16 years agoSBC8548: fix address mask to allow 64M flash
Jeremy McNicoll [Fri, 2 May 2008 20:10:04 +0000 (16:10 -0400)]
SBC8548: fix address mask to allow 64M flash

Fix incorrect mask to enable all 64MB of onboard flash.
Previously U-Boot incorrectly mapped only 8MB of flash, this
patch correctly maps all the available flash.

Signed-off-by: Jeremy McNicoll <jeremy.mcnicoll@windriver.com>
16 years agoqemu_mips: add README
Jean-Christophe PLAGNIOL-VILLARD [Fri, 2 May 2008 17:48:56 +0000 (19:48 +0200)]
qemu_mips: add README

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-mips
Wolfgang Denk [Sat, 3 May 2008 22:02:29 +0000 (00:02 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-mips

16 years agoFix misspelled comment
Marcel Ziswiler [Fri, 2 May 2008 00:35:59 +0000 (02:35 +0200)]
Fix misspelled comment

Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
16 years agomkimage: make mmap() checks consistent
Mike Frysinger [Thu, 1 May 2008 08:13:05 +0000 (04:13 -0400)]
mkimage: make mmap() checks consistent

The mmap() related code is full of inconsistent casts/constants when
it comes to error checking, and may break when building on some
systems (like ones that do not implicitly define the caddr_t type).
Let's just avoid the whole mess by writing the code nice and clean in
the first place.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
16 years agoFix defined but not used build warning
Marcel Ziswiler [Thu, 1 May 2008 07:05:34 +0000 (09:05 +0200)]
Fix defined but not used build warning

- warning: 'srom' defined but not used

Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
16 years agoFix implicit declaration build warnings
Marcel Ziswiler [Thu, 1 May 2008 07:05:26 +0000 (09:05 +0200)]
Fix implicit declaration build warnings

- warning: implicit declaration of function ‘serial_initialize’

Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
16 years agoTSEC: add config options for VSC8601 RGMII PHY
Andre Schwarz [Tue, 29 Apr 2008 17:18:32 +0000 (19:18 +0200)]
TSEC: add config options for VSC8601 RGMII PHY

The Vitesse VSC8601 RGMII PHY has internal delay for both Rx
and Tx clock lines. They are configured using 2 bits in extended
register 0x17.
Therefore CFG_VSC8601_SKEW_TX and CFG_VSC8601_SKEW_RX have
been introduced with valid values 0-3 giving 0.0, 1.4,1.7 and 2.0ns delay.

Signed-off-by: Andre Schwarz <andre.schwarz@matrix-vision.de>
Acked-by: Andy Fleming <afleming@freescale.com>
Acked-by: Ben Warren <biggerbadderben@gmail.com>
--

 drivers/net/tsec.c |    6 ++++++
 drivers/net/tsec.h |    3 +++
 2 files changed, 9 insertions(+), 0 deletions(-)

16 years agoRevert "ColdFire: Get information from the correct GCC"
Wolfgang Denk [Sat, 3 May 2008 21:07:15 +0000 (23:07 +0200)]
Revert "ColdFire: Get information from the correct GCC"

This reverts commit b7166e05a513c0806b63b9dfb6f1d77645cede2a
(replaced by commit c4e5f52a58d278eebb87f476e353972c5dacea40).

16 years agoconfig.mk: use correct (cross) compiler
Wolfgang Denk [Sat, 3 May 2008 20:25:00 +0000 (22:25 +0200)]
config.mk: use correct (cross) compiler

Some config.mk files reference $(CC) to test for specific tool chain
features, so make sure $(CC) gets set before including any such
config files.

This patch replaces commit b7166e05a5 ("ColdFire: Get information from
the correct GCC").

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agopxa: fix previous definition on cpu init
Jean-Christophe PLAGNIOL-VILLARD [Thu, 1 May 2008 00:13:44 +0000 (02:13 +0200)]
pxa: fix previous definition on cpu init

start.S:183:1: warning: "ICMR" redefined
In file included from start.S:33:
include/asm/arch/pxa-regs.h:935:1: warning: this is the location of the previous definition
start.S:187:1: warning: "RCSR" redefined
...

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agopxa: fix pcmcia operation on 'i' may be undefined
Jean-Christophe PLAGNIOL-VILLARD [Thu, 1 May 2008 00:13:43 +0000 (02:13 +0200)]
pxa: fix pcmcia operation on 'i' may be undefined

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoMPC8610HPCD: Drop -O2 from the build flags
Kumar Gala [Wed, 30 Apr 2008 21:24:35 +0000 (16:24 -0500)]
MPC8610HPCD: Drop -O2 from the build flags

Make the flags use -Os like all other boards

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
Wolfgang Denk [Sat, 3 May 2008 18:46:40 +0000 (20:46 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-ppc4xx

16 years agoRTC: Fix month offset by one problem in M41T62 RTC driver
Stefan Roese [Wed, 30 Apr 2008 13:50:39 +0000 (15:50 +0200)]
RTC: Fix month offset by one problem in M41T62 RTC driver

This patch fixes a problem with the month being read and written
incorrectly (offset by one). This only gets visible by also using
the Linux driver (rtc-m41t80).

Tested on AMCC Canyonlands.

Signed-off-by: Stefan Roese <sr@denx.de>
16 years ago[MIPS] cpu/mips/config.mk: Fix GNU assembler minor version picker
Shinya Kuribayashi [Sat, 3 May 2008 04:51:44 +0000 (13:51 +0900)]
[MIPS] cpu/mips/config.mk: Fix GNU assembler minor version picker

Current trick to pick up GNU assembler minor version uses a dot(.) as a
delimiter, and take the second field to obtain minor version number. But
as can be expected, this doesn't work with a version string which has
dots more than needs.

Here's an example:

$ mips-linux-gnu-as --version | grep 'GNU assembler'
GNU assembler (Sourcery G++ Lite 4.2-129) 2.18.50.20080215
$ mips-linux-gnu-as --version | grep 'GNU assembler' | cut -d. -f2
2-129) 2
$

This patch restricts the version format to 2.XX.XX... This will work
in most cases.

$ mips-linux-gnu-as --version | grep 'GNU assembler' | egrep -o '2\.[0-9\.]+'
2.18.50.20080215
$ mips-linux-gnu-as --version | grep 'GNU assembler' | egrep -o '2\.[0-9\.]+' | cut -d. -f2
18
$

Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
16 years ago[MIPS] cpu/mips/cache.S: Add dcache_enable
Shinya Kuribayashi [Sat, 3 May 2008 04:51:28 +0000 (13:51 +0900)]
[MIPS] cpu/mips/cache.S: Add dcache_enable

Recent bootelf command fixes (017e9b7925f74878d0e9475388cca9bda5ef9482,
"allow ports to override bootelf behavior") requires ports to have this
function.

Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agoMerge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master
Wolfgang Denk [Thu, 1 May 2008 19:39:34 +0000 (21:39 +0200)]
Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master

16 years agoonenand: rename 16 bit memory copy into memcpy_16() to avoid conflicts
Wolfgang Denk [Thu, 1 May 2008 19:30:16 +0000 (21:30 +0200)]
onenand: rename 16 bit memory copy into memcpy_16() to avoid conflicts

Onenand needs a version of memcpy() which performs 16 bit accesses
only; make sure the name does not conflict with the standard
function.

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoMerge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master
Wolfgang Denk [Wed, 30 Apr 2008 21:04:51 +0000 (23:04 +0200)]
Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master

16 years agocmd_nand: fix warning: str2long ncompatible pointer type
Jean-Christophe PLAGNIOL-VILLARD [Wed, 30 Apr 2008 20:38:17 +0000 (22:38 +0200)]
cmd_nand: fix warning: str2long ncompatible pointer type

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agoFix calculation of I2C clock for some 86xx chips
Timur Tabi [Fri, 4 Apr 2008 16:16:11 +0000 (11:16 -0500)]
Fix calculation of I2C clock for some 86xx chips

Some 86xx chips use CCB as the base clock for the I2C, and others used CCB/2.
There is no pattern that can be used to determine which chips use which
frequency, so the only way to determine is to look up the actual SOC
designation and use the right value for that SOC.

Signed-off-by: Timur Tabi <timur@freescale.com>
16 years agoColdFire: Fix ethernet hang issue for mcf547x_8x
TsiChung Liew [Wed, 30 Apr 2008 17:11:19 +0000 (12:11 -0500)]
ColdFire: Fix ethernet hang issue for mcf547x_8x

The ethernet hang is caused by receiving buffer in DRAM is not
yet ready due to access cycles require longer time in DRAM.
Relocate DMA buffer descriptors from DRAM to internal SRAM.

Signed-off-by: TsiChung Liew <Tsi-Chung.Liew@freescale.com>
16 years agoColdFire: Fix compilation issue caused by new changes in fsl_i2c.c
TsiChung Liew [Wed, 30 Apr 2008 17:10:47 +0000 (12:10 -0500)]
ColdFire: Fix compilation issue caused by new changes in fsl_i2c.c

Signed-off-by: Luigi Comio Mantellini <luigi.mantellini@idf-hit.com>
Signed-off-by: TsiChung Liew <Tsi-Chung.Liew@freescale.com>
16 years agoColdFire: Get information from the correct GCC
TsiChung Liew [Wed, 30 Apr 2008 17:10:23 +0000 (12:10 -0500)]
ColdFire: Get information from the correct GCC

Signed-off-by: Kurt Mahan <kmahan@freescale.com>
Signed-off-by: TsiChung Liew <Tsi-Chung.Liew@freescale.com>
16 years agoFix warning in env_nand.c if compiled for DaVinci Schmoogie
dirk.behme@googlemail.com [Wed, 30 Apr 2008 16:02:59 +0000 (18:02 +0200)]
Fix warning in env_nand.c if compiled for DaVinci Schmoogie

Fix warnings

nv_nand.c: In function 'saveenv':
env_nand.c:200: warning: passing argument 3 of 'nand_write' from incompatible pointer type
env_nand.c: In function 'env_relocate_spec':
env_nand.c:275: warning: passing argument 3 of 'nand_read' from incompatible pointer type

if compiled for davinci_schmoogie_config.

Signed-off-by: Dirk Behme <dirk.behme@gmail.com>
Ack by: Sergey Kubushyn <ksi@koi8.net>

16 years agoFix warnings while compiling net/net.c for MPC8610HPCD board
Anatolij Gustschin [Wed, 30 Apr 2008 11:34:40 +0000 (13:34 +0200)]
Fix warnings while compiling net/net.c for MPC8610HPCD board

MPC8610HPCD board adds -O2 gcc option to PLATFORM_CPPFLAGS
causing overriding default -Os option. New gcc (ver. 4.2.2)
produces warnings while compiling net/net.c file with -O2
option. The patch is an attempt to fix this.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
16 years agolwmon5: fix offset error in sysmon0 POST
Sascha Laue [Wed, 30 Apr 2008 13:23:38 +0000 (15:23 +0200)]
lwmon5: fix offset error in sysmon0 POST

Signed-off-by: Sascha Laue <sascha.laue@liebherr.com>
Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agolwmon5: fix manual merge error in POST
Sascha Laue [Wed, 30 Apr 2008 13:16:35 +0000 (15:16 +0200)]
lwmon5: fix manual merge error in POST

Signed-off-by: Sascha Laue <sascha.laue@liebherr.com>
16 years agocmd_nand.c: fix another 'incompatible pointer type' warning.
Wolfgang Denk [Wed, 30 Apr 2008 15:46:26 +0000 (17:46 +0200)]
cmd_nand.c: fix another 'incompatible pointer type' warning.

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoMakefile: fix parallel builds
Wolfgang Denk [Wed, 30 Apr 2008 15:25:07 +0000 (17:25 +0200)]
Makefile: fix parallel builds

This problem shows up with parallel builds only; it results in
somewhat cryptic error messages like

$ JOBS=-j6 MAKEALL netstar
Configuring for netstar board...
arm-linux-ld: cannot find -lgeneric
make[1]: *** [eeprom.srec] Error 1

A few boards (like netstar and voiceblue) need some libraries for
building; however, the board Makefile does not contain any such
dependencies which may cause problems with parallel builds. Adding
such dependencies is difficult as we would also have to provide build
rules, which already exist in the respective library Makefiles.

To solve this, we make sure that all libraries get built before the
board code.

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoppc4xx: Adapt Canyonlands fixed DDR2 setup to new DIMM module
Stefan Roese [Wed, 30 Apr 2008 12:51:36 +0000 (14:51 +0200)]
ppc4xx: Adapt Canyonlands fixed DDR2 setup to new DIMM module

This patch changes the Canyonlands/Glacier fixed DDR2 controller setup
used for NAND booting to match the values needed for the new 512MB
DIMM modules shipped with the productions boards:

Crucial: CT6464AC667.8FB

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoppc4xx: Fix problem with DIMMs with 8 banks in 44x_spd_ddr2.c
Stefan Roese [Wed, 30 Apr 2008 08:49:43 +0000 (10:49 +0200)]
ppc4xx: Fix problem with DIMMs with 8 banks in 44x_spd_ddr2.c

This patch fixes a problem with DIMMs that have 8 banks. Now the
MCIF0_MBxCF register will be setup correctly for this setup too.

This was noticed with the 512MB DIMM on Canyonlands/Glacier.

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoPrepare v1.3.3-rc2, again.
Wolfgang Denk [Tue, 29 Apr 2008 21:41:06 +0000 (23:41 +0200)]
Prepare v1.3.3-rc2, again.

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-net
Wolfgang Denk [Tue, 29 Apr 2008 21:39:42 +0000 (23:39 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-net

16 years agoPrepare v1.3.3-rc2
Wolfgang Denk [Tue, 29 Apr 2008 21:35:24 +0000 (23:35 +0200)]
Prepare v1.3.3-rc2

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agocommon/env_nand.c: fix one more incompatible pointer type issue
Wolfgang Denk [Tue, 29 Apr 2008 21:32:20 +0000 (23:32 +0200)]
common/env_nand.c: fix one more incompatible pointer type issue

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agopost/board/lwmon5/sysmon.c: fix manual merge error.
Wolfgang Denk [Tue, 29 Apr 2008 19:33:08 +0000 (21:33 +0200)]
post/board/lwmon5/sysmon.c: fix manual merge error.

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years ago85xx: Add -mno-spe to e500/85xx builds
Kumar Gala [Tue, 29 Apr 2008 17:54:59 +0000 (12:54 -0500)]
85xx: Add -mno-spe to e500/85xx builds

Newer gcc's might be configured to enable autovectorization by default.
If we happen to build with one of those compilers we will get SPE
instructions in random code.

-mno-spe disables the compiler for automatically generating SPE
instructions without our knowledge.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
Wolfgang Denk [Tue, 29 Apr 2008 18:06:42 +0000 (20:06 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-ppc4xx

16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-mpc85xx
Wolfgang Denk [Tue, 29 Apr 2008 18:04:56 +0000 (20:04 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-mpc85xx

16 years agoUpdate .gitignore for zlib.h
Kumar Gala [Tue, 29 Apr 2008 15:18:34 +0000 (10:18 -0500)]
Update .gitignore for zlib.h

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years ago85xx/86xx: Rename ext_refrec to timing_cfg_3 to match docs
Kumar Gala [Tue, 29 Apr 2008 15:27:08 +0000 (10:27 -0500)]
85xx/86xx: Rename ext_refrec to timing_cfg_3 to match docs

All the 85xx and 86xx UM describe the register as timing_cfg_3
not as ext_refrec.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years ago85xx/86xx: Rename DDR init address and init extended address register
Kumar Gala [Tue, 29 Apr 2008 15:28:34 +0000 (10:28 -0500)]
85xx/86xx: Rename DDR init address and init extended address register

Rename init_addr and init_ext_addr to match the docs between
85xx and 86xx.  Both now use 'init_addr' and 'init_ext_addr'.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years ago85xx: Additional fixes and cleanup of MP code
Kumar Gala [Mon, 28 Apr 2008 07:24:04 +0000 (02:24 -0500)]
85xx: Additional fixes and cleanup of MP code

* adjust __spin_table alignment to match ePAPR v0.94 spec
* loop over all cpus when determing who is up.  This fixes an issue if
  the "boot cpu" isn't core0.  The "boot cpu" will already be in the
  cpu_up_mask so there is no harm
* Added some protection in the code to ensure proper behavior.  These
  changes are explicitly needed but don't hurt:
  - Added eieio to ensure the "hot word" of the table is written after
    all other table updates have occurred.
  - Added isync to ensure we don't prefetch loading of table entries
    until we a released

These issues we raised by Dave Liu.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agoMerge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master
Wolfgang Denk [Tue, 29 Apr 2008 14:11:33 +0000 (16:11 +0200)]
Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master

16 years agolwmon5: minor clean-up to include/configs/lwmon5.h
Yuri Tikhonov [Tue, 29 Apr 2008 13:06:41 +0000 (15:06 +0200)]
lwmon5: minor clean-up to include/configs/lwmon5.h

LWMON5 DSPIC POST uses the watch-dog scratch register. So, make
the CFG_DSPIC_TEST_ADDR definition more readable.

Signed-off-by: Yuri Tikhonov <yur@emcraft.com>
16 years agoppc4xx: Fix CFG_MONITOR_LEN on Katmai failsave this time
Stefan Roese [Tue, 29 Apr 2008 14:08:05 +0000 (16:08 +0200)]
ppc4xx: Fix CFG_MONITOR_LEN on Katmai failsave this time

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoMerge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master
Wolfgang Denk [Tue, 29 Apr 2008 12:52:18 +0000 (14:52 +0200)]
Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master

16 years agoppc flush_cache: add watch-dog triggering into the loops.
Yuri Tikhonov [Tue, 29 Apr 2008 11:32:45 +0000 (13:32 +0200)]
ppc flush_cache: add watch-dog triggering into the loops.

Some boards (e.g. lwmon5) need rather a frequent watch-dog
kicking. Since the time it takes for the flush_cache() function
to complete its job depends on the size of data being flushed, one
may encounter watch-dog resets on such boards when, for example,
download big files over ethernet.

Signed-off-by: Yuri Tikhonov <yur@emcraft.com>
16 years agoppc4xx: Fix compilation warning in denali_spd_ddr2.c
Stefan Roese [Tue, 29 Apr 2008 12:44:54 +0000 (14:44 +0200)]
ppc4xx: Fix compilation warning in denali_spd_ddr2.c

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoppc4xx: Fix Katmai CFG_MONITOR_LEN
Stefan Roese [Tue, 29 Apr 2008 12:12:07 +0000 (14:12 +0200)]
ppc4xx: Fix Katmai CFG_MONITOR_LEN

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoppc4xx: Complete remove bogus dflush()
Stefan Roese [Tue, 29 Apr 2008 11:57:07 +0000 (13:57 +0200)]
ppc4xx: Complete remove bogus dflush()

Since the current dflush() implementation is know to have some problems
(as seem on lwmon5 ECC init) this patch removes it completely and replaces
it by using clean_dcache_range().

Tested on Katmai with ECC DIMM.

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoppc4xx: Change ECC initialization on lwmon5 to use clean_dcache_range()
Stefan Roese [Tue, 29 Apr 2008 11:36:51 +0000 (13:36 +0200)]
ppc4xx: Change ECC initialization on lwmon5 to use clean_dcache_range()

As it seems the "old" ECC initialization routine by using dflush() didn't
write all lines in the dcache back to memory on lwmon5. This could lead
to ECC error upon Linux booting. This patch changes the program_ecc()
routine to now use clean_dcache_range() instead of dflush().
clean_dcache_range() uses dcbst which is exactly what we want in this
case.

Since dflush() is known is cause problems, this routine will be
removed completely and replaced by clean_dcache_range() with an
additional patch.

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoMerge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master
Wolfgang Denk [Tue, 29 Apr 2008 11:15:20 +0000 (13:15 +0200)]
Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master

16 years agoPOST: fix Makefiles for mpc8xx, lwmon, and netta POSTs.
Yuri Tikhonov [Mon, 28 Apr 2008 16:19:34 +0000 (18:19 +0200)]
POST: fix Makefiles for mpc8xx, lwmon, and netta POSTs.

Signed-off-by: Yuri Tikhonov <yur@emcraft.com>
16 years agoppc4xx: Fixup ebc clock in FDT for 405GP/EP
Markus Brunner [Mon, 28 Apr 2008 06:47:47 +0000 (08:47 +0200)]
ppc4xx: Fixup ebc clock in FDT for 405GP/EP

On ppc405EP and ppc405GP (at least) the ebc is directly attached to the plb
and not to the opb. This patch will try to fixup /plb/ebc if /plb/opb/ebc
doesn't exist.

Signed-off-by: Markus Brunner <super.firetwister@gmail.com>
16 years agoNE2000: Fix regresssion introduced by e710185aae90 on non AX88796
Jean-Christophe PLAGNIOL-VILLARD [Thu, 24 Apr 2008 05:57:17 +0000 (07:57 +0200)]
NE2000: Fix regresssion introduced by e710185aae90 on non AX88796

Move non-inlied functions into specific drivers file
Set get_prom as weak

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Vlad Lungu <vlad@comsys.ro>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
16 years agonet: make ARP timeout configurable
Guennadi Liakhovetski [Thu, 3 Apr 2008 15:04:19 +0000 (17:04 +0200)]
net: make ARP timeout configurable

Currently the timeout waiting for an ARP reply is hard set to 5 seconds.
On i.MX31ADS due to a hardware "strangeness" up to four first IP packets
to the boards get lost, which typically are ARP replies. By configuring
the timeout to a lower value we significantly improve the first network
transfer time on this board. The timeout is specified in milliseconds,
later internally it is converted to deciseconds, because it has to be
converted to hardware ticks, and CFG_HZ ranges from 900 to 27000000 on
different boards.

Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
16 years agominor cs8900 driver clean up
Guennadi Liakhovetski [Thu, 3 Apr 2008 11:36:18 +0000 (13:36 +0200)]
minor cs8900 driver clean up

Remove a redundant register definition, clean up some coding style
violations.

Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
16 years agojffs2_1pass.c: fix incompatible pointer type warning
Wolfgang Denk [Mon, 28 Apr 2008 20:01:04 +0000 (22:01 +0200)]
jffs2_1pass.c: fix incompatible pointer type warning

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agolwmon5: update dsPIC POST spezification
Sascha Laue [Tue, 1 Apr 2008 08:10:18 +0000 (10:10 +0200)]
lwmon5: update dsPIC POST spezification

The specification for the lwmon5 board dsPIC POST got changed.
Also add defines for the temperatures  and voltages.

Signed-off-by: Sascha Laue <sascha.laue@liebherr.com>
16 years agoFix watchdog POST for lwmon5
Sascha Laue [Tue, 1 Apr 2008 13:13:03 +0000 (15:13 +0200)]
Fix watchdog POST for lwmon5

If the hardware watchdog detects a voltage error, the watchdog sets
GPIO62 to low. The watchdog POST has to detect this low level.

Signed-off-by: Sascha Laue <leglas0@legpc180.leg.liebherr.i>
Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agortl8169: fix compiler warnings
Guennadi Liakhovetski [Mon, 28 Apr 2008 12:37:14 +0000 (14:37 +0200)]
rtl8169: fix compiler warnings

Fix multiple compiler warnings related to argument type mismatch.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
16 years agoIDE: fix compiler warnings
Guennadi Liakhovetski [Mon, 28 Apr 2008 12:36:06 +0000 (14:36 +0200)]
IDE: fix compiler warnings

The IDE driver can use 32-bit addresses in LBA mode, in which case it
spits multiple warnings during compilation. Fix them.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
16 years agoLinkStation: fix compiler warning, add a maintainer
Guennadi Liakhovetski [Mon, 28 Apr 2008 12:35:57 +0000 (14:35 +0200)]
LinkStation: fix compiler warning, add a maintainer

out_8 wants a pointer to an unsigned as the first argument. Add a
maintainer for Linkstation boards.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
16 years agocmd_nand.c: fix "differ in signedness" problem
Wolfgang Denk [Mon, 28 Apr 2008 12:55:12 +0000 (14:55 +0200)]
cmd_nand.c: fix "differ in signedness" problem

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agopcnet.c: fix a merge issue
Wolfgang Denk [Mon, 28 Apr 2008 10:48:47 +0000 (12:48 +0200)]
pcnet.c: fix a merge issue

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoNAND: fix some strict-aliasing compiler warnings
Wolfgang Denk [Mon, 28 Apr 2008 10:08:18 +0000 (12:08 +0200)]
NAND: fix some strict-aliasing compiler warnings

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoMerge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master
Wolfgang Denk [Mon, 28 Apr 2008 10:07:34 +0000 (12:07 +0200)]
Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master