kernel/u-boot.git
15 years agoarm nomadik: allow Nand and OneNand to coexists
Alessandro Rubini [Mon, 22 Jun 2009 07:18:57 +0000 (09:18 +0200)]
arm nomadik: allow Nand and OneNand to coexists

The evaluation kit has both Nand and OneNand, both drivers are there
and the two configurations only select a different default for the
jffs partition. This adds the OneNand driver and cleans up storage.

Signed-off-by: Alessandro Rubini <rubini@unipv.it>
Acked-by: Andrea Gallo <andrea.gallo@stericsson.com>
15 years agoarm nomadik: cleanup reset
Alessandro Rubini [Mon, 22 Jun 2009 07:18:47 +0000 (09:18 +0200)]
arm nomadik: cleanup reset

There is only one public release of the Nomadik chip, so the ifdef
in reset code as well as a define in the config file are not needed

Signed-off-by: Alessandro Rubini <rubini@unipv.it>
Acked-by: Andrea Gallo <andrea.gallo@stericsson.com>
15 years agoarm nomadik: rename board to nhk8815
Alessandro Rubini [Mon, 22 Jun 2009 07:18:37 +0000 (09:18 +0200)]
arm nomadik: rename board to nhk8815

This is an error in my side in the initial submission: nobody
calls it ""nmdk8815", it's "nomadik hardware kit", nhk8815, instead.

Signed-off-by: Alessandro Rubini <rubini@unipv.it>
Acked-by: Andrea Gallo <andrea.gallo@stericsson.com>
15 years agoxscale: add support for the polaris board
Stefano Babic [Wed, 1 Jul 2009 18:40:41 +0000 (20:40 +0200)]
xscale: add support for the polaris board

The Polaris board is based on the TrizepsIV module of
Keith & Koep (http://www.keith-koep.com).

Signed-off-by: Stefano Babic <sbabic@denx.de>
15 years agoxscale: fix USB initialization for Trizepsiv module
Stefano Babic [Wed, 1 Jul 2009 02:33:56 +0000 (04:33 +0200)]
xscale: fix USB initialization for Trizepsiv module

Due to change in the usb_board_init() prototype, the USB for
the TrizepsIV was not correctly initialized.
Removed dummy print from usb_board_stop().

Signed-off-by: Stefano Babic <sbabic@denx.de>
15 years agonet: merge bugfix: Marvell Kirkwood gigabit ethernet driver
Prafulla Wadaskar [Wed, 1 Jul 2009 18:34:51 +0000 (20:34 +0200)]
net: merge bugfix: Marvell Kirkwood gigabit ethernet driver

This patch looks okay on u-boot-net.git/next branch
but when it was merged to u-boot.git/master the last line is missing

Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
Acked-by: Ben Warren <biggerbadderben@gmail.com>
15 years agoat91: Add esd gmbh MEESC board support
Daniel Gorsulowski [Tue, 30 Jun 2009 19:03:37 +0000 (21:03 +0200)]
at91: Add esd gmbh MEESC board support

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

Signed-off-by: Daniel Gorsulowski <Daniel.Gorsulowski@esd.eu>
15 years agoARM: Update mach-types
Jean-Christophe PLAGNIOL-VILLARD [Tue, 30 Jun 2009 19:03:35 +0000 (21:03 +0200)]
ARM: Update mach-types

update against linux v2.6.30

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
15 years agoat91: Add CAN init function
Daniel Gorsulowski [Tue, 30 Jun 2009 21:03:33 +0000 (23:03 +0200)]
at91: Add CAN init function

To enable CAN init, CONFIG_CAN has to be defined in the board config file
and at91_can_hw_init() has to be called in the board specific code.

CAN is available on AT91SAM9263 and AT91CAP9 SoC.

Signed-off-by: Daniel Gorsulowski <Daniel.Gorsulowski@esd.eu>
15 years agoarm: Kirkwood: Correct header define
Simon Kagstrom [Tue, 30 Jun 2009 21:03:31 +0000 (23:03 +0200)]
arm: Kirkwood: Correct header define

Correct define typo (. -> ,)

Signed-off-by: Simon Kagstrom <simon.kagstrom@netinsight.net>
15 years agoMX31: Add basic support for Freescale i.MX31 PDK board.
Magnus Lilja [Tue, 30 Jun 2009 23:07:55 +0000 (01:07 +0200)]
MX31: Add basic support for Freescale i.MX31 PDK board.

Add support for Freescale's i.MX31 PDK board (a.k.a. 3 stack board).

This patch assumes that some other program performs the actual
NAND boot.

Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>
Acked-by: Fabio Estevam <fabioestevam@yahoo.com>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
15 years agoS3C24x0: extract interrupts from timer
Jean-Christophe PLAGNIOL-VILLARD [Mon, 22 Jun 2009 22:12:01 +0000 (00:12 +0200)]
S3C24x0: extract interrupts from timer

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
15 years agodm355/pm9261: add missing CONFIG_NET_MULTI
Jean-Christophe PLAGNIOL-VILLARD [Sun, 28 Jun 2009 12:14:21 +0000 (14:14 +0200)]
dm355/pm9261: add missing CONFIG_NET_MULTI

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
15 years agoarm920t/interrupts: Move conditional compilation to Makefile
Jean-Christophe PLAGNIOL-VILLARD [Mon, 22 Jun 2009 22:12:01 +0000 (00:12 +0200)]
arm920t/interrupts: Move conditional compilation to Makefile

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
15 years agomove L2 cache enable/disable function to cache.c in the omap3 SoC directory
Kim, Heung Jun [Sat, 20 Jun 2009 09:02:17 +0000 (11:02 +0200)]
move L2 cache enable/disable function to cache.c in the omap3 SoC directory

Signed-off-by: HeungJun, Kim <riverful.kim@samsung.com>
CC: Dirk Behme <dirk.behme@googlemail.com>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
15 years agoARM DaVinci: EMIF settings
Thomas Lange [Sat, 20 Jun 2009 09:02:17 +0000 (11:02 +0200)]
ARM DaVinci: EMIF settings

NAND module should not modify EMIF registers unrelated to CS2
that is used for NAND, i.e. do not modify EWAIT config register
or registers for other Chip Selects.

Without this patch, EMIF configurations made in board_init()
will be invalidated.

Signed-off-by: Thomas Lange <thomas@corelatus.se>
15 years agoversatile: config coding style cleanup
Jean-Christophe PLAGNIOL-VILLARD [Sat, 20 Jun 2009 09:02:17 +0000 (11:02 +0200)]
versatile: config coding style cleanup

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Peter Pearse <peter.pearse@arm.com>
15 years agoarm: Kirkwood: Basic SOCs support
Prafulla Wadaskar [Sat, 20 Jun 2009 09:01:53 +0000 (11:01 +0200)]
arm: Kirkwood: Basic SOCs support

Kirkwood family controllers are highly integrated SOCs
based on Feroceon-88FR131/Sheeva-88SV131/arm926ejs cpu core.

SOC versions supported:-
1) 88F6281-A0       define CONFIG_KW88F6281_A0
2) 88F6192-A0       define CONFIG_KW88F6192_A0

Other supported features:-
1) get_random_hex() fucntion
2) PCI Express port initialization
3) NS16550 driver support

Contributors:
Yotam Admon <yotam@marvell.com>
Michael Blostein <michaelbl@marvell.com

Reviewed-by: Ronen Shitrit <rshitrit@marvell.com>
Acked-by: Stefan Rose <sr@denx.de>
Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
15 years agoarm: generic cache.h for ARM architectures
Prafulla Wadaskar [Sat, 20 Jun 2009 09:01:52 +0000 (11:01 +0200)]
arm: generic cache.h for ARM architectures

This patch is required for Kirkwood SoC support
may be used by other ARM architectures

Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
15 years agoOMAP3EVM: fix typo. replace CS6 by CS5, no functionality change
Matthias Ludwig [Sat, 20 Jun 2009 09:01:50 +0000 (11:01 +0200)]
OMAP3EVM: fix typo. replace CS6 by CS5, no functionality change

Signed-off-by: Matthias Ludwig <mludwig@ultratronik.de>
15 years agoat91sam9260/9263: add back up for the rst(reset controller).
Sedji Gaouaou [Wed, 24 Jun 2009 06:32:09 +0000 (08:32 +0200)]
at91sam9260/9263: add back up for the rst(reset controller).

On the boards at91sam9260ek, at91sam9263ek and afed9260, the rstc register was
set to 0 after being set to 500 ms for the PHY reset.
Do backup the old reset length and restore it after the MACB initialisation.

Signed-off-by: Sedji Gaouaou <sedji.gaouaou@atmel.com>
Signed-off-by: Stelian Pop <stelian@popies.net>
15 years agospi: Add Marvell Kirkwood SPI driver
Prafulla Wadaskar [Fri, 29 May 2009 19:43:33 +0000 (01:13 +0530)]
spi: Add Marvell Kirkwood SPI driver

This patch adds a SPI driver for the Marvell Kirkwood SoC's.

Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
15 years agos3c64xx: move the reset_cpu function
Minkyu Kang [Thu, 25 Jun 2009 10:21:33 +0000 (19:21 +0900)]
s3c64xx: move the reset_cpu function

Because of the reset_cpu is soc specific, should be move to soc
And read reset value from SYS_ID register instead of hard code
this patch also supports s3c6410

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
15 years agointegrator: merge integratorap and integratorcp
Jean-Christophe PLAGNIOL-VILLARD [Sat, 16 May 2009 22:58:37 +0000 (00:58 +0200)]
integrator: merge integratorap and integratorcp

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: Peter Pearse <peter.pearse@arm.com>
15 years agointegratorap/cp: use cfi driver
Jean-Christophe PLAGNIOL-VILLARD [Sat, 16 May 2009 22:58:36 +0000 (00:58 +0200)]
integratorap/cp: use cfi driver

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: Peter Pearse <peter.pearse@arm.com>
15 years agointegratorap/cp/versatile: remove non used functions
Jean-Christophe PLAGNIOL-VILLARD [Sat, 16 May 2009 22:58:36 +0000 (00:58 +0200)]
integratorap/cp/versatile: remove non used functions

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: Peter Pearse <peter.pearse@arm.com>
15 years agointegratorcp: split timer support
Jean-Christophe PLAGNIOL-VILLARD [Sat, 16 May 2009 22:58:36 +0000 (00:58 +0200)]
integratorcp: split timer support

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: Peter Pearse <peter.pearse@arm.com>
15 years agointegratorap: split timer support
Jean-Christophe PLAGNIOL-VILLARD [Sat, 16 May 2009 22:58:36 +0000 (00:58 +0200)]
integratorap: split timer support

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: Peter Pearse <peter.pearse@arm.com>
15 years agointegratorap: split pci support
Jean-Christophe PLAGNIOL-VILLARD [Sat, 16 May 2009 22:58:36 +0000 (00:58 +0200)]
integratorap: split pci support

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: Peter Pearse <peter.pearse@arm.com>
15 years agoarm: add support for CONFIG_GENERIC_MMC
Ilya Yanok [Mon, 8 Jun 2009 00:12:50 +0000 (04:12 +0400)]
arm: add support for CONFIG_GENERIC_MMC

Signed-off-by: Ilya Yanok <yanok@emcraft.com>
15 years agoserial_mx31: allow it to work with mx27 too and rename to serial_mxc
Ilya Yanok [Mon, 8 Jun 2009 00:12:46 +0000 (04:12 +0400)]
serial_mx31: allow it to work with mx27 too and rename to serial_mxc

UART hardware on i.MX27 is the same as on the i.MX31 so we just
need to provide the driver with correct address of the registers.

Signed-off-by: Ilya Yanok <yanok@emcraft.com>
15 years agomx27: basic cpu support
Ilya Yanok [Mon, 8 Jun 2009 00:12:45 +0000 (04:12 +0400)]
mx27: basic cpu support

This patch adds generic code to support Freescale's i.MX27 SoCs.

Signed-off-by: Ilya Yanok <yanok@emcraft.com>
15 years agoi.MX31: Create a common device file.
Magnus Lilja [Sat, 13 Jun 2009 18:50:03 +0000 (20:50 +0200)]
i.MX31: Create a common device file.

Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>
15 years agoARM: Add macros.h to be used in assembler file.
Jean-Christophe PLAGNIOL-VILLARD [Sat, 13 Jun 2009 18:50:02 +0000 (20:50 +0200)]
ARM: Add macros.h to be used in assembler file.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
15 years agoMX31: Add NAND SPL for i.MX31.
Magnus Lilja [Sat, 13 Jun 2009 18:50:01 +0000 (20:50 +0200)]
MX31: Add NAND SPL for i.MX31.

This patch adds the NAND SPL framework needed to boot i.MX31 boards
from NAND.

It has been tested on a i.MX31 PDK board with large page NAND. Small
page NANDs should work as well, but this has not been tested.

Note: The i.MX31 NFC uses a non-standard layout for large page NANDs,
whether this is compatible with a particular setup depends on how
the NAND device is programmed by the flash programmer (e.g. JTAG
debugger).

The patch is based on the work by Maxim Artamonov.

Signed-off-by: Maxim Artamonov <scn1874@yandex.ru>
Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>
15 years agoARM1136: Introduce CONFIG_PRELOADER macro.
Magnus Lilja [Sat, 13 Jun 2009 18:50:00 +0000 (20:50 +0200)]
ARM1136: Introduce CONFIG_PRELOADER macro.

Currently CONFIG_ONENAND_IPL is used in a number of #ifdef's
in start.S. In preparation for adding support for NAND SPL
the macro CONFIG_PRELOADER is introducted and replaces the
CONFIG_ONENAND_IPL in start.S.

Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>
15 years agoat91: unify nor boot support
Jean-Christophe PLAGNIOL-VILLARD [Sat, 13 Jun 2009 10:50:04 +0000 (12:50 +0200)]
at91: unify nor boot support

the lowlevel init sequence is the same so unify it

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
15 years agoat91sam9263ek: add nor flash support
Jean-Christophe PLAGNIOL-VILLARD [Sat, 13 Jun 2009 10:48:36 +0000 (12:48 +0200)]
at91sam9263ek: add nor flash support

this will allow you to store use it for the env and to boot directly U-Boot from

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
15 years agoat91: add support for the PM9261 board of Ronetix GmbH
Ilko Iliev [Fri, 12 Jun 2009 19:20:39 +0000 (21:20 +0200)]
at91: add support for the PM9261 board of Ronetix GmbH

The PM9261 board is based on the AT91SAM9261-EK board.

Here is the page on Ronetix website:
http://www.ronetix.at/starter_kit_9261.html

Signed-off-by: Ilko Iliev <iliev@ronetix.at>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
15 years agopm9263: use macro instead of hardcode value for the lowlevel_init
Jean-Christophe PLAGNIOL-VILLARD [Fri, 12 Jun 2009 19:20:38 +0000 (21:20 +0200)]
pm9263: use macro instead of hardcode value for the lowlevel_init

optimize a few the RAM init

Signed-off-by: Ilko Iliev <iliev@ronetix.at>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
15 years agopm9263: lowlevel init update
Jean-Christophe PLAGNIOL-VILLARD [Fri, 12 Jun 2009 19:20:37 +0000 (21:20 +0200)]
pm9263: lowlevel init update

move PSRAM init to pm9263.c
this will allow us after to make the nor lowlevel_init generic

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
15 years agoBlackfin: move ALL += u-boot.ldr to blackfin_config.mk
Mike Frysinger [Mon, 15 Jun 2009 04:25:19 +0000 (00:25 -0400)]
Blackfin: move ALL += u-boot.ldr to blackfin_config.mk

The way the ALL variable is used allows for config.mk's to add more
targets themselves without having to clutter up the top level Makefile.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoBlackfin: fix SPI flash speed define name
Mike Frysinger [Mon, 15 Jun 2009 02:29:35 +0000 (22:29 -0400)]
Blackfin: fix SPI flash speed define name

The SPI flash define is named CONFIG_SF_DEFAULT_SPEED, not
CONFIG_SF_DEFAULT_HZ, so fix the typos in the Blackfin boards.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoBlackfin: enable -O2 in lib_generic/ for ADI/Bluetechnix boards
Mike Frysinger [Mon, 15 Jun 2009 02:26:31 +0000 (22:26 -0400)]
Blackfin: enable -O2 in lib_generic/ for ADI/Bluetechnix boards

Building the compression code in lib_generic/ with -O2 rather than -Os
gives a nice speed boost without too much code size increase.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoBlackfin: bf548-ezkit: bump up monitor size
Mike Frysinger [Mon, 15 Jun 2009 01:23:27 +0000 (21:23 -0400)]
Blackfin: bf548-ezkit: bump up monitor size

The latest version of U-Boot got a bit fatter in the BSS section which
caused overflows in the RAM region, so increase the monitor size.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoBlackfin: bf533-stamp/bf537-stamp: fix env settings for SPI flash
Vivi Li [Fri, 12 Jun 2009 10:53:22 +0000 (10:53 +0000)]
Blackfin: bf533-stamp/bf537-stamp: fix env settings for SPI flash

The SPI flash layer is much stricter about sector usage than the eeprom
layer we used to use, so update the env settings to better match the
sector alignment of the flashes we use.

Signed-off-by: Vivi Li <vivi.li@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoBlackfin: bump up default JTAG console timeout
Vivi Li [Fri, 12 Jun 2009 10:33:23 +0000 (10:33 +0000)]
Blackfin: bump up default JTAG console timeout

The debug tools that interface with the other side of the JTAG console
got much slower when generalizing things, so bump up the default timeout
value on the U-Boot side to cope.  Hopefully at some point we can improve
the debug tools to speed things back up.

Signed-off-by: Vivi Li <vivi.li@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Mon, 15 Jun 2009 09:16:04 +0000 (11:16 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

15 years agoMerge branch 'master' of git://git.denx.de/u-boot-net
Wolfgang Denk [Mon, 15 Jun 2009 09:15:54 +0000 (11:15 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-net

15 years agoBlackfin: add jtagconsole helper script
Mike Frysinger [Mon, 1 Jun 2009 23:08:33 +0000 (19:08 -0400)]
Blackfin: add jtagconsole helper script

This script is similar to the netconsole script, but instead works with
the JTAG console device driver that exists on Blackfin parts.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoConvert DM9000 driver for CONFIG_NET_MULTI
Remy Bohmer [Sat, 2 May 2009 19:49:18 +0000 (21:49 +0200)]
Convert DM9000 driver for CONFIG_NET_MULTI

All drivers need to be converted to CONFIG_NET_MULTI.
This patch converts the dm9000 driver.

Signed-off-by: Thomas Smits <ts.smits@gmail.com>
Signed-off-by: Remy Bohmer <linux@bohmer.net>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
15 years agonet: Add Marvell Kirkwood gigabit ethernet driver
Prafulla Wadaskar [Sun, 14 Jun 2009 17:03:46 +0000 (22:33 +0530)]
net: Add Marvell Kirkwood gigabit ethernet driver

This patch adds a egiga driver for the Marvell Kirkwood SoC's.

Contributors:
Yotam Admon <yotam@marvell.com>
Michael Blostein <michaelbl@marvell.com

Reviewed-by: Ronen Shitrit <rshitrit@marvell.com>
Acked-by: Stefan Rose <sr@denx.de>
Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
15 years agoDaVinci Network Driver Updates
s-paulraj@ti.com [Tue, 12 May 2009 15:45:34 +0000 (11:45 -0400)]
DaVinci Network Driver Updates

Different flavours of DaVinci SOC's have differences in their EMAC IP
This patch does the following
1) Updates base addresses for DM365
2) Updates MDIO frequencies for DM365 and DM646x
3) Update EMAC wrapper registers for DM365 and DM646x

Patch applies to u-boot-net git. the EMAC driver itself
will be updated shortly to add support for DM365 and DM646x

Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
15 years agoSubject: [PATCH] [repost] Standardize the use of MCFFEC_TOUT_LOOP as a udelay(1)...
Richard Retanubun [Tue, 26 May 2009 12:29:29 +0000 (08:29 -0400)]
Subject: [PATCH] [repost] Standardize the use of MCFFEC_TOUT_LOOP as a udelay(1) loop counter.

 From 584b5fbd4abfc43f920cc1c329633e03816e28be Mon Sep 17 00:00:00 2001
From: Richard Retanubun <RichardRetanubun@RuggedCom.com>
Date: Wed, 20 May 2009 18:26:01 -0400
Subject: [PATCH] Standardize the use of MCFFEC_TOUT_LOOP as a udelay(1) loop counter.

Signed-off-by: Richard Retanubun <RichardRetanubun@RuggedCom.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
15 years agoA VLAN tagged DHCP request/discover is 4 bytes short
Norbert van Bolhuis [Thu, 4 Jun 2009 07:39:48 +0000 (09:39 +0200)]
A VLAN tagged DHCP request/discover is 4 bytes short

The problem is that BOOTP_SIZE uses ETHER_HDR_SIZE which is 14 bytes.
If sending a VLAN tagged frame (when env variable vlan is set) this
should be VLAN_ETHER_HDR_SIZE=18 which is what NetSetEther returns.

Signed-off-by: Norbert van Bolhuis <nvbolhuis@aimvalley.nl>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
15 years agoRemove support for non-CONFIG_NET_MULTI on PPC4xx EMAC
Ben Warren [Tue, 28 Apr 2009 23:39:19 +0000 (16:39 -0700)]
Remove support for non-CONFIG_NET_MULTI on PPC4xx EMAC

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
15 years agoSwitched davinci_emac Ethernet driver to use newer API
Ben Warren [Tue, 26 May 2009 07:34:07 +0000 (00:34 -0700)]
Switched davinci_emac Ethernet driver to use newer API

Added CONFIG_NET_MULTI to all Davinci boards
Removed all calls to Davinci network driver from board code
Added cpu_eth_init() to cpu/arm926ejs/cpu.c

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
15 years agoInitial cleanup of Davinci Ethernet driver
Ben Warren [Tue, 28 Apr 2009 06:19:10 +0000 (23:19 -0700)]
Initial cleanup of Davinci Ethernet driver

 Removed pointless #ifdefs
 Moved functions around in file in preparation for switch to newer API

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
15 years agoMoved Davinci Ethernet driver to drivers/net
Ben Warren [Tue, 26 May 2009 07:17:59 +0000 (00:17 -0700)]
Moved Davinci Ethernet driver to drivers/net

This driver has been renamed davinci_emac.c

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
15 years agoMarvell MV88E61XX Switch Driver support
Prafulla Wadaskar [Mon, 18 May 2009 20:10:16 +0000 (01:40 +0530)]
Marvell MV88E61XX Switch Driver support

Chips supported:-
1. 88E6161 6 port gbe swtich with 5 integrated PHYs
2. 88E6165 6 port gbe swtich with 5 integrated PHYs
2. 88E6132 3 port gbe swtich with 2 integrated PHYs
Platform specific configuration supported for:-
default or router port vlan configuration
led_init configuration
mdip/n polarity reversal configuration

Note: This driver is supported and tested against
kirkwood egiga interface

Contributors:
Yotam Admon <yotam@marvell.com>
Michael Blostein <michaelbl@marvell.com

Reviewed by: Ronen Shitrit <rshitrit@marvell.com>
Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
15 years agotsec: Add support for BCM5482S PHY
Zach LeRoy [Fri, 22 May 2009 15:26:33 +0000 (10:26 -0500)]
tsec: Add support for BCM5482S PHY

Signed-off-by: Zach LeRoy <zleroy@xes-inc.com>
Acked-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
15 years agoBlackfin: unify u-boot linker scripts
Mike Frysinger [Sun, 14 Jun 2009 10:29:07 +0000 (06:29 -0400)]
Blackfin: unify u-boot linker scripts

All the Blackfin linker scripts were duplicated across the board dirs with
no difference save from the semi-often used ENV_IS_EMBEDDED option.  So
unify all of them in the lib_blackfin/ dir and for the few boards that
need to embedded the environment directly, add a LDS_BOARD_TEXT define for
them to customize via their board config file.  This is much simpler than
forcing them to duplicate the rest of the linker script.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoBlackfin: bf518f-ezbrd: enable SST SPI flash driver
Mike Frysinger [Fri, 29 May 2009 21:02:37 +0000 (17:02 -0400)]
Blackfin: bf518f-ezbrd: enable SST SPI flash driver

The BF51xF parts have an internal SST SPI flash, so make sure the driver is
enabled by default so we can access it.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoBlackfin: convert specific pre/post config headers to common method
Mike Frysinger [Fri, 24 Apr 2009 21:22:40 +0000 (17:22 -0400)]
Blackfin: convert specific pre/post config headers to common method

The Blackfin port was using asm/blackfin-config-{pre,post}.h to setup
common Blackfin board defines.  The common method now is to use config.h,
so convert blackfin-config-post.h to that.  Rename the still Blackfin
specific blackfin-config-pre.h to config-pre.h so the naming conventions
at least line up.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoBlackfin: enable LZMA for all ADI boards
Mike Frysinger [Fri, 24 Apr 2009 21:11:47 +0000 (17:11 -0400)]
Blackfin: enable LZMA for all ADI boards

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoBlackfin: make default ADI env more flexible
Mike Frysinger [Mon, 13 Apr 2009 09:52:45 +0000 (05:52 -0400)]
Blackfin: make default ADI env more flexible

Allow boards to easily override the root= and default bootcmd, allow
people to tweak the file used in default bootcmds at runtime via one env
var, and add a stock nandboot command.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoBlackfin: ibf-dsp561: new board port
Hoan Hoang [Mon, 19 Jan 2009 03:44:17 +0000 (22:44 -0500)]
Blackfin: ibf-dsp561: new board port

Signed-off-by: Hoan Hoang <hnhoan@i-syst.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoBlackfin: blackstamp: new board port
Mike Frysinger [Mon, 13 Oct 2008 03:28:33 +0000 (23:28 -0400)]
Blackfin: blackstamp: new board port

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoBlackfin: bf537-srv1: new board port
Mike Frysinger [Mon, 13 Oct 2008 03:22:25 +0000 (23:22 -0400)]
Blackfin: bf537-srv1: new board port

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoBlackfin: bf537-minotaur: new board port
Mike Frysinger [Mon, 13 Oct 2008 03:16:52 +0000 (23:16 -0400)]
Blackfin: bf537-minotaur: new board port

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoBlackfin: bf537-pnav: new board port
Mike Frysinger [Mon, 13 Oct 2008 03:08:03 +0000 (23:08 -0400)]
Blackfin: bf537-pnav: new board port

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoBlackfin: cm-bf527: new board port
Mike Frysinger [Mon, 13 Oct 2008 01:55:45 +0000 (21:55 -0400)]
Blackfin: cm-bf527: new board port

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoBlackfin: cm-bf548: new board port
Mike Frysinger [Mon, 13 Oct 2008 01:54:07 +0000 (21:54 -0400)]
Blackfin: cm-bf548: new board port

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoBlackfin: tcm-bf537: new board port
Mike Frysinger [Mon, 13 Oct 2008 01:49:28 +0000 (21:49 -0400)]
Blackfin: tcm-bf537: new board port

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoBlackfin: cm-bf561: new board port
Mike Frysinger [Mon, 13 Oct 2008 01:45:05 +0000 (21:45 -0400)]
Blackfin: cm-bf561: new board port

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoBlackfin: cm-bf537e: new board port
Mike Frysinger [Mon, 13 Oct 2008 01:41:06 +0000 (21:41 -0400)]
Blackfin: cm-bf537e: new board port

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoBlackfin: cm-bf533: new board port
Mike Frysinger [Mon, 13 Oct 2008 01:36:22 +0000 (21:36 -0400)]
Blackfin: cm-bf533: new board port

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoBlackfin: new spibootldr command
Mike Frysinger [Thu, 27 Nov 2008 21:50:32 +0000 (16:50 -0500)]
Blackfin: new spibootldr command

Newer Blackfin parts can an on-chip ROM that can boot LDRs over SPI flashes,
so add a new 'spibootldr' command to take advantage of it.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoBlackfin: support embedding the environment into loader files (LDRs)
Mike Frysinger [Mon, 6 Oct 2008 08:42:33 +0000 (04:42 -0400)]
Blackfin: support embedding the environment into loader files (LDRs)

For the most part, the Blackfin processor boots files in the LDR format
rather than binary/ELF files.  So we want to export the environment as a
raw blob to the LDR utility so it can embed it at the right location.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoadd %.c->%.i and %.c->%.s rules
Mike Frysinger [Sun, 14 Jun 2009 15:03:48 +0000 (11:03 -0400)]
add %.c->%.i and %.c->%.s rules

The Linux kernel has some helper rules which allow you to quickly produce
some of the intermediary files from C source.  Specifically, you can
create .i files which is the preprocessed output and you can create .s
files which is the assembler output.  This is useful when you are trying
to track down header/macro expansion errors or inline assembly errors.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
15 years agomake sure toplevel $(SUBDIRS) is always declared
Mike Frysinger [Sat, 30 May 2009 05:02:03 +0000 (01:02 -0400)]
make sure toplevel $(SUBDIRS) is always declared

The $(SUBDIRS) variable is only declared when U-Boot has been configured,
but it gets used all the time.  In the non-configured case, it is used to
generate a helpful error message, but it needs to be set properly for that
to occur.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoallow boards to customize compiler options on a per-file/dir basis
Mike Frysinger [Sun, 14 Jun 2009 13:33:00 +0000 (09:33 -0400)]
allow boards to customize compiler options on a per-file/dir basis

With our Blackfin boards, we like to build the compression routines with
-O2 as our tests show a pretty good size/speed tradeoff.  For the rest of
U-Boot though, we want to stick with the default -Os as that is mostly
control code.  So in our case, we would add a line like so to the board
specific config.mk file:
CFLAGS_lib_generic += -O2

Now all files under lib_generic/ will have -O2 appended to their build.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
15 years agoMerge branch 'next' of ../master
Wolfgang Denk [Sun, 14 Jun 2009 20:05:42 +0000 (22:05 +0200)]
Merge branch 'next' of ../master

15 years agoPrepare v2009.06 v2009.06
Wolfgang Denk [Sun, 14 Jun 2009 19:30:39 +0000 (21:30 +0200)]
Prepare v2009.06

Update CHANGELOG, fix minor coding stylke issue. Update Makefile.

Signed-off-by: Wolfgang Denk <wd@denx.de>
15 years agoRevert "SMC911x driver fixed for NFS boot"
Wolfgang Denk [Sun, 14 Jun 2009 18:31:36 +0000 (20:31 +0200)]
Revert "SMC911x driver fixed for NFS boot"

This reverts commit ca9c8a1e10fac01e6a1129f82a7ce18bd818fa43,
which causes compile warnings ("large integer implicitly truncated
to unsigned type") on all systems that use this driver. The warning
results from passing long constants (TX_CFG, RX_CFG) into
smc911x_set_mac_csr() which is declared to accept "unsigned
character" arguments only.

Being close to a release, with nobody available to actually test the
code or the suggested fixes, it seems better to revert the patch.

15 years agoxes: Update Freescale clock code to work with 86xx processors
Peter Tyser [Fri, 22 May 2009 15:26:37 +0000 (10:26 -0500)]
xes: Update Freescale clock code to work with 86xx processors

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years agoxes: Update Freescale DDR code to work with 86xx processors
Peter Tyser [Fri, 22 May 2009 15:26:36 +0000 (10:26 -0500)]
xes: Update Freescale DDR code to work with 86xx processors

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years agoxes: Update Freescale PCI code to work with 86xx processors
Peter Tyser [Fri, 22 May 2009 15:26:35 +0000 (10:26 -0500)]
xes: Update Freescale PCI code to work with 86xx processors

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years ago85xx: Add PORBMSR and PORDEVSR shift defines
Peter Tyser [Fri, 22 May 2009 15:26:32 +0000 (10:26 -0500)]
85xx: Add PORBMSR and PORDEVSR shift defines

Add defines similar to those already used for the the 86xx architecture.
This will ease sharing of PCI code between the 85xx and 86xx
architectures.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years agofsl/85xx, 86xx: Sync up DMA code
Peter Tyser [Thu, 21 May 2009 17:10:00 +0000 (12:10 -0500)]
fsl/85xx, 86xx: Sync up DMA code

The following changes were made to sync up the DMA code between the 85xx
and 86xx architectures which will make it easier to break out common
8xxx DMA code:

85xx:
- Don't set STRANSINT and SPCIORDER fields in SATR register.  These bits
  only have an affect when the SBPATMU bit is set.
- Write 0xffffffff instead of 0xfffffff to clear errors in the DMA
  status register.  We may as well clear all 32 bits of the register...

86xx:
- Add CONFIG_SYS_MPC86xx_DMA_ADDR define to address DMA registers
- Add clearing of errors in the DMA status register when initializing
  the controller
- Clear the channel start bit in the DMA mode register after a transfer

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years agofsl: Create common fsl_dma.h for 85xx and 86xx cpus
Peter Tyser [Thu, 21 May 2009 17:09:59 +0000 (12:09 -0500)]
fsl: Create common fsl_dma.h for 85xx and 86xx cpus

Break out DMA structures for the Freescale MPC85xx and MPC86xx cpus to
reduce a large amount of code duplication

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years ago85xx: Add UEC6 and UEC8 at SGMII mode for MPC8569MDS
Haiying Wang [Wed, 20 May 2009 16:30:41 +0000 (12:30 -0400)]
85xx: Add UEC6 and UEC8 at SGMII mode for MPC8569MDS

On MPC8569MDS board, UCC6 and UCC8 can be configured to work at SGMII mode via
UEM on PB board. Since MPC8569 supports up to 4 Gigabit Ethernet ports, we
disable UEC6 and UEC8 by default.

Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years agodrivers/qe: add sgmii support in for UEC driver
Haiying Wang [Thu, 4 Jun 2009 20:12:42 +0000 (16:12 -0400)]
drivers/qe: add sgmii support in for UEC driver

Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years agoqe: Pass in uec_info struct through uec_initialize
Haiying Wang [Thu, 4 Jun 2009 20:12:41 +0000 (16:12 -0400)]
qe: Pass in uec_info struct through uec_initialize

The uec driver contains code to hard code configuration information for the uec
ethernet controllers. This patch creates an array of uec_info structures, which
are then parsed by the corresponding driver instance to determine configuration.
It also creates function uec_standard_init() to initialize all UEC interfaces
for 83xx and 85xx.

Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years agofsl: Update the number of ethxaddr in reading system eeprom
Haiying Wang [Thu, 4 Jun 2009 20:12:40 +0000 (16:12 -0400)]
fsl: Update the number of ethxaddr in reading system eeprom

We support up to 8 mac addresses in system eeprom, so we define the macro
MAX_NUM_PORTS to limit the mac_count to 8, and update the number of ethxaddr
according to mac_count.

Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years ago85xx: Add RMII support for MPC8569MDS
Haiying Wang [Wed, 20 May 2009 16:30:37 +0000 (12:30 -0400)]
85xx: Add RMII support for MPC8569MDS

This patch supports UCC working at RMII mode on PIB board, fixup fdt blob to
support rmii in kernel. It also changes the name of enable_mpc8569mds_qe_mdio to
enalbe_mpc8569mds_qe_uec which is  more accurate.

Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years ago85xx: Add UEC3 and UEC4 support for MPC8569MDS
Haiying Wang [Wed, 20 May 2009 16:30:36 +0000 (12:30 -0400)]
85xx: Add UEC3 and UEC4 support for MPC8569MDS

Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years agodrivers/qe: Add more SNUM number for QE
Haiying Wang [Wed, 20 May 2009 16:30:35 +0000 (12:30 -0400)]
drivers/qe: Add more SNUM number for QE

Some QE chips like 8569 need more SNUM numbers for supporting 4 UECs in RGMII-
1000 mode.

Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
Acked-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years agodrivers/qe: Change QE RISC ALLOCATION to support 4 RISCs
Haiying Wang [Thu, 21 May 2009 19:34:14 +0000 (15:34 -0400)]
drivers/qe: Change QE RISC ALLOCATION to support 4 RISCs

Also define the QE_RISC_ALLOCATION_RISCs to MACROs instead of using enum, and
define MAX_QE_RISC for QE based silicons.

Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
Acked-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years ago85xx: Add QE clk support
Haiying Wang [Wed, 20 May 2009 16:30:29 +0000 (12:30 -0400)]
85xx: Add QE clk support

Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
Acked-by: Timur Tabi <Timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>