kernel/u-boot.git
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 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. v1.3.3-rc2
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

16 years agoppc4xx: Fix compile warning of hcu4 board
Stefan Roese [Mon, 28 Apr 2008 09:37:14 +0000 (11:37 +0200)]
ppc4xx: Fix compile warning of hcu4 board

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 [Mon, 28 Apr 2008 09:34:34 +0000 (11:34 +0200)]
Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master

16 years agoMPC8323ERDB: fix implicit declaration of function 'mac_read_from_eeprom'
Wolfgang Denk [Mon, 28 Apr 2008 09:31:23 +0000 (11:31 +0200)]
MPC8323ERDB: fix implicit declaration of function 'mac_read_from_eeprom'

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agomx31ads: fix loadaddr environment variable define
Guennadi Liakhovetski [Sun, 27 Apr 2008 22:25:32 +0000 (00:25 +0200)]
mx31ads: fix loadaddr environment variable define

Arithmetic expressions do not get evaluated under stringification. Remove
default network configuration, add DHCP command support. Thanks to Felix
Radensky for reporting.

Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
16 years agokatmai: fix section overlap problem
Wolfgang Denk [Mon, 28 Apr 2008 08:55:24 +0000 (10:55 +0200)]
katmai: fix section overlap problem

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: Wolfgang Denk <wd@denx.de>
Acked-by: Stefan Roese <sr@denx.de>
16 years agokatmai: fix section overlap problem
Wolfgang Denk [Mon, 28 Apr 2008 08:55:24 +0000 (10:55 +0200)]
katmai: fix section overlap problem

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: Wolfgang Denk <wd@denx.de>
Acked-by: Stefan Roese <sr@denx.de>
16 years agopost: Fix building with O=
Kumar Gala [Sat, 26 Apr 2008 16:44:44 +0000 (11:44 -0500)]
post: Fix building with O=

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agoPrepare v1.3.3-rc1 v1.3.3-rc1
Wolfgang Denk [Fri, 25 Apr 2008 23:55:00 +0000 (01:55 +0200)]
Prepare v1.3.3-rc1

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agopost/Makefile: make sure to use the correct flags
Wolfgang Denk [Fri, 25 Apr 2008 23:25:39 +0000 (01:25 +0200)]
post/Makefile: make sure to use the correct flags

ARFLAGS was not set, which caused "ppc_8xx-ar: creating libgenpost.a"
messages to be printed.

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoCoding Style cleanup, update CHANGELOG
Wolfgang Denk [Fri, 25 Apr 2008 22:34:42 +0000 (00:34 +0200)]
Coding Style cleanup, update CHANGELOG

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoi.MX31: Enable SPI and MC13783/RTC support for the Litekit board
Magnus Lilja [Sun, 20 Apr 2008 08:38:12 +0000 (10:38 +0200)]
i.MX31: Enable SPI and MC13783/RTC support for the Litekit board

This patch enables SPI and MC13783/RTC support for the Litekit board.

Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>
16 years agoMPC8544DS: decode pcie3 end-point configuration correctly.
Ed Swarthout [Fri, 25 Apr 2008 06:08:32 +0000 (01:08 -0500)]
MPC8544DS: decode pcie3 end-point configuration correctly.

Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agoMPC8544DS: Removes the unknown flash message information
Roy Zang [Fri, 25 Apr 2008 05:55:09 +0000 (00:55 -0500)]
MPC8544DS: Removes the unknown flash message information

This patch removes the unknown flash message information:
'## Unknown FLASH on Bank 1 - Size = 0xdeadbeef = -286261248 MB'
This unknown flash message is caused by PromJet.
Some of the board user is unhappy with this information.

Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-mpc83xx
Wolfgang Denk [Fri, 25 Apr 2008 22:07:26 +0000 (00:07 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-mpc83xx

16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-cfi-flash
Wolfgang Denk [Fri, 25 Apr 2008 22:06:51 +0000 (00:06 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-cfi-flash

16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
Wolfgang Denk [Fri, 25 Apr 2008 22:06:13 +0000 (00:06 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-ppc4xx

16 years agompc83xx: bump loadaddr over fdtaddr to 0x500000
Kim Phillips [Thu, 24 Apr 2008 19:07:38 +0000 (14:07 -0500)]
mpc83xx: bump loadaddr over fdtaddr to 0x500000

this seems as a good compromise between human memory, typing,
and last but not least, to accommodate for current and future kernel bloat.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Acked-by: Dave Liu <daveliu@freescale.com>
16 years agompc83xx: clean up the readme for 83xx boards
Dave Liu [Tue, 15 Apr 2008 05:12:23 +0000 (13:12 +0800)]
mpc83xx: clean up the readme for 83xx boards

1. correct the typo
2. correct the memory map for 837xerdb board

Signed-off-by: Dave Liu <daveliu@freescale.com>
16 years agompc83xx: remove the unused CPM's stuff
Dave Liu [Tue, 15 Apr 2008 05:11:11 +0000 (13:11 +0800)]
mpc83xx: remove the unused CPM's stuff

The MPC83xx family never have CPM block, so remove it from 83xx.

Signed-off-by: Dave Liu <daveliu@freescale.com>
16 years agocfi-flash: Add CFG_FLASH_AUTOPROTECT_LIST
Matthias Fuchs [Fri, 18 Apr 2008 14:29:40 +0000 (16:29 +0200)]
cfi-flash: Add CFG_FLASH_AUTOPROTECT_LIST

This patch adds a configurable flash auto protection list that can be used
to make U-Boot protect flash regions in flash_init().

The idea has been discussed on the u-boot mailing list starting
on Nov 18th, 2007.

Even this patch brings a new feature it is used as a bugfix for 4xx
platforms where flash_init() does not completely protect the
monitor's flash range in all situations.

U-Boot protects the flash range from CFG_MONITOR_BASE to
(CFG_MONITOR_BASE + monitor_flash_len  - 1) by default. This does not
include the reset vector at 0xfffffffc.

Example:
#define CFG_FLASH_AUTOPROTECT_LIST {{0xfff80000, 0x80000}}

This config option will auto protect the last 512k of flash that
contains the bootloader on board like APC405 and PMC405.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
16 years agoppc4xx: Remove double defines in lwmon5.h
Stefan Roese [Fri, 25 Apr 2008 11:59:03 +0000 (13:59 +0200)]
ppc4xx: Remove double defines in lwmon5.h

introduced with latest lwmon5/POST merge

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoUse watchdog-aware functions when calculating hashes of images - take two
Bartlomiej Sieka [Fri, 25 Apr 2008 11:54:02 +0000 (13:54 +0200)]
Use watchdog-aware functions when calculating hashes of images - take two

Some files didn't get updated properly with the "Use watchdog-aware
functions when calculating hashes of images" commit, this commit
fixes this.

Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoppc4xx: Add bootcount limit handling for APC405 boards
Matthias Fuchs [Fri, 25 Apr 2008 10:01:39 +0000 (12:01 +0200)]
ppc4xx: Add bootcount limit handling for APC405 boards

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
16 years agoUse watchdog-aware functions when calculating hashes of images
Bartlomiej Sieka [Fri, 25 Apr 2008 10:10:09 +0000 (12:10 +0200)]
Use watchdog-aware functions when calculating hashes of images

Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
16 years agoUSB: fix more GCC 4.2.x aliasing warnings
Wolfgang Denk [Fri, 25 Apr 2008 10:44:08 +0000 (12:44 +0200)]
USB: fix more GCC 4.2.x aliasing warnings

Signed-off-by: Wolfgang Denk <wd@denx.de>
Acked-by: Markus Klotzbuecher <mk@denx.de>
16 years agolib_generic/crc32.c: add missing #include <watchdog.h>
Wolfgang Denk [Fri, 25 Apr 2008 10:41:53 +0000 (12:41 +0200)]
lib_generic/crc32.c: add missing #include <watchdog.h>

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agolib_generic/crc32.c: fix compile problem
Wolfgang Denk [Fri, 25 Apr 2008 09:52:21 +0000 (11:52 +0200)]
lib_generic/crc32.c: fix compile problem

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoppc4xx: Pass PCIe root-complex/endpoint configuration to Linux via the fdt
Stefan Roese [Tue, 22 Apr 2008 10:20:32 +0000 (12:20 +0200)]
ppc4xx: Pass PCIe root-complex/endpoint configuration to Linux via the fdt

The PCIe root-complex/endpoint setup as configured via the "pcie_mode"
environment variable will now get passed to the Linux kernel by setting
the device_type property of the PCIe device tree node. For normal root-
complex configuration it will keep its defaults value of "pci" and for
endpoint configuration it will get changed to "pci-endpoint".

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agolwmon5: watchdog POST fix
Yuri Tikhonov [Thu, 24 Apr 2008 08:30:53 +0000 (10:30 +0200)]
lwmon5: watchdog POST fix

Use the GPT0_MASKx registers as the temporary storage for watch-dog
timer POST test instead of GPT0_COMPx. The latter
(GPT0_COMP1..GPT0_COMP5) are used for the log-buffer header.

Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
Signed-off-by: Yuri Tikhonov <yur@emcraft.com>
16 years agoMerge branch 'master' of /home/wd/git/u-boot/lwmon5
Wolfgang Denk [Fri, 25 Apr 2008 09:32:01 +0000 (11:32 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/lwmon5

Conflicts:

common/cmd_bootm.c
common/cmd_log.c
include/common.h
post/board/lwmon5/Makefile
post/board/lwmon5/dsp.c
post/board/lwmon5/dspic.c
post/board/lwmon5/fpga.c
post/board/lwmon5/gdc.c
post/board/lwmon5/sysmon.c
post/board/lwmon5/watchdog.c

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-nand-flash
Wolfgang Denk [Fri, 25 Apr 2008 09:10:17 +0000 (11:10 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-nand-flash

16 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-at91
Wolfgang Denk [Fri, 25 Apr 2008 08:05:42 +0000 (10:05 +0200)]
Merge branch 'master' of git://denx.de/git/u-boot-at91

16 years agolib_ppc: Revert "Make MPC83xx one step closer to full relocation."
Kim Phillips [Mon, 21 Apr 2008 23:10:14 +0000 (18:10 -0500)]
lib_ppc: Revert "Make MPC83xx one step closer to full relocation."

This reverts commit 70431e8a7393b6b793f77957f95b999fc9a269b8 which has
proven problematic getting right from the start at least on 83xx and
4xx.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
16 years agoRealining some header definitions.
Detlev Zundel [Fri, 18 Apr 2008 12:50:01 +0000 (14:50 +0200)]
Realining some header definitions.

Signed-off-by: Detlev Zundel <dzu@denx.de>
16 years agoNE2000: coding style cleanup
Jean-Christophe PLAGNIOL-VILLARD [Thu, 24 Apr 2008 05:57:16 +0000 (07:57 +0200)]
NE2000: coding style cleanup

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agoqemu-mips.h: Add CFI support
Jean-Christophe PLAGNIOL-VILLARD [Tue, 22 Apr 2008 15:11:47 +0000 (00:11 +0900)]
qemu-mips.h: Add CFI support

CONFIG_ENV_OVERWRITE is also added.

This patch is originally created by Jean-Christophe PLAGNIOL-VILLARD.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
16 years agodoc/README.mips: Add MIPS notes
Shinya Kuribayashi [Tue, 22 Apr 2008 13:47:27 +0000 (22:47 +0900)]
doc/README.mips: Add MIPS notes

Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
16 years agoAdd support for calculating hashes with watchdog triggering
Bartlomiej Sieka [Tue, 22 Apr 2008 10:27:56 +0000 (12:27 +0200)]
Add support for calculating hashes with watchdog triggering

Implement watchodg-aware variants of hash calculation functions:
- crc32_wd()
- md5_wd()
- sha1_csum_wd()
The above functions calculate the hash of the input buffer in chunks,
triggering the watchdog after processing each chunk. The chunk size
is given as a function call parameter.

Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
16 years agoqemu-mips: Cleanup whitespace, indentation, etc.
Shinya Kuribayashi [Wed, 23 Apr 2008 02:02:12 +0000 (11:02 +0900)]
qemu-mips: Cleanup whitespace, indentation, etc.

No functional change.

This patch was originally submitted by Jean-Christophe PLAGNIOL-VILLARD.
Then I re-created from scratch, and changed more lines than the original.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
16 years agoFixed pcnet io_base
Vlad Lungu [Wed, 10 Oct 2007 20:02:09 +0000 (23:02 +0300)]
Fixed pcnet io_base

Bus and phys address are not always the same

Signed-off-by: Vlad Lungu <vlad@comsys.ro>
16 years agodrivers/net/pcnet.c: Coding Style cleanup.
Wolfgang Denk [Thu, 24 Apr 2008 21:44:26 +0000 (23:44 +0200)]
drivers/net/pcnet.c: Coding Style cleanup.

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoAdded Am79C970A chip id to pcnet
Vlad Lungu [Wed, 10 Oct 2007 20:04:23 +0000 (23:04 +0300)]
Added Am79C970A chip id to pcnet

Signed-off-by: Vlad Lungu <vlad@comsys.ro>
16 years agoi.MX31: Fix architecture numbers for ADS and Litekit boards
Magnus Lilja [Sun, 20 Apr 2008 08:35:03 +0000 (10:35 +0200)]
i.MX31: Fix architecture numbers for ADS and Litekit boards

Correct the Linux architecture number for i.MX31 Litekit and ADS boards.

Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>
16 years agoi.MX31: Use symbolic names for Litekit membases.
Magnus Lilja [Sun, 20 Apr 2008 08:36:36 +0000 (10:36 +0200)]
i.MX31: Use symbolic names for Litekit membases.

Use symbolic names instead of hard coded addresses for Litekit membases.

Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>
16 years agoFix show_boot_progress prototype
Jean-Christophe PLAGNIOL-VILLARD [Sat, 19 Apr 2008 15:59:20 +0000 (17:59 +0200)]
Fix show_boot_progress prototype

in commit fad634071 "make show_boot_progress () weak."
show_boot_progress is supposed to be declared as weak but declared as
inline instead.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>