platform/kernel/u-boot.git
12 years agoPXA: Export cpu_is_ and pxa_dram_init functions
Marek Vasut [Sat, 26 Nov 2011 10:17:09 +0000 (11:17 +0100)]
PXA: Export cpu_is_ and pxa_dram_init functions

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
12 years agoPXA: Cleanup Colibri PXA270
Marek Vasut [Sat, 26 Nov 2011 06:15:36 +0000 (07:15 +0100)]
PXA: Cleanup Colibri PXA270

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
12 years agoPXA: Replace timer driver
Marek Vasut [Sat, 26 Nov 2011 09:02:41 +0000 (10:02 +0100)]
PXA: Replace timer driver

This new timer driver shall conform to new Timer API.

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
12 years agoPXA: Add cpuinfo display for PXA2xx
Marek Vasut [Sat, 26 Nov 2011 07:11:32 +0000 (08:11 +0100)]
PXA: Add cpuinfo display for PXA2xx

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
12 years agoPXA: Separate PXA2xx CPU init
Marek Vasut [Sat, 26 Nov 2011 06:32:24 +0000 (07:32 +0100)]
PXA: Separate PXA2xx CPU init

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
12 years agoPXA: Rename CONFIG_PXA2[57]X to CONFIG_CPU_PXA2[57]X
Marek Vasut [Sat, 26 Nov 2011 06:20:07 +0000 (07:20 +0100)]
PXA: Rename CONFIG_PXA2[57]X to CONFIG_CPU_PXA2[57]X

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
12 years agoPXA: Unify vpac270 environment size
Marek Vasut [Sun, 13 Nov 2011 00:40:46 +0000 (01:40 +0100)]
PXA: Unify vpac270 environment size

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
12 years agoPXA: Enable command line editing for vpac270
Marek Vasut [Sat, 12 Nov 2011 02:35:50 +0000 (03:35 +0100)]
PXA: Enable command line editing for vpac270

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
12 years agoPXA: Adapt Voipac PXA270 to OneNAND SPL
Marek Vasut [Mon, 31 Oct 2011 13:17:21 +0000 (14:17 +0100)]
PXA: Adapt Voipac PXA270 to OneNAND SPL

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
V2: Add missing u-boot-spl.lds, convert bitshifts to division,
    convert to spl_onenand_load_image()

12 years agoPXA: Drop Voipac PXA270 OneNAND IPL
Marek Vasut [Mon, 31 Oct 2011 12:11:48 +0000 (13:11 +0100)]
PXA: Drop Voipac PXA270 OneNAND IPL

This OneNAND IPL will be replaced by OneNAND SPL.

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
12 years agoPXA: Fixup PXA25x boards after start.S update
Marek Vasut [Sat, 26 Nov 2011 11:04:11 +0000 (12:04 +0100)]
PXA: Fixup PXA25x boards after start.S update

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
12 years agoPXA: Re-add the Dcache locking as RAM for pxa250
Marek Vasut [Sat, 5 Nov 2011 18:26:47 +0000 (19:26 +0100)]
PXA: Re-add the Dcache locking as RAM for pxa250

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Stefan Herbrechtsmeier <sherbrec@cit-ec.uni-bielefeld.de>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
12 years agoPXA: Rework start.S to be closer to other ARMs
Marek Vasut [Mon, 31 Oct 2011 13:12:39 +0000 (14:12 +0100)]
PXA: Rework start.S to be closer to other ARMs

The start.S on PXA was very obscure. This reworks it back to be close to arm1136
start.S and others.

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
V2: Don't compile in relocation support if building SPL

12 years agoPXA: Drop XM250 board
Marek Vasut [Mon, 21 Nov 2011 22:40:23 +0000 (23:40 +0100)]
PXA: Drop XM250 board

The board is unmaintained and maintainer doesn't respond.

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Anatolij Gustschin <agust@denx.de>
12 years agoPXA: Drop PLEB2 board
Marek Vasut [Mon, 21 Nov 2011 22:31:25 +0000 (23:31 +0100)]
PXA: Drop PLEB2 board

The board is unmaintained and maintainer doesn't respond.

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Anatolij Gustschin <agust@denx.de>
12 years agoPXA: Drop CRADLE board
Marek Vasut [Mon, 21 Nov 2011 22:32:36 +0000 (23:32 +0100)]
PXA: Drop CRADLE board

The board is unmaintained and maintainer doesn't respond.

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Anatolij Gustschin <agust@denx.de>
12 years agoPXA: Drop CERF250 board
Marek Vasut [Sun, 20 Nov 2011 04:18:28 +0000 (05:18 +0100)]
PXA: Drop CERF250 board

The board is unmaintained and maintainer doesn't respond.

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Anatolij Gustschin <agust@denx.de>
12 years agoFix regression in SMDK6400
Simon Schwarz [Mon, 31 Oct 2011 06:34:45 +0000 (06:34 +0000)]
Fix regression in SMDK6400

s3c64xx.c implemented its own nand_read_byte, nand_write_buf and
nand_read_buf functions. This provoked a regression when these functions
were made public by patch 55f429bb39614a16b1bacc9a8bea9ac01a60bfc8.

This deletes these duplicated functions from s3c64xx.c and adds the generic
implementations in nand_base.c to the spl Makefile. It also adds
-ffcuntion-sections and -gc-sections to the compilation flags of the SPL to
avoid errors originating from unused functions in nand_base.c.

Description of the regression:
http://article.gmane.org/gmane.comp.boot-loaders.u-boot/108873

Signed-off-by: Simon Schwarz <simonschwarzcor@gmail.com>
Cc: scottwood@freescale.com
Cc: s-paulraj@ti.com
Cc: albert.u.boot@aribaud.net
12 years agonand: Add common functions to linux/mtd/nand.h
Simon Schwarz [Mon, 31 Oct 2011 06:34:44 +0000 (06:34 +0000)]
nand: Add common functions to linux/mtd/nand.h

Functions often used in SPL are now part of linux/mtd/nand.h.
Static modifiers are removed from these functions in
drivers/mtd/nand/nand_base.c.

Signed-off-by: Simon Schwarz <simonschwarzcor@gmail.com>
Cc: scottwood@freescale.com
Cc: s-paulraj@ti.com
Cc: albert.u.boot@aribaud.net
Acked-by: Scott Wood <scottwood@freescale.com>
12 years agoEthernut 5 board support
Tim Schendekehl [Tue, 1 Nov 2011 23:55:01 +0000 (23:55 +0000)]
Ethernut 5 board support

Add support for the Ethernut 5 open hardware design, based
on Atmel's AT91SAM9XE512 SoC.

V4
 - Fix several coding style issues.
 - Move machine type to config file.
 - Remove use of CONFIG_ATMEL_LEGACY.

Signed-off-by: Tim Schendekehl <tim.schendekehl@egnite.de>
12 years agonet: Armada100: Fix compilation warnings
Ajay Bhargav [Mon, 31 Oct 2011 01:19:37 +0000 (01:19 +0000)]
net: Armada100: Fix compilation warnings

This patch fix compilation warnings for Armada100 FEC driver

Ref:
warning: dereferencing type-punned pointer will break
strict-aliasing rules

Signed-off-by: Ajay Bhargav <ajay.bhargav@einfochips.com>
Acked-by: Anatolij Gustschin <agust@denx.de>
12 years agoARM: remove duplicated code for LaCie boards
Simon Guinot [Mon, 21 Nov 2011 13:55:47 +0000 (19:25 +0530)]
ARM: remove duplicated code for LaCie boards

This patch groups together all the common functions for LaCie boards:
Ethernet PHY and MAC address initializations.

Moreover the configurations for LaCie Kirkwood boards are merged into
a single file: include/configs/lacie_kw.h

Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>
12 years agoARM: add support for LaCie 2Big Network v2
Simon Guinot [Mon, 21 Nov 2011 13:55:46 +0000 (19:25 +0530)]
ARM: add support for LaCie 2Big Network v2

This patch adds support for the LaCie 2Big Network v2 board, based on
the Marvell Kirkwood 6281 SoC.

Additional information is available at:
http://lacie-nas.org/doku.php?id=2big_network_v2

Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>
12 years agomvsata: fix ide_preinit for missing disks
Simon Guinot [Mon, 21 Nov 2011 13:55:46 +0000 (19:25 +0530)]
mvsata: fix ide_preinit for missing disks

Consider that ide_preinit() succeed if at least one port is successfully
initialized. This allows to iniatialize IDE support on a board with two
SATA ports but a single hard disk available.

Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>
12 years agonetspace_v2: Read Ethernet MAC address from EEPROM
Simon Guinot [Tue, 8 Nov 2011 11:31:14 +0000 (11:31 +0000)]
netspace_v2: Read Ethernet MAC address from EEPROM

Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>
12 years agoomap3evm: Add support for EFI partitions
Sanjeev Premi [Wed, 16 Nov 2011 15:20:50 +0000 (10:20 -0500)]
omap3evm: Add support for EFI partitions

Defines CONFIG_EFI_PARTITION for OMAP3 EVM.

Signed-off-by: Sanjeev Premi <premi@ti.com>
Cc: Sandeep Paulraj <s-paulraj@ti.com>
Cc: Tom Rini <tom.rini@gmail.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
12 years agopart_efi: Fix compile errors
Sanjeev Premi [Wed, 16 Nov 2011 15:20:47 +0000 (10:20 -0500)]
part_efi: Fix compile errors

Fix errors noticed after enabling CONFIG_EFI_PARTITION
for the OMAP3 EVM board:

part_efi.c: In function 'print_part_efi':
part_efi.c:133:5: warning: passing argument 3 of 'is_gpt_valid'
 from incompatible pointer type
part_efi.c:95:12: note: expected 'struct gpt_header *' but arg
ument is of type 'struct gpt_header **'
part_efi.c: In function 'get_partition_info_efi':
part_efi.c:173:4: warning: passing argument 3 of 'is_gpt_valid
' from incompatible pointer type
part_efi.c:95:12: note: expected 'struct gpt_header *' but arg
ument is of type 'struct gpt_header **'
part_efi.c: In function 'alloc_read_gpt_entries':
part_efi.c:384:18: error: 'CONFIG_SYS_CACHELINE_SIZE' undeclare
d (first use in this function)

Signed-off-by: Sanjeev Premi <premi@ti.com>
Cc: Tom Rini <tom.rini@gmail.com>
Cc: Anton staaf <robotboy@chromium.org>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
12 years agonet: Make sure IPaddr_t is 32 bits in size
Matthias Weisser [Sat, 3 Dec 2011 03:29:44 +0000 (03:29 +0000)]
net: Make sure IPaddr_t is 32 bits in size

When building u-boot as 64 bit application (e.g. sandbox) ulong might be
64 bits in size. This breaks network code as IPaddr_t is 64 bytes in
size then and an IPv4 address is 32 bits in size. This patch makes sure
that IPaddr_t is always 32 bits in size. Also some warnings introduced
by this patch are fixed.

Signed-off-by: Matthias Weisser <weisserm@arcor.de>
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agoMAKEALL: Add -l option to only list build targets
Marek Vasut [Fri, 2 Dec 2011 21:32:03 +0000 (21:32 +0000)]
MAKEALL: Add -l option to only list build targets

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Wolfgang Denk <wd@denx.de>
12 years agoOMAP3: Change devkit8000 maintainer
Thomas Weber [Mon, 28 Nov 2011 04:18:57 +0000 (04:18 +0000)]
OMAP3: Change devkit8000 maintainer

Signed-off-by: Thomas Weber <weber@corscience.de>
12 years agotools/envcrc: fix compile breakage
Igor Grinberg [Sun, 27 Nov 2011 21:57:38 +0000 (21:57 +0000)]
tools/envcrc: fix compile breakage

When ENV_IS_EMBEDDED is not set, but CONFIG_BUILD_ENVCRC is set,
the environment.h file does not get included resulting in unrecognized
env_t type.
Fix this by moving the include directive.

Reported-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Tested-by: Mike Frysinger <vapier@gentoo.org>
12 years agoAdd a "tidy" build option
Andy Fleming [Mon, 21 Nov 2011 13:40:43 +0000 (13:40 +0000)]
Add a "tidy" build option

It is sometimes desireable to clean up the byproducts of the build
process without removing the executable results. "make clean" is
close, but leaves the build directory with a large number of
*.depend* files. This new build option invokes make clean, and then
removes the depend files.

Signed-off-by: Andy Fleming <afleming@freescale.com>
12 years agoadd a git mailrc file for maintainers
Mike Frysinger [Mon, 7 Nov 2011 18:18:44 +0000 (18:18 +0000)]
add a git mailrc file for maintainers

This should make sending out e-mails to the right people easier.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
12 years agoAdd a cli command to test the TPM device.
Vadim Bendebury [Sat, 15 Oct 2011 15:13:34 +0000 (15:13 +0000)]
Add a cli command to test the TPM device.

The command gets an arbitrary number of arguments (up to 30), which
are interpreted as byte values and are feed into the TPM device after
proper initialization. Then the return value and data of the TPM
driver is examined.

TPM commands are described in the TCG specification.

For instance, the following sequence is the 'TPM Startup' command, it
is processed by the TPM and a response is generated:

boot > tpm 0x0 0xc1 0x0 0x0 0x0 0xc 0x0 0x0 0x0 0x99 0x0 0x1
Found TPM SLB9635 TT 1.2 by Infineon
Got TPM response:
 00 c4 00 00 00 0a 00 00 00 00

If the command is corrupted (fed one byte short), an error is reported:
boot > tpm 0x0 0xc1 0x0 0x0 0x0 0xc 0x0 0x0 0x0 0x99 0x0
generic_lpc_tpm.c:311 unexpected TPM status 0xff000888
generic_lpc_tpm.c:516 failed sending data to TPM
tpm command failed
boot >

Change-Id: I3f3c5bfec8b852e208c4e99ba37b0f2b875140b0
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
CC: Wolfgang Denk <wd@denx.de>
12 years agopxe: make the first label the implicit default
Jason Hobbs [Mon, 7 Nov 2011 03:07:15 +0000 (03:07 +0000)]
pxe: make the first label the implicit default

If no default label is specified, but a situation arises where the
default label should be used, treat the first label specified as the
default label.

Signed-off-by: Jason Hobbs <jason.hobbs@calxeda.com>
Cc: Ricardo Salveti de Araujo <ricardo.salveti@linaro.org>
Cc: Wolfgang Denk <wd@denx.de>
12 years agocmd_bdinfo: simplify local static funcs a bit
Mike Frysinger [Sun, 4 Dec 2011 17:45:22 +0000 (17:45 +0000)]
cmd_bdinfo: simplify local static funcs a bit

If we move the local funcs to the top of the file, and use the
__maybe_unused define, we can drop a lot of ugly ifdef logic and
duplicated prototypes.

Acked-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
12 years agomii: miiphy register address width change
Chandan Nath [Wed, 21 Sep 2011 01:10:32 +0000 (01:10 +0000)]
mii: miiphy register address width change

This patch is added for PHY whose register offset value exceeds 0xFF and
cannot be used with "unsigned char" datatype in miiphy_read, miiphy_write
and miiphy_register functions. Datatype of register offset is changed to
unsigned short instead of unsigned char so that offset value greater then
0xFF can be used.

Signed-off-by: Chandan Nath <chandan.nath@ti.com>
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agoStandalone Apps: Standalone apps should need only exports.h.
Mike Partington [Wed, 27 Oct 2010 10:31:09 +0000 (10:31 +0000)]
Standalone Apps: Standalone apps should need only exports.h.

Modify exports.h to remove its dependencies on other files, thus
enabling standalone apps to require only exports.h from the U-Boot
source tree.  This appears to be the intent based on the following
note: http://lists.denx.de/pipermail/u-boot/2010-January/067174.html

Signed-off-by: Mike Partington <mparting@lexmark.com>
12 years agoenv_nand: Remove DEBUG definition
Thomas Weber [Mon, 5 Dec 2011 22:19:36 +0000 (22:19 +0000)]
env_nand: Remove DEBUG definition

Signed-off-by: Thomas Weber <weber@corscience.de>
12 years agoMerge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
Wolfgang Denk [Mon, 5 Dec 2011 22:33:48 +0000 (23:33 +0100)]
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging

* 'agust@denx.de' of git://git.denx.de/u-boot-staging:
  Makefile: add tools/mkenvimage to target 'clean'
  mv_common.c: get rid of 'defined but not used' warning
  m68k: fix ambiguous bit testing
  sparc: fix unknown escape sequence warnings
  sparc: fix unused variable warnings
  sf: fix erase debug output

12 years agocommon/menu.c: Fix build warning
Anatolij Gustschin [Sat, 3 Dec 2011 06:46:07 +0000 (06:46 +0000)]
common/menu.c: Fix build warning

Fix:
menu.c: In function 'menu_item_print':
menu.c:91: warning: passing argument 1 of 'putc' makes integer from
pointer without a cast

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Acked-by: Heiko Schocher <hs@denx.de>
Tested-by: Heiko Schocher <hs@denx.de>
Acked-by: Marek Vasut <marek.vasut@gmail.com>
12 years agoboard/amcc/taihu/flash.c: Fix GCC 4.6 build warnings
Wolfgang Denk [Thu, 17 Nov 2011 09:50:01 +0000 (09:50 +0000)]
board/amcc/taihu/flash.c: Fix GCC 4.6 build warnings

Fix:
flash.c: In function 'flash_erase_1':
flash.c:514:24: warning: variable 'l_sect' set but not used
[-Wunused-but-set-variable]
flash.c: In function 'flash_erase_2':
flash.c:956:24: warning: variable 'l_sect' set but not used
[-Wunused-but-set-variable]

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Stefan Roese <sr@denx.de>
Acked-by: Stefan Roese <sr@denx.de>
12 years agoboard/amcc/yucca/flash.c: Fix GCC 4.6 build warnings
Wolfgang Denk [Thu, 17 Nov 2011 09:50:00 +0000 (09:50 +0000)]
board/amcc/yucca/flash.c: Fix GCC 4.6 build warnings

Fix:
flash.c: In function 'flash_erase_1':
flash.c:425:24: warning: variable 'l_sect' set but not used
[-Wunused-but-set-variable]
flash.c: In function 'flash_erase_2':
flash.c:834:24: warning: variable 'l_sect' set but not used
[-Wunused-but-set-variable]

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Stefan Roese <sr@denx.de>
Acked-by: Stefan Roese <sr@denx.de>
12 years agoboard/amcc/common/flash.c: Fix GCC 4.6 build warning
Wolfgang Denk [Thu, 17 Nov 2011 09:49:59 +0000 (09:49 +0000)]
board/amcc/common/flash.c: Fix GCC 4.6 build warning

Fix:
In file included from flash.c:45:0:
../common/flash.c: In function 'flash_erase':
../common/flash.c:399:24: warning: variable 'l_sect' set but not used
[-Wunused-but-set-variable]

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Stefan Roese <sr@denx.de>
Acked-by: Stefan Roese <sr@denx.de>
12 years agopci_ftpci100: Implementation FTPCI100 PCI driver
Gavin Guo [Mon, 28 Nov 2011 20:48:14 +0000 (20:48 +0000)]
pci_ftpci100: Implementation FTPCI100 PCI driver

FTPCI100 is a SoC PCI componenet of Faraday company.
Which is usually built into SoC chips for providing
embedded PCI functions.

Signed-off-by: Gavin Guo <gavinguo@andestech.com>
Signed-off-by: Macpaul Lin <macpaul@andestech.com>
12 years agophy: Add support for SMSC LAN87xx PHYs
Nobuhiro Iwamatsu [Wed, 23 Nov 2011 21:24:15 +0000 (21:24 +0000)]
phy: Add support for SMSC LAN87xx PHYs

This adds support for the SMSC LAN87xx PHYs.

Following PHYs can be used by set CONFIG_PHY_SMSC to config.
 - SMSC LAN8700
 - SMSC LAN8710/LAN8720
 - SMSC LAN8710/LAN8720

A setup of PHY was copied from linux kenrel.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Fixed white space errors; modified commit message a bit.
Signed-off-by: Wolfgang Denk <wd@denx.de>
12 years agoFix tsize warning in tools/aisimage.c
Simon Glass [Sat, 19 Nov 2011 08:20:54 +0000 (08:20 +0000)]
Fix tsize warning in tools/aisimage.c

This fixes the following warning with gcc 4.4.3.

aisimage.c: In function 'aisimage_generate':
aisimage.c:365: warning: 'tsize' may be used uninitialized in this function

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agodrivers/net/mvgbe.c: Fix GCC 4.6 warnings
Anatolij Gustschin [Sat, 19 Nov 2011 08:59:36 +0000 (08:59 +0000)]
drivers/net/mvgbe.c: Fix GCC 4.6 warnings

Fix:
mvgbe.c: In function 'mvgbe_send':
mvgbe.c:555:2: warning: dereferencing type-punned pointer will
break strict-aliasing rules [-Wstrict-aliasing]
mvgbe.c: In function 'mvgbe_recv':
mvgbe.c:640:2: warning: dereferencing type-punned pointer will
break strict-aliasing rules [-Wstrict-aliasing]

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Prafulla Wadaskar <prafulla@marvell.com>
Acked-By: Prafulla Wadaskar <prafulla@marvell.com>
12 years agoserial: constify serial_assign()
Gerlando Falauto [Fri, 18 Nov 2011 06:49:12 +0000 (06:49 +0000)]
serial: constify serial_assign()

Signed-off-by: Gerlando Falauto <gerlando.falauto@keymile.com>
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agoserial: cosmetic checkpatch compliance
Gerlando Falauto [Fri, 18 Nov 2011 06:49:11 +0000 (06:49 +0000)]
serial: cosmetic checkpatch compliance

Signed-off-by: Gerlando Falauto <gerlando.falauto@keymile.com>
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agodisk: part_efi: fix regression due to incorrect buffer usage
Stephen Warren [Fri, 28 Oct 2011 09:21:46 +0000 (09:21 +0000)]
disk: part_efi: fix regression due to incorrect buffer usage

Commit deb5ca80275e8cfa74d5680b41204e08a095eca5 "disk: part_efi: fix
**pgpt_pte == NULL" modified the code to pass "&gpt_head" to
is_gpt_valid() rather than the previous "gpt_head". However, gpt_head
is a pointer to the buffer, not the actual buffer, since it was allocated
using ALLOC_CACHE_ALIGN_BUFFER. This caused is_gpt_valid() to read the
disk block onto the stack rather than into the buffer, causing the
code to fail.

This change reverts that portion of the commit mentioned above.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Doug Anderson <dianders@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Tested-by: Anton Staaf <robotboy@chromium.org>
12 years agomiiphy: Note that miiphy_* API is deprecated
Andy Fleming [Mon, 31 Oct 2011 14:46:13 +0000 (09:46 -0500)]
miiphy: Note that miiphy_* API is deprecated

We want to move everything to phylib, and we definitely don't want
new drivers using the miiphy infrastructure.

Signed-off-by: Andy Fleming <afleming@freescale.com>
12 years agoPhy/Marvell: Rewrite the MV88E1111 phy config function based on kernel code
Zang Roy-R61911 [Thu, 27 Oct 2011 18:52:09 +0000 (18:52 +0000)]
Phy/Marvell: Rewrite the MV88E1111 phy config function based on kernel code

The original m88e1111s_config() does not do the SGMII mode
initialization and is buggy. Rewrite the function according to
3.0.6 kernel function m88e1111_config_init() in drivers/net/phy/marvell.c

Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
Acked-by: Andy Fleming <afleming@freescale.com>
Cc: Kumar Gala <galak@kernel.crashing.org>
12 years agoMakefile: add tools/mkenvimage to target 'clean'
Horst Kronstorfer [Mon, 28 Nov 2011 23:42:14 +0000 (23:42 +0000)]
Makefile: add tools/mkenvimage to target 'clean'

Signed-off-by: Horst Kronstorfer <hkronsto@frequentis.com>
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agomv_common.c: get rid of 'defined but not used' warning
Michael Jones [Thu, 20 Oct 2011 01:37:18 +0000 (01:37 +0000)]
mv_common.c: get rid of 'defined but not used' warning

When CONFIG_ENV_IS_NOWHERE, got following warning:
mv_common.c:32:14: warning: 'entries_to_keep' defined but not used.
Get rid of this warning.

Signed-off-by: Michael Jones <michael.jones@matrix-vision.de>
Acked-by: Andre Schwarz <andre.schwarz@matrix-vision.de>
12 years agom68k: fix ambiguous bit testing
Mike Frysinger [Sat, 15 Oct 2011 10:10:42 +0000 (10:10 +0000)]
m68k: fix ambiguous bit testing

Building for some m68k boards results in the warning:

cpu_init.c: In function 'cpu_init_f':
cpu_init.c:287: warning: suggest parentheses around
operand of '!' or change '&' to '&&' or '!' to '~'

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
12 years agosparc: fix unknown escape sequence warnings
Mike Frysinger [Wed, 12 Oct 2011 19:47:51 +0000 (19:47 +0000)]
sparc: fix unknown escape sequence warnings

I don't know what exactly the code was going for, but the object code
is the same before/after my change, and in looking at the env strings,
this seems to be OK.

Otherwise gcc warns:
cc1: warning: unknown escape sequence: '\$'
cc1: warning: unknown escape sequence: '\)'
cc1: warning: unknown escape sequence: '\040'
cc1: warning: unknown escape sequence: '\$'
cc1: warning: unknown escape sequence: '\)'

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
12 years agosparc: fix unused variable warnings
Mike Frysinger [Wed, 12 Oct 2011 19:44:10 +0000 (19:44 +0000)]
sparc: fix unused variable warnings

Fix the build warnings:
board.c: In function 'board_init_f':
board.c:179:8: warning: unused variable 'e'
board.c:178:6: warning: unused variable 'i'
board.c:173:13: warning: unused variable 'cmdtp'
bootm.c: In function 'do_bootm_linux':
bootm.c:101:28: warning: unused variable 'kernend'
bootm.c:101:15: warning: unused variable 'initrd_addr'
bootm.c:100:26: warning: unused variable 'checksum'
bootm.c:100:21: warning: unused variable 'len'
bootm.c:100:15: warning: unused variable 'data'

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
12 years agosf: fix erase debug output
Vadim Bendebury [Wed, 12 Oct 2011 11:28:38 +0000 (11:28 +0000)]
sf: fix erase debug output

We want to show the length, so multiplying by sector size makes no sense.
This is a hold over from the erase code before the big refactor.

Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
12 years agoMerge branch 'marek.vasut@gmail.com' of git://git.denx.de/u-boot-staging
Wolfgang Denk [Mon, 5 Dec 2011 20:32:42 +0000 (21:32 +0100)]
Merge branch 'marek.vasut@gmail.com' of git://git.denx.de/u-boot-staging

* 'marek.vasut@gmail.com' of git://git.denx.de/u-boot-staging:
  tools/os_support: add OS X Lion support
  board/esd/dasa_sim/flash.c: Fix GCC 4.6 warning
  board/esd/common/xilinx_jtag_micro.c: Fix GCC 4.6 warning

12 years agotools/os_support: add OS X Lion support
Andreas Bießmann [Thu, 24 Nov 2011 21:36:16 +0000 (22:36 +0100)]
tools/os_support: add OS X Lion support

OS X Lion's c-library implements getline(), therefore prevent including the old
helper implementation for __DARWIN_C_LEVEL < 200809L.

Without this patch following error occours:

---8<---
In file included from os_support.h:32,
                 from img2srec.c:55:
getline.h:1: error: conflicting types for â€˜getline’
/usr/include/stdio.h:449: error: previous declaration of â€˜getline’ was
here
--->8---

Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
12 years agoboard/esd/dasa_sim/flash.c: Fix GCC 4.6 warning
Matthias Fuchs [Thu, 24 Nov 2011 15:39:18 +0000 (16:39 +0100)]
board/esd/dasa_sim/flash.c: Fix GCC 4.6 warning

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
12 years agoboard/esd/common/xilinx_jtag_micro.c: Fix GCC 4.6 warning
Matthias Fuchs [Thu, 24 Nov 2011 15:39:15 +0000 (16:39 +0100)]
board/esd/common/xilinx_jtag_micro.c: Fix GCC 4.6 warning

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
12 years agosh: Add support for ecovec board
Nobuhiro Iwamatsu [Tue, 15 Nov 2011 03:29:06 +0000 (12:29 +0900)]
sh: Add support for ecovec board

The ecovec board has SH7724, 256MB DDR2-SDRAM, USB,
Ethernet, and more.

This patch supports the following functions:
- 256MB DDR2-SDRAM
- USB
- I2C
- Ethernet

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
12 years agosh: Add support Renesas SH7724
Nobuhiro Iwamatsu [Tue, 15 Nov 2011 02:00:01 +0000 (11:00 +0900)]
sh: Add support Renesas SH7724

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
12 years agosh: Add updating method of SPI ROM to README of sh7757lcr
Nobuhiro Iwamatsu [Tue, 8 Nov 2011 06:40:08 +0000 (15:40 +0900)]
sh: Add updating method of SPI ROM to README of sh7757lcr

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
12 years agosh: espt: change config for new sh_eth driver
Yoshihiro Shimoda [Mon, 31 Oct 2011 01:44:19 +0000 (10:44 +0900)]
sh: espt: change config for new sh_eth driver

The new sh_eth driver uses the phy driver. So, this patch enables it.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
12 years agosh7763rdp: change config for new sh_eth driver
Yoshihiro Shimoda [Mon, 31 Oct 2011 01:44:18 +0000 (10:44 +0900)]
sh7763rdp: change config for new sh_eth driver

The new sh_eth driver uses the phy driver. So, this patch enables it.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
12 years agosh: avoid multiple definition errors with cache funcs
Mike Frysinger [Thu, 27 Oct 2011 08:59:59 +0000 (04:59 -0400)]
sh: avoid multiple definition errors with cache funcs

Recent builds for SH4 boards fail with a lot of errors like:
cmd_mem.o: In function 'dcache_invalid_range':
include/asm/cache.h:25: multiple definition of 'dcache_invalid_range'
include/asm/cache.h:25: first defined here

This is due to the funcs being defined in the header, but not static
or inline or extern.  So move them to the sh4-specific cache.c file.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
12 years agosh: Add a flag which controls the DDR ECC mode of sh7757lcr
Nobuhiro Iwamatsu [Mon, 31 Oct 2011 04:16:02 +0000 (13:16 +0900)]
sh: Add a flag which controls the DDR ECC mode of sh7757lcr

When DDR-ECC is effective, the physical memory which can be used
reduces this boardby half. However, this mode can chenge to disable.
When it was disabled, user can use 512 MB of physical memory.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
CC: "Yoshihiro Shimoda" <yoshihiro.shimoda.uh@renesas.com>
Acked-by: "Yoshihiro Shimoda" <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
12 years agosh: Add ashrsi3 libgcc function
Phil Edworthy [Mon, 24 Oct 2011 09:24:12 +0000 (10:24 +0100)]
sh: Add ashrsi3 libgcc function

The ashrsi3 function is used by some commands that aren't in SH2A
default configs (e.g. JFFS2).

The ashrsi3.S file has been copied from Linux.

Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
12 years agosh: only add -mno-fdpic if the compiler supports it
Mike Frysinger [Thu, 13 Oct 2011 04:45:47 +0000 (00:45 -0400)]
sh: only add -mno-fdpic if the compiler supports it

Not all SuperH toolchains support -mno-fdpic.  Chances are good that if
the flag doesn't work, it isn't defaulting to the FDPIC ABI, so the flag
isn't needed.  So only add it if it is actually supported.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
12 years agosh7757lcr: change config for new sh_eth driver
Yoshihiro Shimoda [Tue, 11 Oct 2011 09:11:03 +0000 (18:11 +0900)]
sh7757lcr: change config for new sh_eth driver

The new sh_eth driver uses the phy driver. So, this patch enables it.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
12 years agonet: sh_eth: use miiphybb instead of own mii functions
Yoshihiro Shimoda [Tue, 11 Oct 2011 09:10:14 +0000 (18:10 +0900)]
net: sh_eth: use miiphybb instead of own mii functions

The sh_eth driver had an own mii functions. However the function
didn't support the gigabit PHY. The U-Boot has the general phy driver
and miiphybb driver, and they already support it.
So this patch removes the own functions and uses the phy driver.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
12 years agoMerge branch 'master' of ssh://gemini/home/wd/git/u-boot/master
Wolfgang Denk [Thu, 1 Dec 2011 23:17:49 +0000 (00:17 +0100)]
Merge branch 'master' of ssh://gemini/home/wd/git/u-boot/master

* 'master' of ssh://gemini/home/wd/git/u-boot/master:
  board/emk/top860/top860.c: Fix GCC 4.6 build warning
  board/sbc405/strataflash.c: Fix GCC 4.6 build warning
  arch/powerpc/cpu/mpc86xx/cpu.c: Fix GCC 4.6 build warning
  board/freescale/mpc8610hpcd/mpc8610hpcd.c: Fix GCC 4.6 build warning
  board/mpl/common/flash.c: Fix GCC 4.6 build warning
  post/board/lwmon5/gdc.c: Fix GCC 4.6 build warning
  drivers/usb/host/sl811-hcd.c: Fix GCC 4.6 build warning
  board/sandburst/common/flash.c: Fix GCC 4.6 build warning
  DB64460: Fix GCC 4.6 build warnings
  DB64360: Fix GCC 4.6 build warnings
  board/cray/L1/flash.c: Fix GCC 4.6 build warning
  drivers/block/sata_dwc.c: Fix GCC 4.6 build warning
  board/amirix/ap1000/flash.c: Fix GCC 4.6 build warning
  alpr board: Fix GCC 4.6 build warnings
  image: Don't detect XIP images as overlapping.
  image: Implement IH_TYPE_KERNEL_NOLOAD
  ppc4xx: Add Io64 board support
  ppc4xx: fix PMC440 painit command
  ppc4xx: remove invalid access to PCI_BRDGOPT2 register
  ppc4xx: use CONFIG_PCI_BOOTDELAY instead of private implementation
  mpc85xx: support for Freescale COM Express P2020
  arch/powerpc/cpu/mpc8xxx/ddr/interactive.c: Fix GCC 4.6 build warning
  mpc85xx: support board-specific reset function
  powerpc/85xx: verify the localbus device tree address before booting the OS
  mpc8xxx: update module_type values from JEDEC DDR3 SPD Specification
  powerpc/p3060qds: Add board related support for P3060QDS platform
  powerpc/85xx: clean up and document the QE/FMAN microcode macros
  powerpc/85xx: always implement the work-around for Erratum SATA_A001
  powerpc/85xx: CONFIG_FSL_SATA_V2 should be defined in config_mpc85xx.h
  powerpc/85xx: Add workaround for erratum A-003474
  powerpc/85xx: fixup flexcan device tree clock-frequency
  powerpc/85xx: Add workaround for erratum CPU-A003999
  x86: Fix some bugs in the i8402 driver when no controller is present
  x86: Make the i8042 driver checkpatch clean
  x86: Wrap small helper functions from libgcc to avoid an ABI mismatch
  x86: Import the glibc memset implementation
  x86: Fix a few recently added bugs
  x86: Don't relocate symbols which point to things that aren't relocated
  x86: Fix how the location of the realmode and bios blobs are calculated
  x86: Misc cleanups
  x86: Misc PCI touchups
  x86: Ensure IDT and GDT remain 16-byte aligned post relocation
  x86: Provide more configuration granularity
  x86: Add multiboot header
  sc520: Create arch asm-offsets
  x86: Punt cold- and warm-boot flags
  cosmetic: checkpatch cleanup of board/eNET/*.c
  cosmetic: checkpatch cleanup of arch/x86/lib/*.c
  cosmetic: checkpatch cleanup of arch/x86/cpu/sc520/*.c
  cosmetic: checkpatch cleanup of arch/x86/cpu/*.c
  x86: Call hang() on unrecoverable exception
  menu.c: use puts() instead of printf() where possible
  MAKEALL: drop obsolete mx31pdk_nand target
  dataflash: fix parameters order in write_dataflash()
  hawkboard: Replace HAWKBOARD_KICK{0, 1}_UNLOCK defines
  davinci_sonata: define CONFIG_MACH_TYPE for davinci_sonata board
  davinci_schmoogie: define CONFIG_MACH_TYPE for davinci_schmoogie board
  arm: a320evb: define mach-type in board config file
  OMAP3: Use sdelay from arch/arm/cpu/armv7/syslib.c instead of cloning that.
  Fix Stelian's email address
  DIU: 1080P and 720P support
  CFB: Fix font rendering on mx5 framebuffer

12 years agoboard/emk/top860/top860.c: Fix GCC 4.6 build warning
Wolfgang Denk [Tue, 29 Nov 2011 22:17:57 +0000 (22:17 +0000)]
board/emk/top860/top860.c: Fix GCC 4.6 build warning

Fix:
top860.c: In function 'initdram':
top860.c:90:11: warning: variable 'j' set but not used
[-Wunused-but-set-variable]

Note: No attempts were made to convert this file completely to using
I/O accessors. This is left as an exercise for the board maintainer.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Reinhard Meyer <reinhard.meyer@emk-elektronik.de>
12 years agoboard/sbc405/strataflash.c: Fix GCC 4.6 build warning
Wolfgang Denk [Tue, 29 Nov 2011 22:17:56 +0000 (22:17 +0000)]
board/sbc405/strataflash.c: Fix GCC 4.6 build warning

Fix:
strataflash.c: In function 'flash_write_cfiword':
strataflash.c:673:11: warning: variable 'ctladdr' set but not used
[-Wunused-but-set-variable]

Signed-off-by: Wolfgang Denk <wd@denx.de>
Acked-by: Marek Vasut <marek.vasut@gmail.com>
12 years agoarch/powerpc/cpu/mpc86xx/cpu.c: Fix GCC 4.6 build warning
Wolfgang Denk [Tue, 29 Nov 2011 22:17:55 +0000 (22:17 +0000)]
arch/powerpc/cpu/mpc86xx/cpu.c: Fix GCC 4.6 build warning

Fix:
cpu.c: In function 'checkcpu':
cpu.c:51:7: warning: variable 'ver' set but not used
[-Wunused-but-set-variable]

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Kumar Gala <galak@kernel.crashing.org>
Acked-by: Kumar Gala <galak@kernel.crashing.org>
12 years agoboard/freescale/mpc8610hpcd/mpc8610hpcd.c: Fix GCC 4.6 build warning
Wolfgang Denk [Tue, 29 Nov 2011 22:17:54 +0000 (22:17 +0000)]
board/freescale/mpc8610hpcd/mpc8610hpcd.c: Fix GCC 4.6 build warning

Fix:
mpc8610hpcd.c: In function 'pci_init_board':
mpc8610hpcd.c:238:15: warning: variable 'pordevsr' set but not used
[-Wunused-but-set-variable]

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Kumar Gala <galak@kernel.crashing.org>
Acked-by: Kumar Gala <galak@kernel.crashing.org>
12 years agoboard/mpl/common/flash.c: Fix GCC 4.6 build warning
Wolfgang Denk [Tue, 29 Nov 2011 22:17:53 +0000 (22:17 +0000)]
board/mpl/common/flash.c: Fix GCC 4.6 build warning

Fix:
../common/flash.c: In function 'flash_init':
../common/flash.c:160:16: warning: variable 'size_b1' set but not used
[-Wunused-but-set-variable]

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Denis Peter <d.peter@mpl.ch>
Acked-by: Marek Vasut <marek.vasut@gmail.com>
12 years agopost/board/lwmon5/gdc.c: Fix GCC 4.6 build warning
Wolfgang Denk [Tue, 29 Nov 2011 22:17:52 +0000 (22:17 +0000)]
post/board/lwmon5/gdc.c: Fix GCC 4.6 build warning

Fix:
gdc.c: In function 'gdc_test_reg_one':
gdc.c:66:6: warning: variable 'ret' set but not used
[-Wunused-but-set-variable]

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Stefan Roese <sr@denx.de>
Acked-by: Stefan Roese <sr@denx.de>
12 years agodrivers/usb/host/sl811-hcd.c: Fix GCC 4.6 build warning
Wolfgang Denk [Tue, 29 Nov 2011 22:17:51 +0000 (22:17 +0000)]
drivers/usb/host/sl811-hcd.c: Fix GCC 4.6 build warning

Fix:
sl811-hcd.c: In function 'sl811_rh_submit_urb':
sl811-hcd.c:556:8: warning: variable 'wIndex' set but not used
[-Wunused-but-set-variable]

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Remy Bohmer <linux@bohmer.net>
12 years agoboard/sandburst/common/flash.c: Fix GCC 4.6 build warning
Wolfgang Denk [Tue, 29 Nov 2011 22:17:50 +0000 (22:17 +0000)]
board/sandburst/common/flash.c: Fix GCC 4.6 build warning

Fix:
../common/flash.c: In function 'flash_erase':
../common/flash.c:307:24: warning: variable 'l_sect' set but not used
[-Wunused-but-set-variable]

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Travis Sawyer <travis.sawyer@sandburst.com>
Acked-by: Marek Vasut <marek.vasut@gmail.com>
12 years agoDB64460: Fix GCC 4.6 build warnings
Wolfgang Denk [Tue, 29 Nov 2011 22:17:49 +0000 (22:17 +0000)]
DB64460: Fix GCC 4.6 build warnings

Fix:
db64460.c: In function 'debug_led':
db64460.c:413:6: warning: variable 'dummy' set but not used [-Wunused-but-set-variable]
mv_eth.c: In function 'mv64460_eth_real_open':
mv_eth.c:423:6: warning: variable 'port_status' set but not used [-Wunused-but-set-variable]
mv_eth.c: In function 'mv64460_eth_stop':
mv_eth.c:641:15: warning: variable 'port_num' set but not used [-Wunused-but-set-variable]
mv_eth.c: In function 'mv64460_eth_xmit':
mv_eth.c:717:15: warning: variable 'port_num' set but not used [-Wunused-but-set-variable]
mv_eth.c: In function 'mv64460_eth_receive':
mv_eth.c:802:15: warning: variable 'port_num' set but not used [-Wunused-but-set-variable]
mv_eth.c: In function 'mv64460_eth_get_stats':
mv_eth.c:901:15: warning: variable 'port_num' set but not used [-Wunused-but-set-variable]
mv_eth.c: In function 'mv64460_eth_update_stat':
mv_eth.c:929:24: warning: variable 'dummy' set but not used [-Wunused-but-set-variable]
mv_eth.c:928:15: warning: variable 'port_num' set but not used [-Wunused-but-set-variable]
mv_eth.c: In function 'mv64460_eth_print_stat':
mv_eth.c:1010:15: warning: variable 'port_num' set but not used [-Wunused-but-set-variable]
mv_eth.c: In function 'eth_clear_mib_counters':
mv_eth.c:2067:15: warning: variable 'dummy' set but not used [-Wunused-but-set-variable]
sdram_init.c: In function 'check_dimm':
sdram_init.c:289:50: warning: variable 'trrd_clocks' set but not used [-Wunused-but-set-variable]
sdram_init.c:289:37: warning: variable 'tras_clocks' set but not used [-Wunused-but-set-variable]
sdram_init.c:289:24: warning: variable 'trcd_clocks' set but not used [-Wunused-but-set-variable]
sdram_init.c:289:8: warning: variable 'trp_clocks' set but not used [-Wunused-but-set-variable]
sdram_init.c:279:34: warning: variable 'devicesForErrCheck' set but not used [-Wunused-but-set-variable]
sdram_init.c: In function 'setup_sdram':
sdram_init.c:1255:13: warning: variable 'check' set but not used [-Wunused-but-set-variable]
sdram_init.c: In function 'initdram':
sdram_init.c:1744:25: warning: variable 'check' set but not used [-Wunused-but-set-variable]
sdram_init.c:1742:14: warning: variable 's1' set but not used [-Wunused-but-set-variable]
sdram_init.c:1742:6: warning: variable 's0' set but not used [-Wunused-but-set-variable]

Note: no attempt was make to clean up the mess coding style and
other issues in sdram_init.c

Signed-off-by: Wolfgang Denk <wd@denx.de>
12 years agoDB64360: Fix GCC 4.6 build warnings
Wolfgang Denk [Tue, 29 Nov 2011 22:17:48 +0000 (22:17 +0000)]
DB64360: Fix GCC 4.6 build warnings

Fix:
db64360.c: In function 'debug_led':
db64360.c:413:6: warning: variable 'dummy' set but not used [-Wunused-but-set-variable]
mv_eth.c: In function 'mv64360_eth_real_open':
mv_eth.c:424:6: warning: variable 'port_status' set but not used [-Wunused-but-set-variable]
mv_eth.c: In function 'mv64360_eth_stop':
mv_eth.c:642:15: warning: variable 'port_num' set but not used [-Wunused-but-set-variable]
mv_eth.c: In function 'mv64360_eth_xmit':
mv_eth.c:718:15: warning: variable 'port_num' set but not used [-Wunused-but-set-variable]
mv_eth.c: In function 'mv64360_eth_receive':
mv_eth.c:803:15: warning: variable 'port_num' set but not used [-Wunused-but-set-variable]
mv_eth.c: In function 'mv64360_eth_get_stats':
mv_eth.c:902:15: warning: variable 'port_num' set but not used [-Wunused-but-set-variable]
mv_eth.c: In function 'mv64360_eth_update_stat':
mv_eth.c:930:24: warning: variable 'dummy' set but not used [-Wunused-but-set-variable]
mv_eth.c:929:15: warning: variable 'port_num' set but not used [-Wunused-but-set-variable]
mv_eth.c: In function 'mv64360_eth_print_stat':
mv_eth.c:1011:15: warning: variable 'port_num' set but not used [-Wunused-but-set-variable]
mv_eth.c: In function 'eth_clear_mib_counters':
mv_eth.c:2068:15: warning: variable 'dummy' set but not used [-Wunused-but-set-variable]
sdram_init.c: In function 'check_dimm':
sdram_init.c:289:50: warning: variable 'trrd_clocks' set but not used [-Wunused-but-set-variable]
sdram_init.c:289:37: warning: variable 'tras_clocks' set but not used [-Wunused-but-set-variable]
sdram_init.c:289:24: warning: variable 'trcd_clocks' set but not used [-Wunused-but-set-variable]
sdram_init.c:289:8: warning: variable 'trp_clocks' set but not used [-Wunused-but-set-variable]
sdram_init.c:279:34: warning: variable 'devicesForErrCheck' set but not used [-Wunused-but-set-variable]
sdram_init.c: In function 'setup_sdram':
sdram_init.c:1256:13: warning: variable 'check' set but not used [-Wunused-but-set-variable]
sdram_init.c: In function 'initdram':
sdram_init.c:1735:25: warning: variable 'check' set but not used [-Wunused-but-set-variable]
sdram_init.c:1733:14: warning: variable 's1' set but not used [-Wunused-but-set-variable]
sdram_init.c:1733:6: warning: variable 's0' set but not used [-Wunused-but-set-variable]

Note: no attempt was make to clean up the mess coding style and
other issues in sdram_init.c

Signed-off-by: Wolfgang Denk <wd@denx.de>
12 years agoboard/cray/L1/flash.c: Fix GCC 4.6 build warning
Wolfgang Denk [Tue, 29 Nov 2011 22:17:47 +0000 (22:17 +0000)]
board/cray/L1/flash.c: Fix GCC 4.6 build warning

Fix:
flash.c: In function 'flash_erase':
flash.c:276:24: warning: variable 'l_sect' set but not used
[-Wunused-but-set-variable]

Signed-off-by: Wolfgang Denk <wd@denx.de>
Acked-by: Marek Vasut <marek.vasut@gmail.com>
12 years agodrivers/block/sata_dwc.c: Fix GCC 4.6 build warning
Wolfgang Denk [Tue, 29 Nov 2011 22:17:46 +0000 (22:17 +0000)]
drivers/block/sata_dwc.c: Fix GCC 4.6 build warning

Fix:
sata_dwc.c: In function 'scan_sata':
sata_dwc.c:535:38: warning: variable 'udma_mask' set but not used
[-Wunused-but-set-variable]

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Kazuaki Ichinohe <kazuichi@fsi.co.jp>
12 years agoboard/amirix/ap1000/flash.c: Fix GCC 4.6 build warning
Wolfgang Denk [Tue, 29 Nov 2011 22:17:45 +0000 (22:17 +0000)]
board/amirix/ap1000/flash.c: Fix GCC 4.6 build warning

Fix:
flash.c: In function 'flash_write_cfiword':
flash.c:778:11: warning: variable 'ctladdr' set but not used
[-Wunused-but-set-variable]

Signed-off-by: Wolfgang Denk <wd@denx.de>
Acked-by: Marek Vasut <marek.vasut@gmail.com>
12 years agoalpr board: Fix GCC 4.6 build warnings
Wolfgang Denk [Tue, 29 Nov 2011 22:17:44 +0000 (22:17 +0000)]
alpr board: Fix GCC 4.6 build warnings

Fix:
fpga.c: In function 'fpga_pre_fn':
fpga.c:88:16: warning: variable 'reg' set but not used
[-Wunused-but-set-variable]
nand.c: In function 'alpr_nand_dev_ready':
nand.c:125:18: warning: variable 'val' set but not used
[-Wunused-but-set-variable]

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Stefan Roese <sr@denx.de>
Acked-by: Stefan Roese <sr@denx.de>
12 years agoMerge branch 'sr@denx.de' of git://git.denx.de/u-boot-staging
Wolfgang Denk [Thu, 1 Dec 2011 23:05:25 +0000 (00:05 +0100)]
Merge branch 'sr@denx.de' of git://git.denx.de/u-boot-staging

* 'sr@denx.de' of git://git.denx.de/u-boot-staging:
  image: Don't detect XIP images as overlapping.
  image: Implement IH_TYPE_KERNEL_NOLOAD

12 years agoMerge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Wolfgang Denk [Thu, 1 Dec 2011 23:03:08 +0000 (00:03 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

* 'master' of git://git.denx.de/u-boot-ppc4xx:
  ppc4xx: Add Io64 board support
  ppc4xx: fix PMC440 painit command
  ppc4xx: remove invalid access to PCI_BRDGOPT2 register
  ppc4xx: use CONFIG_PCI_BOOTDELAY instead of private implementation

12 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Wolfgang Denk [Thu, 1 Dec 2011 22:58:11 +0000 (23:58 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

* 'master' of git://git.denx.de/u-boot-mpc85xx:
  mpc85xx: support for Freescale COM Express P2020
  arch/powerpc/cpu/mpc8xxx/ddr/interactive.c: Fix GCC 4.6 build warning
  mpc85xx: support board-specific reset function
  powerpc/85xx: verify the localbus device tree address before booting the OS
  mpc8xxx: update module_type values from JEDEC DDR3 SPD Specification
  powerpc/p3060qds: Add board related support for P3060QDS platform
  powerpc/85xx: clean up and document the QE/FMAN microcode macros
  powerpc/85xx: always implement the work-around for Erratum SATA_A001
  powerpc/85xx: CONFIG_FSL_SATA_V2 should be defined in config_mpc85xx.h
  powerpc/85xx: Add workaround for erratum A-003474
  powerpc/85xx: fixup flexcan device tree clock-frequency
  powerpc/85xx: Add workaround for erratum CPU-A003999

12 years agoimage: Don't detect XIP images as overlapping.
Stephen Warren [Thu, 10 Nov 2011 20:17:54 +0000 (13:17 -0700)]
image: Don't detect XIP images as overlapping.

bootm_load_os() detects when it writes the decompressed image over
the top of the compressed image. If this happens, the original image
is corrupted. When the original image is a multi-component legacy image,
or a (potentially multi-component) FIT image, this implies that other
components may be corrupted. In turn, this means that booting is unlikely
to be successful.

However, in the case of no image compresssion coupled with an image with
load address equal to where the image is already located (e.g. an XIP
kernel, or IH_TYPE_KERNEL_ANYLOAD), there has been no copy and hence no
corruption, no matter whether it's a single-component legacy image, a
multi-component legacy image, or a FIT image. In this case, disable the
overlap detection, and allow boot to continue.

Without this change, when booting a single-component legacy image that
contains an IH_TYPE_KERNEL_ANYLOAD, bootm_load_os() would have returned
BOOTM_ERR_OVERLAP, but the caller ignores this, and boot continues and
succeeds. Now, the false error is no longer even returned.

Without this change, when booting a FIT image that contains an
IH_TYPE_KERNEL_ANYLOAD, bootm_load_os() would have returned
BOOTM_ERR_OVERLAP, which would then cause the caller to reset the board.
Now, the false error is no longer returned, and boot succeeds.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Stefan Roese <sr@denx.de>
12 years agoimage: Implement IH_TYPE_KERNEL_NOLOAD
Stephen Warren [Thu, 10 Nov 2011 20:17:53 +0000 (13:17 -0700)]
image: Implement IH_TYPE_KERNEL_NOLOAD

The legacy uImage format includes an absolute load and entry-point
address. When bootm operates on a kernel uImage in memory that isn't
loaded at the address in the image's load address, U-Boot will copy
the image to its address in the header.

Some kernel images can actually be loaded and used at any arbitrary
address. An example is an ARM Linux kernel zImage file. To represent
this capability, IH_TYPE_KERNEL_NOLOAD is implemented, which operates
just like IH_TYPE_KERNEL, except that the load address header is
ignored, and U-Boot does not copy the image to its load address, but
rather uses it in-place.

This is useful when sharing a single (uImage-wrapped) zImage across
multiple boards with different memory layouts; in this case, a specific
load address need not be picked when creating the uImage, but instead
is selected by the board-specific U-Boot environment used to load and
boot that image.

v2: Rename from IH_TYPE_KERNEL_ANYLOAD to IH_TYPE_KERNEL_NOLOAD.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Stefan Roese <sr@denx.de>
12 years agoppc4xx: Add Io64 board support
Dirk Eibach [Thu, 20 Oct 2011 09:12:55 +0000 (11:12 +0200)]
ppc4xx: Add Io64 board support

Board support for the Guntermann & Drunck Io64.

Signed-off-by: Dirk Eibach <eibach@gdsys.de>
Signed-off-by: Stefan Roese <sr@denx.de>
12 years agoppc4xx: fix PMC440 painit command
Matthias Fuchs [Thu, 24 Nov 2011 15:36:06 +0000 (16:36 +0100)]
ppc4xx: fix PMC440 painit command

This patch fixes the PMC440 BSP command painit. The implementation was
broken since the step to the new environment handling.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
Signed-off-by: Stefan Roese <sr@denx.de>
12 years agoppc4xx: remove invalid access to PCI_BRDGOPT2 register
Matthias Fuchs [Thu, 13 Oct 2011 13:12:23 +0000 (15:12 +0200)]
ppc4xx: remove invalid access to PCI_BRDGOPT2 register

This patch removes an invalid call to pci_write_config_dword to
PCI_BRDGOPT2 register. This function must not be used from pci_target_init
and is also at the wrong place. The correct call is done later in
pci_target_init via pci_hose_write_config_dword.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
Signed-off-by: Stefan Roese <sr@denx.de>
12 years agoppc4xx: use CONFIG_PCI_BOOTDELAY instead of private implementation
Matthias Fuchs [Thu, 13 Oct 2011 13:12:22 +0000 (15:12 +0200)]
ppc4xx: use CONFIG_PCI_BOOTDELAY instead of private implementation

This patch switches PMC440 board code to the CONFIG_PCI_BOOTDELAY option
instead of using a private implemention. This relies on Anatolji's patch
that moves the pcidelay handling behind pci_target_init.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
Signed-off-by: Stefan Roese <sr@denx.de>
12 years agompc85xx: support for Freescale COM Express P2020
Ira W. Snyder [Wed, 23 Nov 2011 16:25:58 +0000 (08:25 -0800)]
mpc85xx: support for Freescale COM Express P2020

This adds support for the Freescale COM Express P2020 board. This board
is similar to the P1_P2_RDB, but has some extra (as well as missing)
peripherals.

Unlike all other mpc85xx boards, it uses a watchdog timeout to reset.
Using the HRESET_REQ register does not work.

This board has no NOR flash, and can only be booted via SD or SPI. This
procedure is documented in Freescale Document Number AN3659 "Booting
from On-Chip ROM (eSDHC or eSPI)." Some alternative documentation is
provided in Freescale Document Number P2020RM "P2020 QorIQ Integrated
Processor Reference Manual" (section 4.5).

Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
12 years agoarch/powerpc/cpu/mpc8xxx/ddr/interactive.c: Fix GCC 4.6 build warning
Kumar Gala [Wed, 23 Nov 2011 16:02:41 +0000 (10:02 -0600)]
arch/powerpc/cpu/mpc8xxx/ddr/interactive.c: Fix GCC 4.6 build warning

Fix:

interactive.c: In function 'fsl_ddr_interactive':
interactive.c:1357:15: warning: variable 'len' set but not used [-Wunused-but-set-variable]

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