10 years agoPrepare 2009.08 v2009.08
Wolfgang Denk [Mon, 31 Aug 2009 17:57:42 +0000 (19:57 +0200)]
Prepare 2009.08


Signed-off-by: Wolfgang Denk <wd@denx.de>
10 years agoAdd common code dir for Matrix Vision boards.
Andre Schwarz [Mon, 31 Aug 2009 14:18:24 +0000 (16:18 +0200)]
Add common code dir for Matrix Vision boards.

This fixes current build failure.

Signed-off-by: Andre Schwarz <andre.schwarz@matrix-vision.de>
mvblm7.c: fix warning: implicit declaration of function

Signed-off-by: Wolfgang Denk <wd@denx.de>
David Brownell [Sun, 30 Aug 2009 18:05:29 +0000 (11:05 -0700)]

The "console: unify printing current devices" patch goofed:
time noise, not add it.  Said patch changed the #ifndefs
to #ifdef; this one restores them to the proper sense.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
10 years agoUse common code for Matrix Vision boards
André Schwarz [Thu, 27 Aug 2009 12:48:35 +0000 (14:48 +0200)]
Use common code for Matrix Vision boards

Clean up existing boards (mvBC-P/MPC5200 and mvBL-M7/MPC8343) by
using common code.

Signed-off-by: André Schwarz <andre.schwarz@matrix-vision.de>
10 years agompc83xx: mpc8349itx - accommodate larger kernel sizes & unzero the bootdelay
Kim Phillips [Thu, 27 Aug 2009 02:27:37 +0000 (21:27 -0500)]
mpc83xx: mpc8349itx - accommodate larger kernel sizes & unzero the bootdelay

apparently the ITX was missed last round.

Also make bootdelay consistent with other boards, so as to give on the
opportunity to fix mistakenly set bootcmd without having checked for an
bootdelay zero setting first.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
10 years agompc83xx: match dtb filename references to their dts equivalents in the linux kernel
Kim Phillips [Thu, 27 Aug 2009 02:25:46 +0000 (21:25 -0500)]
mpc83xx: match dtb filename references to their dts equivalents in the linux kernel

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
10 years agoMerge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Wolfgang Denk [Tue, 25 Aug 2009 20:54:01 +0000 (22:54 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

10 years agoMerge branch 'master' of git://git.denx.de/u-boot-blackfin
Wolfgang Denk [Tue, 25 Aug 2009 20:51:40 +0000 (22:51 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-blackfin

10 years agoppc4xx: Fix ECC Correction bug with SMC ordering for NDFC driver
Feng Kan [Fri, 21 Aug 2009 17:59:42 +0000 (10:59 -0700)]
ppc4xx: Fix ECC Correction bug with SMC ordering for NDFC driver

Fix ECC Correction bug where the byte offset location were double
flipped causing correction routine to toggle the wrong byte location
in the ECC segment. The ndfc_calculate_ecc routine change the order
of getting the ECC code.
        /* The NDFC uses Smart Media (SMC) bytes order */
        ecc_code[0] = p[2];
        ecc_code[1] = p[1];
        ecc_code[2] = p[3];
But in the Correction algorithm when calculating the byte offset
location, the s1 is used as the upper part of the address. Which
again reverse the order making the final byte offset address
location incorrect.
byteoffs = (s1 << 0) & 0x80;
byteoffs |= (s0 >> 4) & 0x08;
The order is change to read it in straight and let the correction
function to revert it to SMC order.

Signed-off-by: Feng Kan <fkan@amcc.com>
Acked-by: Victor Gallardo <vgallardo@amcc.com>
Acked-by: Prodyut Hazarika <phazarika@amcc.com>
Signed-off-by: Stefan Roese <sr@denx.de>
10 years agoinclude/s3c24x0.h: fix S3C24X0_SPI_CHANNEL declaration
Wolfgang Denk [Tue, 25 Aug 2009 10:22:38 +0000 (12:22 +0200)]
include/s3c24x0.h: fix S3C24X0_SPI_CHANNEL declaration

The SPI controller on the S3C24X0 has 8 bit registers, not 32 bit.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Wolfgang Denk <wd@denx.de>
10 years agoBlackfin: fix typos in gpio comments
Mike Frysinger [Thu, 20 Aug 2009 23:17:59 +0000 (19:17 -0400)]
Blackfin: fix typos in gpio comments

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
10 years agoBlackfin: cm-bf527/cm-bf537: increase flash sectors
Harald Krapfenbauer [Tue, 18 Aug 2009 08:49:57 +0000 (04:49 -0400)]
Blackfin: cm-bf527/cm-bf537: increase flash sectors

Newer revisions of these boards have slightly larger flashes, so increase
the configured number of sectors so that U-Boot works on all revisions.

Signed-off-by: Harald Krapfenbauer <Harald.Krapfenbauer@bluetechnix.at>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
10 years agosh/rsk7203: add missing include net.h
Jean-Christophe PLAGNIOL-VILLARD [Sun, 23 Aug 2009 12:14:52 +0000 (14:14 +0200)]
sh/rsk7203: add missing include net.h

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
10 years agostart a linker script helper file
Mike Frysinger [Sun, 23 Aug 2009 06:47:59 +0000 (02:47 -0400)]
start a linker script helper file

Start a common header file for common linker script code (such as
workarounds for older linkers) rather than doing this in the build system.

As fallout, we no longer execute the linker every time config.mk is
included by a build file (which can easily be 70+ times), but rather only
execute it once.

This also fixes a bug in the major version checking by creating a macro to
easily compare versions and keep people from making the same common
mistake (forgetting to check major and minor together).

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
10 years agoBlackfin: use common code to preprocess linker script
Mike Frysinger [Sat, 22 Aug 2009 23:50:22 +0000 (19:50 -0400)]
Blackfin: use common code to preprocess linker script

Now that the common code preprocesses the linker script, the Blackfin code
no longer needs to do it.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
10 years ago.gitignore: ignore generated u-boot.lds
Mike Frysinger [Sat, 22 Aug 2009 23:48:56 +0000 (19:48 -0400)]
.gitignore: ignore generated u-boot.lds

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
10 years agoinclude/mmc.h: Fix typo in IS_SD() macro
Albin Tonnerre [Sat, 22 Aug 2009 12:21:53 +0000 (14:21 +0200)]
include/mmc.h: Fix typo in IS_SD() macro

Signed-off-by: Albin Tonnerre <albin.tonnerre@free-electrons.com>
10 years agoPrepare 2009.08-rc3 v2009.08-rc3
Wolfgang Denk [Sat, 22 Aug 2009 21:27:26 +0000 (23:27 +0200)]
Prepare 2009.08-rc3

Update CHANGELOG, minor Coding Style cleanup.

Signed-off-by: Wolfgang Denk <wd@denx.de>
10 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Fri, 21 Aug 2009 22:24:54 +0000 (00:24 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

10 years agoqemu-mips: Fix Qemu website
Michal Simek [Thu, 20 Aug 2009 20:52:25 +0000 (06:52 +1000)]
qemu-mips: Fix Qemu website

Signed-off-by: Michal Simek <monstr@monstr.eu>
Signed-off-by: Michal Simek <michal.simek@petalogix.com>
Acked-by: Shinya Kuribayashi <skuribay@pobox.com>
10 years agompc83xx: accommodate larger kernel sizes by default
Kim Phillips [Fri, 21 Aug 2009 21:34:38 +0000 (16:34 -0500)]
mpc83xx: accommodate larger kernel sizes by default

linux mpc83xx_defconfig kernels are getting bigger, accommodate for
their growth by adjusting default load and fdt addresses.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
10 years agompc83xx: mpc8377erdb - change DDR settings to those from latest bsp
Kim Phillips [Fri, 21 Aug 2009 21:33:15 +0000 (16:33 -0500)]
mpc83xx: mpc8377erdb - change DDR settings to those from latest bsp

when using Linus' 83xx_defconfig, the mpc8377rdb would hang at boot
at either:

NET: Registered protocol family 16

or the

io scheduler cfq registered

message.  Fixing up these DDR settings appears to fix the problem.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
10 years agompc83xx: tqm8349 - remove pci & flash window conflict
Kim Phillips [Fri, 21 Aug 2009 21:31:20 +0000 (16:31 -0500)]
mpc83xx: tqm8349 - remove pci & flash window conflict

commit 9993e196da707a0a1cd4584f1fcef12382c1c144 "mpc83xx: convert all
remaining boards over to 83XX_GENERIC_PCI" remapped pci windows on
tqm834x to make it more consistent with the other 83xx boards.  During
that time however, the author failed to realize that FLASH_BASE was
occupying the same range as what PCI1_MEM_BASE was being assigned.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Tested-by: Wolfgang Denk <wd@denx.de>
10 years agompc83xx: add missing CSCONFIG_ODT_WR_CFG for 832x CPUs
Heiko Schocher [Fri, 21 Aug 2009 21:30:30 +0000 (16:30 -0500)]
mpc83xx: add missing CSCONFIG_ODT_WR_CFG for 832x CPUs

Signed-off-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
10 years agompc83xx: mpc8349 - delete unused SYS_MID_FLASH_JUMP
Paul Gortmaker [Fri, 21 Aug 2009 21:27:05 +0000 (16:27 -0500)]
mpc83xx: mpc8349 - delete unused SYS_MID_FLASH_JUMP

This was introduced with the MPC8349EMDS board, and then copied to
a couple other boards by nature of being the reference implementation.

  u-boot$git grep CONFIG_SYS_MID_FLASH_JUMP
  include/configs/MPC8349EMDS.h:#define CONFIG_SYS_MID_FLASH_JUMP 0x7F000000
  include/configs/sbc8349.h:#define CONFIG_SYS_MID_FLASH_JUMP     0x7F000000
  include/configs/vme8349.h:#define CONFIG_SYS_MID_FLASH_JUMP     0x7F000000

It currently isn't used, so delete it before it spreads further.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
10 years agompc83xx: sbc8349 - make enabling PCI more user friendly
Paul Gortmaker [Fri, 21 Aug 2009 21:21:58 +0000 (16:21 -0500)]
mpc83xx: sbc8349 - make enabling PCI more user friendly

Prior to this commit, to enable PCI, you had to go manually
edit the board config header, which isn't really user friendly.
This adds the typical PCI make targets to the toplevel Makefile
in accordance with what is being done with other boards.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
10 years agoeeprom_m95xxx: remove unused variable i
Jean-Christophe PLAGNIOL-VILLARD [Fri, 7 Aug 2009 21:37:54 +0000 (23:37 +0200)]
eeprom_m95xxx: remove unused variable i

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
10 years agojffs2: some fixes to summary support
Ilya Yanok [Fri, 17 Jul 2009 11:02:42 +0000 (15:02 +0400)]
jffs2: some fixes to summary support

This patch fixes some issues with JFFS2 summary support in U-Boot.
1/ Summary support made compilation configurable (as summary support
considered expiremental even in Linux).
2/ Summary code can do unaligned 16-bit and 32-bit memory accesses.
We need to get data byte by byte to exclude data aborts.
3/ Make summary scan in two passes so we can safely fall back to full
scan if we found unsupported entry in the summary.

Signed-off-by: Ilya Yanok <yanok@emcraft.com>
10 years agoarm: rd6281a: Fixed NAND specific warning
Prafulla Wadaskar [Mon, 10 Aug 2009 13:25:54 +0000 (18:55 +0530)]
arm: rd6281a: Fixed NAND specific warning

It is recommended to define the macro CONFIG_SYS_64BIT_VSPRINTF
for NAND specific warning removal, same is done in this patch

Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
10 years agoTRAB: make independent of specific libgcc helper routines
Wolfgang Denk [Wed, 12 Aug 2009 22:37:16 +0000 (00:37 +0200)]
TRAB: make independent of specific libgcc helper routines

The TRAB board references local libgcc helper routines
(lib_arm/div0.o and lib_arm/_umodsi3.o) which cause build problems
when we try to use the normal, compiler provided libgcc instead.
Removing these references allows to build both with and without the
local libgcc helper routines.

Signed-off-by: Wolfgang Denk <wd@denx.de>
10 years agoFix all linker scripts for older binutils versions (pre-2.16)
Wolfgang Denk [Mon, 17 Aug 2009 12:00:53 +0000 (14:00 +0200)]
Fix all linker scripts for older binutils versions (pre-2.16)

Commit f62fb99941c6 fixed handling of all rodata sections by using a
wildcard combined with calls to ld's builtin functions SORT_BY_ALIGNMENT()
and SORT_BY_NAME().  Unfortunately these functions were only
introduced with biunutils version 2.16, so the modification broke
building with all tool chains using older binutils.

This patch makes it work again.  This is done by omitting the use of
these functions for such old tool chains.  This will result in
slightly larger target binaries, as the rodata sections are no longer
in optimal order alignment-wise which reauls in unused gaps, but the
effect was found to be insignificant - especially compared to the fact
that you cannot build U-Boot at all in the current state.

As ld seems to have no support for conditionals we run the linker
script through the C preprocessor which can be easily used to remove
the unwanted function calls.

Note that the C preprocessor must be run with the "-ansi" (or a
"-std=") option to make sure all the system-specific predefined
macros outside the reserved namespace are suppressed. Otherise, cpp
might for example substitute "powerpc" to "1", thus corrupting for
example "OUTPUT_ARCH(powerpc)" etc.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Mike Frysinger <vapier@gentoo.org>
10 years agoARM: compiler options cleanup - improve tool chain support
Wolfgang Denk [Mon, 17 Aug 2009 11:17:29 +0000 (13:17 +0200)]
ARM: compiler options cleanup - improve tool chain support

For some time there have been repeated reports about build problems
with some ARM (cross) tool chains.  Especially issues about
(in)compatibility with the tool chain provided runtime support
library libgcc.a caused to add and support a private implementation
of such runtime support code in U-Boot.  A closer look at the code
indicated that some of these issues are actually home-made.  This
patch attempts to clean up some of the most obvious problems and make
building of U-Boot with different tool chains easier:

- Even though all ARM systems basicy used the same compiler options
  to select a specific ABI from the tool chain, the code for this was
  distributed over all cpu/*/config.mk files.  We move this one level
  up into lib_arm/config.mk instead.

- So far, we only checked if "-mapcs-32" was supported by the tool
  chain; if yes, this was used, if not, "-mabi=apcs-gnu" was
  selected, no matter if the tool chain actually understood this
  option.  There was no support for EABI conformant tool chains.
  This patch implements the following logic:

  1) If the tool chain supports
"-mabi=aapcs-linux -mno-thumb-interwork"
     we use these options (EABI conformant tool chain).
  2) Otherwise, we check first if
     is supported, and then check for
     If one test succeeds, we use the first found option.
  3) In case 2), we also test if "-mno-thumb-interwork", and use
     this if the test succeeds. [For "-mabi=aapcs-linux" we set
     "-mno-thumb-interwork" mandatorily.]

  This way we use a similar logic for the compile options as the
  Linux kernel does.

- Some EABI conformant tool chains cause external references to
  utility functions like raise(); such functions are provided in the
  new file lib_arm/eabi_compat.c

  Note that lib_arm/config.mk gets parsed several times, so we must
  make sure to add eabi_compat.o only once to the linker list.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Dirk Behme <dirk.behme@googlemail.com>
Cc: Magnus Lilja <lilja.magnus@gmail.com>
Cc: Tom Rix <Tom.Rix@windriver.com>
Cc: Prafulla Wadaskar <prafulla@marvell.com>
Acked-by: Sergey Kubushyn <ksi@koi8.net>
Tested-by: Magnus Lilja <lilja.magnus@gmail.com>
Tested-by: Andrzej Wolski <awolski@poczta.fm>
Tested-by: Gaye Abdoulaye Walsimou <walsimou@walsimou.com>
Tested-by: Tom Rix <Tom.Rix@windriver.com>
Tested-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
10 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Fri, 21 Aug 2009 21:04:03 +0000 (23:04 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

10 years agoMerge branch 'master' of git://git.denx.de/u-boot-net
Wolfgang Denk [Fri, 21 Aug 2009 21:03:58 +0000 (23:03 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-net

10 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Fri, 21 Aug 2009 20:56:01 +0000 (22:56 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

10 years agoNAND boot: fix nand_load overlap issue
Mingkai Hu [Thu, 30 Jul 2009 09:56:51 +0000 (17:56 +0800)]
NAND boot: fix nand_load overlap issue

The code copy data from NAND flash block by block, so when
the data length isn't a whole-number multiple of the block
size, it will overlap the rest space.

Signed-off-by: Mingkai Hu <Mingkai.hu@freescale.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
10 years agoadd WATCHDOG_RESET() on nand write and read
Giulio Benetti [Fri, 31 Jul 2009 22:30:34 +0000 (17:30 -0500)]
add WATCHDOG_RESET() on nand write and read

Signed-off-by: giulio.benetti@micronovasrl.com
Acked-by: Wolfgang Denk <wd@denx.de>
Signed-off-by: Scott Wood <scottwood@freescale.com>
10 years agotsec: Wait for auto-negotiation to complete without link
Peter Tyser [Wed, 4 Feb 2009 21:14:05 +0000 (15:14 -0600)]
tsec: Wait for auto-negotiation to complete without link

Previously, waiting for auto-negotiation would only occur if a valid
link had been detected.  Problems arose when attempting to use a
tsec immediately after bootup but before link was achieved, eg:
=> dhcp
Auto-neg error, defaulting to 10BT/HD
eTSEC1: No link.
Auto-neg error, defaulting to 10BT/HD
eTSEC2: No link.

With this patch applied the same operation as above resulted in:
=> dhcp
Waiting for PHY auto negotiation to complete. done
Enet starting in 1000BT/FD
Speed: 1000, full duplex

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
10 years agoarm: kirkwood: See to it that sent data is 8-byte aligned
Simon Kagstrom [Thu, 20 Aug 2009 08:14:11 +0000 (10:14 +0200)]
arm: kirkwood: See to it that sent data is 8-byte aligned

U-boot might use non-8-byte-aligned addresses for sending data, which
the kwgbe_send doesn't accept (bootp does this for me). This patch
copies the data to be sent to a malloced temporary buffer if it is

Signed-off-by: Simon Kagstrom <simon.kagstrom@netinsight.net>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
10 years agoWait for the link to come up on kirkwood network init
Simon Kagstrom [Thu, 20 Aug 2009 08:13:06 +0000 (10:13 +0200)]
Wait for the link to come up on kirkwood network init

This patch makes the device wait for up to 5 seconds for the link to
come up, similar to what many of the other network drivers do. This
avoids confusing situations where, e.g., a tftp fails when initiated
early after U-boot has started (before the link has come up).

Signed-off-by: Simon Kagstrom <simon.kagstrom@netinsight.net>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
10 years agoarm:kirkwood Define kirkwood phy address magic number
Simon Kagstrom [Thu, 20 Aug 2009 08:12:28 +0000 (10:12 +0200)]
arm:kirkwood Define kirkwood phy address magic number

Signed-off-by: Simon Kagstrom <simon.kagstrom@netinsight.net>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
10 years agoe1000: fix PCI memory addressing
Timur Tabi [Mon, 17 Aug 2009 20:55:38 +0000 (15:55 -0500)]
e1000: fix PCI memory addressing

The Intel E1000 driver was making assumptions about the relationship between
some virtual, physical, and PCI addresses.

Also fix some bad usage of the DEBUGOUT macro

Signed-off-by: Timur Tabi <timur@freescale.com>
Acked-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
10 years agojffs2: clean the cache in case of malloc fails in build_lists
Ilya Yanok [Wed, 12 Aug 2009 12:42:48 +0000 (16:42 +0400)]
jffs2: clean the cache in case of malloc fails in build_lists

We should call jffs2_clean_cache() if we return from jffs2_build_lists()
with an error to prevent usage of incomplete lists. Also we should
free() a local buffer to prevent memory leaks.

Signed-off-by: Ilya Yanok <yanok@emcraft.com>
10 years agoppc: trigger WDT before starting Linux
Heiko Schocher [Wed, 12 Aug 2009 08:17:03 +0000 (10:17 +0200)]
ppc: trigger WDT before starting Linux

Signed-off-by: Heiko Schocher <hs@denx.de>
10 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Wolfgang Denk [Tue, 18 Aug 2009 11:57:04 +0000 (13:57 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

10 years agoMerge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Wolfgang Denk [Tue, 18 Aug 2009 11:53:54 +0000 (13:53 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

10 years agoUpdate the mtd driver name in bootargs for at91-based boards
Albin Tonnerre [Wed, 22 Jul 2009 16:30:03 +0000 (18:30 +0200)]
Update the mtd driver name in bootargs for at91-based boards

The name of the atmel nand driver in the kernel changed from at91_nand
to atmel_nand back in June 2008, but the at91-based boards config files
still refer to at91_nand. This patch updates them with the new name

Signed-off-by: Albin Tonnerre <albin.tonnerre@free-electrons.com>
10 years agoomap3: Fixed a problem with hwecc
Ben Goska [Fri, 14 Aug 2009 17:03:36 +0000 (10:03 -0700)]
omap3: Fixed a problem with hwecc

In commit 187af954cf7958c24efcf0fd62289bbdb4f1f24e there
was a typo that offset all the ecc registers by 4 bytes, fixed that.

Signed-off-by: Ben Goska <goskab@onid.oregonstate.edu>
Acked-by: Dirk Behme <dirk.behme@googlemail.com>
10 years agoppc4xx: Fix "chip_config" command for AMCC Arches
Stefan Roese [Mon, 17 Aug 2009 14:57:53 +0000 (16:57 +0200)]
ppc4xx: Fix "chip_config" command for AMCC Arches

This patch fixes the "chip_config" command for I2C bootstrap EEPROM
configuration. First it changes the I2C bootstrap EEPROM address to
0x54 as this is used on Arches (instead of 0x52 on Canyonlands/
Glacier). Additionally, the NAND bootstrap settings are removed
for Arches since Arches doesn't support NAND-booting.

Signed-off-by: Stefan Roese <sr@denx.de>
10 years agoMonahans: avoid floating point calculations
Wolfgang Denk [Sun, 16 Aug 2009 21:40:13 +0000 (23:40 +0200)]
Monahans: avoid floating point calculations

Current code for the Monahans CPU defined OSCR_CLK_FREQ as 3.250 (MHz)
which caused floating point operations to be used. This resulted in
unresolved references to some FP related libgcc functions when using
U-Boot's private libgcc functions.

Change the code to use fixed point math only.

Signed-off-by: Wolfgang Denk <wd@denx.de>
10 years ago85xx: Fix addrmap to include memory
Kumar Gala [Fri, 14 Aug 2009 21:43:22 +0000 (16:43 -0500)]
85xx: Fix addrmap to include memory

When we init the addrmap based on the TLB we will not end up getting
the TLB that covers memory if we are using SPD.  The reason is we
haven't relocated at the point that we setup the memory TLB and thus it
will not get setup in the addrmap.

Instead we can just walk over the TLB array after we've relocated and
see all the TLBs that have been set and use that information to populate
the initial addrmap.  By doing this we insure that we get the TLB
entries that cover memory.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
10 years agoflash: Fix CFI buffer size bug
John Schmoller [Wed, 12 Aug 2009 15:55:47 +0000 (10:55 -0500)]
flash: Fix CFI buffer size bug

Fix bug introduced by 9c048b523413ae5f3ff34e00cf57569c3368ab51.

The cfi_flash.c driver cast the flash buffer size to a uchar in
flash_write_cfibuffer(). On some flash parts, (tested on Numonyx
part PC32F512M29EWH), the buffer size is 1KB. Remove the cast to
uchar to enable buffer sizes to be larger.

Signed-off-by: John Schmoller <jschmoller@xes-inc.com>
Signed-off-by: Stefan Roese <sr@denx.de>
10 years agotrab: rename spi_init()
Mike Frysinger [Thu, 13 Aug 2009 04:32:14 +0000 (00:32 -0400)]
trab: rename spi_init()

The local board-specific spi_init() function conflicts with the common SPI
layer, so rename it to something board-specific.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
10 years agozlib: add watchdog reset call
Giuseppe CONDORELLI [Wed, 29 Jul 2009 10:05:20 +0000 (06:05 -0400)]
zlib: add watchdog reset call

This patch adds watchdog reset call to allow its invokation during decompression
phase. This control was present on old zlib version and here it is
backported for those relevant routines. This patch is sent as a zlib separate
one beacuse it was not tested due to specific board lack.
zlib patches will be unified just in one when this will be validated through

Signed-off-by: Giuseppe Condorelli <giuseppe.condorelli@st.com>
10 years agozlib: updated to v.1.2.3
Giuseppe CONDORELLI [Wed, 29 Jul 2009 12:05:08 +0000 (08:05 -0400)]
zlib: updated to v.1.2.3

This patch updates zlib to the latest stable version.
Only relevant zlib parts were ported to u-boot tree, as already did for the
current zlib (0.95). New zlib guarantees a faster inflate performances
other then others improvements as explained at www.zlib.net.
It also includes Alessandro Rubini's patches to allow 0 as destination pointer
and to call watchdog reset if required by architecture.

Signed-off-by: Giuseppe Condorelli <giuseppe.condorelli@st.com>
Reviewed-by: Angelo Castello <angelo.castello@st.com>
Reviewed-by: Alessandro Rubini <rubini-list@gnudd.com>
10 years agodtt, lm81: move unneccessary printf into a debug printf
Heiko Schocher [Tue, 11 Aug 2009 08:37:58 +0000 (10:37 +0200)]
dtt, lm81: move unneccessary printf into a debug printf

Signed-off-by: Heiko Schocher <hs@denx.de>
10 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc83xx
Wolfgang Denk [Tue, 11 Aug 2009 19:49:15 +0000 (21:49 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx

10 years agoMerge branch 'master' of git://git.denx.de/u-boot-video
Wolfgang Denk [Tue, 11 Aug 2009 19:47:42 +0000 (21:47 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-video

10 years agoMerge branch 'master' of git://git.denx.de/u-boot-net
Wolfgang Denk [Tue, 11 Aug 2009 19:44:55 +0000 (21:44 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-net

10 years agoMIMC200: reduce LCD pixclock
Mark Jackson [Tue, 11 Aug 2009 10:33:47 +0000 (11:33 +0100)]
MIMC200: reduce LCD pixclock

The initial pixclock for the MIMC200 board is wrong (and causes
screen corruption due to DMA underruns).

This patch simply reduces the pixel clock to fix the problem.

Signed-off-by: Mark Jackson <mpfj@mimc.co.uk>
10 years agoUEC FIXED PHY: Determine fixed-phy port using UEC interface name.
Richard Retanubun [Wed, 1 Jul 2009 18:04:05 +0000 (14:04 -0400)]
UEC FIXED PHY: Determine fixed-phy port using UEC interface name.

Fixed a misunderstanding in the original implementation, 'devnum' that
was used in the cpu/ppc4xx/4xx_enet.c implementation was NOT the
PHY's SMI address, rather it was the number of the MAC interface on
the CPU. The equivalent of this for uec_phy will be the UEC number
stored in mii_info->dev->name. Usage example is updated for uec.

Signed-off-by: Richard Retanubun <RichardRetanubun@RuggedCom.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
10 years agoAssigned a static SMI address to all UECs TBIPA address.
Richard Retanubun [Wed, 1 Jul 2009 18:03:15 +0000 (14:03 -0400)]
Assigned a static SMI address to all UECs TBIPA address.

It is set to 0x1F by default and can be overwritten on the board
header file by defining CONFIG_UTBIPAR_INIT_TBIPA. This allows
the CPU to simply "reserve" one SMI address instead of using
a different one for each UEC.

Signed-off-by: Richard Retanubun <RichardRetanubun@RuggedCom.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
10 years agonet: kirkwood: updates: used eth_setenv_enetaddr api
Prafulla Wadaskar [Mon, 10 Aug 2009 14:13:06 +0000 (19:43 +0530)]
net: kirkwood: updates: used eth_setenv_enetaddr api

eth_setenv_enetaddr is avaible by upper layer
using this saves 204 bytes on total image size

used Local OUI instead of Marvell OUI for
random MAC address generation logic

Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
10 years agoFix E1000 build warning on AP1000 board
Roy Zang [Mon, 10 Aug 2009 19:48:05 +0000 (03:48 +0800)]
Fix E1000 build warning on AP1000 board

 Fix E1000 build warning on AP1000 board
 Fix the build warning on AP1000 board:
 e1000.c:131: warning: 'e1000_read_eeprom' used but never defined
 e1000.c:2012: warning: 'e1000_set_phy_mode' defined but not used

Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
10 years agoARM: Davinci DM355: Enabling DM9000 on DM355 EVM
Sandeep Paulraj [Mon, 10 Aug 2009 16:24:40 +0000 (12:24 -0400)]
ARM: Davinci DM355: Enabling DM9000 on DM355 EVM

Due to recent changes to the NET support on U-boot, DM9000
is no longer detected on the DM355 EVM.
This minor update enables DM9000 on the DM355 EVM.
Tested on the DM355 EVM

Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
10 years agonet: phy: bugfixes: mv88E61xx compiler warnings fixed
Prafulla Wadaskar [Mon, 10 Aug 2009 13:53:19 +0000 (19:23 +0530)]
net: phy: bugfixes: mv88E61xx compiler warnings fixed

1. mv88E61xx driver compiler warnings fixed
2. idstr if-else statements changed to switch() construct
   and added default case too.
   This fixed idstr may be uninitialized warning

Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
10 years agoarm: A320: driver for FTMAC100 ethernet controller
Po-Yu Chuang [Mon, 10 Aug 2009 03:00:00 +0000 (11:00 +0800)]
arm: A320: driver for FTMAC100 ethernet controller

This patch adds an FTMAC100 ethernet driver for Faraday A320 evaluation board.

Signed-off-by: Po-Yu Chuang <ratbert@faraday-tech.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
10 years ago85xx: Removed BEDBUG support from FSL 85xx boards
Kumar Gala [Mon, 10 Aug 2009 21:40:55 +0000 (16:40 -0500)]
85xx: Removed BEDBUG support from FSL 85xx boards

For some reason the MPC8544 enabled BEDBUG if PCI was enabled and that
got copied int the MPC8536, MPC8572 and P2020 DS boards.  The BEDBUG
support has never been made to work completely on e500/85xx so we
just disable it to save space and match the other FSL 85xx boards.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
10 years agoPrepare 2009.08-rc2 v2009.08-rc2
Wolfgang Denk [Mon, 10 Aug 2009 08:39:12 +0000 (10:39 +0200)]
Prepare 2009.08-rc2


Signed-off-by: Wolfgang Denk <wd@denx.de>
10 years agoMinor coding style cleanup.
Wolfgang Denk [Mon, 10 Aug 2009 08:38:34 +0000 (10:38 +0200)]
Minor coding style cleanup.

Signed-off-by: Wolfgang Denk <wd@denx.de>
10 years agonet/tftp.c: fix warning: pointer targets differ in signedness
Wolfgang Denk [Mon, 10 Aug 2009 07:59:10 +0000 (09:59 +0200)]
net/tftp.c: fix warning: pointer targets differ in signedness

tftp.c:294: warning: pointer targets in passing argument 1 of 'strlen'
differ in signedness

This was only visible for the utx8245 board which seems to have DEBUG

Signed-off-by: Wolfgang Denk <wd@denx.de>
10 years agoARM Cortex A8: Remove bogus config.mk entries
Dirk Behme [Sat, 8 Aug 2009 14:06:47 +0000 (16:06 +0200)]
ARM Cortex A8: Remove bogus config.mk entries

Remove bogus config.mk entry, fix newline and remove redundant

Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
10 years agoOMAP3: Fix missing GPMC_CONFIG_CS0_BASE
Dirk Behme [Sat, 8 Aug 2009 10:46:09 +0000 (12:46 +0200)]

Applying two indepenent OMAP3 patches resulted in missing
GPMC_CONFIG_CS0_BASE. Patch "omap3: embedd gpmc_cs into gpmc
config struct" removes GPMC_CONFIG_CS0_BASE, independent patch
"omap3: bug fix for NOR boot support" introduces it's usage.
Re-introduce GPMC_CONFIG_CS0_BASE.

Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
10 years agomxc-mmc: sdhc host driver for MX2 and MX3 proccessor
Ilya Yanok [Mon, 8 Jun 2009 00:12:49 +0000 (04:12 +0400)]
mxc-mmc: sdhc host driver for MX2 and MX3 proccessor

This is a port of Linux driver for SDHC host controller hardware
found on Freescale's MX2 and MX3 processors. Uses new generic MMC
framework (CONFIG_GENERIC_MMC) and it looks like there are some
problems with a framework (at least on LE cpus). Some of these
problems are addressed in the following patches.

Signed-off-by: Ilya Yanok <yanok@emcraft.com>
10 years agokirkwood/gpio.h: remove duplicate definition
Alessandro Rubini [Fri, 7 Aug 2009 10:35:47 +0000 (12:35 +0200)]
kirkwood/gpio.h: remove duplicate definition

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
10 years agoAdd driver for the ST M95xxx SPI EEPROM
Albin Tonnerre [Fri, 7 Aug 2009 10:37:36 +0000 (12:37 +0200)]
Add driver for the ST M95xxx SPI EEPROM

This chip is used in a number of boards manufactured by Calao-Systems
which should be supported soon. This driver provides the necessary
spi_read and spi_write functions necessary to communicate with the chip.

Signed-off-by: Albin Tonnerre <albin.tonnerre@free-electrons.com>
10 years agoarm: Sheevaplug: Fixed NAND specific warning
Prafulla Wadaskar [Fri, 7 Aug 2009 16:57:32 +0000 (22:27 +0530)]
arm: Sheevaplug: Fixed NAND specific warning

It is recommended to define the macro CONFIG_SYS_64BIT_VSPRINTF
for NAND specific warning removal, same is done in this patch

Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
10 years agoDual-license IBM code contributions
Josh Boyer [Fri, 7 Aug 2009 17:53:20 +0000 (13:53 -0400)]
Dual-license IBM code contributions

It was brought to our attention that U-Boot contains code derived from the
IBM OpenBIOS source code originally provided with some of the older PowerPC
4xx development boards.  As a result, the original license of this code has
been carried in the various files for a number of years in the U-Boot project.

IBM is dual-licensing the IBM code contributions already present in U-Boot
under either the terms of the GNU General Public License version 2, or the
original code license already present.

Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
10 years agofdt: Fix fdt_pci_dma_ranges handling of 64-bit ranges
Kumar Gala [Wed, 5 Aug 2009 14:03:54 +0000 (09:03 -0500)]
fdt: Fix fdt_pci_dma_ranges handling of 64-bit ranges

If the size of a region equal to 4G it can't be represnted in a 32-bit
BAR so we should have marked that case as MEM64.

Additionally bump the number of inbound windows up to 4 to handle the
fact that Freescale PPCs that have an implicit window for CCSRBAR.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
10 years agoARM EABI: add new helper functions resp. function names
Wolfgang Denk [Thu, 6 Aug 2009 19:29:59 +0000 (21:29 +0200)]
ARM EABI: add new helper functions resp. function names

The ARM EABI defines new names for GCC helper functions,
and GCC seems to need some new functions as well.

This patch is a minimal-invasive approach to fix problems with EABI
conformant tool chains (to be used with "USE_PRIVATE_LIBGCC=yes").

Signed-off-by: Wolfgang Denk <wd@denx.de>
Tested-by: Dirk Behme <dirk.behme@googlemail.com>
10 years agohush: Fix bogus free() call
Peter Tyser [Wed, 5 Aug 2009 21:18:44 +0000 (16:18 -0500)]
hush: Fix bogus free() call

An off-by-one error in hush.c resulted in an unintentional free() call
every time a command was executed

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
10 years agodigsy_mtc: Update default environment
Detlev Zundel [Wed, 5 Aug 2009 16:37:45 +0000 (18:37 +0200)]
digsy_mtc: Update default environment

Signed-off-by: Detlev Zundel <dzu@denx.de>
10 years agodigsy_mtc: Add delay in SPI transfers to the companion controller.
Detlev Zundel [Wed, 5 Aug 2009 16:37:44 +0000 (18:37 +0200)]
digsy_mtc: Add delay in SPI transfers to the companion controller.

While at it, remove initialization of variables which will be set
before usage in all cases.

Signed-off-by: Detlev Zundel <dzu@denx.de>
10 years agodigsy_mtc: minor fixes for mtc command help
Anatolij Gustschin [Wed, 5 Aug 2009 16:37:43 +0000 (18:37 +0200)]
digsy_mtc: minor fixes for mtc command help

Add mtc state subcommand description to the
help of mtc command.

Remove some newlines in description of commands
for proper help formating.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
10 years agodigsy_mtc: Add mtc state command.
Grzegorz Bernacki [Wed, 5 Aug 2009 16:37:42 +0000 (18:37 +0200)]
digsy_mtc: Add mtc state command.

Signed-off-by: Grzegorz Bernacki <gjb@semihalf.com>
10 years agoPartition support: remove newline from partition name
Wolfgang Denk [Tue, 28 Jul 2009 20:35:39 +0000 (22:35 +0200)]
Partition support: remove newline from partition name

Remove bogus newline character that got added to the .name field of
the disk_partition_t structure.

Signed-off-by: Wolfgang Denk <wd@denx.de>
10 years agoFix LZMA string.h header inclusion issue and remove unused variables.
Luigi 'Comio' Mantellini [Tue, 28 Jul 2009 07:33:17 +0000 (09:33 +0200)]
Fix LZMA string.h header inclusion issue and remove unused variables.

Signed-off-by: Luigi 'Comio' Mantellini <luigi.mantellini@idf-hit.com>
10 years agobus_vcxk.c: fix warning: unused variable 'lineptr'
Jens Scharsig [Mon, 27 Jul 2009 13:28:42 +0000 (15:28 +0200)]
bus_vcxk.c: fix warning: unused variable 'lineptr'

Signed-off-by: Jens Scharsig <esw@bus-elektronik.de>
10 years agoenv: kill off default_environment_size
Mike Frysinger [Fri, 24 Jul 2009 21:51:27 +0000 (17:51 -0400)]
env: kill off default_environment_size

The only environment type that uses this variable is spi flash, and that is
only because it is reimplementing the common set_default_env() function.
So fix the spi flash code and kill off the default_environment_size in the

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
10 years agoexport SPI functions to standalone apps
Mike Frysinger [Thu, 23 Jul 2009 20:37:48 +0000 (16:37 -0400)]
export SPI functions to standalone apps

While we're here, fix the broken #ifdef handling in _exports.h.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
10 years agoMerge branch 'master' of git://git.denx.de/u-boot-net
Wolfgang Denk [Sat, 8 Aug 2009 10:08:09 +0000 (12:08 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-net

10 years agoomap3: bug fix for NOR boot support
Penda Naveen Kumar [Thu, 30 Jul 2009 18:36:36 +0000 (00:06 +0530)]
omap3: bug fix for NOR boot support

This patch provides bug fix, when omap3 uses nor boot.

Signed-off-by: Penda Naveen Kumar<pnaveen@ti.com>
Acked-by: Dirk Behme <dirk.behme@googlemail.com>
10 years agoFix examples for OMAP3 boards...
Michael Evans [Mon, 13 Jul 2009 19:13:45 +0000 (20:13 +0100)]
Fix examples for OMAP3 boards...

The attached patch corrects an error in the examples/Makefile which
causes the applications in the examples directory to hang on OMAP3
based boards. The current Makefile sets -Ttext during linking to
0x0c100000 which is outside of addressable SDRAM memory. The script
corrects the existing ifeq...else...endif logic to look at the VENDOR
tag rather than the CPU tag.

The patch affects the following configs: omap3_beagle_config,
omap3_overo_config, omap3_evm_config, omap3_pandora_config,
omap3_zoom1_config and omap3_zoom2_config.

Signed-off-by: Michael Evans <horse_dung@hotmail.com>
Edited commit message.
Signed-off-by: Wolfgang Denk <wd@denx.de>
10 years agoomap3: use only fixed-size types inside ctrl_structs
Dirk Behme [Sat, 8 Aug 2009 07:30:23 +0000 (09:30 +0200)]
omap3: use only fixed-size types inside ctrl_structs

replace variable types in ctrl_structs for omap3 by those with
fixed size (u8, u16, u32).
Additional ifndef-protection is needed by examples which do not
compile when including asm/types.h

Signed-off-by: Matthias Ludwig <mludwig@ultratronik.de>
Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
10 years agoomap3: replace all instances of gpmc config struct by one global
Dirk Behme [Sat, 8 Aug 2009 07:30:22 +0000 (09:30 +0200)]
omap3: replace all instances of gpmc config struct by one global

Signed-off-by: Matthias Ludwig <mludwig@ultratronik.de>
Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
10 years agoomap3: remove typedefs for configuration structs
Dirk Behme [Sat, 8 Aug 2009 07:30:21 +0000 (09:30 +0200)]
omap3: remove typedefs for configuration structs

Signed-off-by: Matthias Ludwig <mludwig@ultratronik.de>
Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
10 years agoAdd Intel E1000 PCIE card support
Roy Zang [Fri, 31 Jul 2009 05:34:02 +0000 (13:34 +0800)]
Add Intel E1000 PCIE card support

Based on Intel PRO/1000 Network Driver 7.3.20-k2
  Add Intel E1000 PCIE card support. The following cards are added:

 82571EB_COPPER dual ports,
 82572EI single port,
 82572EI_COPPER single port PCIE cards
 pci cards are tested on both  P2020 board
 and MPC8544DS board.

Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
10 years agonet: sync env ethaddr to device enetaddr in eth_init()
Mike Frysinger [Thu, 16 Jul 2009 01:31:28 +0000 (21:31 -0400)]
net: sync env ethaddr to device enetaddr in eth_init()

In the previous enetaddr refactoring, the assumption with commit 56b555a644
was that the eth layer would handle the env -> device enetaddr syncing.
This was not the case as eth_initialize() is called only once and the sync
occurs there.  So make sure the eth_init() function does the env -> device
sync with every network init.

Reported-by: Andrzej Wolski <awolski@poczta.fm>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
10 years agominor debug cleanups in ./net
Robin Getz [Thu, 23 Jul 2009 07:01:03 +0000 (03:01 -0400)]
minor debug cleanups in ./net

 Minor ./net cleanups - no functional changes
  - change #ifdef DEBUG printf(); #endif to just debug()
  - changed __FUNCTION__ to __func__
  - got rid of extra whitespace between function and opening brace
  - removed unnecessary braces on if statements

 gcc dead code elimination should make this functionally/size equivalent
 when DEBUG is not defined. (confirmed on Blackfin, with gcc 4.3.3).

Signed-off-by: Robin Getz <rgetz@blackfin.uclinux.org>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
10 years agoomap3: embedd gpmc_cs into gpmc config struct
Matthias Ludwig [Tue, 19 May 2009 07:09:31 +0000 (09:09 +0200)]
omap3: embedd gpmc_cs into gpmc config struct

Embedd chip select configuration into struct for gpmc config
instead of having it completely separated as suggested by
Wolfgang Denk on

Signed-off-by: Matthias Ludwig <mludwig@ultratronik.de>