platform/kernel/u-boot.git
13 years agoMX25: tx25: Avoid the usage of extern in C file
Fabio Estevam [Tue, 6 Sep 2011 09:05:42 +0000 (09:05 +0000)]
MX25: tx25: Avoid the usage of extern in C file

Avoid the usage of extern in C file as pointed out by checkpatch.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
13 years agomx31pdk: Change the prompt as per other i.MX boards
Fabio Estevam [Thu, 15 Sep 2011 13:18:23 +0000 (13:18 +0000)]
mx31pdk: Change the prompt as per other i.MX boards

Change the prompt as done in other i.MX boards.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
13 years agoMX31: Improve readability for reset cause
Fabio Estevam [Fri, 16 Sep 2011 04:01:22 +0000 (04:01 +0000)]
MX31: Improve readability for reset cause

Currently the reset cause is printed like:
CPU:   Freescale i.MX31 rev 2.0 at 531 MHz.Reset cause: POR

Improve readability by adding a new line like it is done on other i.MX boards.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
13 years agoMX31: mx31pdk: Remove nand_spl config.mk file
Fabio Estevam [Mon, 5 Sep 2011 08:55:12 +0000 (08:55 +0000)]
MX31: mx31pdk: Remove nand_spl config.mk file

No need to have a config.mk to only store a single line.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Stefano Babic <sbabic@denx.de>
13 years agoARM: mx25: Print the source of reset
Fabio Estevam [Fri, 2 Sep 2011 05:38:55 +0000 (05:38 +0000)]
ARM: mx25: Print the source of reset

Print the source of reset during boot.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
13 years agoARM: mx25: Print the silicon revison
Fabio Estevam [Fri, 2 Sep 2011 05:38:54 +0000 (05:38 +0000)]
ARM: mx25: Print the silicon revison

Print the silicon revison during boot.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
13 years agoarm, davinci, da8xx: add cpuinfo
Heiko Schocher [Wed, 14 Sep 2011 19:59:39 +0000 (19:59 +0000)]
arm, davinci, da8xx: add cpuinfo

Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Paulraj Sandeep <s-paulraj@ti.com>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoarm, davinci, am1808: add lowlevel functions for booting from NOR
Heiko Schocher [Wed, 14 Sep 2011 19:59:38 +0000 (19:59 +0000)]
arm, davinci, am1808: add lowlevel functions for booting from NOR

Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Paulraj Sandeep <s-paulraj@ti.com>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoarm, davinci: add NOR Boot Configuration Word
Heiko Schocher [Wed, 14 Sep 2011 19:59:37 +0000 (19:59 +0000)]
arm, davinci: add NOR Boot Configuration Word

to add the "NOR Boot Configuration Word" on AM18xx based boards,
define CONFIG_SYS_DV_NOR_BOOT_CFG.

Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Paulraj Sandeep <s-paulraj@ti.com>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoarm, davinci: add ddr2 definition
Heiko Schocher [Wed, 14 Sep 2011 19:59:36 +0000 (19:59 +0000)]
arm, davinci: add ddr2 definition

Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Paulraj Sandeep <s-paulraj@ti.com>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoarm, davinci, am1808, gpio: add missing defines for bank 8
Heiko Schocher [Wed, 14 Sep 2011 19:59:35 +0000 (19:59 +0000)]
arm, davinci, am1808, gpio: add missing defines for bank 8

Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Paulraj Sandeep <s-paulraj@ti.com>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoarm, davinci: add some missing defines in hardware.h
Heiko Schocher [Wed, 14 Sep 2011 19:59:34 +0000 (19:59 +0000)]
arm, davinci: add some missing defines in hardware.h

Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Paulraj Sandeep <s-paulraj@ti.com>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoarm, davinci: add SYSCFG1 base and register struct
Heiko Schocher [Wed, 14 Sep 2011 19:59:33 +0000 (19:59 +0000)]
arm, davinci: add SYSCFG1 base and register struct

Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Paulraj Sandeep <s-paulraj@ti.com>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agortc, davinci: add support for davinci internal RTC
Heiko Schocher [Wed, 14 Sep 2011 19:48:23 +0000 (19:48 +0000)]
rtc, davinci: add support for davinci internal RTC

Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Paulraj Sandeep <s-paulraj@ti.com>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoarm, davinci: add RTC base addr
Heiko Schocher [Wed, 14 Sep 2011 19:48:22 +0000 (19:48 +0000)]
arm, davinci: add RTC base addr

Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Paulraj Sandeep <s-paulraj@ti.com>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoarm, davinci: add internal WDT support for AM1808 cpus
Heiko Schocher [Wed, 14 Sep 2011 19:44:02 +0000 (19:44 +0000)]
arm, davinci: add internal WDT support for AM1808 cpus

Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Paulraj Sandeep <s-paulraj@ti.com>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoarm, davinci: add missing timer baseaddresses for !DA8xx cpu
Heiko Schocher [Wed, 14 Sep 2011 19:44:01 +0000 (19:44 +0000)]
arm, davinci: add missing timer baseaddresses for !DA8xx cpu

Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Paulraj Sandeep <s-paulraj@ti.com>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoarm, davinci: move davinci_timer in header file
Heiko Schocher [Wed, 14 Sep 2011 19:44:00 +0000 (19:44 +0000)]
arm, davinci: move davinci_timer in header file

Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Paulraj Sandeep <s-paulraj@ti.com>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agonet, davinci_emac: let the EMAC detect the PHYs
Heiko Schocher [Wed, 14 Sep 2011 19:37:42 +0000 (19:37 +0000)]
net, davinci_emac: let the EMAC detect the PHYs

Once the MDIO state machine has been initialized and enabled, it
starts polling all 32 PHY addresses on the MDIO bus, looking for
an active PHY. Add a 5 ms delay, so all PHYs are for sure detected.

This problem was detected on the cmc board with a KSZ8864 switch.

Signed-off-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agonet, davinci_emac: make less verbose - turn printf() into debug()
Heiko Schocher [Wed, 14 Sep 2011 19:22:57 +0000 (19:22 +0000)]
net, davinci_emac: make less verbose - turn printf() into debug()

The PHY driver was too verbose and corrupted the boot message display
like this:

...
Net:   Ethernet PHY: KSZ8873 @ 0x02
DaVinci-EMAC
...

Turn printf() into debug() so we get the expected output again:

...
Net:   DaVinci-EMAC
...

Signed-off-by: Heiko Schocher <hs@denx.de>
cc: Paulraj Sandeep <s-paulraj@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agonet, davinci_emac: add KSZ8864 switch
Heiko Schocher [Sun, 18 Sep 2011 19:49:25 +0000 (19:49 +0000)]
net, davinci_emac: add KSZ8864 switch

Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Paulraj Sandeep <s-paulraj@ti.com>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Cc: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoi2c, davinci: add i2c set speed
Heiko Schocher [Wed, 14 Sep 2011 19:25:12 +0000 (19:25 +0000)]
i2c, davinci: add i2c set speed

Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Paulraj Sandeep <s-paulraj@ti.com>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoDevkit8000: Change console from ttyS2 to ttyO2
Thomas Weber [Sun, 18 Sep 2011 22:43:58 +0000 (22:43 +0000)]
Devkit8000: Change console from ttyS2 to ttyO2

The omap serial names have changed from ttySx to ttyOx,
so the console should be also changed to support this.

Signed-off-by: Thomas Weber <weber@corscience.de>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoomap4: update maintainer for omap4 boards
Aneesh V [Fri, 23 Sep 2011 01:06:17 +0000 (01:06 +0000)]
omap4: update maintainer for omap4 boards

Steve wants to transfer maintainership of OMAP4 boards
to me as he is not working on these boards lately.

CC: Steve Sakoman <steve@sakoman.com>
CC: Sandeep Paulraj <s-paulraj@ti.com>
CC: Albert Aribaud <albert.u.boot@aribaud.net>
CC: Wolfgang Denk <wd@denx.de>
Signed-off-by: Aneesh V <aneesh@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoomap3evm: env: Fix default console
Sanjeev Premi [Fri, 23 Sep 2011 05:25:28 +0000 (05:25 +0000)]
omap3evm: env: Fix default console

Change the default console from ttyS2 to ttyO0 to
match the Linux default for the EVM.

Signed-off-by: Sanjeev Premi <premi@ti.com>
Cc: Sandeep Paulraj <s-paulraj@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoomap3: Fix compile warning
Sanjeev Premi [Fri, 23 Sep 2011 05:29:45 +0000 (05:29 +0000)]
omap3: Fix compile warning

Building without option CONFIG_DISPLAY_CPUINFO leads to
this warning:
sys_info.c:50:14: warning: 'rev_s_37xx' defined but not used

Signed-off-by: Sanjeev Premi <premi@ti.com>
Cc: Sandeep Paulraj <s-paulraj@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agommc: omap: config VMMC, MMC1_PBIAS
Balaji T K [Thu, 8 Sep 2011 06:34:57 +0000 (06:34 +0000)]
mmc: omap: config VMMC, MMC1_PBIAS

Config VMMC voltage to 3V for MMC/SD card slot
and PBIAS settings needed for OMAP4
Fixes MMC/SD detection on boot from eMMC.

Signed-off-by: Balaji T K <balajitk@ti.com>
Signed-off-by: Aneesh V <aneesh@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agommc: omap: enable high capacity
Balaji T K [Thu, 25 Aug 2011 04:46:51 +0000 (04:46 +0000)]
mmc: omap: enable high capacity

Enable high capacity to host capability.
Fixes eMMC detection on boot from MMC/SD card.

Signed-off-by: Balaji T K <balajitk@ti.com>
Signed-off-by: Aneesh V <aneesh@ti.com>
Acked-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agodevkit8000: Fix build break
Sandeep Paulraj [Fri, 16 Sep 2011 16:35:00 +0000 (12:35 -0400)]
devkit8000: Fix build break

Found a build erros when i ran MAKEALL.
So fix it.

Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoomap-common: reorganize spl.c
Simon Schwarz [Wed, 14 Sep 2011 19:33:34 +0000 (15:33 -0400)]
omap-common: reorganize spl.c

split-up spl.c into spl.c, spl_mmc.c and spl_nand.c. This avoids problems
with missing defines if a board does not use mmc or nand. This includes
adding spl_ prefix to some functions which are now public. spl_image_t is now
a public type. Added some of the common functions to omap-common.h

Signed-off-by: Simon Schwarz <simonschwarzcor@gmail.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoomap3: implement boot parameter saving
Simon Schwarz [Wed, 14 Sep 2011 19:32:57 +0000 (15:32 -0400)]
omap3: implement boot parameter saving

Implements the saving of boot params passed by OMAP3 ROM code.

Signed-off-by: Simon Schwarz <simonschwarzcor@gmail.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agodevkit8000: Add nand-spl support for new SPL
Simon Schwarz [Wed, 14 Sep 2011 19:32:17 +0000 (15:32 -0400)]
devkit8000: Add nand-spl support for new SPL

Add NAND SPL support to the devkit8000 config

Signed-off-by: Simon Schwarz <simonschwarzcor@gmail.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoomap3: new SPL structure support
Simon Schwarz [Wed, 14 Sep 2011 19:31:33 +0000 (15:31 -0400)]
omap3: new SPL structure support

Support for the new spl structure. Using the interface defined by Aneesh V for
OMAP4

Signed-off-by: Simon Schwarz <simonschwarzcor@gmail.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agospl: Add POWER library to new spl
Simon Schwarz [Wed, 14 Sep 2011 19:30:54 +0000 (15:30 -0400)]
spl: Add POWER library to new spl

Adds power library to the new spl

Signed-off-by: Simon Schwarz <simonschwarzcor@gmail.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agospl: add NAND Library to new SPL
Simon Schwarz [Wed, 14 Sep 2011 19:30:16 +0000 (15:30 -0400)]
spl: add NAND Library to new SPL

Adds NAND library to SPL.

Signed-off-by: Simon Schwarz <simonschwarzcor@gmail.com>
Acked-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoomap-common: add nand spl support
Simon Schwarz [Wed, 14 Sep 2011 19:29:26 +0000 (15:29 -0400)]
omap-common: add nand spl support

Add NAND support for the new SPL structure.

Signed-off-by: Simon Schwarz <simonschwarzcor@gmail.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoomap3: Configure RAM bank 0 if in SPL
Simon Schwarz [Wed, 14 Sep 2011 19:15:37 +0000 (15:15 -0400)]
omap3: Configure RAM bank 0 if in SPL

OMAP3 relied on the memory config done by X-loader or Configuration Header. This
has to be reworked for the implementation of a SPL. This patch configures RAM
bank 0 if CONFIG_SPL_BUILD is set. Settings for Micron-RAM used by devkit8000
are added to mem.h

Signed-off-by: Simon Schwarz <simonschwarzcor@gmail.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoomap-common/omap4: relocate early UART clock setup
Simon Schwarz [Wed, 14 Sep 2011 19:14:46 +0000 (15:14 -0400)]
omap-common/omap4: relocate early UART clock setup

Moves the early UART clock setup setup_clocks_for_console() from
preloader_console_init() to s_init() of OMAP4.

This is done to prepare for OMAP3 integration.

This patch was posted seperatly to the mailinglist but I decidet - since it is
a prereqesit for this patch to add it. Former port to ML:
http://article.gmane.org/gmane.comp.boot-loaders.u-boot/104395

Signed-off-by: Simon Schwarz <simonschwarzcor@gmail.com>
Signed-off-by: Tom Rini <trini@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoovero: Set IEN on GPMC_CLK to support synchronous clocking.
Philip Balister [Wed, 14 Sep 2011 16:50:12 +0000 (12:50 -0400)]
overo: Set IEN on GPMC_CLK to support synchronous clocking.

Without this change CS's configured for synchronous clocking cannot
read data.

Signed-off-by: Philip Balister <philip@opensdr.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoOMAP3: Overo: Update GPMC timing for ethernet chip
Philip Balister [Wed, 14 Sep 2011 17:32:22 +0000 (13:32 -0400)]
OMAP3: Overo: Update GPMC timing for ethernet chip

The existing timing does not quite meet the minimum requirements
in the LAN9221 datasheet. The timing in this patch solves problems
noticed on some parts. The patch also combines the CS configuration
for the overo and igep0020 boards per request.

Signed-off-by: Philip Balister <philip@opensdr.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoArmada100: Enable 88E3015 PHY support for GplugD
Ajay Bhargav [Tue, 13 Sep 2011 16:52:13 +0000 (22:22 +0530)]
Armada100: Enable 88E3015 PHY support for GplugD

This patch adds support for 88E3015 PHY for Marvell GplugD board.
This patch depends on series of patch which adds support for Marvell
GuruPlug-Display.

Signed-off-by: Ajay Bhargav <ajay.bhargav@einfochips.com>
13 years agoArmada100: Enable Ethernet support for GplugD
Ajay Bhargav [Tue, 13 Sep 2011 16:52:04 +0000 (22:22 +0530)]
Armada100: Enable Ethernet support for GplugD

This patch enables ethernet support for Marvell GplugD board. Network
related commands works.

Signed-off-by: Ajay Bhargav <ajay.bhargav@einfochips.com>
13 years agonet: Adds Fast Ethernet Controller driver for Armada100
Ajay Bhargav [Tue, 13 Sep 2011 16:51:58 +0000 (22:21 +0530)]
net: Adds Fast Ethernet Controller driver for Armada100

This patch adds support for Fast Ethernet Controller driver for
Armada100 series.

Signed-off-by: Ajay Bhargav <ajay.bhargav@einfochips.com>
Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
13 years agoomap4_panda: Ignore omap4 SPL called MLO
Joe Hershberger [Tue, 9 Aug 2011 19:21:50 +0000 (19:21 +0000)]
omap4_panda: Ignore omap4 SPL called MLO

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Cc: Joe Hershberger <joe.hershberger@gmail.com>
Cc: Sandeep Paulraj <s-paulraj@ti.com>
13 years agogpio: Add GPIO driver for Marvell SoC Armada100
Ajay Bhargav [Mon, 22 Aug 2011 12:27:38 +0000 (17:57 +0530)]
gpio: Add GPIO driver for Marvell SoC Armada100

This patch adds support for generic GPIO driver framework for Marvell
SoC Armada100.

Signed-off-by: Ajay Bhargav <ajay.bhargav@einfochips.com>
13 years agogpio: Add GPIO driver framework for Marvell SoCs
Ajay Bhargav [Mon, 22 Aug 2011 12:27:38 +0000 (17:57 +0530)]
gpio: Add GPIO driver framework for Marvell SoCs

This patch adds generic GPIO driver framework support for Marvell SoCs.

To enable GPIO driver define CONFIG_MARVELL_GPIO and for GPIO commands
define CONFIG_CMD_GPIO in your board configuration file.

Signed-off-by: Ajay Bhargav <ajay.bhargav@einfochips.com>
13 years agoPrepare v2011.09 v2011.09
Wolfgang Denk [Thu, 29 Sep 2011 19:11:15 +0000 (21:11 +0200)]
Prepare v2011.09

Signed-off-by: Wolfgang Denk <wd@denx.de>
13 years agoARM: versatile: delete split_by_variant.sh
Linus Walleij [Sun, 11 Sep 2011 23:25:22 +0000 (01:25 +0200)]
ARM: versatile: delete split_by_variant.sh

Since commit d388298a59ba375c76597b8f95b560afa971a0fb by
Stefano Babic this file is no longer needed so delete it.

Cc: Stefano Babic <sbabic@denx.de>
Cc: Loïc Minier <loic.minier@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
13 years agoRevert "phylib: remove a couple of redundant code lines"
Wolfgang Denk [Wed, 28 Sep 2011 19:02:43 +0000 (21:02 +0200)]
Revert "phylib: remove a couple of redundant code lines"

This reverts commit 041c542219af7f31c372d89b4c7c6f4c8064a8ce.

The lines removed by this commit weren't redundant. The logic is (and
probably should be better commented):

Find the intersection of the advertised capabilities of both sides of
the link (lpa).
From that intersection, find the highest capability we can run at
(that will be the negotiated link).

Now imagine that the intersection (lpa) is (LPA_100HALF | LPA_10FULL).

The code will now set phydev->speed to 100, and phydev->duplex to 1,
but this link does not support 100FULL.

Kudos to Andy Fleming <afleming@gmail.com> for binging this to
attention and for the explanation.

Signed-off-by: Wolfgang Denk <wd@denx.de>
13 years agodoc/README.scrapyard: Update board removal commit IDs
Wolfgang Denk [Wed, 28 Sep 2011 18:42:00 +0000 (20:42 +0200)]
doc/README.scrapyard: Update board removal commit IDs

Signed-off-by: Wolfgang Denk <wd@denx.de>
13 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm
Wolfgang Denk [Wed, 28 Sep 2011 18:38:21 +0000 (20:38 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-arm

* 'master' of git://git.denx.de/u-boot-arm:
  ARM: remove broken "ixdp425" and "ixpdg425" boards

13 years agoARM: remove broken "ixdp425" and "ixpdg425" boards
Albert ARIBAUD [Thu, 22 Sep 2011 21:55:19 +0000 (21:55 +0000)]
ARM: remove broken "ixdp425" and "ixpdg425" boards

Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
Acked-by: Stefan Roese <sr@denx.de>
13 years agoASIX: Fix buffer access in asix_get_phy_addr()
Marek Vasut [Fri, 23 Sep 2011 19:13:35 +0000 (21:13 +0200)]
ASIX: Fix buffer access in asix_get_phy_addr()

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
13 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm
Wolfgang Denk [Fri, 23 Sep 2011 06:23:25 +0000 (08:23 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-arm

* 'master' of git://git.denx.de/u-boot-arm:
  OMAP3: beagle: Fix build warning in beagle.c

13 years agodoc: provide a correct board_init_r definition path
Vladimir Zapolskiy [Mon, 5 Sep 2011 07:25:04 +0000 (07:25 +0000)]
doc: provide a correct board_init_r definition path

This is a trivial fix in the documentation, which corrects
board_init_r() source reference.

Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>
Acked-by: Mike Frysinger <vapier@gentoo.org>
13 years agoOMAP3: beagle: Fix build warning in beagle.c
Dirk Behme [Thu, 22 Sep 2011 01:53:22 +0000 (01:53 +0000)]
OMAP3: beagle: Fix build warning in beagle.c

Fix build warning

beagle.c:532: warning: initialization from incompatible pointer type

Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
CC: Jason Kridner <jkridner@beagleboard.org>
CC: Koen Kooi <koen@dominion.thruhere.net>
CC: Joel A Fernandes <agnel.joel@gmail.com>
Cc: Greg Turner <gregturner@ti.com>
CC: Sandeep Paulraj <s-paulraj@ti.com>
Acked-by: Jason Kridner <jkridner@beagleboard.org>
13 years agoPrepare v2011.09-rc2 v2011.09-rc2
Wolfgang Denk [Thu, 22 Sep 2011 19:58:05 +0000 (21:58 +0200)]
Prepare v2011.09-rc2

Signed-off-by: Wolfgang Denk <wd@denx.de>
13 years agoMinor Coding Style Cleanup
Wolfgang Denk [Thu, 22 Sep 2011 19:56:54 +0000 (21:56 +0200)]
Minor Coding Style Cleanup

Signed-off-by: Wolfgang Denk <wd@denx.de>
13 years agokm/common: fix bug in IVM mac address access
Holger Brunck [Tue, 20 Sep 2011 05:05:55 +0000 (05:05 +0000)]
km/common: fix bug in IVM mac address access

The MAC address stored in the inventory eeprom begins at offset 1.

Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
cc: Wolfgang Denk <wd@denx.de>

13 years agosf: fix debug format string warning
Vadim Bendebury [Sun, 11 Sep 2011 18:54:48 +0000 (18:54 +0000)]
sf: fix debug format string warning

On some systems, we get a warning when %lu is used with size_t's, so
use the correct format string.

Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
13 years agonet: turn name len check into an assert
Mike Frysinger [Sun, 11 Sep 2011 18:49:53 +0000 (18:49 +0000)]
net: turn name len check into an assert

The new sanity check introduces a printf warning for some systems:
eth.c:233: warning: format '%zu' expects type 'size_t', but argument 3 has type 'int'

Rather than tweak the format string, use the new assert() helper instead.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
13 years agoignore soc asm-offsets.s
Mike Frysinger [Sun, 11 Sep 2011 18:47:24 +0000 (18:47 +0000)]
ignore soc asm-offsets.s

Recent commit a4814a69d3bca6ee05f4bfc4 cleaned up generation of
asm-offsets.s for SoC dirs, but missed adding it to the ignore
list which makes it show up in `git status`.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
13 years agoDrop bogus BOOTFLAG_* definitions
Wolfgang Denk [Tue, 20 Sep 2011 11:18:07 +0000 (13:18 +0200)]
Drop bogus BOOTFLAG_* definitions

There is no code anywhere that references BOOTFLAG_* so remove these
defines.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Heiko Schocher <hs@denx.de>
Cc: Valentin Longchamp <valentin.longchamp@keymile.com>
Cc: Peter Tyser <ptyser@xes-inc.com>
13 years agonet/bootp.c: fix tftp load if autoload environment var isn't set
Peter Korsgaard [Sun, 18 Sep 2011 21:54:46 +0000 (21:54 +0000)]
net/bootp.c: fix tftp load if autoload environment var isn't set

Commit 093498669 (Put common autoload code into auto_load() function)
broke handling of autoload environment variable not being set.
The bootp/dhcp code will just keep on requesting IP address forever
and never start TFTP download.

Fix it by moving TftpStart() outside the conditional like it was before.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Tested-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Simon Glass <sjg@chromium.org>
13 years agoppc4xx: Flush dcache after DDR2 autocalibration with caches on
Stefan Roese [Fri, 16 Sep 2011 10:54:58 +0000 (12:54 +0200)]
ppc4xx: Flush dcache after DDR2 autocalibration with caches on

Flush the dcache before removing the TLB with caches enabled.
Otherwise this might lead to problems later on, e.g. while booting
Linux (as seen on ICON-440SPe).

Signed-off-by: Stefan Roese <sr@denx.de>
13 years agoFix incorrect array size of phy settings for 405EX
Weirich, Bernhard [Thu, 8 Sep 2011 16:27:38 +0000 (18:27 +0200)]
Fix incorrect array size of phy settings for 405EX

Change bd_t->bi_phy* arrays from 1 to 2 for PPC405EX since
405EX has 2 ethernet interfaces.

Signed-off-by: Bernhard Weirich <bernhard.weirich@riedel.net>
Signed-off-by: Stefan Roese <sr@denx.de>
13 years agoDA830: Fix Build Warning
Sandeep Paulraj [Tue, 13 Sep 2011 09:56:56 +0000 (09:56 +0000)]
DA830: Fix Build Warning

This commit fixes a build warning in the DA830 EVM build

Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoled: remove camel casing of led identifiers globally
Jason Kridner [Sun, 4 Sep 2011 18:40:16 +0000 (14:40 -0400)]
led: remove camel casing of led identifiers globally

Result of running the following command to address Wolfgang's
comment about camel case:

for file in `find . | grep '\.[chS]$'`; do perl -i -pe
's/(green|yellow|red|blue)_LED_(on|off)/$1_led_$2/g' $file; done

Discussion:
http://patchwork.ozlabs.org/patch/84988/

Signed-off-by: Jason Kridner <jkridner@beagleboard.org>
Signed-off-by: Joel A Fernandes <agnel.joel@gmail.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoomap4: fix pad configuration settings for SDP and Panda
Aneesh V [Thu, 8 Sep 2011 15:06:06 +0000 (11:06 -0400)]
omap4: fix pad configuration settings for SDP and Panda

omap4: fix pad configuration settings for SDP and Panda

Signed-off-by: Aneesh V <aneesh@ti.com>
Signed-off-by: Sebastien Jan <s-jan@ti.com>
Signed-off-by: David Anders <x0132446@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoomap4: IO settings
Aneesh V [Thu, 8 Sep 2011 15:05:56 +0000 (11:05 -0400)]
omap4: IO settings

Tuning some IO settings for better performance and power.
And consolidate all such IO settings at one place.

Signed-off-by: Aneesh V <aneesh@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoomap4: make SDRAM init work for ES1.0 silicon
Aneesh V [Thu, 8 Sep 2011 15:05:53 +0000 (11:05 -0400)]
omap4: make SDRAM init work for ES1.0 silicon

SDRAM init was not working on ES1.0 due to a programming
error. A pointer that was passed by value to a function
was set in function emif_get_device_details(), but the effect
wouldn't be seen in the calling function. The issue came
out while testing for ES1.0 because ES1.0 doesn't have any
SDRAM chips connected to CS1

Signed-off-by: Aneesh V <aneesh@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoomap4: factor out common part from board config headers
Aneesh V [Thu, 8 Sep 2011 15:05:49 +0000 (11:05 -0400)]
omap4: factor out common part from board config headers

Factor out common parts from omap4_sdp4430.h and omap4_panda.h
into a new file omap4_common.h

Signed-off-by: Aneesh V <aneesh@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoomap: gpio: Adapt board files to use generic API
Sanjeev Premi [Thu, 8 Sep 2011 14:51:01 +0000 (10:51 -0400)]
omap: gpio: Adapt board files to use generic API

This patch contains updates the sources in the board files
to use the generic API.

Signed-off-by: Sanjeev Premi <premi@ti.com>
13 years agoomap: gpio: generic changes after changing API
Sanjeev Premi [Thu, 8 Sep 2011 14:48:39 +0000 (10:48 -0400)]
omap: gpio: generic changes after changing API

This patch contains the generic changes required after
change to generic API in the previous patch.

Signed-off-by: Sanjeev Premi <premi@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoomap: gpio: Use generic API
Sanjeev Premi [Thu, 8 Sep 2011 14:47:25 +0000 (10:47 -0400)]
omap: gpio: Use generic API

Convert all OMAP specific functions to use the common API
definitions in include/asm/gpio.h. In the process, made
few additional changes:
 - Use -EINVAL consistently. -1 was used in many places.
 - Removed one-liner static functions that were used only
   once. Replaced the content as necessary.
 - Combines implementation of functions omap_get_gpio_dataout()
   and omap_get_gpio_datain(). To do so, new static function
   _get_gpio_direction() was added.

Signed-off-by: Sanjeev Premi <premi@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoOMAP3 Beagle: Minor config cleanup
Sandeep Paulraj [Mon, 5 Sep 2011 15:25:20 +0000 (11:25 -0400)]
OMAP3 Beagle: Minor config cleanup

This patch removes a hardcoded MAC address

Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoda830: modify the MEMTEST start and end address
Nagabhushana Netagunte [Sun, 4 Sep 2011 19:08:47 +0000 (15:08 -0400)]
da830: modify the MEMTEST start and end address

Modify the MEMTEST start and end address. The memtest range was overlapping the
CONFIG_SYS_LOAD_ADDR which causes the uImage to be corrupt.Also, modify the
size for which mtest is run to 32MB from 16MB.

Signed-off-by: Sudhakar Rajashekhara <sudhakar.raj@ti.com>
Signed-off-by: Nagabhushana Netagunte <nagabhushana.netagunte@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoda830: enable SPI flash boot mode
Nagabhushana Netagunte [Sun, 4 Sep 2011 19:05:38 +0000 (15:05 -0400)]
da830: enable SPI flash boot mode

Enable SPI flash boot mode in configuration file as default.
With the introduction of 456MHz part, SPI operating frequency
will increase and at this frequency SPI does not work correctly.
Hence reduce the default SPI speed to 30MHz from 50MHz.

Signed-off-by: Sudhakar Rajashekhara <sudhakar.raj@ti.com>
Signed-off-by: Nagabhushana Netagunte <nagabhushana.netagunte@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoda830: modify the U-Boot prompt string
Nagabhushana Netagunte [Sun, 4 Sep 2011 18:59:01 +0000 (14:59 -0400)]
da830: modify the U-Boot prompt string

Modify U-boot promt string from 'DA830-evm >' to 'U-Boot >' as
there are many variants of da830 based boards which have diffrent
names such as L137, AM1707 etc.

Signed-off-by: Sudhakar Rajashekhara <sudhakar.raj@ti.com>
Signed-off-by: Nagabhushana Netagunte <nagabhushana.netagunte@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoARMV7: OMAP3: Add 37xx ESx revision numbers.
Howard D. Gray [Sun, 4 Sep 2011 18:11:17 +0000 (14:11 -0400)]
ARMV7: OMAP3: Add 37xx ESx revision numbers.

OMAP3: Add 37xx ESx revision numbers.

Signed-off-by: Michael Jones <michael.jones@matrix-vision.de>
Signed-off-by: Howard D. Gray <howard.gray@matrix-vision.de>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoARMV7: OMAP: I2C driver: cosmetic: make checkpatch-compatible
Michael Jones [Wed, 27 Jul 2011 18:01:55 +0000 (14:01 -0400)]
ARMV7: OMAP: I2C driver: cosmetic: make checkpatch-compatible

Signed-off-by: Michael Jones <michael.jones@matrix-vision.de>
Acked-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoARMV7: OMAP: Write more than 1 byte at a time in i2c_write
Michael Jones [Sun, 4 Sep 2011 18:01:55 +0000 (14:01 -0400)]
ARMV7: OMAP: Write more than 1 byte at a time in i2c_write

This allows the EEPROM layer to send a single i2c write command
per page, and wait CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS between
i2c write commands.

Signed-off-by: Michael Jones <michael.jones@matrix-vision.de>
Acked-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoOMAP: Add function to get state of a GPIO output
Joel A Fernandes [Sun, 4 Sep 2011 16:10:03 +0000 (11:10 -0500)]
OMAP: Add function to get state of a GPIO output

Read directly from OMAP_GPIO_DATAOUT to get the output state of the GPIO pin

Signed-off-by: Joel A Fernandes <agnel.joel@gmail.com>
Signed-off-by: Jason Kridner <jkridner@beagleboard.org>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
13 years agoMX25: tx25: Cleanup tx25.h config
Fabio Estevam [Tue, 30 Aug 2011 05:44:15 +0000 (05:44 +0000)]
MX25: tx25: Cleanup tx25.h config

Cleanup tx25.h by removing unnecessary defines and by removing unneeded "1"'s.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
13 years agoMX25: tx25: Fix build by making use of GPIO framework
Fabio Estevam [Mon, 29 Aug 2011 04:27:06 +0000 (04:27 +0000)]
MX25: tx25: Fix build by making use of GPIO framework

Make use of GPIO framework and avoid the following build error:

tx25.c: In function 'tx25_fec_init':
tx25.c:73: error: dereferencing pointer to incomplete type
tx25.c:74: error: dereferencing pointer to incomplete type
tx25.c:75: error: dereferencing pointer to incomplete type
tx25.c:76: error: dereferencing pointer to incomplete type
tx25.c:83: error: dereferencing pointer to incomplete type
tx25.c:84: error: dereferencing pointer to incomplete type
tx25.c:114: error: dereferencing pointer to incomplete type
tx25.c:115: error: dereferencing pointer to incomplete type
tx25.c:116: error: dereferencing pointer to incomplete type
tx25.c:117: error: dereferencing pointer to incomplete type
tx25.c:124: error: dereferencing pointer to incomplete type
tx25.c:125: error: dereferencing pointer to incomplete type
tx25.c:126: error: dereferencing pointer to incomplete type

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Stefano Babic <sbabic@denx.de>
13 years agoomap3: beagle: Fix build warning
Sanjeev Premi [Mon, 5 Sep 2011 00:25:53 +0000 (00:25 +0000)]
omap3: beagle: Fix build warning

This patch fixes the warning dure to recent changes to the board
configuration:
cmd_i2c.o cmd_i2c.c -c
cmd_i2c.c:109:1: warning: missing braces around initializer
cmd_i2c.c:109:1: warning: (near initialization for 'i2c_no_probes[0]')

Signed-off-by: Sanjeev Premi <premi@ti.com>
Cc: Jason Kridner <jkridner@beagleboard.org>
Acked-by: Jason Kridner <jdk@ti.com>
13 years agoPrepare v2011.09 v2011.09-rc1
Wolfgang Denk [Sun, 11 Sep 2011 19:31:04 +0000 (21:31 +0200)]
Prepare v2011.09

Signed-off-by: Wolfgang Denk <wd@denx.de>
13 years agoMinor coding style cleanup.
Wolfgang Denk [Sun, 11 Sep 2011 19:24:09 +0000 (21:24 +0200)]
Minor coding style cleanup.

Signed-off-by: Wolfgang Denk <wd@denx.de>
13 years agoARM: hawkboard: fix compilation of nand_spl
Wolfgang Denk [Sat, 10 Sep 2011 20:26:28 +0000 (22:26 +0200)]
ARM: hawkboard: fix compilation of nand_spl

Fix build problem:

nand_spl/board/davinci/da8xxevm/hawkboard_nand_spl.c: In function 'board_init_f':
nand_spl/board/davinci/da8xxevm/hawkboard_nand_spl.c:132: warning: implicit declaration of function 'nand_boot'
nand_spl/board/davinci/da8xxevm/hawkboard_nand_spl.c:133: warning: 'noreturn' function does return

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Syed Mohammed Khasim <sm.khasim@gmail.com>
Cc: Sughosh Ganu <urwithsughosh@gmail.com>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
13 years agocm4008, cm41xx: fix build warnings
Wolfgang Denk [Sat, 10 Sep 2011 14:59:02 +0000 (16:59 +0200)]
cm4008, cm41xx: fix build warnings

Fix these:
cm4008.c: In function 'board_eth_init':
cm4008.c:79: warning: implicit declaration of function 'ks8695_eth_initialize'

cm41xx.c: In function 'board_eth_init':
cm41xx.c:79: warning: implicit declaration of function 'ks8695_eth_initialize'

While we are at it, sort include list in netdev.h

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Greg Ungerer <greg.ungerer@opengear.com>
13 years agotegra2: fix warning: "assert" redefined
Wolfgang Denk [Sat, 10 Sep 2011 14:17:25 +0000 (16:17 +0200)]
tegra2: fix warning: "assert" redefined

Commit 21726a7 "Add assert() for debug assertions" caused build
warnings for all tegra2 based boards:

clock.c:36:1: warning: "assert" redefined
In file included from clock.c:29:
include/common.h:144:1: warning: this is the location of the previous definition

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
13 years agoARM: hawkboard_nand: fix compilation of nand_spl
Stefano Babic [Fri, 9 Sep 2011 03:09:02 +0000 (03:09 +0000)]
ARM: hawkboard_nand: fix compilation of nand_spl

get_ram_size() is called, but memsize.c is not compiled.

Signed-off-by: Stefano Babic <sbabic@denx.de>
13 years agoKS8695: convert KS8695 eth driver to CONFIG_MULTI_ETH
Greg Ungerer [Sat, 10 Sep 2011 08:40:34 +0000 (18:40 +1000)]
KS8695: convert KS8695 eth driver to CONFIG_MULTI_ETH

Trivial conversion of the ks8695eth driver to a CONFIG_MULTI_ETH type
driver.

Signed-off-by: Greg Ungerer <greg.ungerer@opengear.com>
13 years agoCM41xx: fix signedness of env bootargs string pointer
Greg Ungerer [Sat, 10 Sep 2011 08:37:21 +0000 (18:37 +1000)]
CM41xx: fix signedness of env bootargs string pointer

The pointer to the flash based bootargs should be a "char *", not unsigned.
Fixes:

cm41xx.c: In function ‘env_flash_cmdline’:
cm41xx.c:67: warning: pointer targets in passing argument 2 of ‘setenv’ differ in signedness

Signed-off-by: Greg Ungerer <greg.ungerer@opengear.com>
13 years agoCM4008: fix signedness of env bootargs string pointer
Greg Ungerer [Sat, 10 Sep 2011 08:36:40 +0000 (18:36 +1000)]
CM4008: fix signedness of env bootargs string pointer

The pointer to the flash based bootargs should be a "char *", not unsigned.
Fixes:

cm4008.c: In function ‘env_flash_cmdline’:
cm4008.c:67: warning: pointer targets in passing argument 2 of ‘setenv’ differ in signedness

Signed-off-by: Greg Ungerer <greg.ungerer@opengear.com>
13 years agoutx8245: fix build breakage due to assert()
Wolfgang Denk [Sat, 10 Sep 2011 14:04:12 +0000 (16:04 +0200)]
utx8245: fix build breakage due to assert()

Commit 21726a7 "Add assert() for debug assertions" broke building the
utx8245 board:

dlmalloc.c: In function 'do_check_chunk':
dlmalloc.c:1660: error: 'sz' undeclared (first use in this function)
dlmalloc.c:1660: error: (Each undeclared identifier is reported only once
dlmalloc.c:1660: error: for each function it appears in.)
dlmalloc.c: In function 'do_check_free_chunk':
dlmalloc.c:1689: error: 'next' undeclared (first use in this function)
dlmalloc.c: In function 'do_check_malloced_chunk':
dlmalloc.c:1748: error: 'sz' undeclared (first use in this function)
dlmalloc.c:1750: error: 'room' undeclared (first use in this function)

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
13 years agoUBIFS: fix warning: format '%lX' expects type 'long unsigned int'
Wolfgang Denk [Fri, 9 Sep 2011 22:41:14 +0000 (00:41 +0200)]
UBIFS: fix warning: format '%lX' expects type 'long unsigned int'

Commit 46d7274 "UBIFS: Change ubifsload to set the filesize variable"
introduced the follwing compiler warning:

ubifs.c: In function 'ubifs_load':
ubifs.c:742: warning: format '%lX' expects type 'long unsigned int', but argument 3 has type 'u32'

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Bastian Ruppert <Bastian.Ruppert@Sewerin.de>
13 years agoFix warning: "assert" redefined
Wolfgang Denk [Fri, 9 Sep 2011 22:31:11 +0000 (00:31 +0200)]
Fix warning: "assert" redefined

Commit 21726a7 "Add assert() for debug assertions" caused build
warnings for many systems:

In file included from bedbug.c:6:
/home/wd/git/u-boot/work/include/bedbug/bedbug.h:24:1: warning: "assert" redefined
In file included from bedbug.c:3:
/home/wd/git/u-boot/work/include/common.h:144:1: warning: this is the location of the previous definition
In file included from cmd_bedbug.c:10:
/home/wd/git/u-boot/work/include/bedbug/bedbug.h:24:1: warning: "assert" redefined
In file included from cmd_bedbug.c:5:
/home/wd/git/u-boot/work/include/common.h:144:1: warning: this is the location of the previous definition

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Acked-by: Simon Glass <sjg@chromium.org>
13 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Wolfgang Denk [Fri, 9 Sep 2011 22:17:42 +0000 (00:17 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

* 'master' of git://git.denx.de/u-boot-mpc85xx:
  powerpc/mpc8610hpcd: set pci1_hose.config_table after fsl_setup_hose
  powerpc/mpc8548cds: set pci1_hose.config_table after fsl_setup_hose
  powerpc/mpc8568mds: set pci1_hose.config_table after fsl_setup_hose

13 years agoCM4000: fix broken flash base for OpenGear boards
Greg Ungerer [Fri, 9 Sep 2011 12:23:34 +0000 (22:23 +1000)]
CM4000: fix broken flash base for OpenGear boards

Use _bss_start_ofs as the size of the boot loader code+data that we want
to protect in the flash. This replaces use of the no longer defined
_armboot_start.

Fixes:

flash.c: In function ‘flash_init’:
flash.c:75: error: ‘_bss_start’ undeclared (first use in this function)
flash.c:75: error: (Each undeclared identifier is reported only once
flash.c:75: error: for each function it appears in.)
flash.c:75: error: ‘_armboot_start’ undeclared (first use in this function)

Signed-off-by: <greg.ungerer@opengear.com>