oweals/u-boot.git
16 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm
Wolfgang Denk [Sun, 12 Oct 2008 21:55:12 +0000 (23:55 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-arm

16 years agoMerge branch 'master' of git://git.denx.de/u-boot-fdt
Wolfgang Denk [Sun, 12 Oct 2008 21:13:16 +0000 (23:13 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-fdt

16 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Wolfgang Denk [Sun, 12 Oct 2008 21:12:44 +0000 (23:12 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

16 years agoMerge branch 'master' of git://git.denx.de/u-boot-cfi-flash
Wolfgang Denk [Sun, 12 Oct 2008 21:12:12 +0000 (23:12 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash

16 years agoMPC8572DS: Fix compile warnings
Kumar Gala [Wed, 8 Oct 2008 20:36:39 +0000 (15:36 -0500)]
MPC8572DS: Fix compile warnings

Commit 445a7b38308eb05b41de74165b20855db58c7ee5 introduced the following
compile warnings:

cmd_i2c.c:112: warning: missing braces around initializer
cmd_i2c.c:112: warning: (near initialization for 'i2c_no_probes[0]')

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years ago85xx: Using proper I2C source clock divider for MPC8544
Wolfgang Grandegger [Tue, 30 Sep 2008 08:55:57 +0000 (10:55 +0200)]
85xx: Using proper I2C source clock divider for MPC8544

Measurements with our MPC8544 board showed that the I2C bus frequency
is wrong by a factor of 1.5. Obviously, the interpretation of the
MPC85xx_PORDEVSR2_SEC_CFG bit of the cfg_sec_freq register is not
correct. There seems to be an error in the 8544 RM.

Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
16 years agoFSL: Fix get_cpu_board_revision() return value.
Rafal Czubak [Wed, 8 Oct 2008 11:41:30 +0000 (13:41 +0200)]
FSL: Fix get_cpu_board_revision() return value.

get_cpu_board_revision() returned board revision based on information stored
in global static struct eeprom. It should instead use one from local struct
board_eeprom, to which the data is actually read from EEPROM. The bug led to
system hang after printing L1 cache information on U-Boot startup. The problem
was observed on MPC8555CDS system and possibly affects other Freescale MPC85xx
boards using CFG_I2C_EEPROM_CCID.

The change has been successfully tested on MPC8555CDS system.

Signed-off-by: Rafal Czubak <rcz@semihalf.com>
16 years agoupdate uImage FIT multi documentation
Jean-Christophe PLAGNIOL-VILLARD [Tue, 30 Sep 2008 18:08:49 +0000 (20:08 +0200)]
update uImage FIT multi documentation

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agomove README.imx31 to doc/ and merge with README.mx31
Jean-Christophe PLAGNIOL-VILLARD [Tue, 30 Sep 2008 18:08:36 +0000 (20:08 +0200)]
move README.imx31 to doc/ and merge with README.mx31

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agoi.MX31: switch to CFG_HZ=1000
Guennadi Liakhovetski [Thu, 25 Sep 2008 18:54:37 +0000 (20:54 +0200)]
i.MX31: switch to CFG_HZ=1000

Switch to the standard CFG_HZ=1000 value, while at it, minor white-space
cleanup, remove CFG_CLKS_IN_HZ from config-headers. Tested on mx31ads,
provides 2% or 0.4% precision depending on the
CONFIG_MX31_TIMER_HIGH_PRECISION flag. Measured with stop-watch on 100s
boot-delay.

Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
16 years agoFix bug: in arch-arm, env_get_char dose not work fine
gnusercn [Wed, 8 Oct 2008 16:58:58 +0000 (18:58 +0200)]
Fix bug: in arch-arm, env_get_char dose not work fine

due to the arm implementation which supposed that U-Boot is in RAM
when we jump to start_armboot

Signed-off-by: gnusercn <gnusercn@gmail.com>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agoRemove redundant #define for MPC8536DS
Haiying Wang [Fri, 3 Oct 2008 15:48:03 +0000 (11:48 -0400)]
Remove redundant #define for MPC8536DS

Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
16 years agoAdd ID EEPROM support for MPC8572DS
Haiying Wang [Fri, 3 Oct 2008 15:47:30 +0000 (11:47 -0400)]
Add ID EEPROM support for MPC8572DS

The ID EEPROM on MPC8572DS board locates on I2C bus 1. Its the storage for
system information like mac addresses etc. This patch enables it.

Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
16 years agoMinor fixes for I2C address on MPC8572DS
Haiying Wang [Fri, 3 Oct 2008 15:46:59 +0000 (11:46 -0400)]
Minor fixes for I2C address on MPC8572DS

MPC8572DS has two i2c buses. This patch moves the DDR SPD_EEPROM to i2c bus 1
according to the board spec, and adds the 2nd i2c bus offset.

Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
16 years agoFix the incorrect DDR clk freq reporting on 8536DS
Jason Jin [Sat, 27 Sep 2008 06:40:57 +0000 (14:40 +0800)]
Fix the incorrect DDR clk freq reporting on 8536DS

On 8536DS board, When the DDR clk is set async mode(SW3[6:8] != 111),
The display is still sync mode DDR freq. This patch try to fix
this. The display DDR freq is now the actual freq in both
sync and async mode.

Signed-off-by: Jason Jin <Jason.jin@freescale.com>
16 years ago85xx: Remove setting of *cache-line-size in device trees
Kumar Gala [Tue, 7 Oct 2008 15:28:46 +0000 (10:28 -0500)]
85xx: Remove setting of *cache-line-size in device trees

ePAPR says if the *cache-block-size is the same as *cache-line-size
than we don't need the *cache-line-size property.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 years agolibfdt: Fix error in documentation for fdt_get_alias_namelen()
Gerald Van Baren [Sat, 4 Oct 2008 11:56:06 +0000 (07:56 -0400)]
libfdt: Fix error in documentation for fdt_get_alias_namelen()

Oops, screwed up the function name in the documenting comment for this
function.  Trivial correction in this patch.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Acked-by: Gerald Van Baren <vanbaren@cideas.com>
16 years agolibfdt: Add function to explicitly expand aliases
David Gibson [Wed, 20 Aug 2008 06:55:14 +0000 (16:55 +1000)]
libfdt: Add function to explicitly expand aliases

Kumar has already added alias expansion to fdt_path_offset().
However, in some circumstances it may be convenient for the user of
libfdt to explicitly get the string expansion of an alias.  This patch
adds a function to do this, fdt_get_alias(), and uses it to implement
fdt_path_offset().

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
16 years agocfi_flash: do not reset flash when probe fails
Mike Frysinger [Thu, 2 Oct 2008 05:55:38 +0000 (01:55 -0400)]
cfi_flash: do not reset flash when probe fails

The CFI flash driver starts at flash_init() which calls down into
flash_get_size().  This starts by calling flash_detect_cfi().  If said
function fails, flash_get_size() finishes by attempting to reset the
flash.  Unfortunately, it does this with an info->portwidth set to 0x10
which filters down into flash_make_cmd() and that happily smashes the
stack by sticking info->portwidth bytes into a cfiword_t variable that
lives on the stack.  On a 64bit system you probably won't notice, but
killing the last 8 bytes on a 32bit system usually leads to a corrupt
return address.  Which is what happens on a Blackfin system.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Stefan Roese <sr@denx.de>
16 years agofdt: Overwrite /chosen node in bootm if it already exists in the dtb
Stefan Roese [Fri, 26 Sep 2008 15:03:26 +0000 (17:03 +0200)]
fdt: Overwrite /chosen node in bootm if it already exists in the dtb

Set force parameter in fdt_chosen() call in do_bootm_linux() call.
Without this, the chosen node is not overwritten if it already
exists.

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoFix an overflow case in fdt_offset_ptr() detected by GCC 4.3.
Jon Loeliger [Thu, 25 Sep 2008 16:02:17 +0000 (11:02 -0500)]
Fix an overflow case in fdt_offset_ptr() detected by GCC 4.3.

Using Gcc 4.3 detected this problem:

    ../dtc/libfdt/fdt.c: In function 'fdt_next_tag':
    ../dtc/libfdt/fdt.c:82: error: assuming signed overflow does not
    occur when assuming that (X + c) < X is always false

To fix the problem, treat the offset as an unsigned int.

The problem report and proposed fix were provided
by Steve Papacharalambous <stevep@freescale.com>.

Signed-off-by: Jon Loeliger <jdl@freescale.com>
16 years agolibfdt: Fix bugs in fdt_get_path()
David Gibson [Fri, 29 Aug 2008 04:19:13 +0000 (14:19 +1000)]
libfdt: Fix bugs in fdt_get_path()

The current implementation of fdt_get_path() has a couple of bugs,
fixed by this patch.

First, contrary to its documentation, on success it returns the length
of the node's path, rather than 0.  The testcase is correspondingly
wrong, and the patch fixes this as well.

Second, in some circumstances, it will return -FDT_ERR_BADOFFSET
instead of -FDT_ERR_NOSPACE when given insufficient buffer space.
Specifically this happens when there is insufficient space even to
hold the path's second last component.  This behaviour is corrected,
and the testcase updated to check it.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
16 years agoRevert "ARM: set GD_FLG_RELOC for boards skipping relocation to RAM"
Jean-Christophe PLAGNIOL-VILLARD [Mon, 15 Sep 2008 03:48:25 +0000 (05:48 +0200)]
Revert "ARM: set GD_FLG_RELOC for boards skipping relocation to RAM"

we need this due to the arm implementation which supposed that U-Boot
is in RAM when we jump to start_armboot

This reverts commit f96b44cef897bd372beb86dde1b33637c119d84d.
in order to do it for all arm board

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agompc83xx: don't disable autoboot
Kim Phillips [Wed, 24 Sep 2008 13:46:25 +0000 (08:46 -0500)]
mpc83xx: don't disable autoboot

bootdelay set to -1 'permanently' disables autobooting, even if
bootcmd is specified.  Change to a positive value to allow
autobooting when a bootcmd is set.

Reported-by: Coray Tate <Coray.Tate@freescale.com>
Cc: Scott Wood <scottwood@freescale.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
16 years agompc83xx: Fix typo in include/mpc83xx.h
Nobuhiro Iwamatsu [Wed, 24 Sep 2008 01:42:15 +0000 (10:42 +0900)]
mpc83xx: Fix typo in include/mpc83xx.h

Fixed typo from CONIFG_MPC837X to CONFIG_MPC837X

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
16 years agompc83xx: add h/w flash protection to board configs
Kim Phillips [Tue, 23 Sep 2008 14:38:49 +0000 (09:38 -0500)]
mpc83xx: add h/w flash protection to board configs

the operating system may leave flash in a h/w locked state after writing.
This allows u-boot to continue to write flash by enabling h/w unlocking
by default.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
16 years agompc83xx: spd_sdram: fix ddr sdram base address assignment bug
Anton Vorontsov [Thu, 11 Sep 2008 17:35:36 +0000 (21:35 +0400)]
mpc83xx: spd_sdram: fix ddr sdram base address assignment bug

The spd_dram code shifts the base address, then masks 20 bits, but
forgets to shift the base address back. Fix this by just masking the
base address correctly.

Found this bug while trying to relocate a DDR memory at the base != 0.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
16 years agoppc4xx: Canyonlands: Remove unnecessary FDT warning upon DTB fixup
Stefan Roese [Mon, 22 Sep 2008 14:10:43 +0000 (16:10 +0200)]
ppc4xx: Canyonlands: Remove unnecessary FDT warning upon DTB fixup

Depending on the configuration jumper "SATA SELECT", U-Boot disabled
either one PCIe node or the SATA node in the device tree blob. This
patch removes the unnecessary and even confusing warning, when the node
is not found at all.

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoAdd missing device types to dev_print() in part.c
Remy Bohmer [Fri, 19 Sep 2008 11:30:06 +0000 (13:30 +0200)]
Add missing device types to dev_print() in part.c

Signed-off-by: Remy Bohmer <linux@bohmer.net>
16 years agoFix DPRAM memory leak when CFG_ALLOC_DPRAM is defined, which
Wolfgang Denk [Mon, 22 Sep 2008 20:23:06 +0000 (22:23 +0200)]
Fix DPRAM memory leak when CFG_ALLOC_DPRAM is defined, which
eventually leads to a machine check. This change assures that DPRAM
is allocated only once in that case.

Signed-off-by: Gary Jennejohn <garyj@denx.de>
Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoFix Spartan-3 definitions.
Laurent Pinchart [Wed, 17 Sep 2008 15:57:34 +0000 (17:57 +0200)]
Fix Spartan-3 definitions.

A few Spartan-3 definitions erroneously use Spartan-3E size
constants. This patch fixes them.

Signed-off-by: Laurent Pinchart <laurentp@cse-semaphore.com>
16 years agoRemove duplicate Spartan-3E definition.
Laurent Pinchart [Wed, 17 Sep 2008 15:41:58 +0000 (17:41 +0200)]
Remove duplicate Spartan-3E definition.

Signed-off-by: Laurent Pinchart <laurentp@cse-semaphore.com>
Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agosocrates: change default mtest address range
Anatolij Gustschin [Wed, 17 Sep 2008 11:46:17 +0000 (13:46 +0200)]
socrates: change default mtest address range

Running mtest command on socrates without specifying
an address range crashes the board. This patch changes
default mtest address range to prevent this behavior.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
16 years agosocrates: fix crash after relocation
Anatolij Gustschin [Wed, 17 Sep 2008 10:34:45 +0000 (12:34 +0200)]
socrates: fix crash after relocation

Currently U-Boot crashes after relocation to RAM.
Changing the CPO value of the DDR SDRAM TIMING_CFG_2
register to READ_LAT + 1 (to the value it was before
conversion of socrates to new DDR code) fixes the
problem.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
16 years agosocrates: fix SPD EEPROM address
Anatolij Gustschin [Wed, 17 Sep 2008 09:45:51 +0000 (11:45 +0200)]
socrates: fix SPD EEPROM address

Commit be0bd8234b9777ecd63c4c686f72af070d886517
changed SPD EEPROM address to 0x51 and DDR SDRAM
detection stopped working. Change this address
back to 0x50.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
16 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Wolfgang Denk [Sun, 21 Sep 2008 20:36:23 +0000 (22:36 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

16 years agosh: Fix compile warning
Nobuhiro Iwamatsu [Thu, 18 Sep 2008 10:34:36 +0000 (19:34 +0900)]
sh: Fix compile warning

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
16 years agosh: Add support watchdog for SH4A core
Nobuhiro Iwamatsu [Thu, 18 Sep 2008 10:04:26 +0000 (19:04 +0900)]
sh: Add support watchdog for SH4A core

Add support watchdog for SH4A core (SH7763, SH7780 and SH7785).
And fix some compile warning.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
16 years agosh: Fix typo in SH serial driver
Nobuhiro Iwamatsu [Wed, 17 Sep 2008 02:45:26 +0000 (11:45 +0900)]
sh: Fix typo in SH serial driver

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
16 years agosh: Add support any page size and empty_zero_page to SH Linux uImage
Nobuhiro Iwamatsu [Wed, 17 Sep 2008 02:08:36 +0000 (11:08 +0900)]
sh: Add support any page size and empty_zero_page to SH Linux uImage

Old U-Boot supported 4KB page size only. If this version, Linux
kernel can not get command line from U-Boot.
SH Linux kernel can change page size and empty_zero_page.
This patch support this function and fix promlem.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
16 years agosh: rsk7203: Add support pkt_data_pull and pkt_data_push function
Nobuhiro Iwamatsu [Thu, 28 Aug 2008 04:40:52 +0000 (13:40 +0900)]
sh: rsk7203: Add support pkt_data_pull and pkt_data_push function

Add function of smc911x, pkt_data_pull and pkt_data_push.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
16 years agoADS5121: fix typo in "rootpath" default setting
Wolfgang Denk [Thu, 18 Sep 2008 11:57:32 +0000 (13:57 +0200)]
ADS5121: fix typo in "rootpath" default setting

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoCoding style cleanup; update CHANEGLOG
Wolfgang Denk [Wed, 17 Sep 2008 08:17:55 +0000 (10:17 +0200)]
Coding style cleanup; update CHANEGLOG

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoSupport for multiple SGMII/TBI interfaces for TSEC ethernet
Peter Tyser [Tue, 16 Sep 2008 15:04:47 +0000 (10:04 -0500)]
Support for multiple SGMII/TBI interfaces for TSEC ethernet

Fix TBI PHY accesses to use the proper offset in CPU register space. The
previous code would incorrectly access the TBI PHY by reading/writing to CPU
register space at the same location as would be used to access external PHYs.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Acked-by: Andy Fleming <afleming@freescale.com>
16 years agoTQM8xx: Fix CFI flash driver support for all TQM8xx based boards
Wolfgang Denk [Tue, 16 Sep 2008 16:02:19 +0000 (18:02 +0200)]
TQM8xx: Fix CFI flash driver support for all TQM8xx based boards

After switching to using the CFI flash driver, the correct remapping
of the flash banks was forgotten.

Also, some boards were not adapted, and the old legacy flash driver
was not removed yet.

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoPrepare v2008.10-rc2 v2008.10-rc2
Wolfgang Denk [Sat, 13 Sep 2008 22:59:35 +0000 (00:59 +0200)]
Prepare v2008.10-rc2

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoCoding style cleanup, update CHANGELOG
Wolfgang Denk [Sat, 13 Sep 2008 00:23:05 +0000 (02:23 +0200)]
Coding style cleanup, update CHANGELOG

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoUpdate mailing list email and archive addresses
Peter Tyser [Wed, 10 Sep 2008 14:18:34 +0000 (09:18 -0500)]
Update mailing list email and archive addresses

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
16 years ago85xx: socrates: autoprobe Lime chip
u-boot@bugs.denx.de [Thu, 11 Sep 2008 13:40:01 +0000 (15:40 +0200)]
85xx: socrates: autoprobe Lime chip

This patch is an attempt to implement autoprobing for the Lime
presence on the bus.
Configure GPCM for Lime CS2 and try to access chip ID registers.
Second read atempt delivers register values if the chip is present.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
16 years ago85xx: socrates: Add support for new image format.
u-boot@bugs.denx.de [Thu, 11 Sep 2008 13:40:01 +0000 (15:40 +0200)]
85xx: socrates: Add support for new image format.

Signed-off-by: Detlev Zundel <dzu@denx.de>
16 years agosh: Fix compile error for r2dplus
Nobuhiro Iwamatsu [Thu, 11 Sep 2008 08:28:18 +0000 (17:28 +0900)]
sh: Fix compile error for r2dplus

netdev.h was not include by r2dplus.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
16 years agopowerpc: Fix bootm to boot up again with a Ramdisk
Heiko Schocher [Thu, 11 Sep 2008 06:11:23 +0000 (08:11 +0200)]
powerpc: Fix bootm to boot up again with a Ramdisk

Commit 2a1a2cb6 didnt remove the dummy mem reservation in fdt_chosen,
and this stopped Linux from booting with a Ramdisk. This patch fixes
this, by deleting the useless dummy mem reservation.

When booting with a Ramdisk, a fix offset FDT_RAMDISK_OVERHEAD is now
added to of_size, so we dont need anymore a dummy mem reservation.

I measured the value of FDT_RAMDISK_OVERHEAD on a MPC8270 based
system (=0x44 bytes) and rounded it up to 0x80).

Signed-off-by: Heiko Schocher <hs@denx.de>
Acked-by: Kumar Gala <galak@kernel.crashing.org>
16 years agoAdd support for LZMA uncompression algorithm.
Luigi 'Comio' Mantellini [Mon, 8 Sep 2008 00:46:13 +0000 (02:46 +0200)]
Add support for LZMA uncompression algorithm.

Signed-off-by: Luigi 'Comio' Mantellini <luigi.mantellini@idf-hit.com>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agoMerge branch 'master' of git://git.denx.de/u-boot-nand-flash
Wolfgang Denk [Fri, 12 Sep 2008 23:45:56 +0000 (01:45 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash

16 years agofsl_elbc_nand: ecclayout cleanups
Anton Vorontsov [Fri, 27 Jun 2008 19:04:20 +0000 (23:04 +0400)]
fsl_elbc_nand: ecclayout cleanups

This patch deletes oobavail assignments, they're calculated by the nand
core code in nand_scan_tail, plus current oobavail values are wrong for
the LP NANDs.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
16 years agofsl_elbc_nand: implement support for flash-based BBT
Anton Vorontsov [Fri, 27 Jun 2008 19:04:13 +0000 (23:04 +0400)]
fsl_elbc_nand: implement support for flash-based BBT

This patch implements support for flash-based BBT for chips working
through ELBC NAND controller, so that NAND core will not have to re-scan
for bad blocks on every boot.

Because ELBC controller may provide HW-generated ECCs we should adjust
bbt pattern and bbt version positions in the OOB free area.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
16 years agofsl_elbc_nand: fix OOB workability for large page NAND chips
Anton Vorontsov [Fri, 27 Jun 2008 19:04:04 +0000 (23:04 +0400)]
fsl_elbc_nand: fix OOB workability for large page NAND chips

For large page chips, nand_bbt is looking into OOB area, and checking
for "0xff 0xff" pattern at OOB offset 0. That is, two bytes should be
reserved for bbt means.

But ELBC driver is specifying ecclayout so that oobfree area starts at
offset 1, so only one byte left for the bbt purposes.

This causes problems with any OOB users, namely JFFS2: after first mount
JFFS2 will fill all OOBs with "erased marker", so OOBs will contain:

  OOB Data: ff 19 85 20 03 00 ff ff ff 00 00 08 ff ff ff ff
  OOB Data: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
  OOB Data: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
  OOB Data: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff

And on the next boot, NAND core will rescan for bad blocks, then will
see "0xff 0x19" pattern, and will mark all blocks as bad ones.

To fix the issue we should implement our own bad block pattern: just one
byte at OOB start. Though, this will work only for x8 chips. For x16
chips two bytes must be checked. Since ELBC driver does not support x16
NANDs (yet), we're safe for now.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
16 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Fri, 12 Sep 2008 14:14:28 +0000 (16:14 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

16 years agoMerge branch 'Makefile-next' of git://git.denx.de/u-boot-arm
Wolfgang Denk [Fri, 12 Sep 2008 14:13:12 +0000 (16:13 +0200)]
Merge branch 'Makefile-next' of git://git.denx.de/u-boot-arm

16 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Fri, 12 Sep 2008 13:24:54 +0000 (15:24 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

16 years agoMerge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Wolfgang Denk [Fri, 12 Sep 2008 13:23:20 +0000 (15:23 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

16 years agoMPC512x: reduce timeout waiting for Ethernet autonegotiation to 2.5s
Wolfgang Denk [Fri, 12 Sep 2008 11:52:21 +0000 (13:52 +0200)]
MPC512x: reduce timeout waiting for Ethernet autonegotiation to 2.5s

Signed-off-by: Wolfgang Denk <wd@denx.de>
16 years agoppc4xx: Enable device tree (FDT) support in zeus board port
Stefan Roese [Thu, 11 Sep 2008 11:05:56 +0000 (13:05 +0200)]
ppc4xx: Enable device tree (FDT) support in zeus board port

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoppc4xx: Fix SDRAM inititialization of multiple 405 based board ports
Stefan Roese [Wed, 10 Sep 2008 14:53:47 +0000 (16:53 +0200)]
ppc4xx: Fix SDRAM inititialization of multiple 405 based board ports

This patch fixes a problem introdiced with patch
bbeff30c [ppc4xx: Remove superfluous dram_init() call or replace it by
initdram()].

The boards affected are:
- PCI405
- PPChameleonEVB
- quad100hd
- taihu
- zeus

Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoppc4xx: Add .gitignore file to xilinx-ppc440 boards
Ricardo Ribalda Delgado [Thu, 11 Sep 2008 23:41:26 +0000 (19:41 -0400)]
ppc4xx: Add .gitignore file to xilinx-ppc440 boards

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@uam.es>
Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoppc4xx: Fix compilation of v5fx30teval_flash
Ricardo Ribalda Delgado [Thu, 11 Sep 2008 23:41:25 +0000 (19:41 -0400)]
ppc4xx: Fix compilation of v5fx30teval_flash

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@uam.es>
Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoppc4xx: Fix in-tree build for ppc440-generic boards
Ricardo Ribalda Delgado [Wed, 10 Sep 2008 21:44:30 +0000 (17:44 -0400)]
ppc4xx: Fix in-tree build for ppc440-generic boards

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@uam.es>
Signed-off-by: Stefan Roese <sr@denx.de>
16 years agoARM: synchronize mach-types.h with linux 2.6.27-rc6
Jean-Christophe PLAGNIOL-VILLARD [Fri, 12 Sep 2008 00:20:47 +0000 (02:20 +0200)]
ARM: synchronize mach-types.h with linux 2.6.27-rc6

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agoat91rm9200: fix errors with CONFIG_CMD_I2C_TREE
Jens Scharsig [Fri, 12 Sep 2008 00:20:47 +0000 (02:20 +0200)]
at91rm9200: fix errors with CONFIG_CMD_I2C_TREE

This patch prevents linker error on AT91RM9200 boards, if
CONFIG_CMD_I2_TREE is set.
It implements i2c_set_bus_speed and i2c_get_bus_speed as a dummy function.

Signed-off-by: Jens Scharsig <esw@bus-elektronik.de>
16 years agoARM DaVinci: Remove duplicate code in cpu/arm926ejs/davinci/dp83848.c
Hugo Villeneuve [Fri, 12 Sep 2008 00:20:47 +0000 (02:20 +0200)]
ARM DaVinci: Remove duplicate code in cpu/arm926ejs/davinci/dp83848.c

ARM DaVinci: Remove duplicate code in cpu/arm926ejs/davinci/dp83848.c

Signed-off-by: Hugo Villeneuve <hugo.villeneuve@lyrtech.com>
16 years agomake: Remove redundant __ARM__ addition when cross-compiling on *BSD
Shinya Kuribayashi [Fri, 12 Sep 2008 00:20:46 +0000 (02:20 +0200)]
make: Remove redundant __ARM__ addition when cross-compiling on *BSD

__ARM__ is given by arm_config.mk automatically.

Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
16 years agoFix MACH_TYPE for the AT91RM9200DK board.
Claudio Scordino [Fri, 12 Sep 2008 00:20:46 +0000 (02:20 +0200)]
Fix MACH_TYPE for the AT91RM9200DK board.

Signed-off-by: Claudio Scordino <claudio@evidence.eu.com>
16 years agoi.mx change get_timer(base) to return time since base
Andrew Dyer [Fri, 12 Sep 2008 00:20:46 +0000 (02:20 +0200)]
i.mx change get_timer(base) to return time since base

This patch changes get_timer() for i.MX to return the time since
'base' instead of the time since the counter was at zero.

Symptom seen is flash timeout errors when erasing or programming a
sector using the common cfi flash code.

Signed-off-by: Andrew Dyer <adyer@righthandtech.com>
16 years agoi.MX use u-boot baud rate and don't assume UART master clock
Andrew Dyer [Fri, 12 Sep 2008 00:20:46 +0000 (02:20 +0200)]
i.MX use u-boot baud rate and don't assume UART master clock

1) Change the i.MX serial driver to use the baud rate set in the
 u-boot environment

2) don't assume a 16MHz value for PERCLK1 in baud rate calculations

3) don't write a 1 to the RDR bit in the USR2 reg. (bit is not "write
 one to clear" like other status bits in the reg.)

Signed-off-by: Andrew Dyer <adyer@righthandtech.com>
16 years agoarm920t fix constant error in start.S
Andrew Dyer [Fri, 12 Sep 2008 00:20:46 +0000 (02:20 +0200)]
arm920t fix constant error in start.S

Code in cpu/arm920t/start.S will die with a compilation error if
CONFIG_STACKSIZE + CFG_MALLOC_LEN works out to an invalid constant for
the ARM sub instruction.  Change the code so that each is subtracted
independently to avoid the error.

Signed-off-by: Andrew Dyer <adyer@righthandtech.com>
16 years agoARM OMAP : Correct Invalid Timer Register Field Declaration in omap1510.h & omap730.h
Gururaja Hebbar K R [Fri, 12 Sep 2008 00:20:40 +0000 (02:20 +0200)]
ARM OMAP : Correct Invalid Timer Register Field Declaration in omap1510.h & omap730.h

- Correct Invalid #define of MPUTIM_PTV_MASK for
   omap1510 & omap730 register definition

 MPUTIM_PTV_MASK is defined as
 #define MPUTIM_PTV_MASK (0x7<<PTV_BIT)

 while it should have been
 #define MPUTIM_PTV_MASK (0x7<<MPUTIM_PTV_BIT)

- Below Patch corrects the same

Signed-off-by: Gururaja Hebbar <gururajakr@sanyo.co.in>
16 years agoSet up SD/MMC OCR as comment describes. i.e. 3.2-3.4v.
Adrian Filipi [Fri, 18 Jul 2008 15:52:02 +0000 (11:52 -0400)]
Set up SD/MMC OCR as comment describes. i.e. 3.2-3.4v.

Signed-off-by: Adrian Filipi <adrian.filipi@eurotech.com>
16 years agoi.MX31: document timer precision option
Guennadi Liakhovetski [Thu, 28 Aug 2008 10:25:11 +0000 (12:25 +0200)]
i.MX31: document timer precision option

Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
16 years agoi.MX31: Make the SPI bus and chip select configurable for MC13783
Magnus Lilja [Fri, 29 Aug 2008 08:36:18 +0000 (10:36 +0200)]
i.MX31: Make the SPI bus and chip select configurable for MC13783

The i.MX31 has three SPI buses and each bus has several chip selects
and the MC13783 chip can be connected to any of these. The current
RTC driver for MC13783 is hardcoded for CSPI2/SS2.

This patch makes make MC13783 SPI bus and chip select configurable
via CONFIG_MC13783_SPI_BUS and CONFIG_MC13783_SPI_CS.

Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>
16 years agoi.MX31: Add reset_timer() and modify get_timer_masked().
Magnus Lilja [Fri, 29 Aug 2008 08:36:17 +0000 (10:36 +0200)]
i.MX31: Add reset_timer() and modify get_timer_masked().

This patch adds the reset_timer() function (needed by nand_base.c) and
modifies the get_timer_masked() to work in the same way as the omap24xx
function.

Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>
16 years agoap325rxa: remove duplicate CONFIG_FLASH_CFI_DRIVER
Jean-Christophe PLAGNIOL-VILLARD [Wed, 10 Sep 2008 20:48:09 +0000 (22:48 +0200)]
ap325rxa: remove duplicate CONFIG_FLASH_CFI_DRIVER

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agobootm arm/avr32/blackfin/microblaze/nios2/sh: remove no more need 'error' label
Jean-Christophe PLAGNIOL-VILLARD [Wed, 10 Sep 2008 20:48:09 +0000 (22:48 +0200)]
bootm arm/avr32/blackfin/microblaze/nios2/sh: remove no more need 'error' label

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agorename CFG_ENV macros to CONFIG_ENV
Jean-Christophe PLAGNIOL-VILLARD [Wed, 10 Sep 2008 20:48:06 +0000 (22:48 +0200)]
rename CFG_ENV macros to CONFIG_ENV

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agonvedit: rename error comment to CONFIG_ENV_IS_IN_
Jean-Christophe PLAGNIOL-VILLARD [Wed, 10 Sep 2008 20:48:05 +0000 (22:48 +0200)]
nvedit: rename error comment to CONFIG_ENV_IS_IN_

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agocmd_mem: Move conditional compilation to Makefile
Jean-Christophe PLAGNIOL-VILLARD [Wed, 10 Sep 2008 20:48:05 +0000 (22:48 +0200)]
cmd_mem: Move conditional compilation to Makefile

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agomove cmd_get_data_size to command.c
Jean-Christophe PLAGNIOL-VILLARD [Wed, 10 Sep 2008 20:48:05 +0000 (22:48 +0200)]
move cmd_get_data_size to command.c

add CMD_DATA_SIZE macro to enable it

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agoenv_flash: Move conditional compilation to Makefile
Jean-Christophe PLAGNIOL-VILLARD [Wed, 10 Sep 2008 20:48:04 +0000 (22:48 +0200)]
env_flash: Move conditional compilation to Makefile

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agorename CFG_ENV_IS_IN_FLASH in CONFIG_ENV_IS_IN_FLASH
Jean-Christophe PLAGNIOL-VILLARD [Wed, 10 Sep 2008 20:48:04 +0000 (22:48 +0200)]
rename CFG_ENV_IS_IN_FLASH in CONFIG_ENV_IS_IN_FLASH

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agocleanup use of CFG_ENV_IS_IN_FLASH
Jean-Christophe PLAGNIOL-VILLARD [Wed, 10 Sep 2008 20:48:03 +0000 (22:48 +0200)]
cleanup use of CFG_ENV_IS_IN_FLASH

- #if CFG_ENV_IS_IN_FLASH
- #if (CFG_ENV_IS_IN_FLASH == 1)
- #define CFG_ENV_IS_IN_FLASH 0

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agorename environment.c in env_embedded.c to reflect is functionality
Jean-Christophe PLAGNIOL-VILLARD [Wed, 10 Sep 2008 20:48:01 +0000 (22:48 +0200)]
rename environment.c in env_embedded.c to reflect is functionality

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agoenv_nowhere: Move conditional compilation to Makefile
Jean-Christophe PLAGNIOL-VILLARD [Wed, 10 Sep 2008 20:48:01 +0000 (22:48 +0200)]
env_nowhere: Move conditional compilation to Makefile

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agorename CFG_ENV_IS_NOWHERE in CONFIG_ENV_IS_NOWHERE
Jean-Christophe PLAGNIOL-VILLARD [Wed, 10 Sep 2008 20:48:00 +0000 (22:48 +0200)]
rename CFG_ENV_IS_NOWHERE in CONFIG_ENV_IS_NOWHERE

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agoenv_sf: Move conditional compilation to Makefile
Jean-Christophe PLAGNIOL-VILLARD [Wed, 10 Sep 2008 20:48:00 +0000 (22:48 +0200)]
env_sf: Move conditional compilation to Makefile

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agorename CFG_ENV_IS_IN_SPI_FLASH in CONFIG_ENV_IS_IN_SPI_FLASH
Jean-Christophe PLAGNIOL-VILLARD [Wed, 10 Sep 2008 20:48:00 +0000 (22:48 +0200)]
rename CFG_ENV_IS_IN_SPI_FLASH in CONFIG_ENV_IS_IN_SPI_FLASH

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agoenv_onenand: Move conditional compilation to Makefile
Jean-Christophe PLAGNIOL-VILLARD [Wed, 10 Sep 2008 20:48:00 +0000 (22:48 +0200)]
env_onenand: Move conditional compilation to Makefile

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agorename CFG_ENV_IS_IN_ONENAND in CONFIG_ENV_IS_IN_ONENAND
Jean-Christophe PLAGNIOL-VILLARD [Wed, 10 Sep 2008 20:47:59 +0000 (22:47 +0200)]
rename CFG_ENV_IS_IN_ONENAND in CONFIG_ENV_IS_IN_ONENAND

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agoenv_nvram: Move conditional compilation to Makefile
Jean-Christophe PLAGNIOL-VILLARD [Wed, 10 Sep 2008 20:47:59 +0000 (22:47 +0200)]
env_nvram: Move conditional compilation to Makefile

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agorename CFG_ENV_IS_IN_NVRAM in CONFIG_ENV_IS_IN_NVRAM
Jean-Christophe PLAGNIOL-VILLARD [Wed, 10 Sep 2008 20:47:59 +0000 (22:47 +0200)]
rename CFG_ENV_IS_IN_NVRAM in CONFIG_ENV_IS_IN_NVRAM

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agoenv_nand: Move conditional compilation to Makefile
Jean-Christophe PLAGNIOL-VILLARD [Wed, 10 Sep 2008 20:47:59 +0000 (22:47 +0200)]
env_nand: Move conditional compilation to Makefile

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
16 years agorename CFG_ENV_IS_IN_NAND in CONFIG_ENV_IS_IN_NAND
Jean-Christophe PLAGNIOL-VILLARD [Wed, 10 Sep 2008 20:47:58 +0000 (22:47 +0200)]
rename CFG_ENV_IS_IN_NAND in CONFIG_ENV_IS_IN_NAND

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