openstora:u-boot-marvell-ms2110.git
8 years agoMAINTAINERS: update responsible for MPC85xx/86xx
Wolfgang Denk [Wed, 2 Dec 2009 21:26:30 +0000 (22:26 +0100)]
MAINTAINERS: update responsible for MPC85xx/86xx

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Kumar Gala <galak@kernel.crashing.org>
Cc: Becky Bruce <beckyb@kernel.crashing.org>
8 years agoMerge branch 'master' of git://git.denx.de/u-boot-nios
Wolfgang Denk [Tue, 1 Dec 2009 09:15:22 +0000 (10:15 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-nios

8 years agoFix example FIT image source files
Ira W. Snyder [Wed, 4 Nov 2009 21:37:59 +0000 (13:37 -0800)]
Fix example FIT image source files

The example FIT image source files do not compile with the latest dtc and
mkimage. The following error message is produced:

DTC: dts->dtb  on file "kernel.its"
Error: kernel.its 7:0 - 1:0 syntax error
FATAL ERROR: Unable to parse input tree
./mkimage: Can't read kernel.itb.tmp: Invalid argument

The FIT image source files are missing the "/dts-v1/;" directive at the
beginning of the file. Add the directive to the examples.

Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
8 years agoimg2srec: use standard types
Mike Frysinger [Wed, 4 Nov 2009 21:13:19 +0000 (16:13 -0500)]
img2srec: use standard types

The img2srec code creates a lot of typedefs with common names.  These
easily clash with system headers that include these typedefs (like mingw).

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
8 years agotools: gitignore *.exe binaries
Mike Frysinger [Wed, 4 Nov 2009 21:03:25 +0000 (16:03 -0500)]
tools: gitignore *.exe binaries

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
8 years agoppc: Move conditional compilation of kgdb.c to Makefile
Peter Tyser [Wed, 4 Nov 2009 05:31:07 +0000 (23:31 -0600)]
ppc: Move conditional compilation of kgdb.c to Makefile

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
8 years agospi_flash.h: pull in linux/types.h for u## types
Mike Frysinger [Tue, 3 Nov 2009 16:36:39 +0000 (11:36 -0500)]
spi_flash.h: pull in linux/types.h for u## types

8 years agobootm: mark local boot_os[] table static
Mike Frysinger [Tue, 3 Nov 2009 16:36:26 +0000 (11:36 -0500)]
bootm: mark local boot_os[] table static

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
8 years agomkconfig: deny messed up ARCH definition
Nishanth Menon [Mon, 2 Nov 2009 15:40:18 +0000 (09:40 -0600)]
mkconfig: deny messed up ARCH definition

Refuse to setup a platform if the command line ARCH= is not the same
as the one required for the board. This prevents any user with
prehistoric aliases from messing up their builds.

Reported in thread:
http://old.nabble.com/-U-Boot--Build-breaks-on-some-OMAP3-configs-to26132721.html

Inputs from: Mike Frysinger and Wolfgang Denk:
http://lists.denx.de/pipermail/u-boot/2009-November/063642.html

Cc: Wolfgang Denk <wd@denx.de>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Anand Gadiyar <gadiyar@ti.com>
Cc: Dirk Behme <dirk.behme@googlemail.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
8 years agoMerge branch 'master' of git://git.denx.de/u-boot-net
Wolfgang Denk [Tue, 24 Nov 2009 22:27:06 +0000 (23:27 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-net

8 years agoMerge branch 'master-sync' of git://git.denx.de/u-boot-arm
Wolfgang Denk [Tue, 24 Nov 2009 22:22:50 +0000 (23:22 +0100)]
Merge branch 'master-sync' of git://git.denx.de/u-boot-arm

8 years agoRepair the 'netretry=once' option.
Remy Bohmer [Wed, 28 Oct 2009 21:13:39 +0000 (22:13 +0100)]
Repair the 'netretry=once' option.

'netretry = once' does the same as 'netretry = yes', because it is not stored
when it was tried once.

Signed-off-by: Remy Bohmer <linux@bohmer.net>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
8 years agoRepair build fail in case CONFIG_PPC=n and CONFIG_FIT=y
Remy Bohmer [Thu, 29 Oct 2009 13:24:22 +0000 (14:24 +0100)]
Repair build fail in case CONFIG_PPC=n and CONFIG_FIT=y

Signed-off-by: Remy Bohmer <linux@bohmer.net>
8 years agoOMAP3: pandora: fix booting without serial attached
Grazvydas Ignotas [Thu, 12 Nov 2009 09:46:07 +0000 (11:46 +0200)]
OMAP3: pandora: fix booting without serial attached

When the board is booted without serial cable attached (which
is how most of them will be used) UART RX is left floating and
sometimes picks noise, which interrupts countdown and enters
U-Boot prompt instead of booting the kernel.

Fix this by setting up internal pullup on UART RX pin. This
does not prevent serial from working as the internal pullup
is weak.

Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
8 years agoAdd support for CS2 dataflash for Atmel-SPI.
Remy Bohmer [Wed, 28 Oct 2009 21:13:37 +0000 (22:13 +0100)]
Add support for CS2 dataflash for Atmel-SPI.

The only missing chipselect line support is CS2, and I need it on
CS2...

Signed-off-by: Remy Bohmer <linux@bohmer.net>
8 years agoFix mingw tools build
Remy Bohmer [Wed, 28 Oct 2009 21:13:36 +0000 (22:13 +0100)]
Fix mingw tools build

mkimage does not build due to missing strtok_r() and getline() implementation

Signed-off-by: Remy Bohmer <linux@bohmer.net>
8 years agoBuilding of FIT images does not work.
Remy Bohmer [Wed, 28 Oct 2009 21:13:35 +0000 (22:13 +0100)]
Building of FIT images does not work.

The type is not set for generation of the FIT images, resulting
in no images being created without printing or returning an error

Signed-off-by: Remy Bohmer <linux@bohmer.net>
8 years agoNios2: do_boom_linux(): kernel gunzip input data integrity problem due to
Renato Andreola [Mon, 23 Nov 2009 21:45:14 +0000 (16:45 -0500)]
Nios2: do_boom_linux(): kernel gunzip input data integrity problem due to
missing cache flush.

    Added instruction and data caches flush.

Signed-off-by: Scott McNutt <smcnutt@psyent.com>
8 years agoNios2: Fix compiler warnings in lib_nios2/board.c (unused variables)
Scott McNutt [Mon, 23 Nov 2009 21:29:40 +0000 (16:29 -0500)]
Nios2: Fix compiler warnings in lib_nios2/board.c (unused variables)

Signed-off-by: Scott McNutt <smcnutt@psyent.com>
8 years agoNios2/Nios: Remove unnecessary (residual) linker Nios command scripts from
Scott McNutt [Mon, 23 Nov 2009 20:54:25 +0000 (15:54 -0500)]
Nios2/Nios: Remove unnecessary (residual) linker Nios command scripts from
the standalone examples.

Signed-off-by: Scott McNutt <smcnutt@psyent.com>
8 years agosf: fix stmicro offset setup while erasing
Mike Frysinger [Wed, 14 Oct 2009 23:28:03 +0000 (19:28 -0400)]
sf: fix stmicro offset setup while erasing

Reported-by: Peter Gombos <gombos@protecta.hu>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
8 years agosf: new driver for Winbond W25X16/32/64 devices
Jason McMullan [Fri, 9 Oct 2009 21:12:23 +0000 (17:12 -0400)]
sf: new driver for Winbond W25X16/32/64 devices

Signed-off-by: Jason McMullan <jason.mcmullan@gmail.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
8 years agompc8260: move FDT memory node fixup into common CPU code.
Marcel Ziswiler [Thu, 1 Oct 2009 21:55:17 +0000 (23:55 +0200)]
mpc8260: move FDT memory node fixup into common CPU code.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@noser.com>
Tested-by: Heiko Schocher <hs@denx.de>
8 years agoAdd driver for FTRTC010 real time clock
Po-Yu Chuang [Wed, 23 Sep 2009 07:52:35 +0000 (15:52 +0800)]
Add driver for FTRTC010 real time clock

Signed-off-by: Po-Yu Chuang <ratbert@faraday-tech.com>
Edited commit message.
Signed-off-by: Wolfgang Denk <wd@denx.de>
8 years agoMIMC200: set default fbmem value
Mark Jackson [Mon, 17 Aug 2009 15:42:52 +0000 (16:42 +0100)]
MIMC200: set default fbmem value

This patch adds a default bootargs "fbmem" value to the
CONFIG_BOOTARGS string for the MIMC200 board.

Signed-off-by: Mark Jackson <mpfj@mimc.co.uk>
8 years agoppc4xx: Initialize magnetic coupler on VOM405 boards
Matthias Fuchs [Tue, 27 Oct 2009 18:58:09 +0000 (19:58 +0100)]
ppc4xx: Initialize magnetic coupler on VOM405 boards

This patch fixes an ugly behavior of the IL712 magnetic coupler
as used on VOM405. These parts will remember their last state
over a power cycle which might cause unwanted behavior.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
Signed-off-by: Stefan Roese <sr@denx.de>
8 years agoppc4xx: Initialize magnetic couplers in PLU405
Matthias Fuchs [Mon, 26 Oct 2009 08:58:45 +0000 (09:58 +0100)]
ppc4xx: Initialize magnetic couplers in PLU405

This patch fixes an ugly behavior of the IL712 magnetic couplers
as used on PLU405. These parts will remember their last state
over a power cycle which might cause unwanted behavior.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
Signed-off-by: Stefan Roese <sr@denx.de>
8 years agoAdd minimal SJA1000 header for basic CAN mode
Matthias Fuchs [Mon, 26 Oct 2009 08:55:40 +0000 (09:55 +0100)]
Add minimal SJA1000 header for basic CAN mode

This patch is in preparation for the upcoming PLU405 board fix.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
Signed-off-by: Stefan Roese <sr@denx.de>
8 years agoMerge branch 'master' of git://git.denx.de/u-boot-net
Wolfgang Denk [Sun, 15 Nov 2009 21:50:52 +0000 (22:50 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-net

8 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Wolfgang Denk [Sun, 15 Nov 2009 21:48:02 +0000 (22:48 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

8 years agoMerge branch 'master-sync' of git://git.denx.de/u-boot-arm
Wolfgang Denk [Sun, 15 Nov 2009 21:27:16 +0000 (22:27 +0100)]
Merge branch 'master-sync' of git://git.denx.de/u-boot-arm

8 years agoppc/85xx: Fix how we determine the number of CAM entries
Kumar Gala [Fri, 13 Nov 2009 14:52:21 +0000 (08:52 -0600)]
ppc/85xx: Fix how we determine the number of CAM entries

We were incorrectly use the max CAM size as the number of entries in
the array for setting up the addrmap.  We should be using the NENTRY
field which is the low 12-bits of TLB1CFG.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
8 years agosmc911x: make smc911x_initialize return correct value
Mike Rapoport [Thu, 12 Nov 2009 13:35:08 +0000 (15:35 +0200)]
smc911x: make smc911x_initialize return correct value

Make smc911x_initialize return -1 on error and number of interfaces
detected otherwise.

Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
8 years agosmc911x_eeprom: fix building after smc911x overhaul
Mike Frysinger [Fri, 13 Nov 2009 03:26:02 +0000 (22:26 -0500)]
smc911x_eeprom: fix building after smc911x overhaul

When the smc911x driver was converted to NET_MULTI, the smc911x eeprom was
missed.  The config option needed updating as well as overhauling of the
rergister read/write functions.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Tested-by: Mike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
8 years agofsl-ddr: Fix the chip-select interleaving issue
Dave Liu [Wed, 11 Nov 2009 23:26:37 +0000 (07:26 +0800)]
fsl-ddr: Fix the chip-select interleaving issue

commit 1542fbdeec0d1e2a6df13189df8dcb1ce8802be3
introduced one new bug to chip-select interleaving.

Single DDR controller also can do the chip-select
interleaving if there is dual-rank or qual-rank DIMMs.

Signed-off-by: Dave Liu <daveliu@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
8 years agoMerge branch 'master' of git://git.denx.de/u-boot-net
Wolfgang Denk [Wed, 11 Nov 2009 22:10:34 +0000 (23:10 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-net

8 years agoMerge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Wolfgang Denk [Wed, 11 Nov 2009 21:58:30 +0000 (22:58 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

8 years agomxc_fec: avoid free() calls to already freed pointers.
javier Martin [Thu, 29 Oct 2009 07:22:43 +0000 (08:22 +0100)]
mxc_fec: avoid free() calls to already freed pointers.

Sometimes, inside NetLoop, eth_halt() is called before eth_init() has
been called. This is harmless except for free() calls to pointers
which have not been allocated yet.

This patch initializes those pointers to NULL and allocates them only
the first time. This way we can get rid of free calls in halt callback.

This has been tested in i.MX27 Litekit board and eldk-4.2 toolchains.

Signed-off-by: Javier Martin <javier.martin@vista-silicon.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
8 years agomxc_fec: fix some erroneous PHY accesses.
javier Martin [Thu, 29 Oct 2009 07:18:34 +0000 (08:18 +0100)]
mxc_fec: fix some erroneous PHY accesses.

This patch fixes erroneous access to the ethernet PHY which broke the driver.
1. Selector field in the auto-negotiation register must be 0x00001 for
using 802.3, not 0x00000 which is reseved.
2. Access to the PHY address specified by CONFIG_FEC_MXC_PHYADDR, not
0x0 fixed address.

This has been tested in i.MX27 Litekit board and eldk-4.2 toolchains.

Now using proper defines for auto-negotiation register.

Signed-off-by: Javier Martin <javier.martin@vista-silicon.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
8 years agoARM Don't inline weak symbols
Ron Lee [Wed, 5 Aug 2009 18:14:01 +0000 (20:14 +0200)]
ARM Don't inline weak symbols

------------------------------------------------------------------------

GCC 4.4 complains about this now.

Signed-off-by: Ron Lee <ron@debian.org>
8 years agoFix SMC91111 regression: lpd7a40x build failures
Ben Warren [Mon, 9 Nov 2009 21:09:57 +0000 (13:09 -0800)]
Fix SMC91111 regression: lpd7a40x build failures

Both lpd7a400 and lpd7a404 failed to compile because they had
CONFIG_SMC_USE_IOFUNCS defined:

examples/standalone/smc91111_eeprom.c:388: undefined reference to `SMC_outw'

Also removed an orphaned paren in lpd7a404.h

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
8 years agoSMC91111: Clean up SMC_inx macros on xsengine and xaeniax
Ben Warren [Mon, 9 Nov 2009 22:01:08 +0000 (14:01 -0800)]
SMC91111: Clean up SMC_inx macros on xsengine and xaeniax

This patch fixes the following warnings:

Configuring for xaeniax board...
smc91111_eeprom.c: In function 'print_macaddr':
smc91111_eeprom.c:278: warning: suggest parentheses around + or - in operand of &
smc91111_eeprom.c:281: warning: suggest parentheses around + or - in operand of &
...
Configuring for xsengine board...
smc91111_eeprom.c: In function 'print_macaddr':
smc91111_eeprom.c:278: warning: suggest parentheses around + or - inside shift
smc91111_eeprom.c:281: warning: suggest parentheses around + or - inside shift

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
8 years agoMerge branch 'master-sync' of git://git.denx.de/u-boot-arm
Wolfgang Denk [Mon, 9 Nov 2009 21:46:32 +0000 (22:46 +0100)]
Merge branch 'master-sync' of git://git.denx.de/u-boot-arm

8 years agoFix CS8900 regression on impa7 board
Ben Warren [Mon, 9 Nov 2009 19:43:18 +0000 (11:43 -0800)]
Fix CS8900 regression on impa7 board

The following error was seen on impa7 board, due to its use of a 32-bit bus
on CS8900.
cs8900.c:137:37: error: macro "get_reg_init_bus" passed 2 arguments, but takes just 1

This patch gives the macro the correct number of arguments

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
8 years agoclarify eth driver halt/recv steps
Mike Frysinger [Mon, 2 Nov 2009 03:39:56 +0000 (22:39 -0500)]
clarify eth driver halt/recv steps

The dev->halt() func can be called at any time, and the dev->recv() func
does not need to use NetRxPackets[] when calling NetReceive().

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
8 years agoFix cs8900 dev->priv not init issue
Hui.Tang [Thu, 5 Nov 2009 01:58:44 +0000 (09:58 +0800)]
Fix cs8900 dev->priv not init issue

Ensure all CS8900 data structures are assigned before accessing device

Signed-off-by: Hui.Tang <zetalabs@gmail.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
8 years agoppc4xx: 44x_spd_ddr2.c: Fix register macro ECCCR -> ECCES (SDRAM_ECCES)
Stefan Roese [Tue, 3 Nov 2009 13:34:45 +0000 (14:34 +0100)]
ppc4xx: 44x_spd_ddr2.c: Fix register macro ECCCR -> ECCES (SDRAM_ECCES)

This error only appears when DEBUG is enabled in this driver. That's why
it went unnoticed till now.

Signed-off-by: Stefan Roese <sr@denx.de>
8 years agoppc4xx: Canyonlands: Change EBC bus config to drive always (no high-z)
Stefan Roese [Thu, 29 Oct 2009 17:37:45 +0000 (18:37 +0100)]
ppc4xx: Canyonlands: Change EBC bus config to drive always (no high-z)

This patch fixes a problem only seen very occasionally on Canyonlands.
The NOR flash interface (CFI driver) doesn't work reliably in all cases.
Erasing and/or programming sometimes doesn't work. Sometimes with
an error message, like "flash not erased" when trying to program an
area that should have just been erased. And sometimes without any error
messages. As mentioned above, this problem was only seen rarely and with
some PLL configuration (CPU speed, EBC speed).

Now I spotted this problem a few times, when running my Canyonlands with
the following setup (chip_config):

1000-nor         - NOR  CPU:1000 PLB: 200 OPB: 100 EBC: 100

Changing the EBC configuration to not release the bus into high
impedance state inbetween the transfers (ATC, DTC and CTC bits set to 1
in EBC0_CFG) seems to fix this problem. I haven't seen any failure
anymore with this patch applied.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: David Mitchell <dmitchell@amcc.com>
Cc: Jeff Mann <MannJ@embeddedplanet.com>
8 years agoARM: Use Linux version for unaligned access code
Remy Bohmer [Thu, 29 Oct 2009 11:29:37 +0000 (12:29 +0100)]
ARM: Use Linux version for unaligned access code

The asm-arm/unaligned.h includes linux/unaligned/access_ok.h
This file is unsafe to be used on ARM, since it does an unaligned memory
accesses which fails on ARM.

Lookin at Linux the basic difference seems to be the header
"include/asm-arm/unaligned.h". The Linux version of "unaligned.h"
does *not* include "access_ok.h" at all. It includes "le_byteshift.h"
and "be_byteshift.h" instead.

Signed-off-by: Remy Bohmer <linux@bohmer.net>
Signed-off-by: Stefan Roese <sr@denx.de>
--
 include/asm-arm/unaligned.h            |    3 -
 include/linux/unaligned/be_byteshift.h |   70 +++++++++++++++++++++++++++++++++
 include/linux/unaligned/le_byteshift.h |   70 +++++++++++++++++++++++++++++++++
 3 files changed, 142 insertions(+), 1 deletion(-)
 create mode 100644 include/linux/unaligned/be_byteshift.h
 create mode 100644 include/linux/unaligned/le_byteshift.h

8 years agoppc/85xx: Fix inclusion of 83xx immap in 85xx builds
Kumar Gala [Thu, 5 Nov 2009 00:02:10 +0000 (18:02 -0600)]
ppc/85xx: Fix inclusion of 83xx immap in 85xx builds

The nand_boot_fsl_elbc.c is shared between 83xx & 85xx however we should
not be including the immap_83xx.h when building 85xx.  We can just get
this all from common.h

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
8 years ago86xx: Remove redundant code in initdram
Becky Bruce [Wed, 4 Nov 2009 23:34:04 +0000 (17:34 -0600)]
86xx: Remove redundant code in initdram

The same code exists both inside an #ifdef and outside of it.
Remove the extra code for all the 86xx boards.

Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
8 years agofsl_pci_init_port end-point initialization is broken
Ed Swarthout [Mon, 2 Nov 2009 15:05:49 +0000 (09:05 -0600)]
fsl_pci_init_port end-point initialization is broken

commit 70ed869e broke fsl pcie end-point initialization.
Returning 0 is not correct.  The function must return the first free
bus number for the next controller.

fsl_pci_init() must still be called and a bus allocated even if the
controller is an end-point.

Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
Acked-by: Vivek Mahajan <vivek.mahajan@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
8 years agoRevert "ppc/85xx/pci: fsl_pci_init: pcie agent mode support"
Kumar Gala [Wed, 4 Nov 2009 07:29:04 +0000 (01:29 -0600)]
Revert "ppc/85xx/pci: fsl_pci_init: pcie agent mode support"

This reverts commit 70ed869ea5f6b1d13d7b140c83ec0dcd8a127ddc.

There isn't any need to modify the API for fsl_pci_init_port to pass the
status of host/agent(end-point) status.  We can determine that
internally to fsl_pci_init_port.  Revert the patch that makes the API
change.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
8 years agoppc/85xx: Fix misc L2 cache enabling bug
Dave Liu [Fri, 30 Oct 2009 23:59:55 +0000 (07:59 +0800)]
ppc/85xx: Fix misc L2 cache enabling bug

We need loop-check the flash clear lock and enable bit for L2 cache.

Signed-off-by: Dave Liu <daveliu@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
8 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Sat, 31 Oct 2009 15:03:08 +0000 (16:03 +0100)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

8 years agosh: Update lowlevel_init.S of espt-giga
Nobuhiro Iwamatsu [Fri, 30 Oct 2009 01:16:27 +0000 (10:16 +0900)]
sh: Update lowlevel_init.S of espt-giga

There was the point that did not use write macro.
Change to write macro.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
8 years agosh: Move some defs to convince 'pcrel too far'
Nobuhiro Iwamatsu [Fri, 30 Oct 2009 01:01:25 +0000 (10:01 +0900)]
sh: Move some defs to convince 'pcrel too far'

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Signed-off-by: Takashi Yoshii <yoshii.takashi@gmail.com>
8 years agosh: Remove malloc_bin_reloc from lib_sh, lib_nios2 and lib_nios.
Nobuhiro Iwamatsu [Thu, 15 Oct 2009 04:36:34 +0000 (13:36 +0900)]
sh: Remove malloc_bin_reloc from lib_sh, lib_nios2 and lib_nios.

By "arm/microblaze/nios/nios2/sh: Remove relocation fixups"
(commit: 0630535e2d062dd73c1ceca5c6125c86d1127a49", doesn't need
malloc_bin_reloc function. This commit remove this.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
8 years agoFix DM9000 MAC address handling
Ben Warren [Thu, 22 Oct 2009 04:53:39 +0000 (21:53 -0700)]
Fix DM9000 MAC address handling

Proper behavior is to pull MAC address from NVRAM in the initialization() an
stuff it in dev->address, then program the device from dev->address in
the init() function.

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
8 years agosbc8349: fix incorrect comment
Wolfgang Denk [Wed, 28 Oct 2009 21:07:56 +0000 (22:07 +0100)]
sbc8349: fix incorrect comment

The comment for the BR0_PRELIM port size initialization incorrectly
stated 32 bit, while it's actually 16 bit. The code is correct.

Reported-by: Guenter Koellner <guenter.koellner@nsn.com>
Signed-off-by: Wolfgang Denk <wd@denx.de>
8 years agoMerge branch 'master' of git://git.denx.de/u-boot-cfi-flash
Wolfgang Denk [Wed, 28 Oct 2009 20:50:09 +0000 (21:50 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash

8 years agoMerge branch 'master' of git://git.denx.de/u-boot-sparc
Wolfgang Denk [Wed, 28 Oct 2009 20:48:40 +0000 (21:48 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-sparc

8 years agoFix Compliation warning for TNY-A9260 and TNY-A9G20
Sandeep Paulraj [Wed, 28 Oct 2009 15:05:03 +0000 (11:05 -0400)]
Fix Compliation warning for TNY-A9260 and TNY-A9G20

The patch fixes a compilation warning by defining
CONFIG_SYS_64BIT_VSPRINTF in the config file

Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
8 years agoFix Compliation warning for SBC35-A9G20 board
Sandeep Paulraj [Wed, 28 Oct 2009 15:04:53 +0000 (11:04 -0400)]
Fix Compliation warning for SBC35-A9G20 board

The patch fixes a compilation warning by defining
CONFIG_SYS_64BIT_VSPRINTF in the config file

Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
8 years agogalaxy5200: Add default environment variables
Eric Millbrandt [Wed, 28 Oct 2009 14:37:33 +0000 (09:37 -0500)]
galaxy5200: Add default environment variables

Extend bootdelay to 10 seconds.  Set boot retry time to 120 seconds and use
reset to retry.  Define default bootcommand and bootargs for production.

Signed-off-by: Eric Millbrandt <emillbrandt@dekaresearch.com>
8 years agocfi: Add weak default function for flash_cmd_reset()
Stefan Roese [Tue, 27 Oct 2009 14:15:55 +0000 (15:15 +0100)]
cfi: Add weak default function for flash_cmd_reset()

Currently the CFI driver issues both AMD and Intel reset commands.
This is because the driver doesn't know yet which chips are connected.
This dual reset seems to cause problems with the M29W128G chips as
reported by Richard Retanubun. This patch now introduces a weak default
function for the CFI reset command, still with both resets. This can
be overridden by a board specific version if necessary.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Richard Retanubun <RichardRetanubun@ruggedcom.com>
8 years agoCoding Style cleanup; update CHANGELOG, prepare -rc1
Wolfgang Denk [Tue, 27 Oct 2009 23:49:47 +0000 (00:49 +0100)]
Coding Style cleanup; update CHANGELOG, prepare -rc1

Signed-off-by: Wolfgang Denk <wd@denx.de>
8 years agoAdd 'editenv' command
Peter Tyser [Sun, 25 Oct 2009 20:12:56 +0000 (15:12 -0500)]
Add 'editenv' command

The editenv command can be used to edit an environment variable.
Editing an environment variable is useful when one wants to tweak an
existing variable, for example fix a typo or change the baudrate in the
'bootargs' environment variable.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
8 years agosetenv(): Delete 0-length environment variables
Peter Tyser [Sun, 25 Oct 2009 20:12:55 +0000 (15:12 -0500)]
setenv(): Delete 0-length environment variables

Previously setenv() would only delete an environment variable if it
was passed a NULL string pointer as a value.  It should also delete an
environment variable when it encounters a valid string pointer of
0-length.

This change/fix is generally useful and is necessary for the upcoming
"editenv" command.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
8 years agoreadline(): Add ability to modify a string buffer
Peter Tyser [Sun, 25 Oct 2009 20:12:54 +0000 (15:12 -0500)]
readline(): Add ability to modify a string buffer

If the 'buf' parameter is a non-0-length string, its contents will be
edited.  Previously, the initial contents of 'buf' were ignored and the
user entered its contents from scratch.

This change is necessary to support the upcoming "editenv" command but
could also be used for future commands which require a user to modify
an existing string.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
8 years agocread_line(): Remove unused variables
Peter Tyser [Sun, 25 Oct 2009 20:12:53 +0000 (15:12 -0500)]
cread_line(): Remove unused variables

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
8 years agoCheck for NULL prompt in readline_into_buffer()
Peter Tyser [Sun, 25 Oct 2009 20:12:52 +0000 (15:12 -0500)]
Check for NULL prompt in readline_into_buffer()

Previously, passing readline() or readline_into_buffer() a NULL 'prompt'
parameter would result in puts() printing garbage when
CONFIG_CMDLINE_EDITING was enabled.

Note that no board currently triggers this bug.  Enabling
CONFIG_CMDLINE_EDITING on some boards (eg bab7xx) would result in
the bug appearing.  This change is only intended to prevent someone
from running into this issue in the future.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
8 years agodrivers/net/phy/miiphybb.c: fix warning: no newline at end of file
Wolfgang Denk [Sun, 25 Oct 2009 22:00:09 +0000 (23:00 +0100)]
drivers/net/phy/miiphybb.c: fix warning: no newline at end of file

Add missing newline.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Luigi Mantellini <luigi.mantellini@idf-hit.com>
Cc: Ben Warren <biggerbadderben@gmail.com>
8 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Wolfgang Denk [Tue, 27 Oct 2009 19:56:31 +0000 (20:56 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

8 years agoRevert "env: only build env_embedded and envcrc when needed"
Wolfgang Denk [Mon, 26 Oct 2009 23:03:32 +0000 (00:03 +0100)]
Revert "env: only build env_embedded and envcrc when needed"

Breaks building on many boards, and no really clean fix available yet.

This reverts commit 6dab6add2d8ee80905234b326abc3de11be1d178.

8 years agompc85xx: Configure QE USB for MPC8569E-MDS boards
Anton Vorontsov [Thu, 15 Oct 2009 13:47:16 +0000 (17:47 +0400)]
mpc85xx: Configure QE USB for MPC8569E-MDS boards

Setup QE pin multiplexing for USB function, configure needed BCSRs
and add some fdt fixups.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
8 years agompc85xx: Configure QE UART for MPC8569E-MDS boards
Anton Vorontsov [Thu, 15 Oct 2009 13:47:13 +0000 (17:47 +0400)]
mpc85xx: Configure QE UART for MPC8569E-MDS boards

To make QE UART usable by Linux we should setup pin multiplexing
and turn UCC2 Ethernet node into UCC2 QE UART node.

Also, QE UART is mutually exclusive with UART0, so we can't enable
it if eSDHC is in 4-bits mode on pilot boards, or if it's a prototype
board with eSDHC in 1- or 4-bits mode.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
8 years agompc85xx: Setup QE pinmux for SPI Flash on MPC8569E-MDS boards
Anton Vorontsov [Thu, 15 Oct 2009 13:47:11 +0000 (17:47 +0400)]
mpc85xx: Setup QE pinmux for SPI Flash on MPC8569E-MDS boards

SPI Flash (M25P40) is connected to the SPI1 bus, we need a few
qe_iop entries to actually enable SPI1 on these boards.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
8 years agompc85xx: Setup SRIO memory region LAW for MPC8569E-MDS boards
Anton Vorontsov [Thu, 15 Oct 2009 13:47:09 +0000 (17:47 +0400)]
mpc85xx: Setup SRIO memory region LAW for MPC8569E-MDS boards

This patch sets memory window for Serial RapidIO on MPC8569E-MDS
boards.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
8 years agompc85xx: Add eLBC NAND support for MPC8569E-MDS boards
Anton Vorontsov [Thu, 15 Oct 2009 13:47:08 +0000 (17:47 +0400)]
mpc85xx: Add eLBC NAND support for MPC8569E-MDS boards

Simply add some defines, and adjust TLBe setup to include some
space for eLBC NAND.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
8 years agompc85xx: Add eSDHC support for MPC8569E-MDS boards
Anton Vorontsov [Thu, 15 Oct 2009 13:47:06 +0000 (17:47 +0400)]
mpc85xx: Add eSDHC support for MPC8569E-MDS boards

eSDHC is mutually exlusive with UART0 (in 4-bits mode) and I2C2
(in 1-bit mode). When eSDHC is used, we should switch u-boot console to
UART1, and make the proper device-tree fixups.

Because of an erratum in prototype boards it is impossible to use eSDHC
without disabling UART0 (which makes it quite easy to 'brick' the board
by simply issung 'setenv hwconfig esdhc', and not able to interact with
U-Boot anylonger).

So, but default we assume that the board is a prototype, which is a most
safe assumption. There is no way to determine board revision from a
register, so we use hwconfig.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
8 years agoxpedite5370: Enable multi-core support
Peter Tyser [Fri, 23 Oct 2009 20:55:48 +0000 (15:55 -0500)]
xpedite5370: Enable multi-core support

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
8 years ago85xx: MP Boot Page Translation update
Peter Tyser [Fri, 23 Oct 2009 20:55:47 +0000 (15:55 -0500)]
85xx: MP Boot Page Translation update

This change has 3 goals:
- Have secondary cores be released into spin loops at their 'true'
  address in SDRAM.  Previously, secondary cores were put into spin
  loops in the 0xfffffxxx address range which required that boot page
  translation was always enabled while cores were in their spin loops.

- Allow the TLB window that the primary core uses to access the
  secondary cores boot page to be placed at any address.  Previously, a
  TLB window at 0xfffff000 was always used to access the seconary cores'
  boot page.  This TLB address requirement overlapped with other
  peripherals on some boards (eg XPedite5370).  By default, the boot
  page TLB will still use the 0xfffffxxx address range, but this can be
  overridden on a board-by-board basis by defining a custom
  CONFIG_BPTR_VIRT_ADDR.  Note that the TLB used to map the boot page
  remains in use while U-Boot executes.  Previously it was only
  temporarily used, then restored to its initial value.

- Allow Boot Page Translation to be disabled on bootup.  Previously,
  Boot Page Translation was always left enabled after secondary cores
  were brought out of reset.  This caused the 0xfffffxxx address range
  to somewhat "magically" be translated to an address in SDRAM.  Some
  boards may not want this oddity in their memory map, so defining
  CONFIG_MPC8xxx_DISABLE_BPTR will turn off Boot Page Translation after
  the secondary cores are initialized.

These changes are only applicable to 85xx boards with CONFIG_MP defined.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
8 years agoppc/85xx/pci: fsl_pci_init: pcie agent mode support
Vivek Mahajan [Tue, 27 Oct 2009 06:48:55 +0000 (12:18 +0530)]
ppc/85xx/pci: fsl_pci_init: pcie agent mode support

Originally written by Jason Jin and Mingkai Hu for mpc8536.

When QorIQ based board is configured as a PCIe agent, then unlock/enable
inbound PCI configuration cycles and init a 4K inbound memory window;
so that a PCIe host can access the PCIe agents SDRAM at address 0x0

* Supported in fsl_pci_init_port() after adding pcie_ep as a param
* Revamped copyright in drivers/pci/fsl_pci_init.c
* Mods in 85xx based board specific pci init after this change

Signed-off-by: Vivek Mahajan <vivek.mahajan@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
8 years ago85xx/p1_p2_rdb: Fixing DDR configuration for 800MHz data rate
Poonam Aggrwal [Tue, 27 Oct 2009 04:06:38 +0000 (09:36 +0530)]
85xx/p1_p2_rdb: Fixing DDR configuration for 800MHz data rate

Signed-off-by: Poonam Aggrwal <poonam.aggrwal@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
8 years ago85xx/p1_p2rdb: Fix crash while configuring 32 bit DDR i/f for P1020RDB.
Poonam Aggrwal [Tue, 27 Oct 2009 03:56:55 +0000 (09:26 +0530)]
85xx/p1_p2rdb: Fix crash while configuring 32 bit DDR i/f for P1020RDB.

The data being modified was in NOR flash which caused the crash.

Signed-off-by: Poonam Aggrwal <poonam.aggrwal@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
8 years agoFix bug in jumptable call stubs for SPARC.
Sergey Mironov [Wed, 23 Sep 2009 12:47:38 +0000 (16:47 +0400)]
Fix bug in jumptable call stubs for SPARC.

Signed-off-by: Sergey Mironov <ierton@gmail.com>
Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
8 years agofdt_support: Add multi-serial support for stdout fixup
Anton Vorontsov [Thu, 15 Oct 2009 13:47:04 +0000 (17:47 +0400)]
fdt_support: Add multi-serial support for stdout fixup

Currently fdt_fixup_stdout() is using hard-coded CONFIG_CONS_INDEX
constant. With multi-serial support, the CONS_INDEX may no longer
represent actual console, so we should try to extract port number
from the current stdio device name instead of always hard-coding the
constant value.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Acked-by: Gerald Van Baren <vanbaren@cideas.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
8 years agoppc/85xx: Fix crashes due to generation of SPE instruction
Leon Woestenberg [Mon, 26 Oct 2009 09:03:32 +0000 (10:03 +0100)]
ppc/85xx: Fix crashes due to generation of SPE instruction

U-Boot crashed on the last instruction:

int parse_stream_outer(struct in_str *inp, int flag)
{
effa4784:       94 21 ff 38     stwu    r1,-200(r1)
effa4788:       7c 08 02 a6     mflr    r0
effa478c:       42 9f 00 05     bcl-    20,4*cr7+so,effa4790 <parse_stream_outer+0xc>
effa4790:       7d 80 00 26     mfcr    r12
effa4794:       13 c1 b3 21     evstdd  r30,176(r1)

...which is a  SPE instruction, although -mno-spe was used.

tmp/cross/ppce500v2/bin/powerpc-angstrom-linux-gnuspe-gcc --version
powerpc-angstrom-linux-gnuspe-gcc (GCC) 4.3.3

Seems to be a known issue (since 2008-04?!)

Googled some, turns out this patch/workaround works for me on MPC8536DS.

See http://gcc.gnu.org/ml/gcc-patches/2008-04/msg00311.html for more info

Signed-off-by: Leon Woestenberg <leon@sidebranch.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
8 years agoppc/85xx: Make L2 support more robust
Dave Liu [Thu, 22 Oct 2009 05:10:23 +0000 (00:10 -0500)]
ppc/85xx: Make L2 support more robust

According the user manual, we need loop-check the L2 enable bit set.

Signed-off-by: Dave Liu <daveliu@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
8 years agoppc/85xx: Fix compiler warning in nand_spl/.../p1_p2_rdb/nand_boot.c
Kumar Gala [Tue, 27 Oct 2009 02:21:25 +0000 (21:21 -0500)]
ppc/85xx: Fix compiler warning in nand_spl/.../p1_p2_rdb/nand_boot.c

nand_boot.c: In function 'board_init_f':
nand_boot.c:44: warning: 'sys_clk' may be used uninitialized in this function

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
8 years agoppc/85xx: Fix building NAND_SPL out of tree
Kumar Gala [Tue, 27 Oct 2009 02:18:33 +0000 (21:18 -0500)]
ppc/85xx: Fix building NAND_SPL out of tree

We need to source files to exist in the O=<FOO> nand_spl dir when
we build out of tree.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
8 years agoLicense cleanup: Fix license header for some esd display configurations
Matthias Fuchs [Fri, 23 Oct 2009 08:52:38 +0000 (10:52 +0200)]
License cleanup: Fix license header for some esd display configurations

These files were autogenerated by EPSON configuration tools.
This patch replaces the autogenerated file headers by the GPL
license notice.

This change is done with the explicit permission
of Epson Research & Development / IC Software Development.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
8 years agosf: add GPL-2 license info
Mike Frysinger [Fri, 9 Oct 2009 21:12:44 +0000 (17:12 -0400)]
sf: add GPL-2 license info

Some of the new spi flash files were missing explicit license lines.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
CC: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
8 years agofdt: Fix fdt padding issue for initrd mem_rsv
Kumar Gala [Thu, 22 Oct 2009 04:29:51 +0000 (23:29 -0500)]
fdt: Fix fdt padding issue for initrd mem_rsv

Its possible that we end up with a device tree that happens to be a
particular size that after we call fdt_resize() we don't have any
space left for the initrd mem_rsv.

Fix this be adding a second mem_rsv into the size calculation.  We
had one to cover the fdt itself and we have the potential of adding
a second for the initrd.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Acked-by: Gerald Van Baren <vanbaren@cideas.com>
8 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Sat, 24 Oct 2009 20:26:42 +0000 (22:26 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

8 years agoMerge branch 'master-sync' of git://git.denx.de/u-boot-arm
Wolfgang Denk [Sat, 24 Oct 2009 20:26:09 +0000 (22:26 +0200)]
Merge branch 'master-sync' of git://git.denx.de/u-boot-arm

8 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Sat, 24 Oct 2009 20:25:11 +0000 (22:25 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

8 years agoMerge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Wolfgang Denk [Sat, 24 Oct 2009 20:25:08 +0000 (22:25 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

8 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Sat, 24 Oct 2009 20:19:54 +0000 (22:19 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/custodians