oweals/u-boot.git
11 years agopowerpc/sec: Add workaround for SEC A-003571
Shengzhou Liu [Thu, 15 Aug 2013 01:31:47 +0000 (09:31 +0800)]
powerpc/sec: Add workaround for SEC A-003571

Multiple read/write transactions initiated by security
engine may cause system to hang.
Workaround: set MCFGR[AXIPIPE] to 0 to avoid hang.

Signed-off-by: Shengzhou Liu <Shengzhou.Liu@freescale.com>
Acked-by: York Sun <yorksun@freescale.com>
11 years agopowerpc/p1010rdb: fix calculating ddr_freq_mhz
Shengzhou Liu [Tue, 13 Aug 2013 08:41:19 +0000 (16:41 +0800)]
powerpc/p1010rdb: fix calculating ddr_freq_mhz

There was a bug for calculating ddr_freq_mhz,
it should be divided by 1000000 rather than 0x1000000.

Signed-off-by: Shengzhou Liu <Shengzhou.Liu@freescale.com>
Acked-by: York Sun <yorksun@freescale.com>
11 years agopowerpc/t4240: add QSGMII interface support
Shaohui Xie [Mon, 19 Aug 2013 10:58:52 +0000 (18:58 +0800)]
powerpc/t4240: add QSGMII interface support

Also some fix for QSGMII.
1. fix QSGMII configure of Serdes2.
2. fix PHY address of QSGMII MAC9 & MAC10 for each FMAN.
3. fix dtb for QSGMII interface.

Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>
Acked-by: York Sun <yorksun@freescale.com>
11 years agopowerpc/t4240: fix lanes routing for QSGMII protocols
Shaohui Xie [Mon, 19 Aug 2013 10:57:57 +0000 (18:57 +0800)]
powerpc/t4240: fix lanes routing for QSGMII protocols

When using QSGMII protocols, the first lane and third lane on each slot
need to be swapped.

Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>
Acked-by: York Sun <yorksun@freescale.com>
11 years agopowerpc/common/vsc3316: remove const from vsc3316_config parameter define
Shaohui Xie [Mon, 19 Aug 2013 10:43:07 +0000 (18:43 +0800)]
powerpc/common/vsc3316: remove const from vsc3316_config parameter define

Since the parameters need to be modified according to different Serdes
protocols at runtime, the const will block this. Also remove const from
arrays define used by vsc3316_config.

Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>
Acked-by: York Sun <yorksun@freescale.com>
11 years agopowerpcv2: Print hardcoded size like print_size() does
Shruti Kanetkar [Thu, 15 Aug 2013 16:25:38 +0000 (11:25 -0500)]
powerpcv2: Print hardcoded size like print_size() does

Makes the startup output more consistent

Signed-off-by: Shruti Kanetkar <Shruti@Freescale.com>
Acked-by: Andy Fleming <afleming@freescale.com>
Acked-by: Stefan Roese <sr@denx.de>
Acked-by: York Sun <yorksun@freescale.com>
11 years agopowerpc: Use print_size() where appropriate
Shruti Kanetkar [Thu, 15 Aug 2013 16:25:37 +0000 (11:25 -0500)]
powerpc: Use print_size() where appropriate

Makes the startup output more consistent

Signed-off-by: Shruti Kanetkar <Shruti@Freescale.com>
Acked-by: Andy Fleming <afleming@freescale.com>
Acked-by: York Sun <yorksun@freescale.com>
11 years agoSPDX-License-Identifier: clean up license header
York Sun [Tue, 20 Aug 2013 17:15:37 +0000 (10:15 -0700)]
SPDX-License-Identifier: clean up license header

This patch cleans up license header in these files:
board/freescale/p1022ds/spl.c
drivers/mmc/fsl_esdhc_spl.c
drivers/mtd/spi/fsl_espi_spl.c

Signed-off-by: York Sun <yorksun@freescale.com>
11 years agopowerpc: Fix CamelCase checkpatch warnings
Prabhakar Kushwaha [Fri, 16 Aug 2013 09:22:26 +0000 (14:52 +0530)]
powerpc: Fix CamelCase checkpatch warnings

85xx, 86xx PowerPC folders have code variables with CamelCase naming conventions.
because of this code checkpatch script generates "WARNING: Avoid CamelCase".

Convert variables name to normal naming convention and modify board, driver
files with updated the new structure.

Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com>
Acked-by: York Sun <yorksun@freescale.com>
11 years agopowerpc: p1022ds: add TPL for p1022ds nand boot
Ying Zhang [Fri, 16 Aug 2013 07:16:16 +0000 (15:16 +0800)]
powerpc: p1022ds: add TPL for p1022ds nand boot

TPL is introduced in the patch "NAND: TPL : introduce the TPL
based on the SPL", here enable TPL for p1022ds nand boot.

Signed-off-by: Ying Zhang <b40530@freescale.com>
Acked-by: York Sun <yorksun@freescale.com>
11 years agoTPL : introduce the TPL based on the SPL
Ying Zhang [Fri, 16 Aug 2013 07:16:15 +0000 (15:16 +0800)]
TPL : introduce the TPL based on the SPL

Due to the nand SPL on some board(e.g. P1022DS)has a size limit, it can
not be more than 4K. So, the SPL cannot initialize the DDR with the SPD
code. This patch introduces TPL to enable a loader stub that is loaded
by the code from the SPL. It initializes the DDR with the SPD or other
operations.

The TPL's size is sizeable, the maximum size is decided by the memory's
size that TPL runs. It initializes the DDR through SPD code, and copys
final uboot image to DDR. So there are three stage uboot images:
* spl_boot, * tpl_boot, * final uboot image

Signed-off-by: Ying Zhang <b40530@freescale.com>
Acked-by: York Sun <yorksun@freescale.com>
11 years agopowerpc : p1022ds : Enable p1022ds to start from eSPI with SPL
Ying Zhang [Fri, 16 Aug 2013 07:16:14 +0000 (15:16 +0800)]
powerpc : p1022ds : Enable p1022ds to start from eSPI with SPL

Enable p1022ds to start from eSPI with SPL.

Signed-off-by: Ying Zhang <b40530@freescale.com>
Acked-by: York Sun <yorksun@freescale.com>
11 years agopowerpc : spi flash : Support to start from eSPI with SPL
Ying Zhang [Fri, 16 Aug 2013 07:16:13 +0000 (15:16 +0800)]
powerpc : spi flash : Support to start from eSPI with SPL

This patch introduces SPL to enable a loader stub that being loaded by
the code from the internal on-chip ROM. It loads the final uboot image
into DDR, then jump to it to begin execution.

The SPL's size is sizeable, the maximum size must not exceed the size of L2
SRAM. It initializes the DDR through SPD code, and copys final uboot image
to DDR. So there are two stage uboot images:
* spl_boot, 96KB size. The env variables are copied to L2 SRAM, so that
ddr spd code can get the interleaving mode setting in env. It loads
final uboot image from offset 96KB.
* final uboot image, size is variable depends on the functions enabled.

Signed-off-by: Ying Zhang <b40530@freescale.com>
Acked-by: York Sun <yorksun@freescale.com>
11 years agopowerpc: p1022ds: Enable P1022DS to boot from SD Card with SPL
Ying Zhang [Fri, 16 Aug 2013 07:16:12 +0000 (15:16 +0800)]
powerpc: p1022ds: Enable P1022DS to boot from SD Card with SPL

Enable p1022ds to start from eSDHC with SPL.

Signed-off-by: Ying Zhang <b40530@freescale.com>
Acked-by: York Sun <yorksun@freescale.com>
11 years agopowerpc: mpc85xx: Support booting from SD Card with SPL
Ying Zhang [Fri, 16 Aug 2013 07:16:11 +0000 (15:16 +0800)]
powerpc: mpc85xx: Support booting from SD Card with SPL

The code from the internal on-chip ROM. It loads the final uboot image
into DDR, then jump to it to begin execution.

The SPL's size is sizeable, the maximum size must not exceed the size of L2
SRAM. It initializes the DDR through SPD code, and copys final uboot image
to DDR. So there are two stage uboot images:
* spl_boot, 96KB size. The env variables are copied to L2 SRAM, so that
ddr spd code can get the interleaving mode setting in env. It loads
final uboot image from offset 96KB.
* final uboot image, size is variable depends on the functions enabled.

Signed-off-by: Ying Zhang <b40530@freescale.com>
Acked-by: York Sun <yorksun@freescale.com>
11 years agopowerpc: deleted unused symbol CONFIG_SPL_NAND_MINIMAL and enabled some functionality...
Ying Zhang [Fri, 16 Aug 2013 07:16:10 +0000 (15:16 +0800)]
powerpc: deleted unused symbol CONFIG_SPL_NAND_MINIMAL and enabled some functionality for common SPL

1. The symbol CONFIG_SPL_NAND_MINIMAL is unused, so deleted it.
2. Some functions were unused in the minimal SPL, but it is useful
in the common SPL. So, enabled some functionality for common SPL.

Signed-off-by: Ying Zhang <b40530@freescale.com>
Acked-by: York Sun <yorksun@freescale.com>
11 years agospl: env_common.c: make CONFIG_SPL_BUILD contain function env_import
Ying Zhang [Thu, 20 Jun 2013 08:04:24 +0000 (16:04 +0800)]
spl: env_common.c: make CONFIG_SPL_BUILD contain function env_import

The functionality env_import will be used in the SPL. They
had been excluded by ifndef CONFIG_SPL_BUILD. Now, put it
into the SPL.

Signed-off-by: Ying Zhang <b40530@freescale.com>
Acked-by: Tom Rini <trini@ti.com>
Acked-by: York Sun <yorksun@freescale.com>
11 years agoSPL: Makefile: Build a separate autoconf.mk for SPL
Joel Fernandes [Mon, 19 Aug 2013 08:14:14 +0000 (16:14 +0800)]
SPL: Makefile: Build a separate autoconf.mk for SPL

SPL defines CONFIG_SPL_BUILD but this does not percolate to the
autoconf.mk Makefile.  As a result the build breaks when
CONFIG_SPL_BUILD is used in the board-specific include header file. With
this, there is a possibility of having a CONFIG option defined in the
header file but not defined in the Makefile causing all kinds of build
failure and problems.

It also messes things for up, for example, when one might want to
undefine options to keep the SPL small and doesn't want to be stuck with
the CONFIG options used for U-boot.  Lastly, this also avoids defining
special CONFIG_SPL_ variables for cases where some options are required
in U-boot but not in SPL.

We add a spl-autoconf.mk rule that is generated for SPL with the
CONFIG_SPL_BUILD flag and conditionally include it for SPL builds.

Signed-off-by: Joel Fernandes <joelf@ti.com>
Signed-off-by: Ying Zhang <b40530@freescale.com>
11 years agoPrepare v2013.10-rc1 v2013.10-rc1
Tom Rini [Mon, 19 Aug 2013 21:26:15 +0000 (17:26 -0400)]
Prepare v2013.10-rc1

Signed-off-by: Tom Rini <trini@ti.com>
11 years agoSPDX-License-Identifier: convert BSD-3-Clause files
Wolfgang Denk [Sun, 28 Jul 2013 20:12:47 +0000 (22:12 +0200)]
SPDX-License-Identifier: convert BSD-3-Clause files

Signed-off-by: Wolfgang Denk <wd@denx.de>
[trini Don't remove some copyrights by accident]
Signed-off-by: Tom Rini <trini@ti.com>
11 years agoboard/esd/cpci750/mv_eth.c: Fix license
Wolfgang Denk [Sun, 28 Jul 2013 20:12:46 +0000 (22:12 +0200)]
board/esd/cpci750/mv_eth.c: Fix license

The file header indicated that this file was GPL-2.0+, but actually
the code was derived from (Marvell based) Linux source code which is
only GPL-2.0.  Fix this.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Stefan Roese <sr@denx.de>
Cc: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
Acked-by: Stefan Roese <sr@denx.de>
11 years agoSPDX-License-Identifier: convert PIBS licensed files
Wolfgang Denk [Sun, 28 Jul 2013 20:12:45 +0000 (22:12 +0200)]
SPDX-License-Identifier: convert PIBS licensed files

This commit adapts the files that were derived from PIBS (PowerPC
Initialization and Boot Software) codeto using SPDX License
Identifiers.

So far, SPDX has not assigned an official License ID for the PIBS
license yet, so this should be considered preliminary.

Note that the following files contained incorrect license information:

arch/powerpc/cpu/ppc4xx/4xx_uart.c
arch/powerpc/cpu/ppc4xx/start.S
arch/powerpc/include/asm/ppc440.h

These files included, in addition to the GPL-2.0 / ibm-pibs dual
license as inherited from PIBS, a GPL-2.0+ license header which was
obviously incorrect.  This has been removed.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Stefan Roese <sr@denx.de>
Signed-off-by: Wolfgang Denk <wd@denx.de>
Conflicts:
Licenses/README
Acked-by: Stefan Roese <sr@denx.de>
11 years agoSPDX-License-Identifier: fixing some problematic GPL-2.0 files
Wolfgang Denk [Sun, 28 Jul 2013 20:12:44 +0000 (22:12 +0200)]
SPDX-License-Identifier: fixing some problematic GPL-2.0 files

Unlike the other patches in this series so far, this commit fixes a
ambiguity in the license terms for some OMAP files:  the code was
originally derived from the Linux kernel sources, where it was clearly
marked as GPL-2.0 (i. e. without the "or later" part), but the U-Boot
version had a GPL-2.0+ file header added, apparently without
permission / relicensing from the original authors of the code.

Insert a GPL-2.0 SPDX-License-Identifier to fix this.

Signed-off-by: Wolfgang Denk <wd@denx.de>
cc: Tom Rix <Tom.Rix@windriver.com>
Cc: Tom Rini <trini@ti.com>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
Acked-by: Tom Rini <trini@ti.com>
11 years agoSPDX-License-Identifier: convert GPL-2.0+ / BSD-2-Clause dual-licensed files
Wolfgang Denk [Sun, 28 Jul 2013 20:12:43 +0000 (22:12 +0200)]
SPDX-License-Identifier: convert GPL-2.0+ / BSD-2-Clause dual-licensed files

Signed-off-by: Wolfgang Denk <wd@denx.de>
11 years agonet: ftmac110: Update tx/rx descriptor format
Kuo-Jung Su [Wed, 10 Jul 2013 01:25:49 +0000 (09:25 +0800)]
net: ftmac110: Update tx/rx descriptor format

1. Reformat tx/rx descriptor as an uniform struct.
2. Replace uint32_t[2] with uint64_t for descriptor control.

Signed-off-by: Kuo-Jung Su <dantesu@faraday-tech.com>
CC: Joe Hershberger <joe.hershberger@gmail.com>
11 years agonet: ftmac110: struct ftmac110_regs __iomem * -> struct ftmac110_regs *
Kuo-Jung Su [Wed, 10 Jul 2013 01:25:48 +0000 (09:25 +0800)]
net: ftmac110: struct ftmac110_regs __iomem * -> struct ftmac110_regs *

Signed-off-by: Kuo-Jung Su <dantesu@faraday-tech.com>
CC: Joe Hershberger <joe.hershberger@gmail.com>
11 years agonet: ftmac110: Update license statement
Kuo-Jung Su [Wed, 10 Jul 2013 01:25:47 +0000 (09:25 +0800)]
net: ftmac110: Update license statement

Signed-off-by: Kuo-Jung Su <dantesu@faraday-tech.com>
CC: Joe Hershberger <joe.hershberger@gmail.com>
11 years agonet.h: don't use the reserved name __unused
Jeroen Hofstee [Sat, 10 Aug 2013 14:52:47 +0000 (16:52 +0200)]
net.h: don't use the reserved name __unused

The __* keywords are reserved. On FreeBSD __unused evaluates
to the attribute unused, causing a compilation failure.
Just use unused instead.

Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
cc: joe.hershberger@gmail.com

11 years agolinkstation_HGLAN: Convert from unused CONFIG_BOOTP_MASK to specific list
Tom Rini [Fri, 9 Aug 2013 19:58:18 +0000 (15:58 -0400)]
linkstation_HGLAN: Convert from unused CONFIG_BOOTP_MASK to specific list

Signed-off-by: Tom Rini <trini@ti.com>
11 years agogalaxy5200: Convert from unused CONFIG_BOOTP_MASK to specific list
Tom Rini [Fri, 9 Aug 2013 18:43:05 +0000 (14:43 -0400)]
galaxy5200: Convert from unused CONFIG_BOOTP_MASK to specific list

Signed-off-by: Tom Rini <trini@ti.com>
11 years agoconfigs: Remove unused CONFIG_BOOTP_DEFAULT
Tom Rini [Fri, 9 Aug 2013 18:39:51 +0000 (14:39 -0400)]
configs: Remove unused CONFIG_BOOTP_DEFAULT

Signed-off-by: Tom Rini <trini@ti.com>
11 years agonet: phy/realtek: Add support for RTL8211DN and RTL8211E phy modules
Bhupesh Sharma [Thu, 18 Jul 2013 08:28:20 +0000 (13:58 +0530)]
net: phy/realtek: Add support for RTL8211DN and RTL8211E phy modules

This patch adds support for Realtek PHY modules RTL8211DN and
RTL8211E (variants: RTL8211E-VB-CG, RTL8211E-VL-CG, RTL8211EG-VB-CG),
which can be found on Freescale's T1040RDB boards.

To make the driver more generic across 8211 family, a generic name 8211x
is added for macros and function names.

Signed-off-by: Bhupesh Sharma <bhupesh.sharma@freescale.com>
Acked-by: York Sun <yorksun@freescale.com>
11 years agonet: smsc95xx: Add support for another SMSC95xx variant
Stefan Roese [Wed, 3 Jul 2013 16:34:54 +0000 (18:34 +0200)]
net: smsc95xx: Add support for another SMSC95xx variant

This patch adds support for the SMSC9500 with product id 0x9900 which is
equipped in the "EXSYS USB 2.0" etherner USB adapter.

Tested on omap3_beagle.

Signed-off-by: Stefan Roese <sr@denx.de>
11 years agonet: Use ARRAY_SIZE at appropriate places
Axel Lin [Wed, 3 Jul 2013 03:24:18 +0000 (11:24 +0800)]
net: Use ARRAY_SIZE at appropriate places

Use ARRAY_SIZE instead of having similar implementation in each drivers.
The NUMELEMS defined in drivers/net/npe/include/IxOsalTypes.h is not used
at all, so this patch removes it instead of converting it to use ARRAY_SIZE.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
Cc: Ben Warren <biggerbadderben@gmail.com>
Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Joe Hershberger <joe.hershberger@ni.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Cc: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: York Sun <yorksun@freescale.com>
11 years agophy: smsc: LAN8710/8720 are not Gbit PHYs
Fabio Estevam [Fri, 7 Jun 2013 00:04:19 +0000 (21:04 -0300)]
phy: smsc: LAN8710/8720 are not Gbit PHYs

LAN8710/8720 are 10/100 Mbps PHYs, so fix the '.features' field.

Cc: Joe Hershberger <joe.hershberger@ni.com>
Cc: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
11 years agoserial: arm_dcc: Convert to use default_serial_puts
Axel Lin [Sat, 17 Aug 2013 07:39:34 +0000 (15:39 +0800)]
serial: arm_dcc: Convert to use default_serial_puts

Use default_serial_puts() instead of its own implementation.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Marek Vasut <marex@denx.de>
Acked-by: Michal Simek <monstr@monstr.eu>
11 years agopowerpc/ppc4xx: Fix dlvision-10g reset gpio
Dirk Eibach [Fri, 9 Aug 2013 08:52:54 +0000 (10:52 +0200)]
powerpc/ppc4xx: Fix dlvision-10g reset gpio

Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc>
Signed-off-by: Stefan Roese <sr@denx.de>
11 years agopowerpc/ppc4xx: Do full iocon PHY initialization in software
Dirk Eibach [Fri, 9 Aug 2013 08:52:53 +0000 (10:52 +0200)]
powerpc/ppc4xx: Do full iocon PHY initialization in software

Up to this point some PHY initialization was done from the FPGA
and some from u-boot.
From now all initialization is done from u-boot.
To keep this maintainable a PHY setup machine was implemented that can
execute commands from initialization arrays.

Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc>
Signed-off-by: Stefan Roese <sr@denx.de>
11 years agopowerpc/ppc4xx: Add support for iocon-2
Dirk Eibach [Fri, 9 Aug 2013 08:52:52 +0000 (10:52 +0200)]
powerpc/ppc4xx: Add support for iocon-2

Add a new iocon flavor with a second communiction port per channel.

Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc>
Signed-off-by: Stefan Roese <sr@denx.de>
11 years agopowerpc/ppc4xx: Add support for iocon fiber
Dirk Eibach [Fri, 9 Aug 2013 08:52:51 +0000 (10:52 +0200)]
powerpc/ppc4xx: Add support for iocon fiber

Add a new iocon flavor with fiber instead of copper connectivity.

Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc>
Signed-off-by: Stefan Roese <sr@denx.de>
11 years agoMerge branch 'master' of git://88.191.163.10/u-boot-arm
Tom Rini [Sun, 18 Aug 2013 18:14:34 +0000 (14:14 -0400)]
Merge branch 'master' of git://88.191.163.10/u-boot-arm

Fixup an easy conflict over adding the clk_get prototype and USB_OTG
defines for am33xx having moved.

Conflicts:
arch/arm/include/asm/arch-am33xx/hardware.h

Signed-off-by: Tom Rini <trini@ti.com>
11 years agoMerge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Albert ARIBAUD [Sat, 17 Aug 2013 16:24:13 +0000 (18:24 +0200)]
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

11 years agogpio: pca953x: Use ARRAY_SIZE instead of reinventing it
Axel Lin [Sat, 22 Jun 2013 10:22:48 +0000 (18:22 +0800)]
gpio: pca953x: Use ARRAY_SIZE instead of reinventing it

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Reviewed-by: Thierry Reding <thierry.reding@gmail.com>
Acked-by: Marek Vasut <marex@denx.de>
11 years agotools/Makefile: Move _GNU_SOURCE to Makefile
York Sun [Tue, 30 Jul 2013 22:26:11 +0000 (15:26 -0700)]
tools/Makefile: Move _GNU_SOURCE to Makefile

Commit 669dfc2e adds libfdt_env.h to HOSTCPPFLAGS. It causes stdio.h
to be included before _GNU_SOURCE is defined in C files. On some old hosts
some prototypes are protected by #ifdef __USE_GNU, which is set when
_GNU_SOURCE is defined.

Signed-off-by: York Sun <yorksun@freescale.com>
Acked-by: Simon Glass <sjg@chromium.org>
11 years agoimage: Display FIT timestamp when booting
Simon Glass [Wed, 17 Jul 2013 03:10:01 +0000 (20:10 -0700)]
image: Display FIT timestamp when booting

The timestamp is shown in fit_print_contents() but for some reason not
in fit_image_print(). This seems to be an oversight, since it is the latter
which is used by bootm.

Add timestamp printing in this case.

(There is code duplication in these two function, for looking at in a future
patch).

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agobootm: fix conditional controlling call to fixup_silent_linux
Paul B. Henson [Sun, 4 Aug 2013 04:29:09 +0000 (21:29 -0700)]
bootm: fix conditional controlling call to fixup_silent_linux

This function is only defined if CONFIG_SILENT_CONSOLE is set and
CONFIG_SILENT_U_BOOT_ONLY is not set, the call to it should be based
on the same conditions.

Signed-off-by: Paul B. Henson <henson@acm.org>
Acked-by: Simon Glass <sjg@chromium.org>
11 years agoRFC: bootm: Add silent_linux environment variable
Simon Glass [Wed, 17 Jul 2013 03:10:00 +0000 (20:10 -0700)]
RFC: bootm: Add silent_linux environment variable

At present the console for linux is silent if the U-Boot console is silent,
unless CONFIG_SILENT_U_BOOT_ONLY is set. I wonder if a better way would be
to have an environment variable to control this? Then we can control the
verbosity from scripts, and set the variable to 'no' for those boards that
want Linux to boot with console output.

Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agoSPL: Limit image name print length
Taras Kondratiuk [Tue, 16 Jul 2013 11:45:01 +0000 (14:45 +0300)]
SPL: Limit image name print length

If image name is longer than 32 bytes, then it will be truncated.
This will remove '\0' at the end of the line, so printf will
go out of string limit.

Signed-off-by: Taras Kondratiuk <taras@ti.com>
Reviewed-by: Tom Rini <trini@ti.com>
11 years agoEnable xmodem support
Angus Ainslie [Wed, 26 Jun 2013 22:54:24 +0000 (16:54 -0600)]
Enable xmodem support

This is a trivial patch that just enables xmodem downloads using the existing
ymodem framework.

Signed-off-by: Angus Ainslie <angus@akkea.ca>
11 years agoAdd TI816X evm board support
TENART Antoine [Tue, 2 Jul 2013 10:06:00 +0000 (12:06 +0200)]
Add TI816X evm board support

Signed-off-by: Antoine Tenart <atenart@adeneo-embedded.com>
[trini: Change to SPDX, fix a few compiler warnings, adapt to
CONFIG_OMAP_COMMON]
Signed-off-by: Tom Rini <trini@ti.com>
11 years agoAdd TI816X support
TENART Antoine [Tue, 2 Jul 2013 10:05:59 +0000 (12:05 +0200)]
Add TI816X support

Signed-off-by: Antoine Tenart <atenart@adeneo-embedded.com>
[trini: Fix warnings about vtp things in emif4.c, adapt AM43XX]
Signed-off-by: Tom Rini <trini@ti.com>
11 years agoPrepare for TI816X : reuse existing code from TI814X
TENART Antoine [Tue, 2 Jul 2013 10:05:58 +0000 (12:05 +0200)]
Prepare for TI816X : reuse existing code from TI814X

Rename some CONFIG_TI814X to a more generic CONFIG_TI81XX

Signed-off-by: Antoine Tenart <atenart@adeneo-embedded.com>
[trini: Adapt for CONFIG_OMAP_COMMON changes, AM43XX]
Signed-off-by: Tom Rini <trini@ti.com>
11 years agoarm, da850: add ipam390 board support
Heiko Schocher [Mon, 5 Aug 2013 14:00:38 +0000 (16:00 +0200)]
arm, da850: add ipam390 board support

add the am1808 based ipam390 board from Barix.

- 128MByte, DDR2, synchronous RAM 16bit databus to SDRAM
  interface
- 128MByte, NAND Flash, 8bit databus to the NANDFlash
  Interface
- Ethernet PHY Micrel KSZ8051R via RMII
- Console on UART 0
- booting fron nand flash
- spl falcon bootmode

Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Tom Rini <trini@ti.com>
11 years agoarm, da850: enable the correct uart in arch_cpu_init()
Heiko Schocher [Mon, 5 Aug 2013 14:00:37 +0000 (16:00 +0200)]
arm, da850: enable the correct uart in arch_cpu_init()

in arch_cpu_init() uart2 is fix enabled, without reference the
setting from CONFIG_SYS_NS16550_COM1. Use the setting from
CONFIG_SYS_NS16550_COM1 for enabling the console.

Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Cc: Tom Rini <tom.rini@gmail.com>
Cc: Christian Riesch <christian.riesch@omicron.at>
11 years agobootstage: get more BOOTSTAGE_ID* in show_boot_progress()
Heiko Schocher [Mon, 5 Aug 2013 14:00:36 +0000 (16:00 +0200)]
bootstage: get more BOOTSTAGE_ID* in show_boot_progress()

In case CONFIG_BOOTSTAGE is not defined, call from bootstage_mark_name()
show_boot_progress(), so get more BOOTSTAGE_ID* ids in show_boot_progress()
if CONFIG_BOOTSTAGE is not defined.

Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Tom Rini <trini@ti.com>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
Acked-by: Simon Glass <sjg@chromium.org>
11 years agoarm/davinci/da850: add uart0_pins_rtscts and RMII_MHz_50_CLK in emac_pins_rmii pinmux
Heiko Schocher [Mon, 5 Aug 2013 14:00:35 +0000 (16:00 +0200)]
arm/davinci/da850: add uart0_pins_rtscts and RMII_MHz_50_CLK in emac_pins_rmii pinmux

Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Tom Rini <trini@ti.com>
11 years agoTI:armv7: Enable CONFIG_CMD_GPIO
Tom Rini [Fri, 9 Aug 2013 15:22:20 +0000 (11:22 -0400)]
TI:armv7: Enable CONFIG_CMD_GPIO

Add the generic "poke a GPIO" command, with the GPIO related defines.

Acked-by: Dan Murphy <dmurphy@ti.com>
Signed-off-by: Tom Rini <trini@ti.com>
11 years agoTI:armv7: Enable CONFIG_CMD_SPI
Tom Rini [Fri, 9 Aug 2013 15:22:19 +0000 (11:22 -0400)]
TI:armv7: Enable CONFIG_CMD_SPI

Add the generic "poke the SPI bus" command, with the SPI related
defines.

Acked-by: Dan Murphy <dmurphy@ti.com>
Signed-off-by: Tom Rini <trini@ti.com>
11 years agoTI:omap5/dra7xx: Convert to ti_armv7_common.h
Tom Rini [Fri, 9 Aug 2013 15:22:18 +0000 (11:22 -0400)]
TI:omap5/dra7xx: Convert to ti_armv7_common.h

Update omap5_common.h to use ti_armv7_common.h, and in turn update
dra7xx_evm.h and omap5_uevm.h slightly.  The biggest changes here are
that IP blocks which exist on the platform, and had clocks enabled,
now have the drivers being built as well.

Signed-off-by: Tom Rini <trini@ti.com>
11 years agoTI:am33xx: Create common config files for TI ARMv7 platforms, and AM33xx
Tom Rini [Fri, 9 Aug 2013 15:22:17 +0000 (11:22 -0400)]
TI:am33xx: Create common config files for TI ARMv7 platforms, and AM33xx

We create two new files, include/configs/ti_armv7_common.h for all of
the common IP blocks and related features / commands we share in
virtually all of our platforms.  We then create
include/configs/ti_am335x_common.h for everything common to the am335x
SoC leaving just the board specific parts to
include/configs/ti_am335x_common.h.

Signed-off-by: Tom Rini <trini@ti.com>
11 years agoam335x_evm: Bring in 'boot_fdt' logic from i.MX
Tom Rini [Fri, 9 Aug 2013 15:22:16 +0000 (11:22 -0400)]
am335x_evm: Bring in 'boot_fdt' logic from i.MX

Bring in the 'boot_fdt' environment variable that i.MX boards use to try
and load a device tree when booting.

Signed-off-by: Tom Rini <trini@ti.com>
11 years agoarm: spl: For Falcon Mode, set a default machid of ~0
Tom Rini [Fri, 9 Aug 2013 15:22:15 +0000 (11:22 -0400)]
arm: spl: For Falcon Mode, set a default machid of ~0

With device trees, boards do not always set CONFIG_MACH_TYPE now, so we
must not rely on this define being set.  The kernel uses ~0 to see if we
have a valid machine number or not, so set that as the default, invalid
machine, id and only fix if CONFIG_MACH_TYPE is set.

Acked-by: Dan Murphy <dmurphy@ti.com>
Tested-by: Heiko Schocher <hs@denx.de>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Signed-off-by: Tom Rini <trini@ti.com>
11 years agoam335x_evm: Use default baud rate table
Tom Rini [Fri, 9 Aug 2013 15:22:14 +0000 (11:22 -0400)]
am335x_evm: Use default baud rate table

Signed-off-by: Tom Rini <trini@ti.com>
11 years agoam33xx: Stop using PHYS_DRAM_1 define
Tom Rini [Fri, 9 Aug 2013 15:22:13 +0000 (11:22 -0400)]
am33xx: Stop using PHYS_DRAM_1 define

We defined PHYS_DRAM_1 to 0x80000000 (start of DRAM) and then used this
for CONFIG_SYS_SDRAM_BASE.  But then we kept on referencing PHYS_DRAM_1
in other places.  Change to directly setting CONFIG_SYS_DRAM_BASE and
then using that name in code.

Signed-off-by: Tom Rini <trini@ti.com>
11 years agoam33xx: CONFIG_DMA_COHERENT defines are unused, remove
Tom Rini [Fri, 9 Aug 2013 15:22:12 +0000 (11:22 -0400)]
am33xx: CONFIG_DMA_COHERENT defines are unused, remove

Acked-by: Dan Murphy <dmurphy@ti.com>
Signed-off-by: Tom Rini <trini@ti.com>
11 years agoOMAP3: igep00x0: allow booting with a FDT from MMC
Javier Martinez Canillas [Wed, 7 Aug 2013 15:53:19 +0000 (17:53 +0200)]
OMAP3: igep00x0: allow booting with a FDT from MMC

IGEP boards now have Device Tree support in the mainline
kernel. To boot an IGEP board using a DT, a uEnv.txt plain
text file could be used to define a custom uenvcmd that will
be run by the default boot command.

It is more convenient to change the default boot command to
allow loading a FDT if it is stored in the boot dir of the
rootfs uSD/MMC partition.

If no FDT is found then the defaul command tries to boot a
zImage without a DT using legacy boot.

Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
11 years agoARM: igep00x0.h: Enable the use of CMD_EXT4, CMD_FS_GENERIC and zImage.
Enric Balletbo i Serra [Wed, 7 Aug 2013 15:53:18 +0000 (17:53 +0200)]
ARM: igep00x0.h: Enable the use of CMD_EXT4, CMD_FS_GENERIC and zImage.

Able to load the kernel from some form of ext[234] or FAT. Also, with v3.9 and
later of the Linux Kernel, uImage isn't builtable anymore by default, so we
should switch to use the bootz command.

Signed-off-by: Enric Balletbo i Serra <eballetbo@gmail.com>
11 years agoomap: emif: Set initial DDR PHY config first
Taras Kondratiuk [Tue, 6 Aug 2013 13:16:50 +0000 (16:16 +0300)]
omap: emif: Set initial DDR PHY config first

Commit "OMAP5: emif/ddr: Change emif settings as required for ES1.0 silicon"
(f40107345cbcd6e0d1747eda45e76c4e2a6df0db)
changed sequence to set final DDR PHY config register value at the beginning.
Looks like it was made by mistake and should be reverted.

Signed-off-by: Taras Kondratiuk <taras@ti.com>
11 years agoARM: omap24xx: remove remainders of dead board
Masahiro Yamada [Mon, 5 Aug 2013 01:49:42 +0000 (10:49 +0900)]
ARM: omap24xx: remove remainders of dead board

Since Commit 7f5eef9 removed OMAP2420H4 support,
arm1136/omap24xx has not been used at all.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
11 years agoARM: omap3: Implement dpll5 (HSUSB clk) workaround for OMAP36xx/AM/DM37xx according...
Naumann Andreas [Tue, 9 Jul 2013 07:43:17 +0000 (09:43 +0200)]
ARM: omap3: Implement dpll5 (HSUSB clk) workaround for OMAP36xx/AM/DM37xx according to errata sprz318e.

In chapter 'Advisory 2.1 USB Host Clock Drift Causes USB Spec Non-compliance in Certain Configurations' of the TI Errata it is recommended to use certain div/mult values for the DPLL5 clock setup.
So far u-boot used the old 34xx values, so I added the errata recommended values specificly for 36xx init only.
Also, the FSEL registers exist no longer, so removed them from init.

Tested this on a AM3703 board with 19.2MHz oscillator, which previously couldnt lock the dpll5 (kernel complained). As a consequence the EHCI USB port wasnt usable in U-Boot and kernel. With this patch, kernel panics disappear and USB working fine in u-boot and kernel.

Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>
[trini: Add extern to <asm/arch-omap3/clock.h>
Signed-off-by: Tom Rini <trini@ti.com>
11 years agoomap: overo: Use 200MHz SDRC timings for revision 1, 2 & 3 boards
Ash Charles [Wed, 24 Jul 2013 19:22:35 +0000 (12:22 -0700)]
omap: overo: Use 200MHz SDRC timings for revision 1, 2 & 3 boards

Gumstix uses 200Mhz RAM on revision 1, 2 & 3 COMs, so use 200MHz
timings rather than 165MHz.  Based on 6cf8bf44b1f8550e12f7f2a16e01890e5de8443d

Signed-off-by: Ash Charles <ashcharles@gmail.com>
11 years agoomap: overo: update support for Micron 1GB POP
Steve Sakoman [Wed, 24 Jul 2013 19:22:34 +0000 (12:22 -0700)]
omap: overo: update support for Micron 1GB POP

Signed-off-by: Ash Charles <ashcharles@gmail.com>
11 years agoARM: IGEP0033: Remove duplicate / unused #defines.
Enric Balletbo i Serra [Thu, 25 Jul 2013 07:27:40 +0000 (09:27 +0200)]
ARM: IGEP0033: Remove duplicate / unused #defines.

As config was originally based on am335x_evm.h we have also some
duplicate / unnused #defines.

Commit 15191c91 removed these #defines on various AM335x boards but not
for IGEP COM AQUILA. This patch simply removes them for this board.

Signed-off-by: Enric Balletbo i Serra <eballetbo@iseebcn.com>
Reviewed-by: Javier Martinez Canillas <javier@dowhile0.org>
11 years agoARM: IGEP0033: Add support to boot from NAND.
Enric Balletbo i Serra [Thu, 25 Jul 2013 07:27:39 +0000 (09:27 +0200)]
ARM: IGEP0033: Add support to boot from NAND.

Add to the default environment the possibily to boot from NAND using
a ubi rootfs. Also the partition scheme is set as follows:

                  Start      Size
    SPL         : 0x00000000 0x00080000 (512KiB)
    U-Boot      : 0x00080000 0x00100000 (1MiB)
    U-Boot Env  : 0x00180000 0x00020000 (128KiB)
    File System : 0x001C0000 -

The ubiboot script gets the kernel and the dtb file from the boot directory
of the File System.

Signed-off-by: Enric Balletbo i Serra <eballetbo@iseebcn.com>
Reviewed-by: Javier Martinez Canillas <javier@dowhile0.org>
11 years agoARM: IGEP0033: Remove CYGNUS name from header.
Enric Balletbo i Serra [Thu, 25 Jul 2013 07:27:38 +0000 (09:27 +0200)]
ARM: IGEP0033: Remove CYGNUS name from header.

We will not use CYGNUS names for any IGEP COM based on AM335x processor,
so, to avoid confusion, remove from headers.

Signed-off-by: Enric Balletbo i Serra <eballetbo@iseebcn.com>
Reviewed-by: Javier Martinez Canillas <javier@dowhile0.org>
11 years agoARM: IGEP0033: Add support for Flattened Device Tree.
Enric Balletbò i Serra [Thu, 25 Jul 2013 07:27:37 +0000 (09:27 +0200)]
ARM: IGEP0033: Add support for Flattened Device Tree.

Now, the default kernel to boot the IGEP COM AQUILA is device tree based. As
old kernel is deprecated we should adapt the boot commands to use DTB files.

Also, with v3.9 and later of the Linux Kernel, uImage isn't builtable anymore
by default, so we should switch to use the bootz command.

Signed-off-by: Enric Balletbo i Serra <eballetbo@iseebcn.com>
Reviewed-by: Javier Martinez Canillas <javier@dowhile0.org>
11 years agoARM: IGEP0033: Remove undef of CONFIG_CMD_MEMTEST
Enric Balletbo i Serra [Thu, 25 Jul 2013 07:27:36 +0000 (09:27 +0200)]
ARM: IGEP0033: Remove undef of CONFIG_CMD_MEMTEST

After commit:

  79cd2f814b1c75efd47161ac27f4cbebf768240f config_cmd_default.h: Remove CONFIG_CMD_MEMTEST

It's not necessary to undef the CONFIG_CMD_MEMTEST, so we can remove it from
configuration file.

Signed-off-by: Enric Balletbo i Serra <eballetbo@iseebcn.com>
Reviewed-by: Javier Martinez Canillas <javier@dowhile0.org>
11 years agoARM: AM43xx: Add config file
Lokesh Vutla [Tue, 30 Jul 2013 06:06:32 +0000 (11:36 +0530)]
ARM: AM43xx: Add config file

Add config file

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
11 years agoARM: AM43xx: Add build support
Lokesh Vutla [Tue, 30 Jul 2013 06:06:31 +0000 (11:36 +0530)]
ARM: AM43xx: Add build support

Add AM43xx support in the required places

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
11 years agoARM: OMAP: Add CONFIG_OMAP_COMMON
Lokesh Vutla [Tue, 30 Jul 2013 06:06:30 +0000 (11:36 +0530)]
ARM: OMAP: Add CONFIG_OMAP_COMMON

Adding a new CONFIG_OMAP_COMMON which is included by all boards
that needs to build cpu/armv7/omap-common folder.

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
11 years agoARM: AM43xx: clocks: Add dpll and clock data
Lokesh Vutla [Tue, 30 Jul 2013 06:06:29 +0000 (11:36 +0530)]
ARM: AM43xx: clocks: Add dpll and clock data

Add dpll and clock data for AM43xx

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
11 years agoARM: AM43xx: Add header files
Lokesh Vutla [Tue, 30 Jul 2013 06:06:28 +0000 (11:36 +0530)]
ARM: AM43xx: Add header files

Adding the following data:
-> Prcm structure
-> Base addresses
-> Pin mux structure.

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
11 years agoARM: AM43xx: Add Board files
Lokesh Vutla [Tue, 30 Jul 2013 06:06:27 +0000 (11:36 +0530)]
ARM: AM43xx: Add Board files

Add board specific information for AM43xx.

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
11 years agomusb: Disable extra prints
Lokesh Vutla [Tue, 30 Jul 2013 05:18:55 +0000 (10:48 +0530)]
musb: Disable extra prints

There are many musb prints in SPL and U-Boot log.
These prints are required only during musb debug.
So replacing printk with pr_debug in musb_core.

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Tested-by: Heiko Schocher <hs@denx.de>
Acked-by: Heiko Schocher <hs@denx.de>
11 years agoARM: AM33xx: Move s_init to a common place
Heiko Schocher [Tue, 30 Jul 2013 05:18:54 +0000 (10:48 +0530)]
ARM: AM33xx: Move s_init to a common place

s_init has the same outline for all the AM33xx based
board. So making it generic.
This also helps in addition of new Soc with minimal changes.

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Tom Rini <trini@ti.com>
Tested-by: Heiko Schocher <hs@denx.de>
Acked-by: Heiko Schocher <hs@denx.de>
11 years agoARM: AM33xx: Cleanup clocks layer
Lokesh Vutla [Tue, 30 Jul 2013 05:18:53 +0000 (10:48 +0530)]
ARM: AM33xx: Cleanup clocks layer

Cleaning up the clocks layer.
This helps in addition of new Soc with minimal
changes.
This is derived from OMAP4 boards.

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Tested-by: Heiko Schocher <hs@denx.de>
Acked-by: Heiko Schocher <hs@denx.de>
11 years agoARM: AM33xx: Cleanup dplls data
Lokesh Vutla [Tue, 30 Jul 2013 05:18:52 +0000 (10:48 +0530)]
ARM: AM33xx: Cleanup dplls data

Locking sequence for all the dplls is same.
In the current code same sequence is done repeatedly
for each dpll. Instead have a generic function
for locking dplls and pass dpll data to that function.

This is derived from OMAP4 boards.

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Tested-by: Heiko Schocher <hs@denx.de>
Acked-by: Heiko Schocher <hs@denx.de>
11 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Tom Rini [Wed, 14 Aug 2013 19:16:48 +0000 (15:16 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

11 years agoinclude/fsl_usb.h: Cleanup license header
York Sun [Wed, 14 Aug 2013 17:56:49 +0000 (10:56 -0700)]
include/fsl_usb.h: Cleanup license header

Replace license header with SPDX license identifier.
Replace GPL-2.0 with GPL-2.0+.

Signed-off-by: York Sun <yorksun@freescale.com>
Acked-by: Ramneek Mehresh <ramneek.mehresh@freescale.com>
11 years agopowerpc/c29xpcie: add readme document for c29xpcie
Po Liu [Thu, 16 May 2013 01:27:28 +0000 (09:27 +0800)]
powerpc/c29xpcie: add readme document for c29xpcie

Signed-off-by: Po Liu <Po.Liu@freescale.com>
11 years agopowerpc/usb: Depricate usb_phy_type and usb_dr_mode uboot env variables
ramneek mehresh [Mon, 5 Aug 2013 10:32:53 +0000 (16:02 +0530)]
powerpc/usb: Depricate usb_phy_type and usb_dr_mode uboot env variables

Remove getting values of usb mode and phy_type from "usb_dr_mode"
and "usb_phy_type" uboot env variables. Now, these are determined
only from hwconfig string

Signed-off-by: Ramneek Mehresh <ramneek.mehresh@freescale.com>
Acked-by: York Sun <yorksun@freescale.com>
11 years agofsl/usb: Move USB internal phy definitions to fsl_usb.h
ramneek mehresh [Mon, 5 Aug 2013 10:30:16 +0000 (16:00 +0530)]
fsl/usb: Move USB internal phy definitions to fsl_usb.h

fsl_usb.h file created to share data bewteen usb platform code
and usb ip driver. Internal phy structure definitions moved to
this file

Signed-off-by: Ramneek Mehresh <ramneek.mehresh@freescale.com>
Acked-by: York Sun <yorksun@freescale.com>
11 years agopowerpc/mpc85xx:Avoid hardcoded init for serdes block 1 & 2
Prabhakar Kushwaha [Wed, 31 Jul 2013 11:26:41 +0000 (16:56 +0530)]
powerpc/mpc85xx:Avoid hardcoded init for serdes block 1 & 2

It is not necessary for all processor to have serdes block 1 & 2.
They may have only one serdes block.

So, put serdes block 1 & 2 related code under defines

Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com>
Acked-by: York Sun <yorksun@freescale.com>
11 years agotegra: Avoid using I2C prior to relocation
Simon Glass [Wed, 7 Aug 2013 05:52:25 +0000 (22:52 -0700)]
tegra: Avoid using I2C prior to relocation

Tegra recently moved to the new I2C framework, which sets up I2C prior to
relocation, and prior to calling i2c_init_board(). This causes a crash on
Tegra boards.

Tested-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Simon Glass <sjg@chromium.org>
11 years agoMerge branch 'dcc' of git://www.denx.de/git/u-boot-microblaze
Tom Rini [Tue, 13 Aug 2013 20:49:44 +0000 (16:49 -0400)]
Merge branch 'dcc' of git://denx.de/git/u-boot-microblaze

11 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Tom Rini [Tue, 13 Aug 2013 13:14:02 +0000 (09:14 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

11 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-mips
Tom Rini [Tue, 13 Aug 2013 12:58:47 +0000 (08:58 -0400)]
Merge branch 'master' of git://denx.de/git/u-boot-mips

11 years agoMIPS: bootm: drop obsolete Qemu specific bootm implementation
Daniel Schwierzeck [Sat, 12 Jan 2013 17:18:20 +0000 (18:18 +0100)]
MIPS: bootm: drop obsolete Qemu specific bootm implementation

The Qemu specific bootm implementation was intended for a special
Qemu target in Linux kernel. But this target has been dropped in
v2.6.25-rc1 by commit 302922e5f6901eb6f29c58539631f71b3d9746b8

    Author: Ralf Baechle <ralf@linux-mips.org>
    Date:   Tue Jan 29 10:15:02 2008 +0000

    [MIPS] Qemu: Remove platform.

    The Qemu platform was originally implemented to have an easily supportable
    platform until Qemu reaches a state where it emulates a real world system.
    Since the latest release Qemu is capable of emulating the MIPSsim and
    Malta platforms, so this goal has been reached.  The Qemu plaform is also
    rather underfeatured so less useful than a Malta emulation.

Thus the special bootm implementation is obsolete by now and can be
dropped. The Qemu support in U-Boot is going to be replaced by MIPS Malta
board support.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
11 years agoMIPS: bootm: add YAMON style Linux preparation/jump code for Qemu Malta
Daniel Schwierzeck [Thu, 30 May 2013 17:04:20 +0000 (19:04 +0200)]
MIPS: bootm: add YAMON style Linux preparation/jump code for Qemu Malta

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
11 years agoMIPS: bootm: add support for generic relocation of init ramdisks
Daniel Schwierzeck [Thu, 9 May 2013 15:10:06 +0000 (17:10 +0200)]
MIPS: bootm: add support for generic relocation of init ramdisks

All linux kernels after v2.6 require a page-aligned location of
an external init ramdisk. Enable CONFIG_SYS_BOOT_RAMDISK_HIGH to
support this with the generic U-Boot relocation code.

Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>