karo-tx-uboot.git
10 years agoFix unused function in cmd_bdinfo.c
Simon Glass [Tue, 6 Dec 2011 13:37:17 +0000 (13:37 +0000)]
Fix unused function in cmd_bdinfo.c

It is fine to use __maybe_unused instead of #ifdef, but we also need one
for print_eth() since not all boards have Ethernet. This fixes this
warning:

cmd_bdinfo.c:39:13: warning: 'print_eth' defined but not used [-Wunused-function]

Signed-off-by: Simon Glass <sjg@chromium.org>
10 years agoFix SPI build errors in exports.c
Simon Glass [Tue, 6 Dec 2011 19:31:32 +0000 (19:31 +0000)]
Fix SPI build errors in exports.c

The spi.h include is no longer included in exports.h, so must be included
here.

This fixes these errors:

In file included from exports.c:41:0:
/home/sjg/trunk/src/third_party/u-boot/files/include/_exports.h: In function 'jumptable_init':
/home/sjg/trunk/src/third_party/u-boot/files/include/_exports.h:27:1: error: 'spi_init' undeclared (first use in this function)
/home/sjg/trunk/src/third_party/u-boot/files/include/_exports.h:27:1: note: each undeclared identifier is reported only once for each function it appears in
/home/sjg/trunk/src/third_party/u-boot/files/include/_exports.h:28:1: error: 'spi_setup_slave' undeclared (first use in this function)
/home/sjg/trunk/src/third_party/u-boot/files/include/_exports.h:29:1: error: 'spi_free_slave' undeclared (first use in this function)
/home/sjg/trunk/src/third_party/u-boot/files/include/_exports.h:30:1: error: 'spi_claim_bus' undeclared (first use in this function)
/home/sjg/trunk/src/third_party/u-boot/files/include/_exports.h:31:1: error: 'spi_release_bus' undeclared (first use in this function)
/home/sjg/trunk/src/third_party/u-boot/files/include/_exports.h:32:1: error: 'spi_xfer' undeclared (first use in this function)

Signed-off-by: Simon Glass <sjg@chromium.org>
10 years agoInclude common.h in qsort.c to fix build warning
Simon Glass [Tue, 6 Dec 2011 13:37:16 +0000 (13:37 +0000)]
Include common.h in qsort.c to fix build warning

exports.h no longer includes common.h, which contains assert(). qsort.c
needs to be updated. This fixes this warning:

qsort.c: In function 'qsort':
qsort.c:30:3: warning: implicit declaration of function 'assert' [-Wimplicit-function-declaration]

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Kumar Gala <galak@kernel.crashing.org>
Tested-by: Heiko Schocher <hs@denx.de>
10 years agoRevert "mii: miiphy register address width change"
Wolfgang Denk [Wed, 7 Dec 2011 07:35:14 +0000 (08:35 +0100)]
Revert "mii: miiphy register address width change"

This reverts commit 5c45a22b9203351a32aec4600514341b91175542.

It causes a lot of "incompatible pointer type" warnings for a large
number of Ethernet drivers, which are not really worth fixing
especially as this patch was only supposed to help the old,
deprecated miiphy API.  Instead of adding more efforts to a lost case
we rather revert it.

Signed-off-by: Wolfgang Denk <wd@denx.de>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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

10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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

10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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

10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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

10 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

10 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

10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 years agompc85xx: support board-specific reset function
Ira W. Snyder [Mon, 21 Nov 2011 21:20:32 +0000 (13:20 -0800)]
mpc85xx: support board-specific reset function

This is useful for boards which cannot be reset in the usual way for the
85xx CPU. An example is a board which can only be reset by a hardware
watchdog.

Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
10 years agopowerpc/85xx: verify the localbus device tree address before booting the OS
Timur Tabi [Wed, 16 Nov 2011 19:28:34 +0000 (13:28 -0600)]
powerpc/85xx: verify the localbus device tree address before booting the OS

The localbus controller node in the device tree is typically a root node,
even though the controller is part of CCSR.  If we were to put the lbc
node under the SOC node, then the 'ranges' property in the lbc node would
translate through the 'ranges' property of the parent SOC node, and we
don't want that.

Since the lbc is a separate node, it's possible for the 'reg' property to
be wrong.  This happened with the original version of p1022ds.dts, which
used a 32-bit value in the 'reg' address, instead of a 36-bit address.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
10 years agompc8xxx: update module_type values from JEDEC DDR3 SPD Specification
Ira W. Snyder [Mon, 21 Nov 2011 21:20:33 +0000 (13:20 -0800)]
mpc8xxx: update module_type values from JEDEC DDR3 SPD Specification

Newer JEDEC DDR3 SPD Specifications define several additional values for
the DDR3 module_type field which were undefined when this code was
written. Update the code to handle the newer module types.

Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
Cc: York Sun <yorksun@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
10 years agopowerpc/p3060qds: Add board related support for P3060QDS platform
Shengzhou Liu [Tue, 22 Nov 2011 08:51:13 +0000 (16:51 +0800)]
powerpc/p3060qds: Add board related support for P3060QDS platform

The P3060QDS is a Freescale reference board for the six-core P3060 SOC.

P3060QDS Board Overview:
 Memory subsystem:
  - 2G Bytes unbuffered DDR3 SDRAM SO-DIMM(64bit bus)
  - 128M Bytes NOR flash single-chip memory
  - 16M Bytes SPI flash
  - 8K Bytes AT24C64 I2C EEPROM for RCW
 Ethernet:
  - Eight Ethernet controllers (4x1G + 4x1G/2.5G)
  - Three VSC8641 PHYs on board (2xRGMII + 1xMII)
  - Suport multiple Vitesse VSC8234 SGMII Cards in Slot1/2/3
 PCIe: Two PCI Express 2.0 controllers/ports
 USB:  Two USB2.0, USB1(TYPE-A) and USB2(TYPE-AB) on board
 I2C:  Four I2C controllers
 UART: Supports two dUARTs up to 115200 bps for console
 RapidIO:  Two RapidIO, sRIO1 and sRIO2

Signed-off-by: Shengzhou Liu <Shengzhou.Liu@freescale.com>
Signed-off-by: York Sun <yorksun@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
10 years agopowerpc/85xx: clean up and document the QE/FMAN microcode macros
Timur Tabi [Tue, 22 Nov 2011 15:21:25 +0000 (09:21 -0600)]
powerpc/85xx: clean up and document the QE/FMAN microcode macros

Several macros are used to identify and locate the microcode binary image
that U-boot needs to upload to the QE or Fman.  Both the QE and the Fman
use the QE Firmware binary format to package their respective microcode data,
which is why the same macros are used for both.  A given SOC will only have
a QE or an Fman, so this is safe.

Unfortunately, the current macro definition and usage has inconsistencies.
For example, CONFIG_SYS_FMAN_FW_ADDR was used to define the address of Fman
firmware in NOR flash, but CONFIG_SYS_QE_FW_IN_NAND contains the address
of NAND.  There's no way to know by looking at a variable how it's supposed
to be used.

In the future, the code which uploads QE firmware and Fman firmware will
be merged.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
10 years agopowerpc/85xx: always implement the work-around for Erratum SATA_A001
Timur Tabi [Mon, 21 Nov 2011 23:10:23 +0000 (17:10 -0600)]
powerpc/85xx: always implement the work-around for Erratum SATA_A001

On the P1022/P1013, the work-around for erratum SATA_A001 was implemented
only if U-Boot initializes SATA, but SATA is not initialized by default.  So
move the work-around to the CPU initialization function, so that it's always
executed on the SOCs that need it.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
10 years agopowerpc/85xx: CONFIG_FSL_SATA_V2 should be defined in config_mpc85xx.h
Timur Tabi [Mon, 21 Nov 2011 23:10:22 +0000 (17:10 -0600)]
powerpc/85xx: CONFIG_FSL_SATA_V2 should be defined in config_mpc85xx.h

Macro CONFIG_FSL_SATA_V2 is defined if the SOC has a V2 Freescale SATA
controller, so it should be defined in config_mpc85xx.h instead of the various
board header files.  So now CONFIG_FSL_SATA_V2 is always defined on the P1013,
P1022, P2041, P3041, P5010, and P5020.  It was already defined for the
P1010 and P1014.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
10 years agopowerpc/85xx: Add workaround for erratum A-003474
York Sun [Sun, 20 Nov 2011 18:01:35 +0000 (10:01 -0800)]
powerpc/85xx: Add workaround for erratum A-003474

Erratum A-003474: Internal DDR calibration circuit is not supported

Impact:
Experience shows no significant benefit to device operation with
auto-calibration enabled versus it disabled. To ensure consistent timing
results, Freescale recommends this feature be disabled in future customer
products. There should be no impact to parts that are already operating
in the field.

Workaround:
Prior to setting DDR_SDRAM_CFG[MEM_EN]=1, do the following:
1. Write a value of 0x0000_0015 to the register at offset
CCSRBAR + DDR OFFSET + 0xf30
2. Write a value of 0x2400_0000 to the register at offset
CCSRBAR + DDR OFFSET + 0xf54

Signed-off-by: York Sun <yorksun@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
10 years agopowerpc/85xx: fixup flexcan device tree clock-frequency
Jia Hongtao [Tue, 15 Nov 2011 07:04:11 +0000 (15:04 +0800)]
powerpc/85xx: fixup flexcan device tree clock-frequency

Make the fixup matchable with dts and kernel.  Update the compatible from
"fsl,flexcan-v1.0" to "fsl,p1010-flexcan" and Change the "clock-freq"
property to "clock-frequency".  We also change flexcan frequency from
CCB-clock to CCB-clock/2 according to P1010 spec.

We now keep the old interfaces to make previous kernel work. They should
be removed in the future.

Signed-off-by: Jia Hongtao <B38951@freescale.com>
Signed-off-by: Li Yang <leoli@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
10 years agopowerpc/85xx: Add workaround for erratum CPU-A003999
Kumar Gala [Tue, 22 Nov 2011 12:51:15 +0000 (06:51 -0600)]
powerpc/85xx: Add workaround for erratum CPU-A003999

Erratum A-003999: Running Floating Point instructions requires special
initialization.

Impact:
Floating point arithmetic operations may result in an incorrect value.

Workaround:
Perform a read modify write to set bit 7 to a 1 in SPR 977 before
executing any floating point arithmetic operation. This bit can be set
when setting MSR[FP], and can be cleared when clearing MSR[FP].
Alternatively, the bit can be set once at boot time, and never cleared.
There will be no performance degradation due to setting this bit.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
10 years agomenu.c: use puts() instead of printf() where possible
Wolfgang Denk [Mon, 28 Nov 2011 19:19:41 +0000 (20:19 +0100)]
menu.c: use puts() instead of printf() where possible

common/menu.c used printf() in a number of places to print user
provided, constant strings (like the "title" string).  printf() is
dangerous here for example in case the user unwittingly embeds some
'%' caracters that printf() would interpret as formatting and then
pick up random arguments.  Use puts() instead.

We also omit the trailing ':' in the title line - if a user wants
this, he can provide it as part of the title string.

Signed-off-by: Wolfgang Denk <wd@denx.de>
10 years agoMAKEALL: drop obsolete mx31pdk_nand target
Stefano Babic [Thu, 17 Nov 2011 23:16:14 +0000 (23:16 +0000)]
MAKEALL: drop obsolete mx31pdk_nand target

The mx31pdk can boot only from NAND and the target was
already updated in boards.cfg. mx31pdk_nand is obsolete
and is dropped.

Signed-off-by: Stefano Babic <sbabic@denx.de>
10 years agodataflash: fix parameters order in write_dataflash()
Igor Grinberg [Sat, 26 Nov 2011 23:06:46 +0000 (23:06 +0000)]
dataflash: fix parameters order in write_dataflash()

Fix parameters order in write_dataflash() function extern declaration in
the header file.
Parameters order, as in function definition, should be:
addr_dest, addr_src, size.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
10 years agohawkboard: Replace HAWKBOARD_KICK{0, 1}_UNLOCK defines
Christian Riesch [Sat, 19 Nov 2011 00:45:44 +0000 (00:45 +0000)]
hawkboard: Replace HAWKBOARD_KICK{0, 1}_UNLOCK defines

This patch replaces the HAWKBOARD_KICK{0,1}_UNLOCK defines by
DV_SYSCFG_KICK{0,1}_UNLOCK.

The kick register values are not hawkboard specific but may be used
for all davinci boards. In commit f3c149d6c6e5ba8dd72baa86fe527837e4fb0e9a
new defines for these values wer introduced.

Signed-off-by: Christian Riesch <christian.riesch@omicron.at>
Cc: Syed Mohammed Khasim <sm.khasim@gmail.com>
Cc: Sughosh Ganu <urwithsughosh@gmail.com>
Cc: Sandeep Paulraj <s-paulraj@ti.com>
10 years agodavinci_sonata: define CONFIG_MACH_TYPE for davinci_sonata board
Christian Riesch [Sat, 19 Nov 2011 00:45:43 +0000 (00:45 +0000)]
davinci_sonata: define CONFIG_MACH_TYPE for davinci_sonata board

This patch fixes the build breakage for the davinci_sonata board.

Signed-off-by: Christian Riesch <christian.riesch@omicron.at>
Cc: Sergey Kubushyn <ksi@koi8.net>
Cc: Sandeep Paulraj <s-paulraj@ti.com>
10 years agodavinci_schmoogie: define CONFIG_MACH_TYPE for davinci_schmoogie board
Christian Riesch [Sat, 19 Nov 2011 00:45:42 +0000 (00:45 +0000)]
davinci_schmoogie: define CONFIG_MACH_TYPE for davinci_schmoogie board

This patch fixes the build breakage for the davinci_schmoogie board.

Signed-off-by: Christian Riesch <christian.riesch@omicron.at>
Cc: Sergey Kubushyn <ksi@koi8.net>
Cc: Sandeep Paulraj <s-paulraj@ti.com>
10 years agoarm: a320evb: define mach-type in board config file
Yan-Pai Chen [Mon, 7 Nov 2011 19:40:25 +0000 (19:40 +0000)]
arm: a320evb: define mach-type in board config file

MACH_TYPE_FARADAY was dropped from mach-types.h. Add it back to
board config file.

Signed-off-by: Yan-Pai Chen <ypchen@faraday-tech.com>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
10 years agoOMAP3: Use sdelay from arch/arm/cpu/armv7/syslib.c instead of cloning that.
Alexander Holler [Sat, 18 Dec 2010 12:24:20 +0000 (13:24 +0100)]
OMAP3: Use sdelay from arch/arm/cpu/armv7/syslib.c instead of cloning that.

There is no need to have such a function twice.

Signed-off-by: Alexander Holler <holler@ahsoftware.de>
Acked-by: Dirk Behme <dirk.behme@googlemail.com>
Signed-off-by: Anatolij Gustschin <agust@denx.de>
10 years agoFix Stelian's email address
Stelian Pop [Mon, 31 Oct 2011 23:00:39 +0000 (00:00 +0100)]
Fix Stelian's email address

Change my old email address which is no longer valid.

Signed-off-by: Stelian Pop <stelian@popies.net>
Signed-off-by: Anatolij Gustschin <agust@denx.de>
10 years agoDIU: 1080P and 720P support
Jerry Huang [Tue, 1 Nov 2011 15:16:43 +0000 (15:16 +0000)]
DIU: 1080P and 720P support

Add the 1920x1080 and 1280x720 resolution support.

Signed-off-by: Jerry Huang <Chang-Ming.Huang@freescale.com>
Acked-by: Timur Tabi <timur@freescale.com>
CC: Anatolij Gustschin <agust@denx.de>
10 years agoCFB: Fix font rendering on mx5 framebuffer
Marek Vasut [Wed, 23 Nov 2011 16:32:16 +0000 (16:32 +0000)]
CFB: Fix font rendering on mx5 framebuffer

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
10 years agox86: Fix some bugs in the i8402 driver when no controller is present
Gabe Black [Mon, 14 Nov 2011 20:18:12 +0000 (20:18 +0000)]
x86: Fix some bugs in the i8402 driver when no controller is present

If no controller is present, the i8402 driver should return immediately and
not attempt to operate on the missing hardware.

In kbd_input_empty, the status register is checked every millisecond to see
whether the input buffer is empty, up to a timeout which is tracked by
decrimenting a counter each time the check is performed. The decrement is
performed with a postfix -- operator, and the value of the counter is
checked in place. That means that when the counter reaches zero and the
loop terminates, it will actually be decrimented one more time and become
-1. That value is returned as the return value of the function. That would
give the right answer if it wasn't for that extra decrement because a
timeout would indicate that the buffer never became empty.

This change fixes both of those bugs.

Signed-off-by: Gabe Black <gabeblack@chromium.org>
10 years agox86: Make the i8042 driver checkpatch clean
Gabe Black [Mon, 14 Nov 2011 19:24:14 +0000 (19:24 +0000)]
x86: Make the i8042 driver checkpatch clean

Signed-off-by: Gabe Black <gabeblack@chromium.org>