]> git.kernelconcepts.de Git - karo-tx-uboot.git/log
karo-tx-uboot.git
11 years agoTegra114: Dalmore: Add DT files
Tom Warren [Mon, 28 Jan 2013 13:32:11 +0000 (13:32 +0000)]
Tegra114: Dalmore: Add DT files

These are stripped down for bringup, They'll be filled out later
to match-up with the kernel DT contents, and/or as devices are
brought up (mmc, usb, spi, etc.).

Signed-off-by: Tom Warren <twarren@nvidia.com>
11 years agoTegra114: Add common CPU (shared) files
Tom Warren [Mon, 28 Jan 2013 13:32:10 +0000 (13:32 +0000)]
Tegra114: Add common CPU (shared) files

These files are used by both SPL and main U-Boot.

Signed-off-by: Tom Warren <twarren@nvidia.com>
11 years agoTegra114: Add CPU (armv7) files
Tom Warren [Mon, 28 Jan 2013 13:32:09 +0000 (13:32 +0000)]
Tegra114: Add CPU (armv7) files

These files are for code that runs on the CPU (A15) on T114 boards.
At this time, there is no A15-specific code here.
As T114-specific run-time code is added, it'll go here.

Signed-off-by: Tom Warren <twarren@nvidia.com>
11 years agoTegra114: Add AVP (arm720t) files
Tom Warren [Mon, 28 Jan 2013 13:32:08 +0000 (13:32 +0000)]
Tegra114: Add AVP (arm720t) files

This provides SPL support for T114 boards - AVP early init, plus
CPU (A15) init/jump to main U-Boot.

Signed-off-by: Tom Warren <twarren@nvidia.com>
11 years agoTegra114: Add arch-tegra114 include files
Tom Warren [Mon, 28 Jan 2013 13:32:07 +0000 (13:32 +0000)]
Tegra114: Add arch-tegra114 include files

Common Tegra files are in arch-tegra, shared between T20/T30/T114.
Tegra114-specific headers are in arch-tegra114. Note that some of
these will be filled in as more T114 support is added (drivers,
WB/LP0 support, etc.).

Signed-off-by: Tom Warren <twarren@nvidia.com>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
11 years agotegra: cardhu: config: enable SPI
Allen Martin [Tue, 29 Jan 2013 13:51:29 +0000 (13:51 +0000)]
tegra: cardhu: config: enable SPI

Turn on SPI in cardhu config file

Signed-off-by: Allen Martin <amartin@nvidia.com>
Acked-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Warren <twarren@nvidia.com>
11 years agotegra: add SPI SLINK driver
Allen Martin [Tue, 29 Jan 2013 13:51:28 +0000 (13:51 +0000)]
tegra: add SPI SLINK driver

Add driver for tegra SPI "SLINK" style driver.  This controller is
similar to the tegra20 SPI "SFLASH" controller.  The difference is
that the SLINK controller is a genernal purpose SPI controller and the
SFLASH controller is special purpose and can only talk to FLASH
devices.  In addition there are potentially many instances of an SLINK
controller on tegra and only a single instance of SFLASH.  Tegra20 is
currently ths only version of tegra that instantiates an SFLASH
controller.

This driver supports basic PIO mode of operation and is configurable
(CONFIG_OF_CONTROL) to be driven off devicetree bindings.  Up to 4
devices per controller may be attached, although typically only a
single chip select line is exposed from tegra per controller so in
reality this is usually limited to 1.

To enable this driver, use CONFIG_TEGRA_SLINK

Signed-off-by: Allen Martin <amartin@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
11 years agotegra: add addresses of SPI SLINK controllers
Allen Martin [Tue, 29 Jan 2013 13:51:27 +0000 (13:51 +0000)]
tegra: add addresses of SPI SLINK controllers

Add I/O addresses of SPI SLINK controllers 1-6

Signed-off-by: Allen Martin <amartin@nvidia.com>
Acked-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Warren <twarren@nvidia.com>
11 years agotegra30: fdt: add SPI SLINK nodes
Allen Martin [Tue, 29 Jan 2013 13:51:26 +0000 (13:51 +0000)]
tegra30: fdt: add SPI SLINK nodes

Add tegra30 SPI SLINK nodes to fdt.

Signed-off-by: Allen Martin <amartin@nvidia.com>
Acked-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Warren <twarren@nvidia.com>
11 years agotegra30: add SBC1 to periph id mapping table
Allen Martin [Tue, 29 Jan 2013 13:51:25 +0000 (13:51 +0000)]
tegra30: add SBC1 to periph id mapping table

SBC1 is SPI controller 1 on tegra30

Signed-off-by: Allen Martin <amartin@nvidia.com>
Acked-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Warren <twarren@nvidia.com>
11 years agotegra: spi: add fdt support to tegra SPI SFLASH driver
Allen Martin [Tue, 29 Jan 2013 13:51:24 +0000 (13:51 +0000)]
tegra: spi: add fdt support to tegra SPI SFLASH driver

Add support for configuring tegra SPI driver from devicetree.
Support is keyed off CONFIG_OF_CONTROL.  Add entry in seaboard dts
file for spi controller to describe seaboard spi.

Signed-off-by: Allen Martin <amartin@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
11 years agotegra20: fdt: add SPI SFLASH node
Allen Martin [Tue, 29 Jan 2013 13:51:23 +0000 (13:51 +0000)]
tegra20: fdt: add SPI SFLASH node

Add node for tegra20 SPI SFLASH controller to fdt.

Signed-off-by: Allen Martin <amartin@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
11 years agotegra: don't hard-code LCD into default TEGRA_DEVICE_SETTINGS
Stephen Warren [Tue, 22 Jan 2013 06:20:07 +0000 (06:20 +0000)]
tegra: don't hard-code LCD into default TEGRA_DEVICE_SETTINGS

Only add "lcd" into TEGRA_DEVICE_SETTINGS if CONFIG_VIDEO_TEGRA.
Otherwise, "lcd" is meaningless.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Warren <twarren@nvidia.com>
11 years agotegra: rename FUNCMUX_UART2_UARTB
Stephen Warren [Tue, 22 Jan 2013 06:20:08 +0000 (06:20 +0000)]
tegra: rename FUNCMUX_UART2_UARTB

FUNCMUX_ defines should be named after the pin groups they affect, not
after the module they're muxing onto those pin groups.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Warren <twarren@nvidia.com>
11 years agoTegra: Move common clock code to arch/arm/cpu/tegra-common/clock.c
Tom Warren [Wed, 23 Jan 2013 21:01:01 +0000 (14:01 -0700)]
Tegra: Move common clock code to arch/arm/cpu/tegra-common/clock.c

This 'commonizes' much of the clock/pll code. SoC-dependent code
and tables are left in arch/cpu/tegraXXX-common/clock.c

Some T30 tables needed whitespace fixes due to checkpatch complaints.

Signed-off-by: Tom Warren <twarren@nvidia.com>
11 years agoTegra: T20: Remove unused 'SLOW' SoC ID and PLLX table entry
Tom Warren [Fri, 18 Jan 2013 20:36:26 +0000 (13:36 -0700)]
Tegra: T20: Remove unused 'SLOW' SoC ID and PLLX table entry

Signed-off-by: Tom Warren <twarren@nvidia.com>
11 years agotegra: fdt: add back missing host1x node
Allen Martin [Fri, 25 Jan 2013 08:46:47 +0000 (08:46 +0000)]
tegra: fdt: add back missing host1x node

Add back host1x node to seaboard dts file.  This got dropped during
the tegra fdt sort.

Signed-off-by: Allen Martin <amartin@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
11 years agoam33xx: Drop gpio0_7_pin_mux from phytec pcm051
Tom Rini [Mon, 4 Feb 2013 17:21:39 +0000 (12:21 -0500)]
am33xx: Drop gpio0_7_pin_mux from phytec pcm051

This mux is not currently used and appears to be a carry-over from the
am335x evm code.

Acked-by: Lars Poeschel <poeschel@lemonage.de>
Signed-off-by: Tom Rini <trini@ti.com>
11 years agoOMAP3: igep00x0: fix a build warning on IGEP boards
Javier Martinez Canillas [Sat, 26 Jan 2013 12:18:32 +0000 (13:18 +0100)]
OMAP3: igep00x0: fix a build warning on IGEP boards

commit b689cd5 OMAP3: use a single board file for IGEP devices

introduced the following build warning:

igep00x0.h:168:24: warning: backslash-newline at end of file [enabled
by default]

This patch fixes the issue.

Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
11 years agoAM335X: Set fdt_high for AM335X devices to enable booting with Device Tree
hvaibhav@ti.com [Tue, 18 Sep 2012 09:26:05 +0000 (09:26 +0000)]
AM335X: Set fdt_high for AM335X devices to enable booting with Device Tree

For AM335X boards, such as the EVM and Bone Linux kernel fails to
locate the device tree blob on boot. The reason being is that
u-boot is copying the DT blob to the upper part of RAM when booting
the kernel and the kernel is unable to access the blob.
By setting the fdt_high variable to 0xffffffff (to prevent the copy)
the kernel is able to locate the DT blob and boot.

This patch is tested on BeagleBone platform.

Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
Cc: Tom Rini <trini@ti.com>
11 years agoAdd DDR3 support for AM335x-EVM (Version 1.5A)
Jeff Lance [Mon, 14 Jan 2013 05:32:20 +0000 (05:32 +0000)]
Add DDR3 support for AM335x-EVM (Version 1.5A)

AM335x EVM 1.5A uses Micron MT41J512M8RH-125 SDRAM 4Gb (512Mx8) as the
DDR3 chip.

[Hebbar Gururaja <gururaja.hebbar@ti.com>]
- Resolve merge conflict while rebasing. File structure is
  changed in the mainline. So re-arrange the code accordingly.
- Update commit message to reflect the DDR3 part number

Signed-off-by: Jeff Lance <j-lance1@ti.com>
Signed-off-by: Tom Rini <trini@ti.com>
Signed-off-by: Hebbar Gururaja <gururaja.hebbar@ti.com>
11 years agoam335x: display msg when reading MAC from efuse
Lars Poeschel [Fri, 11 Jan 2013 00:53:32 +0000 (00:53 +0000)]
am335x: display msg when reading MAC from efuse

When ethaddr is not set in environment the MAC address is read
from efuse. The message was only printed in debug case, but this
message could be of interest for the ordinary user, so printf it.

Signed-off-by: Lars Poeschel <poeschel@lemonage.de>
11 years agopcm051: Add support for Phytec phyCORE-AM335x
Lars Poeschel [Fri, 11 Jan 2013 00:53:31 +0000 (00:53 +0000)]
pcm051: Add support for Phytec phyCORE-AM335x

The board is named pcm051 and has this hardware:
SOC: TI AM3359
DDR3-RAM: 2x MT41J256M8HX-15EIT:D 512MiB
ETH 1: LAN8710AI
SPI-Flash: W25Q64BVSSIG
RTC: RV-4162-C7
I2C-EEPROM: CAT32WC32
NAND: MT29F4G08_VFPGA63
PMIC: TPS65910A3
LCD

Supported:
UART 1
MMC/SD
ETH 1
USB
I2C
SPI

Not yet supported:
NAND
RTC
LCD

Signed-off-by: Lars Poeschel <poeschel@lemonage.de>
[trini: Add #define CONFIG_PHY_ADDR 0 to config]
Signed-off-by: Tom Rini <trini@ti.com>
11 years agoam33xx: add a pulldown macro to pinmux config
Lars Poeschel [Fri, 11 Jan 2013 00:53:30 +0000 (00:53 +0000)]
am33xx: add a pulldown macro to pinmux config

Signed-off-by: Lars Poeschel <poeschel@lemonage.de>
11 years agoomap4: allow the use of a plain text env file instead boot scripts
Javier Martinez Canillas [Mon, 7 Jan 2013 03:51:20 +0000 (03:51 +0000)]
omap4: allow the use of a plain text env file instead boot scripts

For production systems it is better to use script images since
they are protected by checksums and carry valuable information like
name and timestamp. Also, you can't validate the content passed to
env import.

But for development, it is easier to use the env import command and
plain text files instead of script-images.

Since both OMAP4 supported boards (Panda and TI SDP4430) are used
primarily for development, this patch allows U-Boot to load env var
from a text file in case that an boot.scr script-image is not present.

The variable uenvcmd (if existent) will be executed (using run) after
uEnv.txt was loaded. If uenvcmd doesn't exist the default boot sequence
will be started.

Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Acked-by: Nishanth Menon <nm@ti.com>
11 years agoOMAP3: igep00x0: add boot status GPIO LED
Javier Martinez Canillas [Thu, 27 Dec 2012 03:36:01 +0000 (03:36 +0000)]
OMAP3: igep00x0: add boot status GPIO LED

This patch adds an GPIO LED boot status for IGEP boards.

The GPIO LED used is the red LED0 while the Linux kernel
uses the green LED0 as the boot status.

By using different GPIO LEDs, the user can know in which
step of the boot process the board currently is.

Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
11 years agoOMAP3: use a single board file for IGEP devices
Javier Martinez Canillas [Thu, 27 Dec 2012 01:35:56 +0000 (01:35 +0000)]
OMAP3: use a single board file for IGEP devices

Even when the IGEPv2 board and the IGEP Computer-on-Module
are different from a form factor point of view, they are
very similar in the fact that share many components and how
they are wired.

So, it is possible (and better) to have a single board file
for both devices and just use the CONFIG_MACH_TYPE to make
a differentiation between each board when needed.

This change avoids code duplication by removing 298 lines of
code and makes future maintenance easier.

Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
11 years agoARM: highbank: use wfi macro instead of inline asm
Rob Herring [Sun, 2 Dec 2012 17:06:22 +0000 (17:06 +0000)]
ARM: highbank: use wfi macro instead of inline asm

Older compilers don't recognize v7 wfi instruction, so use wfi macro to
fix builds on old compilers.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
11 years agoARM: add wfi assembly macro
Rob Herring [Sun, 2 Dec 2012 17:06:21 +0000 (17:06 +0000)]
ARM: add wfi assembly macro

Since wfi instruction is only available on ARMv7, add a conditional
macro for it.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
11 years agoarm: rmobile: kzm9g: Adjust ETM trace clock
Tetsuyuki Kobayashi [Tue, 20 Nov 2012 16:29:17 +0000 (16:29 +0000)]
arm: rmobile: kzm9g: Adjust ETM trace clock

Set ETM TRCLK down to 78MHz to get clear wave form.
This patch makes difference only when you use ETM trace connecting JTAG debugger.

Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
Acked-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
11 years agoarm: rmobile: kzm9g: Adjust SDRAM setting
Tetsuyuki Kobayashi [Tue, 20 Nov 2012 16:29:16 +0000 (16:29 +0000)]
arm: rmobile: kzm9g: Adjust SDRAM setting

After stress test, I found some of kzm9g board occures memory failure.
This patch adust SDRAM setting.
- Enlarge drivability on both SDRAM controller and SDRAM itself
- Raise core voltage

Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
Acked-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
11 years agoMerge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Albert ARIBAUD [Sat, 2 Feb 2013 18:29:59 +0000 (19:29 +0100)]
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

11 years agomx23evk: Add initial board support
Otavio Salvador [Wed, 23 Jan 2013 10:30:34 +0000 (10:30 +0000)]
mx23evk: Add initial board support

The following features are supported:
 * 128 MB DDR1 SDRAM
 * DUART
 * SD/MMC Card Socket

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Tested-by: Fabio Estevam <fabio.estevam@freescale.com>
11 years agomx23_olinuxino: Add default environment
Otavio Salvador [Wed, 23 Jan 2013 10:30:33 +0000 (10:30 +0000)]
mx23_olinuxino: Add default environment

This adds a default environment with support for MMC booting.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
11 years agomxs: mmc: mx23_olinuxino: Add MMC support
Marek Vasut [Tue, 22 Jan 2013 15:01:05 +0000 (15:01 +0000)]
mxs: mmc: mx23_olinuxino: Add MMC support

Add support for the MMC attached to SSP1.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Otavio Salvador <otavio@ossystems.com.br>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Stefano Babic <sbabic@denx.de>
11 years agomxs: mmc: Fix the MMC driver for MX23
Marek Vasut [Tue, 22 Jan 2013 15:01:04 +0000 (15:01 +0000)]
mxs: mmc: Fix the MMC driver for MX23

The MX23 has different layout of DMA channels. Fix the MMC
driver to support MX23.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Otavio Salvador <otavio@ossystems.com.br>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Stefano Babic <sbabic@denx.de>
11 years agomxs: mmc: Allow overriding default card detect implementation
Marek Vasut [Tue, 22 Jan 2013 15:01:03 +0000 (15:01 +0000)]
mxs: mmc: Allow overriding default card detect implementation

Some MXS based boards do not implement the card-detect signal. Allow
user to specify alternate card-detect implementation.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Otavio Salvador <otavio@ossystems.com.br>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Stefano Babic <sbabic@denx.de>
11 years agomxs: mmc: Fix MMC reset on iMX23
Otavio Salvador [Tue, 22 Jan 2013 15:01:02 +0000 (15:01 +0000)]
mxs: mmc: Fix MMC reset on iMX23

This does the same reset mask as done in v3.7 Linux kernel code.
The block is properly configured for MMC operation that way.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Cc: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Stefano Babic <sbabic@denx.de>
11 years agomxs: ssp: Add SSP registers map for MX23
Marek Vasut [Tue, 22 Jan 2013 15:01:01 +0000 (15:01 +0000)]
mxs: ssp: Add SSP registers map for MX23

The MX23 SSP register layout differs from MX28 in certain bits,
adjust the register layout accordingly.

Signed-off-by: Marek Vasut <marex@denx.de>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Stefano Babic <sbabic@denx.de>
11 years agomxs: dma: Fix APBH DMA driver for MX23
Marek Vasut [Tue, 22 Jan 2013 15:01:00 +0000 (15:01 +0000)]
mxs: dma: Fix APBH DMA driver for MX23

The MX23 has less channels for the APBH DMA, sligtly different register
layout and some bits in those registers are placed differently. Reflect
this in the driver. This patch fixes MMC/DMA issue on MX23.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Otavio Salvador <otavio@ossystems.com.br>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Stefano Babic <sbabic@denx.de>
11 years agomx6qsabrelite: search mii phy address 4-7
Troy Kisky [Mon, 22 Oct 2012 16:40:47 +0000 (16:40 +0000)]
mx6qsabrelite: search mii phy address 4-7

Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
11 years agonet: fec_mxc: get phydev before fec_probe
Troy Kisky [Mon, 22 Oct 2012 16:40:46 +0000 (16:40 +0000)]
net: fec_mxc: get phydev before fec_probe

Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
11 years agonet: fec_mxc: only call phy_connect in fec_probe
Troy Kisky [Mon, 22 Oct 2012 16:40:45 +0000 (16:40 +0000)]
net: fec_mxc: only call phy_connect in fec_probe

This allows us to create the phydev before calling
fec_probe in later patch.

Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
11 years agonet: fec_mxc: use fec_set_dev_name to set name
Troy Kisky [Mon, 22 Oct 2012 16:40:44 +0000 (16:40 +0000)]
net: fec_mxc: use fec_set_dev_name to set name

This allows us to create the phydev before calling
fec_probe in later patch.

Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
11 years agophy: add phy_find_by_mask/phy_connect_dev
Troy Kisky [Mon, 22 Oct 2012 16:40:43 +0000 (16:40 +0000)]
phy: add phy_find_by_mask/phy_connect_dev

It is useful to be able to try a range of
possible phy addresses to connect.

Also, an ethernet device is not required
to use phy_find_by_mask leading to better
separation of mii vs ethernet, as suggested
by Andy Fleming.

Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
11 years agonet: fec_mxc: have fecmxc_initialize call fecmxc_initialize_multi
Troy Kisky [Mon, 22 Oct 2012 16:40:42 +0000 (16:40 +0000)]
net: fec_mxc: have fecmxc_initialize call fecmxc_initialize_multi

Having only one call to fec_probe will ease the changing of its
parameters.

Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
11 years agonet: fec_mxc: change fec_mii_setspeed parameter
Troy Kisky [Mon, 22 Oct 2012 16:40:41 +0000 (16:40 +0000)]
net: fec_mxc: change fec_mii_setspeed parameter

Only the hardware ethernet registers are needed
for this function, so don't pass the more general
structure. I'm trying to separate MII and fec.

This also fixes MX28 fec_mii_setspeed use on secondary ethernet port

This was found by inspection of the code and should be
checked on real hardware.

Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
11 years agonet: fec_mxc: delete CONFIG_FEC_MXC_MULTI
Troy Kisky [Mon, 22 Oct 2012 16:40:40 +0000 (16:40 +0000)]
net: fec_mxc: delete CONFIG_FEC_MXC_MULTI

It is more logical to test for CONFIG_FEC_MXC_PHYADDR
to determine whether to define the function fecmxc_initialize.

Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
11 years agodoc/README.fec_mxc: add documentation
Troy Kisky [Mon, 22 Oct 2012 16:40:39 +0000 (16:40 +0000)]
doc/README.fec_mxc: add documentation

Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
11 years agomxs: Use __weak annotation to simplify code
Fabio Estevam [Tue, 8 Jan 2013 05:21:45 +0000 (05:21 +0000)]
mxs: Use __weak annotation to simplify code

Using the __weak annotation can make the code cleaner.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Marek Vasut <marex@denx.de>
11 years agotools: imximage: Let .name field be more generic
Fabio Estevam [Wed, 2 Jan 2013 08:48:34 +0000 (08:48 +0000)]
tools: imximage: Let .name field be more generic

Since this structure is not i.MX5x specific, remove the '5x' to make it more
generic.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
11 years agomx6qsabre_common: Let mmc partition be board specific
Fabio Estevam [Mon, 14 Jan 2013 08:59:24 +0000 (08:59 +0000)]
mx6qsabre_common: Let mmc partition be board specific

commit 49ea0ff5 (49ea0ff5) introduced CONFIG_SYS_MMC_ENV_PART into mx6qsabresd.h
to store the mmc partition, but in order for it to have effect we should place
it into 'mmcpart' variable.

Also add CONFIG_SYS_MMC_ENV_PART into mx6qsabreauto.h.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
11 years agomx6qsabreauto: enable USB host interface
Knut Wohlrab [Mon, 21 Jan 2013 23:11:21 +0000 (23:11 +0000)]
mx6qsabreauto: enable USB host interface

The USB host interface is routed to plug USB1/J30 on the mother board.

Signed-off-by: Knut Wohlrab <knut.wohlrab@de.bosch.com>
11 years agomxs: Boost the memory power supply
Marek Vasut [Mon, 21 Jan 2013 14:57:03 +0000 (14:57 +0000)]
mxs: Boost the memory power supply

The memory power supply on MX23 didn't pump out enough juice into
the DRAM chip, thus caused occasional memory corruption. Fix this.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Otavio Salvador <otavio@ossystems.com.br>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Stefano Babic <sbabic@denx.de>
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
11 years agoimximage.cfg: run files through C preprocessor
Troy Kisky [Fri, 18 Jan 2013 16:14:24 +0000 (16:14 +0000)]
imximage.cfg: run files through C preprocessor

The '#' used as comments in the files cause the preprocessor
trouble, so change to /* */.

The mkimage command which uses this preprocessor output
was moved to arch/arm/imx-common/Makefile

.gitignore was updated to ignore .cfgtmp files.

Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
11 years agomxs: Add MX23 quirks into the clock code
Otavio Salvador [Sat, 19 Jan 2013 16:02:49 +0000 (16:02 +0000)]
mxs: Add MX23 quirks into the clock code

The MX23 has different handling of the SSP clock and GPMI NAND clock sources,
add necessary quirks into the clock code to properly handle these.

Signed-off-by: Marek Vasut <marex@denx.de>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Stefano Babic <sbabic@denx.de>
11 years agowoodburn: Set Write Protection GPIO as input
Fabio Estevam [Fri, 18 Jan 2013 23:57:45 +0000 (23:57 +0000)]
woodburn: Set Write Protection GPIO as input

Set Write Protection GPIO as input.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
11 years agomxs: Add MX23 olinuxino board support
Marek Vasut [Sat, 12 Jan 2013 07:11:11 +0000 (07:11 +0000)]
mxs: Add MX23 olinuxino board support

This patch adds support for MX23-based Olinuxino board.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Otavio Salvador <otavio@ossystems.com.br>
Cc: Stefano Babic <sbabic@denx.de>
11 years agomxs: Linux uses ttyAMA0 as DUART
Marek Vasut [Fri, 11 Jan 2013 13:29:42 +0000 (13:29 +0000)]
mxs: Linux uses ttyAMA0 as DUART

Replace use of ttyAM0 with ttyAMA0 as default serial console.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
11 years agomxs: Fix the memory init for MX23
Otavio Salvador [Fri, 11 Jan 2013 03:19:18 +0000 (03:19 +0000)]
mxs: Fix the memory init for MX23

The memory init is slightly different on MX23, thus split the memory
init for mx23 and mx28 into different functions.

Signed-off-by: Marek Vasut <marex@denx.de>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Stefano Babic <sbabic@denx.de>
11 years agomxs: Add function to ungate the power block on MX23
Marek Vasut [Fri, 11 Jan 2013 03:19:17 +0000 (03:19 +0000)]
mxs: Add function to ungate the power block on MX23

The power block on MX23 must first be ungated before it can be operated.
Add function to MXS power init that ungates it.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Otavio Salvador <otavio@ossystems.com.br>
Cc: Stefano Babic <sbabic@denx.de>
11 years agommc: Limit the number of used SSP ports on MX23
Marek Vasut [Fri, 11 Jan 2013 03:19:14 +0000 (03:19 +0000)]
mmc: Limit the number of used SSP ports on MX23

The MX23 can only use two SSP ports.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Andy Fleming <afleming@freescale.com>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Otavio Salvador <otavio@ossystems.com.br>
Cc: Stefano Babic <sbabic@denx.de>
11 years agomx23: config: Enable mxsboot tool for i.MX23 based boards
Otavio Salvador [Fri, 11 Jan 2013 03:19:13 +0000 (03:19 +0000)]
mx23: config: Enable mxsboot tool for i.MX23 based boards

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
11 years agomx23: config: Enable building of u-boot.sb binary
Otavio Salvador [Fri, 11 Jan 2013 03:19:12 +0000 (03:19 +0000)]
mx23: config: Enable building of u-boot.sb binary

For i.MX23 we need to pass imx23 as elftosb param.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
11 years agomx23: SPL: Initialize DDR at 133MHz
Otavio Salvador [Fri, 11 Jan 2013 03:19:11 +0000 (03:19 +0000)]
mx23: SPL: Initialize DDR at 133MHz

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
11 years agomx23: SPL: Add boot mode support
Otavio Salvador [Fri, 11 Jan 2013 03:19:10 +0000 (03:19 +0000)]
mx23: SPL: Add boot mode support

This adds the boot mode support for i.MX23 processors.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
11 years agomx23: Add boot mode description
Otavio Salvador [Fri, 11 Jan 2013 03:19:09 +0000 (03:19 +0000)]
mx23: Add boot mode description

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Otavio Salvador <otavio@ossystems.com.br>
Cc: Stefano Babic <sbabic@denx.de>
11 years agomx23: Add support on print_cpuinfo()
Otavio Salvador [Fri, 11 Jan 2013 03:19:08 +0000 (03:19 +0000)]
mx23: Add support on print_cpuinfo()

Add information to identify i.MX23 chips and its known revisions.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
11 years agomx23: ssp: Fix ssp-regs.h for MX23
Marek Vasut [Fri, 11 Jan 2013 03:19:07 +0000 (03:19 +0000)]
mx23: ssp: Fix ssp-regs.h for MX23

Disable SSP2 and SSP3 ports on MX23.

Signed-off-by: Marek Vasut <marex@denx.de>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Stefano Babic <sbabic@denx.de>
11 years agomx23: Add POWER and CLKCTRL register definitions
Marek Vasut [Fri, 11 Jan 2013 03:19:06 +0000 (03:19 +0000)]
mx23: Add POWER and CLKCTRL register definitions

Add register definitions for the i.MX23 power control block and
clock control block. These are essential for the basic bootstrap
of the i.MX23. Also, properly include them in imx-regs.h .

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Otavio Salvador <otavio@ossystems.com.br>
Cc: Stefano Babic <sbabic@denx.de>
11 years agomx23: Add iomux-mx23.h
Otavio Salvador [Fri, 11 Jan 2013 03:19:05 +0000 (03:19 +0000)]
mx23: Add iomux-mx23.h

This has been copied from Linux source at revision 786f02b719f.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
11 years agomx23: Add register base addresses
Otavio Salvador [Fri, 11 Jan 2013 03:19:04 +0000 (03:19 +0000)]
mx23: Add register base addresses

This adds the base addresses of i.MX23 and easy the detection of wrong
order in board setup, in case no SoC has been set, an error is raised
during build.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
11 years agomxs: clock: Use 'mxs' prefix for methods
Otavio Salvador [Fri, 11 Jan 2013 03:19:03 +0000 (03:19 +0000)]
mxs: clock: Use 'mxs' prefix for methods

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
11 years agomxs: ssp: Pull out the SSP bus to regs conversion
Marek Vasut [Fri, 11 Jan 2013 03:19:02 +0000 (03:19 +0000)]
mxs: ssp: Pull out the SSP bus to regs conversion

Create function which converts SSP bus number to SSP register pointer.
This functionality is reimplemented multiple times in the code, thus
make one common implementation. Moreover, make it a switch(), since the
SSP ports are not mapped in such nice linear fashion on MX23, therefore
having it a switch will simplify things there.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Andy Fleming <afleming@freescale.com>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Stefano Babic <sbabic@denx.de>
11 years agomxs: mmc: Drop unused members from struct mxsmmc_priv
Marek Vasut [Fri, 11 Jan 2013 03:19:01 +0000 (03:19 +0000)]
mxs: mmc: Drop unused members from struct mxsmmc_priv

The clock data are not used by the driver, drop them.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Andy Fleming <afleming@freescale.com>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Stefano Babic <sbabic@denx.de>
11 years agofdt: fix dts preprocessor options
Allen Martin [Tue, 8 Jan 2013 16:07:54 +0000 (16:07 +0000)]
fdt: fix dts preprocessor options

Using "-ansi" preprocessor option will cause dts lines that begin with
'#' to choke the preprocessor.  Change to "-x assembler-with-cpp"
instead which is what the kernel uses to preprocess dts files.

Signed-off-by: Allen Martin <amartin@nvidia.com>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Warren <twarren@nvidia.com>
11 years agotegra: fdt: add apbdma node
Allen Martin [Fri, 11 Jan 2013 23:07:04 +0000 (23:07 +0000)]
tegra: fdt: add apbdma node

Add apbdma node for tegra20 and tegra30, copied directly from tegra
Linux dtsi files.

Signed-off-by: Allen Martin <amartin@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
11 years agotegra: fdt: sort dts files
Allen Martin [Wed, 16 Jan 2013 13:12:24 +0000 (13:12 +0000)]
tegra: fdt: sort dts files

Sort nodes in dts files according the the following rules:

1) Any nodes that already exist in any /include/d file, in the order
they appear in the /include/d file.

2) Any nodes with a reg property, in order of their address.

3) Any nodes without a reg property, alphabetically by node name.

Signed-off-by: Allen Martin <amartin@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
11 years agotegra: fdt: remove clocks nodes
Allen Martin [Wed, 16 Jan 2013 13:11:21 +0000 (13:11 +0000)]
tegra: fdt: remove clocks nodes

These nodes are unused.

Signed-off-by: Allen Martin <amartin@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
11 years agotegra: remove IRDA pinmux synonym
Allen Martin [Wed, 9 Jan 2013 10:52:23 +0000 (10:52 +0000)]
tegra: remove IRDA pinmux synonym

IRDA is a synonym for UARTB in tegra pinmux, remove all usage of this
synonym and replace with UARTB to disambiguate.

Signed-off-by: Allen Martin <amartin@nvidia.com>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
11 years agoTegra30: I2C: Enable I2C driver on Cardhu
Tom Warren [Fri, 21 Dec 2012 23:09:52 +0000 (16:09 -0700)]
Tegra30: I2C: Enable I2C driver on Cardhu

Tested all 5 'buses', i2c probe enumerates device addresses on all
but dev 4 (I2C4) [no devices on that bus on my Cardhu].

Note that this uses the extant tegra_i2c.c driver w/o modification.

Signed-off-by: Tom Warren <twarren@nvidia.com>
11 years agoTegra30: fdt: Update DT files with I2C info for T30/Cardhu
Tom Warren [Fri, 21 Dec 2012 22:59:15 +0000 (15:59 -0700)]
Tegra30: fdt: Update DT files with I2C info for T30/Cardhu

Note that T30 does not have a separate/different DVC (power I2C)
controller like T20 - all 5 I2C controllers are identical, but
DVC_I2C is still used to designate the controller intended for
power control (PWR_I2C in the schematics). On Cardhu, it's used
to access the PMU and EEPROM, as well as the audio codec, temp
sensor, and fuel gauge devices from the OS.

Signed-off-by: Tom Warren <twarren@nvidia.com>
11 years agoTegra30: clocks: Fix clock tables for I2C and other periphs
Tom Warren [Fri, 21 Dec 2012 22:02:45 +0000 (15:02 -0700)]
Tegra30: clocks: Fix clock tables for I2C and other periphs

Add 16-bit divider support (I2C) to periph table, annotate and
correct some entries, and fix clk_id lookup function.

Signed-off-by: Tom Warren <twarren@nvidia.com>
11 years agoTegra30: Add/enable Cardhu build (T30 reference board)
Tom Warren [Tue, 11 Dec 2012 13:34:18 +0000 (13:34 +0000)]
Tegra30: Add/enable Cardhu build (T30 reference board)

This build is stripped down. It boots to the command prompt.
GPIO is the only peripheral supported. Others TBD.

include/configs/tegra-common.h now holds common config options
for Tegra SoCs.

Signed-off-by: Tom Warren <twarren@nvidia.com>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
11 years agoTegra30: Add generic Tegra30 build support
Tom Warren [Tue, 11 Dec 2012 13:34:17 +0000 (13:34 +0000)]
Tegra30: Add generic Tegra30 build support

This patch adds basic Tegra30 (T30) build support - no specific
board is targeted.

Signed-off-by: Tom Warren <twarren@nvidia.com>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
11 years agoTegra30: Cardhu: Add DT files
Tom Warren [Tue, 11 Dec 2012 13:34:16 +0000 (13:34 +0000)]
Tegra30: Cardhu: Add DT files

These are stripped down for bringup, They'll be filled out later
to match-up with the kernel DT contents, and/or as devices are
brought up (mmc, usb, spi, etc.).

Signed-off-by: Tom Warren <twarren@nvidia.com>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
11 years agoTegra30: Add common CPU (shared) files
Tom Warren [Tue, 11 Dec 2012 13:34:15 +0000 (13:34 +0000)]
Tegra30: Add common CPU (shared) files

These files are used by both SPL and main U-Boot.
Also made minor changes to shared Tegra code to support
T30 differences.

Signed-off-by: Tom Warren <twarren@nvidia.com>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
11 years agoTegra30: Add CPU (armv7) files
Tom Warren [Tue, 11 Dec 2012 13:34:14 +0000 (13:34 +0000)]
Tegra30: Add CPU (armv7) files

These files are for code that runs on the CPU (A9) on T30 boards.
At this time, there are no T30-specific ARMV7 files. As T30-specific
run-time code is added, it'll go here.

Signed-off-by: Tom Warren <twarren@nvidia.com>
Reviewed-by: Stephen Warren <swarren@nvidai.com>
11 years agoTegra30: Add AVP (arm720t) files
Tom Warren [Tue, 11 Dec 2012 13:34:13 +0000 (13:34 +0000)]
Tegra30: Add AVP (arm720t) files

This provides SPL support for T30 boards - AVP early init, plus
CPU (A9) init/jump to main U-Boot.

Some changes were made to Tegra20 cpu.c to move common routines
into tegra-common/cpu.c and reduce code duplication.

Signed-off-by: Tom Warren <twarren@nvidia.com>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Simon Glass <sjg@chromium.org>
11 years agoTegra30: Add arch-tegra30 include files
Tom Warren [Tue, 11 Dec 2012 13:34:12 +0000 (13:34 +0000)]
Tegra30: Add arch-tegra30 include files

Common Tegra files are in arch-tegra, shared between T20 and T30.
Tegra30-specific headers are in arch-tegra30. Note that some of
these will be filled in as more T30 support is added (drivers,
WB/LP0 support, etc.). A couple of Tegra20 files were changed
to support common headers in arch-tegra, also.

Signed-off-by: Tom Warren <twarren@nvidia.com>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Simon Glass <sjg@chromium.org>
11 years agotegra: remove custom TEGRA_DEVICE_SETTINGS for board files
Marc Dietrich [Wed, 28 Nov 2012 23:23:55 +0000 (23:23 +0000)]
tegra: remove custom TEGRA_DEVICE_SETTINGS for board files

TEGRA_DEVICE_SETTINGS lives now in tegra-common-post.h.

This removes custom TEGRA_DEVICE_SETTINGS for all tegra boards providing
video output, except seaboard, which was fixed by Stephen already.

Cc: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: Marc Dietrich <marvin24@gmx.de>
Signed-off-by: Tom Warren <twarren@nvidia.com>
11 years agotegra: enable LCD on PAZ00
Marc Dietrich [Sun, 25 Nov 2012 11:26:12 +0000 (11:26 +0000)]
tegra: enable LCD on PAZ00

This adds LCD panel descriptions to the device tree of PAZ00 and
enables LCD support in the configuration.

Signed-off-by: Marc Dietrich <marvin24@gmx.de>
Signed-off-by: Tom Warren <twarren@nvidia.com>
11 years agotegra: display: add board pinmux
Marc Dietrich [Sun, 25 Nov 2012 11:26:11 +0000 (11:26 +0000)]
tegra: display: add board pinmux

Boards may require a different pinmux setup for DISPALY than the default one.
Add a way to call into board specific code to set this up.

Signed-off-by: Marc Dietrich <marvin24@gmx.de>
Signed-off-by: Tom Warren <twarren@nvidia.com>
11 years agotegra: Enable LCD on TEC
Thierry Reding [Fri, 23 Nov 2012 00:58:51 +0000 (00:58 +0000)]
tegra: Enable LCD on TEC

The TEC ships with a 7" LCD panel that provides a resolution of 800x480
pixels. Add a corresponding panel description to the device tree and
enable LCD support in the configuration.

Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: Tom Warren <twarren@nvidia.com>
11 years agotegra: Enable LCD on Medcom-Wide
Thierry Reding [Fri, 23 Nov 2012 00:58:50 +0000 (00:58 +0000)]
tegra: Enable LCD on Medcom-Wide

The Medcom-Wide has a 15" LCD panel with a resolution of 1366x768
pixels. Add a corresponding panel description to the device tree and
enable LCD support in the configuration.

Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: Tom Warren <twarren@nvidia.com>
11 years agovideo: tegra: Update line length to match resolution
Thierry Reding [Fri, 23 Nov 2012 00:58:49 +0000 (00:58 +0000)]
video: tegra: Update line length to match resolution

Instead of storing the computed line length in a local variable, store
it in the global lcd_line_length variable to make sure the LCD subsystem
can properly draw content for the display resolution.

This probably wasn't noticed yet because the only board where LCD
support is currently enabled is Seaboard, which runs at a 1366x768
resolution. As it happens this is the maximum resolution supported and
also the default that is used to initialize the framebuffer before the
configuration from DT is available.

Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: Tom Warren <twarren@nvidia.com>
11 years agoPrepare v2013.01 v2013.01
Tom Rini [Tue, 15 Jan 2013 21:47:42 +0000 (14:47 -0700)]
Prepare v2013.01

Signed-off-by: Tom Rini <trini@ti.com>
11 years agopxa: Save lr register in relocate_code function
Łukasz Dałek [Sat, 12 Jan 2013 11:39:27 +0000 (11:39 +0000)]
pxa: Save lr register in relocate_code function

When u-boot is compiled for PXA25x processor, pxa/start.S is calling
cpu_init_crit by BL instruction. BL is overwriting lr register so
relocate_code is going into infinite loop. This patch preservs lr
register in r12 before calling cpu_init_crit and after function returns
restores it.

Signed-off-by: Lukasz Dalek <luk0104@gmail.com>
Acked-by: Marek Vasut <marex@denx.de>
11 years agoMerge branch 'master' of git://git.denx.de/u-boot-video
Tom Rini [Mon, 14 Jan 2013 22:41:38 +0000 (15:41 -0700)]
Merge branch 'master' of git://git.denx.de/u-boot-video

11 years agoMerge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
Tom Rini [Mon, 14 Jan 2013 22:30:31 +0000 (15:30 -0700)]
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging