oweals/u-boot.git
14 years agoNetStar: make mtdparts default ready for recent kernels
Ladislav Michl [Mon, 8 Feb 2010 19:19:06 +0000 (14:19 -0500)]
NetStar: make mtdparts default ready for recent kernels

Recent kernels are using generic NAND and NOR drivers. Change
default mtdparts to reflect it.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
14 years agoNetStar: fix default environment
Ladislav Michl [Mon, 8 Feb 2010 19:17:45 +0000 (14:17 -0500)]
NetStar: fix default environment

Correct switching partitions after upgrade and make it more readable.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
14 years agoNetStar: eeprom - fix linker error
Ladislav Michl [Mon, 8 Feb 2010 19:15:47 +0000 (14:15 -0500)]
NetStar: eeprom - fix linker error

linking eeprom with libgeneric.a is not really needed and causes following
error:
../../lib_generic/libgeneric.a(string.o): In function `strcmp':
lib_generic/string.c:152: multiple definition of `strcmp'
../../examples/standalone/libstubs.a(stubs.o):include/_exports.h:24: first defined here
Remove eeprom linker script as well and generate entry point object
(to start application by jumping on its beginning) on the fly.
Out-of-tree build tested as well.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
14 years agoNetStar: eeprom - be less verbose
Ladislav Michl [Mon, 8 Feb 2010 19:15:43 +0000 (14:15 -0500)]
NetStar: eeprom - be less verbose

Use shorter yet descriptive messages, replace printf() with
puts() where appropriate. This saves few bytes.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
14 years agoNetStar: eeprom - undefined reference to `memset'
Ladislav Michl [Mon, 8 Feb 2010 19:15:15 +0000 (14:15 -0500)]
NetStar: eeprom - undefined reference to `memset'

Defining partially initialized struct eth_device on stack means
gcc has to zero out it, and some gcc versions optimize this with
an implicit call to memset. Move definition to data section
to avoid that (it has also nice side effect that we need not
to pass it to helper functions anymore)

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
14 years agoMerge branch 'master' of git://git.denx.de/u-boot-cfi-flash
Wolfgang Denk [Thu, 4 Mar 2010 20:30:01 +0000 (21:30 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash

14 years agoMerge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Wolfgang Denk [Thu, 4 Mar 2010 20:28:46 +0000 (21:28 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

14 years agoMerge branch 'next' of git://git.denx.de/u-boot-coldfire
Wolfgang Denk [Thu, 4 Mar 2010 20:24:44 +0000 (21:24 +0100)]
Merge branch 'next' of git://git.denx.de/u-boot-coldfire

14 years agoMerge branch 'master' of git://git.denx.de/u-boot-sh
Wolfgang Denk [Thu, 4 Mar 2010 20:11:55 +0000 (21:11 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-sh

14 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc83xx
Wolfgang Denk [Thu, 4 Mar 2010 20:09:02 +0000 (21:09 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx

14 years ago] fix monitor protection for CONFIG_MONITOR_IS_IN_RAM
Wolfgang Wegner [Tue, 2 Mar 2010 09:59:19 +0000 (10:59 +0100)]
] fix monitor protection for CONFIG_MONITOR_IS_IN_RAM

For platforms with flash below ram addresses, the current check to
activate monitor protection is wrong/insufficient. This patch fixes
CONFIG_MONITOR_IS_IN_RAM for these systems by adding a check for
this configuration.

Signed-off-by: Wolfgang Wegner <w.wegner@astro-kom.de>
Signed-off-by: Stefan Roese <sr@denx.de>
14 years agoallow MCF532x to use CONFIG_MONITOR_IS_IN_RAM
Wolfgang Wegner [Tue, 2 Mar 2010 09:59:20 +0000 (10:59 +0100)]
allow MCF532x to use CONFIG_MONITOR_IS_IN_RAM

CONFIG_MONITOR_IS_IN_RAM is broken for MCF532x. This patch fixes this
 by conditionally
- removing the vector table at the beginning of code
- not overwriting the vector base register
- removing the code to re-set the PLL, which effectively disables
  SDRAM access

Signed-off-by: Wolfgang Wegner <w.wegner@astro-kom.de>
14 years agoMCF5271-only: Added a weak board_reset function to allow custom reset
Richard Retanubun [Mon, 26 Oct 2009 18:19:17 +0000 (14:19 -0400)]
MCF5271-only: Added a weak board_reset function to allow custom reset

This patch adds a board_reset function to allow boards to specify
their own custom reset sequence (e.g. resetting by timing out watchdog).
Tested only on MCF5271, can be expanded if needed.

Based on Mike Frysinger's suggestion on:
http://article.gmane.org/gmane.comp.boot-loaders.u-boot/70304

Signed-off-by: Richard Retanubun <RichardRetanubun at RuggedCom.com>
14 years agoMCF532x: make icache_enable use CONFIG_SYS_SDRAM_SIZE
Wolfgang Wegner [Wed, 28 Oct 2009 20:11:00 +0000 (15:11 -0500)]
MCF532x: make icache_enable use CONFIG_SYS_SDRAM_SIZE

in cpu/mcf532x/start.S, the function icache_enable enables the cache for
a fixed 32MB region starting at the SDRAM start address; this patch
changes the function to cover the region defined by CONFIG_SYS_SDRAM_SIZE

Signed-off-by: Wolfgang Wegner <w.wegner at astro-kom.de>
14 years agoadd include/asm-m68k/unaligned.h
Wolfgang Wegner [Wed, 9 Dec 2009 22:32:12 +0000 (17:32 -0500)]
add include/asm-m68k/unaligned.h

lib_generic/zlib.c needs include/asm/unaligned.h since commit
cd514aeb996e2f7aefbe1f78481965d9d074aed4, which broke compilation for
Coldfire/M68K. This patch adds the missing header for these
architectures.

Signed-off-by: Wolfgang Wegner <w.wegner at astro-kom.de>
14 years agosh: Add asm/unaligned.h and asm/unaligned-sh4a.h from Linux kernel
Nobuhiro Iwamatsu [Mon, 8 Feb 2010 02:50:16 +0000 (11:50 +0900)]
sh: Add asm/unaligned.h and asm/unaligned-sh4a.h from Linux kernel

zlib.c demands asm/unaligned.h. But, SH does not have these.
This commit add asm/unaligned.h and asm/unaligned-sh4a.h from Linux
kernel and modifyf for u-boot.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
14 years agompc83xx: fix out-of-tree mpc8315 nand build
Kim Phillips [Mon, 1 Mar 2010 17:10:17 +0000 (11:10 -0600)]
mpc83xx: fix out-of-tree mpc8315 nand build

commit 2e95004deb6e33e33bf1b8a92a38cd2115bac4c2 "mpc83xx: Add NAND boot support
for MPC8315E-RDB boards" symlinked nand_spl/board/freescale/mpc8315erdb to
mpc8313erdb in order to not duplicate code.

Since the main makefile builds nand_spl/board/$(BOARDDIR) (which makes sense),
and the board Makefile and linker script are the only two necessary files
to enable out-of-tree building, and other boards have duplicated nand makefiles
(e.g. 8536ds & 8569mds), it only seems prudent to copy these two files in the
name of the 8315 too.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Cc: Anton Vorontsov <avorontsov@ru.mvista.com>
Cc: Wolfgang Denk <wd@denx.de>
14 years agompc83xx: vme8349: fix incorrect BR0_PRELIM port size comment
Kim Phillips [Tue, 23 Feb 2010 01:39:16 +0000 (19:39 -0600)]
mpc83xx: vme8349: fix incorrect BR0_PRELIM port size comment

commit 98d92d8c9f4021629a45261ad5ec3f3595f3a27a "sbc8349: fix incorrect
comment" missed this one.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
14 years agoppc4xx: Corrected EBC register bit definitions
Eugene O'Brien [Wed, 24 Feb 2010 19:10:24 +0000 (14:10 -0500)]
ppc4xx: Corrected EBC register bit definitions

Corrected the bit field positions of the external master priority low
and the external master priority high values in the EBC configuration
register. These bit field positions differ between PPC405 and PPC440
processors

Signed-off-by: Eugene O'Brien <eugene.obrien@advantechamt.com>
Signed-off-by: Stefan Roese <sr@denx.de>
14 years agocmd_itest.c: fix pointer dereferencing
Frans Meulenbroeks [Mon, 22 Feb 2010 21:49:06 +0000 (22:49 +0100)]
cmd_itest.c: fix pointer dereferencing

fix pointer dereferencing
if the size is .b and .w an 8 or 16 bit access is done.

Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Acked-by: Detlev Zundel <dzu@denx.de>
14 years agotools: fix imximage warning
Kim Phillips [Tue, 23 Feb 2010 01:37:56 +0000 (19:37 -0600)]
tools: fix imximage warning

Fix build warning:

Configuring for MPC837XEMDS board...
imximage.c: In function `imximage_parse_cfg_file':
imximage.c:146: warning: passing argument 2 of `getline' from incompatible pointer type
/usr/include/bits/stdio.h:116: note: expected `size_t *' but argument is of type `uint32_t *'

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
14 years agomkimage: SEGFAULT with imximage on 64 bit systems
Stefano Babic [Fri, 5 Feb 2010 14:16:02 +0000 (15:16 +0100)]
mkimage: SEGFAULT with imximage on 64 bit systems

Running mkimage to generate an imximage produces a SEGFAULT
on 64 bit machines due to pointer arithmetic limited to 32 bit.

Signed-off-by: Stefano Babic <sbabic@denx.de>
Acked-by: Kim Phillips <kim.phillips@freescale.com>
14 years agompc83xx: remove hardcoded network addresses from config files
Kim Phillips [Fri, 19 Feb 2010 01:28:12 +0000 (19:28 -0600)]
mpc83xx: remove hardcoded network addresses from config files

and avoid e.g., two identical boards from causing random networking
conflicts when hooked up to the same network.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
14 years agoBug: do_reset issued via netconsole does not reset mpc83xx cpu.
Michael Zaidman [Mon, 15 Feb 2010 08:02:32 +0000 (10:02 +0200)]
Bug: do_reset issued via netconsole does not reset mpc83xx cpu.

The do_reset routine in the cpu/mpc83xx/cpu.c file does not reset
the mpc83xx cpu when issued via netconsole.

Moving the console output "resetting the board." to the beginning of
the routine before disabling interrupts solved the problem.

Signed-off-by: Michael Zaidman <michael.zaidman@gmail.com>
Acked-by: Detlev Zundel <dzu@denx.de>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
14 years agonew board (eb_cpux9k2)
Jens Scharsig [Wed, 3 Feb 2010 21:48:09 +0000 (22:48 +0100)]
new board (eb_cpux9k2)

* new board (eb_cpux9k2)
 * support for EB+CPUx9K2 board by BuS Elektronik GmbH & Co. KG
 * select via make eb_cpux9k2_config
 * this also demonstrates, how to use boards with AT91RM9200 cpu
   in at91 arch tree

Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de>
14 years agonew at91_emac network driver (NET_MULTI api)
Jens Scharsig [Wed, 3 Feb 2010 21:47:57 +0000 (22:47 +0100)]
new at91_emac network driver (NET_MULTI api)

* add's at91_emac (AT91RM9200) network driver (NET_MULTI api)
 * enable driver with CONFIG_DRIVER_AT91EMAC
 * generic PHY initialization
 * modify AT91RM9200 boards to use NET_MULTI driver
 * the drivers has been tested with LXT971 Phy and DM9161 Phy at MII and RMII
   interface

Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de>
14 years agoprepare joining at91rm9200 into at91
Jens Scharsig [Wed, 3 Feb 2010 21:47:35 +0000 (22:47 +0100)]
prepare joining at91rm9200 into at91

* prepare joining at91 and at91rm9200
 * add modified copy of soc files to cpu/arm920t/at91 to make
   possible to compile at91rm9200 boards in at91 tree instead
   of at91rm9200
 * add header files with c structure defs for AT91 MC, ST and TC
 * the new cpu files are using at91 c structure soc access
 * please read README.soc-at91 for details

Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de>
14 years agoupdate at91sam9263ek board to new SoC access
Jens Scharsig [Wed, 3 Feb 2010 21:47:18 +0000 (22:47 +0100)]
update at91sam9263ek board to new SoC access

* convert at91sam9263ek board to use c stucture SoC access
 * change gpio access to at91_gpio syntax

Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de>
14 years agoconvert common files to new SoC access
Jens Scharsig [Wed, 3 Feb 2010 21:46:58 +0000 (22:46 +0100)]
convert common files to new SoC access

* add's a warning to all files, which need update to new SoC access
 * convert common files in cpu/../at91 and a lot of drivers to use
   c stucture SoC access

Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de>
14 years agoconvert all at91 files to use at91_gpio driver syntax
Jens Scharsig [Wed, 3 Feb 2010 21:46:46 +0000 (22:46 +0100)]
convert all at91 files to use at91_gpio driver syntax

* convert all files cpu/../at91 to use at91_gpio driver syntax
 * change AT91_PINP([A-F])(\d+) to AT91_PIO_PORT\1, \2
   this makes all 160 AT91_PINPxxx defines obsolete
 * AT91_PINPxxx defines and gpio.h can be remove, if all boards converted to new SoC access

Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de>
14 years agoadd a new AT91 GPIO driver
Jens Scharsig [Wed, 3 Feb 2010 21:46:16 +0000 (22:46 +0100)]
add a new AT91 GPIO driver

* add a real AT91 GPIO driver instead of header inline code
* resolve the mixing of port and pins
* change board config files to use new driver
* add macros to gpio to realize backward compatibility

Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de>
14 years agoadd c structures for SoC access
Jens Scharsig [Wed, 3 Feb 2010 21:46:01 +0000 (22:46 +0100)]
add c structures for SoC access

* add's c structures for SoC access to pheriperials head files

Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de>
14 years agoadd new CONFIG_AT91_LEGACY
Jens Scharsig [Wed, 3 Feb 2010 21:45:42 +0000 (22:45 +0100)]
add new CONFIG_AT91_LEGACY

* add's the new temporary CONFIG_AT91_LEGACY to all board configs
 This will need for backward compatiblity, while change the SoC access
 to c structures. If CONFIG_AT91_LEGACY is defined, the deprecated
 SoC is used.

Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de>
14 years agoDA830 EVM: Enable NAND support on Spectrum Digital EVM
Nick Thompson [Mon, 8 Feb 2010 16:36:16 +0000 (11:36 -0500)]
DA830 EVM: Enable NAND support on Spectrum Digital EVM

The EVM UI extender card has a NAND device. This change will enable
saveenv to work with NAND and Linux to be booted using:

mtdparts default
nboot kernel
bootm

Signed-off-by: Nick Thompson <nick.thompson@ge.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
14 years agoDavinci: Add EMIF-A macros for setting chip select parameters
Nick Thompson [Mon, 8 Feb 2010 16:34:58 +0000 (11:34 -0500)]
Davinci: Add EMIF-A macros for setting chip select parameters

The patch adds EMIF-A macros for setting chip select parameters

Signed-off-by: Nick Thompson <nick.thompson@ge.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
14 years agoOMAP3: Avoid re-write to PRM_CLKSRC_CTRL
Sanjeev Premi [Mon, 8 Feb 2010 16:33:25 +0000 (11:33 -0500)]
OMAP3: Avoid re-write to PRM_CLKSRC_CTRL

In function get_osc_clk_speed(), do not change/ update
the divider for SYS_CLK as it can has cascading effect
on the other derived clocks.

Sudden change in divider value can lead to inconsistent
behavior in the system - often leading to crashes.

The problem was found when working with OMAP3EVM using
DM3730 processor card.

The patch has been tested with OMAP3530 on OMAP3EVM as
well

Signed-off-by: Sanjeev Premi <premi@ti.com>
Signed-off-by: Hiremath Vaibhav <hvaibhav@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
14 years agoSPI: Fix 32 bit transfers in mxc_spi.c
Magnus Lilja [Tue, 9 Feb 2010 21:05:39 +0000 (22:05 +0100)]
SPI: Fix 32 bit transfers in mxc_spi.c

Commit f9b6a1575d9f1ca192e4cb60e547aa66f08baa3f,  "i.MX31: fix SPI
driver for shorter than 32 bit" broke 32 bit transfers. This patch
makes single 32 bit transfer work again.

Transfer lengths that are known not to work will abort and print
an error message.

Tested on i.MX31 Litekit and i.MX31 PDK using 32 bit transfers to
the MC13783/ATLAS chip (using the 'date' command).

Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>
14 years agoedb93xx: enable the uart in devicecfg register
Alessandro Rubini [Sat, 6 Feb 2010 19:54:05 +0000 (20:54 +0100)]
edb93xx: enable the uart in devicecfg register

printf goes to uart1, but it will block forever waiting for
busy to go off unless the uart is enabled first.

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
14 years agoedb93xx: change calculation un early_udelay.h
Alessandro Rubini [Sat, 6 Feb 2010 19:53:54 +0000 (20:53 +0100)]
edb93xx: change calculation un early_udelay.h

Previous code compiled with gcc-4.2.2 makes a call to
__aeabi_uidiv to divide by 20. As a side effect it was
not inline any more, and so sdram_cfg used the stack
as well, but this is early code that has no stack yet.
The patch explicitly removes the division, so no stack is used.

The calculation of the counter calls a division by 20

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
14 years agoEP93xx: fix syscon_regs definition
Alessandro Rubini [Sat, 6 Feb 2010 19:53:43 +0000 (20:53 +0100)]
EP93xx: fix syscon_regs definition

The structure was missing a reserved entry (not listed in the manual,
actually), so the last registers had a wrong offset. This prevented
all swlocked registers to be modified as swlock is last in the structure.

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
14 years agoARM: Add support for EP93xx SoCs
Matthias Kaehlcke [Mon, 1 Feb 2010 20:29:39 +0000 (21:29 +0100)]
ARM: Add support for EP93xx SoCs

Add support for the Cirrus EP93xx platform

Signed-off-by: Matthias Kaehlcke <matthias@kaehlcke.net>
Acked-by: Tom <Tom.Rix@windriver.com>
14 years agoAdd support for EDB93xx boards
Matthias Kaehlcke [Mon, 1 Feb 2010 20:29:48 +0000 (21:29 +0100)]
Add support for EDB93xx boards

Added support for the following EDB93xx boards:

EDB9301
EDB9302
EDB9302A
EDB9307
EDB9307A
EDB93012
EDB9315
EDB9315A

Signed-off-by: Matthias Kaehlcke <matthias@kaehlcke.net>
14 years agoNetStar: Remove debug junk leaked into eeprom utility
Ladislav Michl [Wed, 27 Jan 2010 16:12:28 +0000 (11:12 -0500)]
NetStar: Remove debug junk leaked into eeprom utility

This patch removes debug junk leaked into eeprom utility.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
14 years agoNetStar: make crcit utility more readable
Ladislav Michl [Wed, 27 Jan 2010 16:12:23 +0000 (11:12 -0500)]
NetStar: make crcit utility more readable

This patch makes the crcit utility more readable

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
14 years agoNetStar: Disable CONFIG_CMD_JFFS2
Ladislav Michl [Wed, 27 Jan 2010 16:12:08 +0000 (11:12 -0500)]
NetStar: Disable CONFIG_CMD_JFFS2

This patch removes "CONFIG_CMD_JFFS" from the board config

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
14 years agoOMAP3 Move declaration of gpmc_cfg.
Tom Rix [Wed, 27 Jan 2010 16:11:55 +0000 (11:11 -0500)]
OMAP3 Move declaration of gpmc_cfg.

Every omap3 board config file declared the global variable gpmc_cfg.
This changes moves the declaration to a better location in the
arch dependent header file cpu.h.

Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
14 years agoOvero GPMC registers
Scott Ellis [Wed, 27 Jan 2010 16:11:46 +0000 (11:11 -0500)]
Overo GPMC registers

Use appropriate GPMC timings for the LAN9221 controller on the
Gumstix Overo expansion boards not the values in arch-omap3/mem.h
which are for a different ethernet controller.

Signed-off-by: Scott Ellis <scott@jumpnowtek.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
14 years agoda830evm: Use table driven pin mux configuration
Nick Thompson [Wed, 27 Jan 2010 16:11:28 +0000 (11:11 -0500)]
da830evm: Use table driven pin mux configuration

Tidyup the pin muxer configuration using the Davinci table driven
pinmux configuration function and data tables.

Signed-off-by: Nick Thompson <nick.thompson@ge.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
14 years agoTI DaVinci: Driver for the davinci SPI controller
Sekhar Nori [Wed, 27 Jan 2010 16:10:40 +0000 (11:10 -0500)]
TI DaVinci: Driver for the davinci SPI controller

This adds a driver for the SPI controller found on davinci
based SoCs from Texas Instruments.

Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Sudhakar Rajashekhara <sudhakar.raj@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
14 years agoat91: Add esd gmbh OTC570 board support
Daniel Gorsulowski [Mon, 25 Jan 2010 09:50:41 +0000 (10:50 +0100)]
at91: Add esd gmbh OTC570 board support

This patch adds support for esd gmbh OTC570 board.
The OTC570 is based on an Atmel AT91SAM9263 SoC.

Signed-off-by: Daniel Gorsulowski <Daniel.Gorsulowski@esd.eu>
14 years agoMerge branch 'master' of git://git.denx.de/u-boot-net
Wolfgang Denk [Mon, 8 Feb 2010 21:09:24 +0000 (22:09 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-net

14 years agokgdb: cpu/mpc* cpu/74xx: include kgdb.h when needed
Mike Frysinger [Mon, 8 Feb 2010 20:30:16 +0000 (15:30 -0500)]
kgdb: cpu/mpc* cpu/74xx: include kgdb.h when needed

Commit cbb0cab1d929839d broke some platforms which used kgdb code but
didn't actually include kgdb.h.  So include kgdb.h in all the relevant
traps code.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agonet: Use 0.5 sec timeout in miiphy_reset() instead of counting loop
Stefan Roese [Tue, 2 Feb 2010 12:43:48 +0000 (13:43 +0100)]
net: Use 0.5 sec timeout in miiphy_reset() instead of counting loop

This patch fixes a problem I've notived on a buggy PPC4xx system. This
system has problems with the PHY MDIO communication and seemed to be
stuck/crashed in miiphy_reset(). But degugging revealed, that the CPU
didn't crash, but "only" hung in this counting loop for about 2 minutes.

This patch now uses a real timeout of 0.5 seconds (as mentioned in the
comment in miiphy_reset).

Signed-off-by: Stefan Roese <sr@denx.de>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years agofec_mxc: add support for MX51 processor
Stefano Babic [Mon, 1 Feb 2010 13:51:30 +0000 (14:51 +0100)]
fec_mxc: add support for MX51 processor

The patch add support for the Freescale mx51 processor
to the FEC ethernet driver.

Signed-off-by: Stefano Babic <sbabic@denx.de>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years agoNET: kirkwood-egiga smi access fix
Siddarth Gore [Tue, 19 Jan 2010 05:39:07 +0000 (11:09 +0530)]
NET: kirkwood-egiga smi access fix

Although the datasheet mentions seperate smi registers for each
port, using Port 1 smi register to access ethernet phys does not
work. Hence only Port 0 smi register should be used to access all
devices connected to the smi bus. This behavior is consistant with
the mv643xx driver in the linux kernel.

Signed-off-by: Siddarth Gore <gores@marvell.com>
Acked-by: Prafulla Wadaskar <prafulla@marvell.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years agons16550: kick watchdog while waiting for a character
Ladislav Michl [Mon, 1 Feb 2010 22:34:25 +0000 (23:34 +0100)]
ns16550: kick watchdog while waiting for a character

ns16550 busyloops waiting for incoming byte causing watchdog to reboot
while waiting for a key press. A call to WATCHDOG_RESET in NS16550_getc
loop fixes it.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
14 years agoUSB: usb_control_msg wait for driver ISR to set status.
Remy Bohmer [Mon, 1 Feb 2010 18:40:47 +0000 (19:40 +0100)]
USB: usb_control_msg wait for driver ISR to set status.

This patch changes usb_control_msg back to the state prior to commit
48867208444cb2a82e2af9c3249e90b7ed4a1751.

The USB driver ISR routine may update the status.

Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
14 years agomusb: Add host support for DM365 EVM
Prathap Srinivas [Mon, 11 Jan 2010 10:06:46 +0000 (15:36 +0530)]
musb: Add host support for DM365 EVM

Add support for musb host on DM365 EVM.

Signed-off-by: Prathap Srinivas <msprathap@ti.com>
14 years agousb: musb: fix Blackfin DMA register padding
Cliff Cai [Tue, 19 Jan 2010 05:10:42 +0000 (00:10 -0500)]
usb: musb: fix Blackfin DMA register padding

The conversion from offsets to C structs lost a little padding in the DMA
register map.  Accessing endpoints other than ep0 with DMA would fail as
the addresses wouldn't be adjusted correctly.

Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoMerge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Wolfgang Denk [Wed, 3 Feb 2010 19:22:10 +0000 (20:22 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

14 years agoMerge branch 'master' of git://git.denx.de/u-boot-cfi-flash
Wolfgang Denk [Wed, 3 Feb 2010 19:15:46 +0000 (20:15 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash

14 years agoMerge branch 'master' of git://git.denx.de/u-boot-net
Wolfgang Denk [Wed, 3 Feb 2010 19:10:20 +0000 (20:10 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-net

14 years agoMerge branch 'master' of git://git.denx.de/u-boot-nand-flash
Wolfgang Denk [Wed, 3 Feb 2010 19:05:27 +0000 (20:05 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash

14 years agoMerge branch 'master' of git://git.denx.de/u-boot-video
Wolfgang Denk [Wed, 3 Feb 2010 19:03:46 +0000 (20:03 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-video

14 years agoEXBITGEN: drop support for unmaintained board
Wolfgang Denk [Mon, 1 Feb 2010 10:36:29 +0000 (11:36 +0100)]
EXBITGEN: drop support for unmaintained board

The EXBITGEN board has not been maintained for a long time; it has
build problems, but no hardware is available any more for testing.

Drop support for this board.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Acked-by: Stefan Roese <sr@denx.de>
14 years agompc5xxx/cpu_init.c: fix warning: unused variable 'cdm'
Wolfgang Denk [Sun, 31 Jan 2010 21:03:15 +0000 (22:03 +0100)]
mpc5xxx/cpu_init.c: fix warning: unused variable 'cdm'

Signed-off-by: Wolfgang Denk <wd@denx.de>
Acked-by: Detlev Zundel <dzu@denx.de>
14 years agompc5xxx/cpu_init.c: fix warning: unused variable 'gpt0'
Wolfgang Denk [Sun, 31 Jan 2010 20:58:48 +0000 (21:58 +0100)]
mpc5xxx/cpu_init.c: fix warning: unused variable 'gpt0'

Signed-off-by: Wolfgang Denk <wd@denx.de>
Acked-by: Detlev Zundel <dzu@denx.de>
14 years agoppc4xx: Remove unused feature from AR405 board
Matthias Fuchs [Mon, 1 Feb 2010 12:54:09 +0000 (13:54 +0100)]
ppc4xx: Remove unused feature from AR405 board

This patch fixes building for AR405 boards by remove an unused feature.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
Signed-off-by: Stefan Roese <sr@denx.de>
14 years agoppc4xx: Fix building for PLU405 boards
Matthias Fuchs [Mon, 1 Feb 2010 12:53:59 +0000 (13:53 +0100)]
ppc4xx: Fix building for PLU405 boards

The init_coupler() function from board/esd/plu405/plu405.c
got lost somehow! This patch readds it.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
Signed-off-by: Stefan Roese <sr@denx.de>
14 years agoppc4xx: Fix building of PMC440 board
Matthias Fuchs [Mon, 1 Feb 2010 12:53:47 +0000 (13:53 +0100)]
ppc4xx: Fix building of PMC440 board

Remove some unused features and default environment variable
to shrink the PMC440 u-boot.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
Signed-off-by: Stefan Roese <sr@denx.de>
14 years agoppc4xx: Fix compilation error on ML2 board
Stefan Roese [Tue, 26 Jan 2010 12:33:29 +0000 (13:33 +0100)]
ppc4xx: Fix compilation error on ML2 board

Recently this compilation error occurs:

Configuring for ML2 board...
traps.c: In function 'MachineCheckException':
traps.c:159: error: 'debugger_exception_handler' undeclared (first use
in this function)
traps.c:159: error: (Each undeclared identifier is reported only once
traps.c:159: error: for each function it appears in.)

This patch now fixes it by including kgdb.h

Signed-off-by: Stefan Roese <sr@denx.de>
14 years agoCFI: fix eraseregions numblocks
Ladislav Michl [Thu, 28 Jan 2010 11:27:14 +0000 (12:27 +0100)]
CFI: fix eraseregions numblocks

eraseregions numblocks was sometimes one less than actual, possibly producing
erase regions with zero blocks. As MTD code touches eraseregions only if
numeraseregions is greater that zero, allocate eraseregions only for non
uniform erase size flash.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Stefan Roese <sr@denx.de>
14 years agonew at91_emac network driver (NET_MULTI api)
Jens Scharsig [Sat, 23 Jan 2010 11:03:45 +0000 (12:03 +0100)]
new at91_emac network driver (NET_MULTI api)

* add's at91_emac (AT91RM9200) network driver (NET_MULTI api)
* enable driver with CONFIG_DRIVER_AT91EMAC
* generic PHY initialization
* modify AT91RM9200 boards to use NET_MULTI driver
* the drivers has been tested with LXT971 Phy and DM9161 Phy at
  MII and RMII interface

Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years agoAdd EP93xx ethernet driver
Matthias Kaehlcke [Sun, 31 Jan 2010 16:39:49 +0000 (17:39 +0100)]
Add EP93xx ethernet driver

Added ethernet driver for EP93xx SoCs

Signed-off-by: Matthias Kaehlcke <matthias@kaehlcke.net>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years ago83xx, uec: split enet_interface in two variables
Heiko Schocher [Wed, 20 Jan 2010 08:04:28 +0000 (09:04 +0100)]
83xx, uec: split enet_interface in two variables

There's no sensible reason to unite speed and interface type into
one variable.  So split this variable enet_interface into two
vars: enet_interface_type, which hold the interface type and speed.

Also: add the possibility for switching between 10 and 100 MBit
interfaces on the fly, when running in FAST_ETH mode.

Signed-off-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years agoTI: DaVinci: Updating EMAC driver for DM365, DM646x and DA8XX
Nick Thompson [Fri, 18 Dec 2009 13:33:07 +0000 (13:33 +0000)]
TI: DaVinci: Updating EMAC driver for DM365, DM646x and DA8XX

The EMAC IP on DM365, DM646x and DA830 is slightly different
from that on DM644x. This change updates the DaVinci EMAC driver
so that EMAC becomes operational on SOCs with EMAC v2.

Signed-off-by: Nick Thompson <nick.thompson@ge.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years agomacb: Fix mii_phy_read and mii_phy_write functions
Semih Hazar [Thu, 17 Dec 2009 13:07:15 +0000 (15:07 +0200)]
macb: Fix mii_phy_read and mii_phy_write functions

Enabling CONFIG_CMD_MII in AVR32 boards was not possible due to
compile errors.

This patch fixes miiphy_read and miiphy_write functions and
registers them properly.

Signed-off-by: Semih Hazar <semih.hazar@indefia.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years agotsec: Add TSEC_FIBER flag
Peter Tyser [Mon, 9 Nov 2009 19:09:48 +0000 (13:09 -0600)]
tsec: Add TSEC_FIBER flag

The TSEC_FIBER flag should be set when a PHY is operating with an
external fiber interface.  Currently it is only used to notify a user
that the PHY is operating in fiber mode.

A short description was also added to the other TSEC flag defines so
that it is clear how they differ from one another.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years agotsec: Add support for using the BCM5482 PHY in fiber mode
Peter Tyser [Mon, 9 Nov 2009 19:09:47 +0000 (13:09 -0600)]
tsec: Add support for using the BCM5482 PHY in fiber mode

The BCM5482 PHY supports both copper and fiber as an ethernet medium.
By enabling its copper/fiber mode auto-detection feature it can
dynamically determine if it should be configured for copper or fiber.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years agotsec: General cleanup
Peter Tyser [Mon, 9 Nov 2009 19:09:46 +0000 (13:09 -0600)]
tsec: General cleanup

- Cleanup formatting of phy_info structures

- Fix lines > 80 chars

- Fix some random indentation inconsistencies

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years agotsec: Make functions/data static when possible
Peter Tyser [Mon, 9 Nov 2009 19:09:45 +0000 (13:09 -0600)]
tsec: Make functions/data static when possible

This is generally good practice and saves ~150 bytes.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years agotsec: Clean up Broadcom PHY status parsing
Peter Tyser [Mon, 9 Nov 2009 19:09:44 +0000 (13:09 -0600)]
tsec: Clean up Broadcom PHY status parsing

- Remove unnecessary printing "Enet starting in <speed>/<duplex>"
    This same information is already printed during normal ethernet
    operation in the form "Speed: 1000, full duplex".

- Add a check for link before determining link speed and duplex
    If there is no link, speed/duplex don't matter.  This also removes
    the annoying and unneeded "Auto-neg error, defaulting to 10BT/HD"
    message that occurs when no link is detected.

- Whitespace and line > 80 characters cleanup

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years agotsec: Force TBI PHY to 1000Mbps full duplex in SGMII mode
Peter Tyser [Tue, 3 Nov 2009 23:52:07 +0000 (17:52 -0600)]
tsec: Force TBI PHY to 1000Mbps full duplex in SGMII mode

In SGMII mode the link between a processor's internal TBI PHY and an
external PHY should always be 1000Mbps, full duplex.  Also, the SGMII
interface between an internal TBI PHY and external PHY does not
support in-band auto-negotation.

Previously, when configured for SGMII mode a TBI PHY would attempt to
restart auto-negotation during initializtion.  This auto-negotation
between a TBI PHY and external PHY would fail and result in unusable
ethernet operation.

Forcing the TBI PHY and and external PHY to link at 1000Mbps full duplex
in SGMII mode resolves this issue of auto-negotation failing.

Note that 10Mbps and 100Mbps operation is still possible on the external
side of the external PHY even when SGMII is operating at 1000Mbps.
The SGMII interface still operates at 1000Mbps, but each byte of data
is repeated 100 or 10 times for 10/100Mbps and the external PHY handles
converting this data stream into proper 10/100Mbps signalling.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years agoNET: Fix MAC addr handling for smc911x
Seunghyeon Rhee [Mon, 2 Nov 2009 08:00:00 +0000 (00:00 -0800)]
NET: Fix MAC addr handling for smc911x

This patch turns off MAC address mismatch warning when
optional eeprom programmed with MAC address is not available.
In that case, smc911x's MAC address register has its default
value ff:ff:ff:ff:ff:ff and it's not a valid address. This
makes eth_initialize() show the warning which has no
meaningful information while environment variable ethaddr
overrides the address read from the register. If there's no
eeprom and the value of MAC address register is not valid
after initialization, dev->enetaddr had better not be updated
and maintain its initial value 00:00:00:00:00:00, which I
think is what eth_initialize() expects. This is not a bug fix.
Even without this patch, the driver works fine. It's just for
enhancing the way of displaying messages.

Signed-off-by: Seunghyeon Rhee <seunghyeon@lpmtec.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years agocs8900_initialize() cleanup
Matthias Kaehlcke [Thu, 21 Jan 2010 21:16:34 +0000 (22:16 +0100)]
cs8900_initialize() cleanup

cs8900_initialize(): remove unecessary calls to free() and fix memory leak

Signed-off-by: Matthias Kaehlcke <matthias@kaehlcke.net>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years agosmc91111_eeprom: fix linking error
Mike Frysinger [Thu, 21 Jan 2010 10:04:59 +0000 (05:04 -0500)]
smc91111_eeprom: fix linking error

Building for a bf533-stamp ends up with this error:
smc91111_eeprom.o: In function `smc91111_eeprom':
examples/standalone/smc91111_eeprom.c:58: undefined reference to `memset'
make[2]: *** [smc91111_eeprom] Error 1

The new eth_struct definition means gcc has to zero out the structure on
the stack, and some gcc versions optimize this with an implicit call to
memset.  So tweak the structure style to avoid that gcc feature.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years agocmd_ximg.c: fix error: 'i' undeclared
Wolfgang Denk [Sun, 31 Jan 2010 20:51:43 +0000 (21:51 +0100)]
cmd_ximg.c: fix error: 'i' undeclared

Fix compile error:

cmd_ximg.c: In function 'do_imgextract':
cmd_ximg.c:234: error: 'i' undeclared (first use in this function)
cmd_ximg.c:234: error: (Each undeclared identifier is reported only once
cmd_ximg.c:234: error: for each function it appears in.)

Signed-off-by: Wolfgang Denk <wd@denx.de>
14 years agolcd: remove CONFIG_ATMEL_LCD ifdefs from lcd_setfgcolor
Anatolij Gustschin [Sat, 12 Dec 2009 20:20:57 +0000 (21:20 +0100)]
lcd: remove CONFIG_ATMEL_LCD ifdefs from lcd_setfgcolor

Not all boards defining LCD_COLOR16 are able to set
lcd_color_fg/lcd_color_bg correctly. The issue seems to
be caused by CONFIG_ATMEL_LCD ifdefs in lcd_setfgcolor()
and lcd_setbgcolor(). Actually, the color values passed
to these functions are already correct, we don't need
to fix them. So remove ifdefs here.

Reported-by: Alessandro Rubini <rubini@unipv.it>
Signed-off-by: Anatolij Gustschin <agust@denx.de>
14 years agoinclude/nomadik.h: add physical address for cldc
Alessandro Rubini [Sat, 5 Dec 2009 12:39:41 +0000 (13:39 +0100)]
include/nomadik.h: add physical address for cldc

Signed-off-by: Alessandro Rubini <rubini@unipv.it>
Acked-by: Andrea Gallo <andrea.gallo@stericsson.com>
14 years agovideo: add amba-clcd prime-cell
Alessandro Rubini [Sat, 5 Dec 2009 12:39:31 +0000 (13:39 +0100)]
video: add amba-clcd prime-cell

This adds support for the CLCD logic cell. It accepts precompiled
register values for specific configuration through a board-supplied
data structure.  It is used by the Nomadik nhk8815, added by a later
patch in this series.

Signed-off-by: Alessandro Rubini <rubini@unipv.it>
Acked-by: Andrea Gallo <andrea.gallo@stericsson.com>
14 years agoNand mxc_nand add v1.1 controller support
John Rigby [Wed, 27 Jan 2010 02:24:18 +0000 (19:24 -0700)]
Nand mxc_nand add v1.1 controller support

Add support for version 1.1 of the nfc nand flash
controller which is on the i.mx25 soc.

Signed-off-by: John Rigby <jcrigby@gmail.com>
CC: Scott Wood <scottwood@freescale.com>
14 years agoAdd MX25 support to nand_spl fsl nfc driver
John Rigby [Wed, 27 Jan 2010 02:24:17 +0000 (19:24 -0700)]
Add MX25 support to nand_spl fsl nfc driver

MX25 has a different version of the fsl_nfc
flash controller known as version 1.1.

Add support to the nand_spl fsl_nfc driver

Versioning differs from mainline mxc kernel driver
no consensus yet on if the naming here and in
Redboot or the kernel is "correct".

Signed-off-by: John Rigby <jcrigby@gmail.com>
Signed-off-by: Wolfgang Denk <wd@denx.de>
CC: Scott Wood <scottwood@freescale.com>
14 years agoarm926ejs: add nand_spl boot support
John Rigby [Tue, 26 Jan 2010 06:12:52 +0000 (23:12 -0700)]
arm926ejs: add nand_spl boot support

Add CONFIG_PRELOADER/CONFIG_NAND_SPL support for nand booting
to arm926ejs/start.S

This is derived from CONFIG_PRELOADER support in arm1136/start.S

Signed-off-by: John Rigby <jcrigby@gmail.com>
CC: Scott Wood <scottwood@freescale.com>
14 years agoenv_nand.c: print error message and fail gracefully
Wolfgang Denk [Sun, 17 Jan 2010 04:50:26 +0000 (21:50 -0700)]
env_nand.c: print error message and fail gracefully

env_nand.c would crash silently if a malloc() for the environment
buffers failed; make it print an error message and fail gracefully,
i. e. use the default environment then.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Acked-by: John Rigby <jcrigby@gmail.com>
14 years agoNand boot: Add nand boot support for MPC8569mds board
Liu Yu [Mon, 18 Jan 2010 11:03:28 +0000 (19:03 +0800)]
Nand boot: Add nand boot support for MPC8569mds board

This patch add nand boot support for MPC8569mds board.

Signed-off-by: Liu Yu <yu.liu@freescale.com>
14 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Wolfgang Denk [Wed, 27 Jan 2010 19:19:08 +0000 (20:19 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

14 years agoFix compiler warning in imximage.c due to getline prototype
Kumar Gala [Wed, 27 Jan 2010 16:16:56 +0000 (10:16 -0600)]
Fix compiler warning in imximage.c due to getline prototype

imximage.c: In function 'imximage_parse_cfg_file':
imximage.c:142: warning: implicit declaration of function 'getline'

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years ago85xx: Add support for 'cpu disable' command
Kumar Gala [Tue, 12 Jan 2010 18:56:05 +0000 (12:56 -0600)]
85xx: Add support for 'cpu disable' command

Support disabling of a core via user command 'cpu disable'.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years ago86xx: Add support for 'cpu disable' command
Kumar Gala [Tue, 12 Jan 2010 17:51:52 +0000 (11:51 -0600)]
86xx: Add support for 'cpu disable' command

Support disabling of a core via user command 'cpu disable'.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agoAdd support to disable cpu's in multicore processors
Kumar Gala [Tue, 12 Jan 2010 17:42:43 +0000 (11:42 -0600)]
Add support to disable cpu's in multicore processors

Add a disable sub-command to the cpu command that allows for disabling
cores in multicore processors.  This can be useful for systems that are
using multicore chips but aren't utilizing all the cores as a way to
reduce power and possibly improve performance.

Also updated an added missing copyright.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>