]> git.ipfire.org Git - thirdparty/u-boot.git/log
thirdparty/u-boot.git
12 years agozynq: Remove duplicated code
Michal Simek [Wed, 1 May 2013 14:54:17 +0000 (16:54 +0200)] 
zynq: Remove duplicated code

This patch was cherry-picked from mainline patch
I have sent and I forget to remove this function
declaration from sys_proto.h file.

This should be the part of patch
"mmc: Add support for Xilinx Zynq sdhci controller"
(sha1: 16a0ab0d38acd89d5af33948a9c18ac340f67e05)

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agofpga: zynqpl: Fix driver message
Michal Simek [Mon, 22 Apr 2013 13:43:02 +0000 (15:43 +0200)] 
fpga: zynqpl: Fix driver message

Use the same format for all prints in the driver.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agofpga: zynq: Add support for loading bitstream
Michal Simek [Wed, 1 May 2013 09:31:07 +0000 (11:31 +0200)] 
fpga: zynq: Add support for loading bitstream

Devcfg device requires to load bitstream in binary format.
But u-boot also has an option for loading bitstream in bit
format. Let's handle both cases by zynqpl driver.
Also add suport for loading partial bitstreams.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agospi: zynq: Correct the U_PAGE bit on LQSPI_CFG
Jagannadha Sutradharudu Teki [Thu, 25 Apr 2013 19:12:07 +0000 (00:42 +0530)] 
spi: zynq: Correct the U_PAGE bit on LQSPI_CFG

Corrected the U_PAGE(bit:28) on LQSPI_CFG which is used
on qspi dual stacked connection.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
12 years agospi: zynq: Set maximum write size as 0
Jagannadha Sutradharudu Teki [Thu, 25 Apr 2013 14:41:17 +0000 (20:11 +0530)] 
spi: zynq: Set maximum write size as 0

Initialize 0 on max_write_size as zynq controller doesn't have
any restriction on write sizes.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
12 years agomicroblaze: Synchronization with mainline
Michal Simek [Thu, 25 Apr 2013 14:51:29 +0000 (16:51 +0200)] 
microblaze: Synchronization with mainline

Based on previous patch which directly point
all petalogix boards to xilinx folder $(BOARD) variable
can be used.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agosf: Update the qspi dual parallel flash access logic
Jagannadha Sutradharudu Teki [Wed, 24 Apr 2013 18:54:48 +0000 (00:24 +0530)] 
sf: Update the qspi dual parallel flash access logic

Updated the xilinx qspi dual parallel flash access support
to use 3-byte addressing instead of 4-byte addressing used
from the mtd flash layer.

Instead of sending 4-byte addressing from mtd layer and
then the controller will again divide the offset addr by 2 and
convert the 4-byte address into 3-byte address, With this
new logic the mtd will serve the offset as offset by 2 and
send the 3-byte addressing to controller driver, as the
driver is configured as separate bus with two mem the
controller internal hardware algorithm will take care the
dual parallel functionality.

Below are the changes for dual parallel to work:
- mtd layer -> addr/2, page_size*2, nr_sectors/nr_blocks*2
- driver -> enable SEP_BUS[BIT:29],TWO_MEM[BIT:30] on LQSPI_CFG

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
12 years agosf: Update spi_flash framework to handle all sizes of flashes
Jagannadha Sutradharudu Teki [Wed, 24 Apr 2013 20:04:00 +0000 (01:34 +0530)] 
sf: Update spi_flash framework to handle all sizes of flashes

Updated the spi_flash framework to handle all sizes of flashes.

As most of the flashes introduces a bank/extended address registers
for accessing the flashes in 16Mbytes of banks if the flash size
is > 16Mbytes, this new scheme will add the bank selection feature
for performaing write/read/erase operations on all flashes.

u-boot.bin size:
- before 262192bytes
- after 262080bytes
sf speed(65536 bytes wr):
- before 1.528s, speed 43890 B/s
- after 1.533s, speed 43776 B/s

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agopetalinux: Use directly xilinx platforms
Michal Simek [Thu, 25 Apr 2013 14:14:18 +0000 (16:14 +0200)] 
petalinux: Use directly xilinx platforms

Currently all of these platforms are symlinks to xilinx
boards which is breaking out of tree compilation.
Keep symlinks but setup board files directly to proper
folder solves this problem.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agoxilinx: Cleanup .gitignore files
Michal Simek [Thu, 25 Apr 2013 13:55:10 +0000 (15:55 +0200)] 
xilinx: Cleanup .gitignore files

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agowathdog: Clean coding style violation
Michal Simek [Mon, 22 Apr 2013 13:33:32 +0000 (15:33 +0200)] 
wathdog: Clean coding style violation

Found in process to merging these drivers to mainline.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agofpga: Clean coding style violations
Michal Simek [Mon, 22 Apr 2013 13:43:02 +0000 (15:43 +0200)] 
fpga: Clean coding style violations

Synchronization with mainline version.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agospi: spansion: Remove unused variables
Michal Simek [Mon, 22 Apr 2013 15:26:30 +0000 (17:26 +0200)] 
spi: spansion: Remove unused variables

They are not used in this file.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agoi2c: zynq: Add support for Xilinx Zynq
Michal Simek [Mon, 22 Apr 2013 13:21:33 +0000 (15:21 +0200)] 
i2c: zynq: Add support for Xilinx Zynq

Support Xilinx Zynq i2c controller.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agoi2c: Clean coding style violations
Michal Simek [Thu, 25 Apr 2013 11:37:00 +0000 (13:37 +0200)] 
i2c: Clean coding style violations

Synchronization with mainline.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agommc: Add support for Xilinx Zynq sdhci controller
Michal Simek [Mon, 22 Apr 2013 12:56:49 +0000 (14:56 +0200)] 
mmc: Add support for Xilinx Zynq sdhci controller

Add support for SD, MMC and eMMC card on Xilinx Zynq.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agonet: gem: Preserve clk on emio interface
David Andrey [Fri, 5 Apr 2013 15:24:24 +0000 (17:24 +0200)] 
net: gem: Preserve clk on emio interface

Avoid overwriting GEMx_RCLK_CTRL and GEMx_CLK_CTRL
if the Ethernet interface is connect on EMIO

Do not enable emio for this standard board configuration for now.

Signed-off-by: David Andrey <david.andrey@netmodule.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agonet: gem: Pass phy address to init
David Andrey [Thu, 4 Apr 2013 17:13:07 +0000 (19:13 +0200)] 
net: gem: Pass phy address to init

Pass the PHY address to the driver init to
allow parallel use of both interfaces

Signed-off-by: David Andrey <david.andrey@netmodule.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agozynq: Move macros to hardware.h
Michal Simek [Fri, 12 Apr 2013 14:33:08 +0000 (16:33 +0200)] 
zynq: Move macros to hardware.h

Add all fixed addresses to hardware.h and change petalinux
configuration to support this.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agopetalinux: Remove unused variables
Michal Simek [Fri, 12 Apr 2013 14:22:44 +0000 (16:22 +0200)] 
petalinux: Remove unused variables

Not needed.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agozynq: Move scutimer baseaddr to hardware.h
Michal Simek [Fri, 12 Apr 2013 14:21:26 +0000 (16:21 +0200)] 
zynq: Move scutimer baseaddr to hardware.h

Move baseaddr to hardware.h to be shared between
configurations.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agoarm: zynq: Rename XPSS_ prefix to ZYNQ_ for hardcoded SoC addresses
Michal Simek [Tue, 23 Apr 2013 09:35:18 +0000 (11:35 +0200)] 
arm: zynq: Rename XPSS_ prefix to ZYNQ_ for hardcoded SoC addresses

XPSS prefix was used in past and it is obsolete for quite
some time. Let's use correct SoC name which is Zynq.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Tom Rini <trini@ti.com>
12 years agopetalinux: Remove duplicated macros
Michal Simek [Fri, 12 Apr 2013 14:19:51 +0000 (16:19 +0200)] 
petalinux: Remove duplicated macros

All these macros are already defined in zynq hardware.h.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agotemplate:/petalinux-auto-board.h: Remove 0x in front of ${filesize}
Jason Wu [Fri, 12 Apr 2013 00:54:45 +0000 (10:54 +1000)] 
template:/petalinux-auto-board.h: Remove 0x in front of ${filesize}

The 0x is not required tread as hex value. However, this is required
for Zynq sd_update_boot because the filesize return by fat load is
in hex size but with 0x prefix. This will cause sf error due to
the file size is 0x0xABCD not 0xABCD.

Signed-off-by: Jason Wu <huanyu@xilinx.com>
12 years agofpga: zynqpl: Buffers must be aligned
Michal Simek [Fri, 19 Apr 2013 12:51:30 +0000 (14:51 +0200)] 
fpga: zynqpl: Buffers must be aligned

Dma requires aligned buffers.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agoxilinx_spi: Move timeout one time calculation out of the loop
Michal Simek [Wed, 24 Apr 2013 12:11:39 +0000 (14:11 +0200)] 
xilinx_spi: Move timeout one time calculation out of the loop

timeout calculation should be out of the data loop.
This patch increase spi bandwidth for 30%.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agoMerge tag 'v2013.04' into master-next
Michal Simek [Thu, 25 Apr 2013 11:51:34 +0000 (13:51 +0200)] 
Merge tag 'v2013.04' into master-next

Prepare v2013.04

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agoPrepare v2013.04 v2013.04
Tom Rini [Fri, 19 Apr 2013 14:25:43 +0000 (10:25 -0400)] 
Prepare v2013.04

Signed-off-by: Tom Rini <trini@ti.com>
12 years agocrc32: Correct endianness of crc32 result
Simon Glass [Thu, 18 Apr 2013 10:25:51 +0000 (10:25 +0000)] 
crc32: Correct endianness of crc32 result

When crc32 is handled by the hash library, it requires the data to be in
big-endian format, since it reads it byte-wise. Thus at present the 'crc32'
command reports incorrect data. For example, previously we might see:

Peach # crc32 40000000 100
CRC32 for 40000000 ... 400000ff ==> 0d968558

but instead with the hash library we see:

Peach # crc32 40000000 100
CRC32 for 40000000 ... 400000ff ==> 5885960d

Correct this.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Vadim Bendebury <vbendeb@google.com>
12 years agopatman: fix gitutil for decorations
Andreas Bießmann [Mon, 15 Apr 2013 23:52:18 +0000 (23:52 +0000)] 
patman: fix gitutil for decorations

The git config parameter log.decorate is quite useful when working with git.
Patman, however can not handle the decorated output when parsing the commit.
To prevent this use the '--no-decorate' switch for git-log.

Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
Acked-by: Simon Glass <sjg@chromium.org>
12 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm into HEAD
Tom Rini [Thu, 18 Apr 2013 20:16:01 +0000 (16:16 -0400)] 
Merge branch 'master' of git://git.denx.de/u-boot-arm into HEAD

Quick manual fixup to merge the USB boot related defines and TPM related
defines.

Conflicts:
include/configs/exynos5250-dt.h

Signed-off-by: Tom Rini <trini@ti.com>
12 years agofdt: Ensure that libfdt_env.h comes from U-Boot
Simon Glass [Mon, 11 Mar 2013 06:30:27 +0000 (06:30 +0000)] 
fdt: Ensure that libfdt_env.h comes from U-Boot

When building host utilities, we include libfdt.h from the host, not from
U-Boot. This in turn brings in libfdt_env.h from the host, which can mess
up the types and cause a build failure, depending on the host environment.
To fix this, force inclusion of U-Boot's libfdt_env.h so that the types
are correct.

Another way to fix this is to use -nostdinc and -idirafter to ensure that
system includes are included after U-Boot ones. Unfortunately this means
that U-Boot's errno.h gets included instead of the system one. This in
turn requires a hack to errno.h to redirect things, so all in all the
solution in this patch is probably cleaner.

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agommc: check the revision for sd3.0
Jaehoon Chung [Tue, 29 Jan 2013 22:58:16 +0000 (22:58 +0000)] 
mmc: check the revision for sd3.0

Support to check whether the SD3.0 or not.

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Tested-by: Rommel Custodio <sessyargc@gmail.com>
12 years agommc: support the correct card version for eMMC
Jaehoon Chung [Tue, 29 Jan 2013 19:31:16 +0000 (19:31 +0000)] 
mmc: support the correct card version for eMMC

eMMC vesrion is supported up to v4.5.
But bootloader isn't saw the exact eMMC version.
After applied this patch,
if use the mmcinfo command, then can see the exactly mmc version.

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Rommel Custodio <sessyargc@gmail.com>
12 years agoprintenv: Correct out-of-memory condition check.
Maxime Larocque [Fri, 28 Sep 2012 05:00:13 +0000 (05:00 +0000)] 
printenv: Correct out-of-memory condition check.

In common/cmd_nvedit.c, en env_print(), the wrong type is used for len.
hexport_r() returns -1 on error (like OOM), which is converted to
0xffffffff when put in an unsigned. Said value is obviously bigger then
0, and as a result an uninitialized string is then displayed. Other
usages of hexport_r() in the code correctly uses ssize_t to keep its
return value.

Signed-off-by: Maxime Larocque <maxmtl2002@yahoo.ca>
12 years agoexynos: fdt: Add TMU node for snow
Simon Glass [Sat, 13 Apr 2013 04:26:42 +0000 (04:26 +0000)] 
exynos: fdt: Add TMU node for snow

Snow is missing a TMU node, and with TMU support this is not allowed, so it
fails to boot. Add it.

Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
12 years agoexynos: Correct use of 64-bit division
Simon Glass [Sat, 13 Apr 2013 04:26:41 +0000 (04:26 +0000)] 
exynos: Correct use of 64-bit division

The current code is causing errors like this on my toolchains:

/usr/x86_64-pc-linux-gnu/armv7a-cros-linux-gnueabi/binutils-bin/2.22/
ld.bfd.real: failed to merge target specific data of file /usr/lib/gcc/
armv7a-cros-linux-gnueabi/4.7.x-google/libgcc.a(_divdi3.o)

Use do_div() to avoid this.

Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
12 years agoExynos5: Add support for USB download boot mode
Vivek Gautam [Mon, 28 Jan 2013 00:39:59 +0000 (00:39 +0000)] 
Exynos5: Add support for USB download boot mode

Exynos5250 supports secondary USB device boot mode. If the iROM fails
to download u-boot from the primary boot device (such as SD or eMMC),
it will try to retrieve from the secondary boot device (such as USB).

Signed-off-by: Naveen Krishna Ch <ch.naveen@samsung.com>
Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Vivek Gautam <gautam.vivek@samsung.com>
Acked-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
12 years agoMerge branch 'master' of git://git.denx.de/u-boot-x86
Tom Rini [Tue, 16 Apr 2013 20:12:33 +0000 (16:12 -0400)] 
Merge branch 'master' of git://git.denx.de/u-boot-x86

12 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm
Tom Rini [Tue, 16 Apr 2013 14:56:55 +0000 (10:56 -0400)] 
Merge branch 'master' of git://git.denx.de/u-boot-arm

12 years agox86: config: Init PCI before SPI
Simon Glass [Mon, 15 Apr 2013 11:25:21 +0000 (11:25 +0000)] 
x86: config: Init PCI before SPI

Since the ICH SPI controller uses PCI, we must ensure that PCI is available
before it is inited.

This fixes the current "ICH SPI: Cannot find device" message on boot.

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agox86: Allow setup code to manage its own global data
Simon Glass [Mon, 15 Apr 2013 11:25:20 +0000 (11:25 +0000)] 
x86: Allow setup code to manage its own global data

Currently x86 has its own means of managing the global data and board data
(bd_t), and this code resides in start.S. With generic board, we need to
ensure that we leave this alone - i.e. don't clear it as we do on other
archs.

This fixes a problem where the memory init data is cleared which causes
the video driver to operate very slowly.

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agox86: Fix DRAM bank size init with generic board
Simon Glass [Mon, 15 Apr 2013 11:22:49 +0000 (11:22 +0000)] 
x86: Fix DRAM bank size init with generic board

The intention of the memory init code is that it should work the same with
CONFIG_SYS_GENERIC_BOARD and without. This is tricky because dram_init()
is called prior to relocation with generic board (matching other archs)
and after relocation without generic board.

Adjust the init sequence so that dram_init() is not called in the generic
board case, which seems like the easiest fix for now. Also ensure that
relocation addresses are still calculated.

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agoTegra: T30: Beaver board support.
Tom Warren [Fri, 12 Apr 2013 18:20:51 +0000 (11:20 -0700)] 
Tegra: T30: Beaver board support.

Beaver is a Tegra30 board that is nearly 100% compatible w/Cardhu.
Add a Beaver build so it can begin to be differentiated, if need be.

Signed-off-by: Tom Warren <twarren@nvidia.com>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
12 years agoTegra: Split tegra_get_chip_type() into soc & sku funcs
Tom Warren [Wed, 10 Apr 2013 17:32:32 +0000 (10:32 -0700)] 
Tegra: Split tegra_get_chip_type() into soc & sku funcs

As suggested by Stephen Warren, use tegra_get_chip() to return
the pure CHIPID for a Tegra SoC (i.e. 0x20 for Tegra20, 0x30 for
Tegra30, etc.) and rename tegra_get_chip_type() to reflect its true
function, i.e. tegra_get_chip_sku(), which returns an ID like
TEGRA_SOC_T25, TEGRA_SOC_T33, etc.

Signed-off-by: Tom Warren <twarren@nvidia.com>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
12 years agoTegra: Fix MSELECT clock divisors for T30/T114.
Tom Warren [Wed, 3 Apr 2013 21:39:30 +0000 (14:39 -0700)] 
Tegra: Fix MSELECT clock divisors for T30/T114.

A comparison of registers between our internal NV U-Boot and
u-boot-tegra/next showed some discrepancies in the MSELECT
clock divisor programming. T20 doesn't have a MSELECT clk src reg.

Signed-off-by: Tom Warren <twarren@nvidia.com>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
12 years agoTegra114: Initialize System Counter (TSC) with osc frequency
Tom Warren [Mon, 1 Apr 2013 22:48:54 +0000 (15:48 -0700)] 
Tegra114: Initialize System Counter (TSC) with osc frequency

T114 needs the SYSCTR0 counter initialized so the TSC can be
read by the kernel. Do it in the bootloader since it's a write-once
deal (secure/non-secure mode dependent).

Signed-off-by: Tom Warren <twarren@nvidia.com>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
12 years agoTegra: Configure L2 cache control reg properly.
Tom Warren [Mon, 25 Mar 2013 23:22:26 +0000 (16:22 -0700)] 
Tegra: Configure L2 cache control reg properly.

Without this change, kernel fails at calling function cache_clean_flush
during kernel early boot.

Aprocryphally, intended for T114 only, so I check for a T114 SoC.
Works (i.e. dalmore 3.8 kernel now starts printing to console).

Signed-off-by: Tom Warren <twarren@nvidia.com>
12 years agoTegra: TEC: Enable boot script support
Thierry Reding [Wed, 3 Apr 2013 04:52:45 +0000 (04:52 +0000)] 
Tegra: TEC: Enable boot script support

Boot script support brings TEC in line with other Tegra boards. To
enable booting a Linux kernel with initial ramdisk, also include support
for the new FIT image type.

Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: Tom Warren <twarren@nvidia.com>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
12 years agoTegra: Plutux: Enable NAND and boot script support
Thierry Reding [Wed, 3 Apr 2013 04:52:44 +0000 (04:52 +0000)] 
Tegra: Plutux: Enable NAND and boot script support

Boot script support brings Plutux in line with other Tegra boards. In
order to enable booting a Linux kernel with initial ramdisk, also add
support for the new FIT image type.

Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: Tom Warren <twarren@nvidia.com>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
12 years agoTegra: Medcom-Wide: Enable NAND and boot script support
Thierry Reding [Wed, 3 Apr 2013 04:52:43 +0000 (04:52 +0000)] 
Tegra: Medcom-Wide: Enable NAND and boot script support

Boot script support brings Medcom-Wide in line with other Tegra boards.
In order to enable booting a Linux kernel with initial ramdisk, also add
support for the new FIT image type.

Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: Tom Warren <twarren@nvidia.com>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
12 years agoTegra: All Tamonten-derived boards use onboard NAND
Thierry Reding [Wed, 3 Apr 2013 04:52:42 +0000 (04:52 +0000)] 
Tegra: All Tamonten-derived boards use onboard NAND

Move the nand-controller node to the tegra20-tamonten.dtsi so that it
can be shared between all derived boards.

Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: Tom Warren <twarren@nvidia.com>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
12 years agoTegra: Restore cp15 VBAR _start vector write for ARMv7
Tom Warren [Thu, 28 Mar 2013 17:03:22 +0000 (10:03 -0700)] 
Tegra: Restore cp15 VBAR _start vector write for ARMv7

A start vector fix was added by AneeshV for OMAP4 (commit 0d479b53),
and caused the old monilithic Tegra builds to hang due to an undefined
instruction trap. Previously, the code needed to run on both the
AVP (ARM7TDI) and A9, and the AVP doesn't have a CP15 register.
I corrected this in commit 6d6c0bae w/#ifndef CONFIG_TEGRA, but
now that we use SPL, and boot the AVP w/o any ARMv7 code, I can
revert my change, and make Aneesh's change apply to Tegra.

Signed-off-by: Tom Warren <twarren@nvidia.com>
12 years agoTegra: enable verify support for the crc32 command
Tom Warren [Tue, 26 Mar 2013 17:39:33 +0000 (10:39 -0700)] 
Tegra: enable verify support for the crc32 command

Some 3rd-party flash tools use the -v (verify) option of crc32 command.

Signed-off-by: Tom Warren <twarren@nvidia.com>
Acked-by: Simon Glass <sjg@chromium.org>
12 years agoARM: tegra: support T33 SKU of Tegra30
Stephen Warren [Wed, 27 Mar 2013 09:37:02 +0000 (09:37 +0000)] 
ARM: tegra: support T33 SKU of Tegra30

Make U-Boot aware of the T33 SKU of Tegra30, and treat it identically
to any other Tegra30.

An alternative would be to simply remove the SKU checking from
tegra_get_chip_type(); most use of the value most likely simply wants
to know the current chip, not the specific SKU. Or, the function could
be split into separate tegra_get_chip() and tegra_get_sku() for the
cases where differentiation really is required.

I wonder whether tegra_get_chip_type() should printf() whenever any
unkown chip/SKU is found, although perhaps the function is called so
early that the printf() wouldn't actually make it to the UART anyway.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
Acked-by: Simon Glass <sjg@chromium.org>
12 years agoARMv7: start.S: stay in HYP mode if u-boot is entered in it
Andre Przywara [Tue, 2 Apr 2013 05:43:36 +0000 (05:43 +0000)] 
ARMv7: start.S: stay in HYP mode if u-boot is entered in it

The KVM and Xen hypervisors for the Cortex-A15 virtualization
implementation need to be entered in HYP mode. Should the primary
board firmware already enter HYP mode (Calxeda firmware does that),
we should not deliberately drop back to SVC mode.
Since U-boot does not use the MMU, running in HYP mode is just fine.

Signed-off-by: Andre Przywara <andre.przywara@linaro.org>
12 years agoPrepare v2013.04-rc3 v2013.04-rc3
Tom Rini [Mon, 15 Apr 2013 15:47:10 +0000 (11:47 -0400)] 
Prepare v2013.04-rc3

Signed-off-by: Tom Rini <trini@ti.com>
12 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm
Tom Rini [Mon, 15 Apr 2013 11:46:11 +0000 (07:46 -0400)] 
Merge branch 'master' of git://git.denx.de/u-boot-arm

12 years agoMerge branch 'tpm' of git://git.denx.de/u-boot-x86
Tom Rini [Mon, 15 Apr 2013 11:45:07 +0000 (07:45 -0400)] 
Merge branch 'tpm' of git://git.denx.de/u-boot-x86

12 years agocosmetic: fix CONFIG_SPL_BSS_MAX_SIZE typo in README
Albert ARIBAUD [Sun, 14 Apr 2013 04:48:38 +0000 (04:48 +0000)] 
cosmetic: fix CONFIG_SPL_BSS_MAX_SIZE typo in README

Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
12 years agosmdk5250, snow: convert to CONFIG_SPL_MAX_FOOTPRINT
Albert ARIBAUD [Fri, 12 Apr 2013 05:14:33 +0000 (05:14 +0000)] 
smdk5250, snow: convert to CONFIG_SPL_MAX_FOOTPRINT

This target wants to check full SPL size, BSS included.
Remove CONFIG_SPL_MAX_SIZE definition and instead define
CONFIG_SPL_MAX_FOOTPRINT.

Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
12 years agoda850evm, da850_am18xxevm: convert to CONFIG_SPL_MAX_FOOTPRINT
Albert ARIBAUD [Fri, 12 Apr 2013 05:14:32 +0000 (05:14 +0000)] 
da850evm, da850_am18xxevm: convert to CONFIG_SPL_MAX_FOOTPRINT

This target wants to check full SPL size, BSS included.
Remove CONFIG_SPL_MAX_SIZE definition and instead define
CONFIG_SPL_MAX_FOOTPRINT.

Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
12 years agocam_enc_4xx: convert to CONFIG_SPL_MAX_FOOTPRINT
Albert ARIBAUD [Fri, 12 Apr 2013 05:14:31 +0000 (05:14 +0000)] 
cam_enc_4xx: convert to CONFIG_SPL_MAX_FOOTPRINT

This target wants to check full SPL size, BSS included.
Remove CONFIG_SPL_MAX_SIZE definition and instead define
CONFIG_SPL_MAX_FOOTPRINT.

Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
12 years agoARM: fix CONFIG_SPL_MAX_SIZE semantics
Albert ARIBAUD [Fri, 12 Apr 2013 05:14:30 +0000 (05:14 +0000)] 
ARM: fix CONFIG_SPL_MAX_SIZE semantics

Remove SPL-related ASSERT() in arch/arm/cpu/u-boot.lds
as this file is never used for SPL builds.

Rewrite the ASSERT() in arch/arm/cpu/u-boot-spl.lds
to separately test image (text,data,rodata...) size,
BSS size, and full footprint each against its own max,
and make Tegra boards check full footprint.

Also, output section mmutable is not used in SPL builds.
Remove it.

Finally, update README regarding the (now homogeneous)
semantics of CONFIG_SPL_[BSS_]MAX_SIZE and add the new
CONFIG_SPL_MAX_FOOTPRINT macro.

Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
Reported-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
12 years agoMerge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Albert ARIBAUD [Sun, 14 Apr 2013 09:45:06 +0000 (11:45 +0200)] 
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

12 years agofsl_esdhc: Fix DMA transfer completion waiting loop
Andrew Gabbasov [Sun, 7 Apr 2013 23:06:08 +0000 (23:06 +0000)] 
fsl_esdhc: Fix DMA transfer completion waiting loop

Rework the waiting for transfer completion loop condition
to continue waiting until both Transfer Complete and DMA End
interrupts occur. Checking of DLA bit in Present State register
looks not needed in addition to interrupts status checking,
so it can be removed from the condition. Also, DMA Error
condition is added to the list of data errors, checked in the loop.

Signed-off-by: Andrew Gabbasov <andrew_gabbasov@mentor.com>
12 years agofsl_esdhc: flush cache after IO completion
Eric Nelson [Wed, 3 Apr 2013 12:31:56 +0000 (12:31 +0000)] 
fsl_esdhc: flush cache after IO completion

The cache should invalidate the read buffer for
the SD card interface after the transfer complete,
not command-complete.

Tested-by: Andrew Gabbasov <Andrew_Gabbasov@mentor.com>
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
12 years agoMerge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Albert ARIBAUD [Sun, 14 Apr 2013 08:38:37 +0000 (10:38 +0200)] 
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

12 years agoARM: Fix __bss_start and __bss_end in linker scripts
Albert ARIBAUD [Thu, 11 Apr 2013 05:43:21 +0000 (05:43 +0000)] 
ARM: Fix __bss_start and __bss_end in linker scripts

Commit 3ebd1cbc introduced compiler-generated __bss_start
and __bss_end__ and commit c23561e7 rewrote all __bss_end__
as __bss_end. Their merge caused silent and harmless but
potentially bug-inducing clashes between compiler- and linker-
generated __bss_end symbols.

Make __bss_end and __bss_start compiler-only, and create
__bss_base and __bss_limit for linker-only use.

Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
Reported-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
12 years agospi: mxc_spi: Set master mode for all channels
Fabio Estevam [Tue, 9 Apr 2013 13:06:25 +0000 (13:06 +0000)] 
spi: mxc_spi: Set master mode for all channels

The glitch in the SPI clock line, which commit 3cea335c34 (spi: mxc_spi: Fix spi
clock glitch durant reset) solved, is back now and itwas re-introduced by
commit d36b39bf0d (spi: mxc_spi: Fix ECSPI reset handling).

Actually the glitch is happening due to always toggling between slave mode
and master mode by configuring the CHANNEL_MODE bits in this reset function.

Since the spi driver only supports master mode, set the mode for all channels
always to master mode in order to have a stable, "glitch-free" SPI clock line.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
12 years agomx6qsabre{sd, auto}: Fix environment as 'mmc rescan' takes no arguments
Otavio Salvador [Wed, 10 Apr 2013 16:55:50 +0000 (16:55 +0000)] 
mx6qsabre{sd, auto}: Fix environment as 'mmc rescan' takes no arguments

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Acked-by: Fabio Estevam <fabio.estevam@freescale.com>
12 years agoBUGFIX: arm: data abort in get_bad_stack_swi
Tetsuyuki Kobayashi [Fri, 5 Apr 2013 00:12:51 +0000 (00:12 +0000)] 
BUGFIX: arm: data abort in get_bad_stack_swi

When swi instruction is executed, it is expected to get message
"software interrupt" in console and dump registers and reboot, as
do_software_interrupt() in arch/arm/lib/interrupts.c.
But, actually it causes data abort accessing wrong address in get_bad_stack_swi
macro in arch/arm/cpu/v7/start.S.
This patch fixes this problem.

The same mistake in arch/arm/cpu/{arm1136,arm1176,pxa}/start.S.

Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
12 years agoMerge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Albert ARIBAUD [Sat, 13 Apr 2013 07:39:29 +0000 (09:39 +0200)] 
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'

12 years agotpm: Add TPM command library
Che-liang Chiou [Thu, 28 Feb 2013 09:34:57 +0000 (09:34 +0000)] 
tpm: Add TPM command library

TPM command library implements a subset of TPM commands defined in TCG
Main Specification 1.2 that are useful for implementing secure boot.
More TPM commands could be added out of necessity.

You may exercise these commands through the 'tpm' command.  However, the
raw TPM commands are too primitive for writing secure boot in command
interpreter scripts; so the 'tpm' command also provides helper functions
to make scripting easier.

For example, to define a counter in TPM non-volatile storage and
initialize it to zero:

$ tpm init
$ tpm startup TPM_ST_CLEAR
$ tpm nv_define d 0x1001 0x1
$ tpm nv_write d 0x1001 0

And then increment the counter by one:

$ tpm nv_read d 0x1001 i
$ setexpr.l i $i + 1
$ tpm nv_write d 0x1001 $i

Signed-off-by: Che-Liang Chiou <clchiou@chromium.org>
12 years agoexynos: Enable I2C TPM for smdk5250
Simon Glass [Fri, 12 Apr 2013 10:44:58 +0000 (10:44 +0000)] 
exynos: Enable I2C TPM for smdk5250

This is used on some Exynos 5250 variants.

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agotpm: Add Infineon slb9635_i2c TPM driver
Rong Chang [Fri, 12 Apr 2013 10:44:57 +0000 (10:44 +0000)] 
tpm: Add Infineon slb9635_i2c TPM driver

Add a driver for the I2C TPM from Infineon.

Signed-off-by: Che-Liang Chiou <clchiou@chromium.org>
Signed-off-by: Rong Chang <rongchang@chromium.org>
Signed-off-by: Tom Wai-Hong Tam <waihong@chromium.org>
Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agotpm: Add casts for proper compilation
Taylor Hutt [Fri, 12 Apr 2013 10:44:56 +0000 (10:44 +0000)] 
tpm: Add casts for proper compilation

When building for the Sandbox version, the casts in this change are
necessary to avoid compilation issues.

Signed-off-by: Taylor Hutt <thutt@chromium.org>
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
12 years agointegrator: enable device tree
Linus Walleij [Wed, 3 Apr 2013 19:19:20 +0000 (19:19 +0000)] 
integrator: enable device tree

This enables the device tree library on the Integrator platforms
so we can pass a device tree when booting.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
12 years agoVCMA9: Enable CONFIG_CMD_NAND_YAFFS
Tom Rini [Tue, 5 Mar 2013 05:54:05 +0000 (05:54 +0000)] 
VCMA9: Enable CONFIG_CMD_NAND_YAFFS

As this board has NAND and supports YAFFS2, add CONFIG_MD_NAND_YAFFS

Cc: David Müller <d.mueller@elsoft.ch>
Signed-off-by: Tom Rini <trini@ti.com>
Acked-by: David Müller <d.mueller@elsoft.ch>
12 years agoMerge branch 'u-boot/master' into 'u-boot-arm/master'
Albert ARIBAUD [Fri, 12 Apr 2013 20:07:57 +0000 (22:07 +0200)] 
Merge branch 'u-boot/master' into 'u-boot-arm/master'

Conflicts:
drivers/video/exynos_fb.c

12 years agoomap5_common.h: Switch to ext4
Tom Rini [Thu, 11 Apr 2013 08:01:42 +0000 (08:01 +0000)] 
omap5_common.h: Switch to ext4

ext3 should not be used on SD cards, so use ext4 instead.

Cc: Sricharan R <r.sricharan@ti.com>
Signed-off-by: Tom Rini <trini@ti.com>
12 years agoomap3: Display MHz instead of mHz on the console
man.huber@arcor.de [Wed, 10 Apr 2013 12:12:17 +0000 (12:12 +0000)] 
omap3: Display MHz instead of mHz on the console

The processor is hopefully running with M(ega)Hz and not with m(illi)Hz.

Signed-off-by: Manfred Huber <man.huber@arcor.de>
12 years agoRevert "mtd: cfi_flash: Fix CFI flash driver for 8-bit bus support"
Stefan Roese [Fri, 12 Apr 2013 17:04:54 +0000 (19:04 +0200)] 
Revert "mtd: cfi_flash: Fix CFI flash driver for 8-bit bus support"

This reverts commit 239cb9d904cfa8ab50d840a47b3306189d695c75.

Signed-off-by: Stefan Roese <sr@denx.de>
12 years agoRevert "cfi_flash: Use uintptr_t for casts from u32 to void *"
Stefan Roese [Fri, 12 Apr 2013 17:04:37 +0000 (19:04 +0200)] 
Revert "cfi_flash: Use uintptr_t for casts from u32 to void *"

This reverts commit 81a4f7098ba137ea1961cb997ca16d57de2b3483.

Signed-off-by: Stefan Roese <sr@denx.de>
12 years agoam335x: Really correct DDR timings on new BeagleBone part
Tom Rini [Fri, 12 Apr 2013 16:38:16 +0000 (12:38 -0400)] 
am335x: Really correct DDR timings on new BeagleBone part

The previous timings were done on the internal-only A1 board which has
different DDR part than all later revs.  The timings need a slight
adjustment to be correct in all cases with later revs.

Signed-off-by: Tom Rini <trini@ti.com>
12 years agoarm/km: add support for kmsuv31 board
Holger Brunck [Tue, 15 Jan 2013 22:51:22 +0000 (22:51 +0000)] 
arm/km: add support for kmsuv31 board

This board is from a u-boot point of view a mixture between kmnusa and
a standard km_kirkwood board. We have our u-boot environment in the spi
NOR flash, but we have a direct connection between the kirkwood and the
piggy. A FPGA is connected via the PCIe interface. So we only have to
select the specific features in the board setup.

Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
cc: Valentin Longchamp <valentin.longchamp@keymile.com>
cc: Prafulla Wadaskar <prafulla@marvell.com>
Acked-By: Prafulla Wadaskar <prafulla@marvell.com>
12 years agoarm/km: use CONFIG_NAND_ECC_BCH
Holger Brunck [Tue, 15 Jan 2013 22:51:21 +0000 (22:51 +0000)] 
arm/km: use CONFIG_NAND_ECC_BCH

Switch from 1-bit ecc to 4-bit ecc.

Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
cc: Valentin Longchamp <valentin.longchamp@keymile.com>
cc: Prafulla Wadaskar <prafulla@marvell.com>
Acked-By: Prafulla Wadaskar <prafulla@marvell.com>
12 years agoarm/km: rename BOARD_LATE_INIT to CONFIG_BOARD_LATE_INIT
Holger Brunck [Tue, 15 Jan 2013 22:51:20 +0000 (22:51 +0000)] 
arm/km: rename BOARD_LATE_INIT to CONFIG_BOARD_LATE_INIT

commit 9660e442 cosmetic: s/BOARD_LATE_INIT/CONFIG_BOARD_LATE_INIT
removes BOARD_LATE_INIT and uses CONFIG_BOARD_LATE_INIT instead.
Therefore we have to use this define.

Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
cc: Valentin Longchamp <valentin.longchamp@keymile.com>
cc: Prafulla Wadaskar <prafulla@marvell.com>
Acked-by: Prafulla Wadaskar <prafulla@marvell.com>
12 years agokirkwood_nand: allow usage of NAND_ECC_SOFT_BCH
Gerlando Falauto [Tue, 15 Jan 2013 22:34:28 +0000 (22:34 +0000)] 
kirkwood_nand: allow usage of NAND_ECC_SOFT_BCH

If CONFIG_NAND_ECC_BCH is set use 4-bit error correction code instead of
the 1-bit error correction code on the NAND device.

Signed-off-by: Gerlando Falauto <gerlando.falauto@keymile.com>
Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
cc: Valentin Longchamp <valentin.longchamp@keymile.com>
cc: Prafulla Wadaskar <prafulla@marvell.com>
Acked-by: Prafulla Wadaskar <prafulla@marvell.com>
Acked-by: Scott Wood <scottwood@freescale.com>
12 years agozynq: nand: Remove nand.h and move it to sys_proto.h
Michal Simek [Thu, 11 Apr 2013 14:07:00 +0000 (16:07 +0200)] 
zynq: nand: Remove nand.h and move it to sys_proto.h

It is useless to have one huge file with one function
declaration. Move it to sys_proto.h where others system
functions are.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agozynq: sdhci: Remove mmc.h and move it to sys_proto.h
Michal Simek [Thu, 11 Apr 2013 14:04:21 +0000 (16:04 +0200)] 
zynq: sdhci: Remove mmc.h and move it to sys_proto.h

It is useless to have one huge file with one function
declaration. Move it to sys_proto.h where others system
functions are.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agozynq: Add CONFIG_ZYNQ_SDHCI1 support
Jagannadha Sutradharudu Teki [Tue, 9 Apr 2013 06:30:34 +0000 (12:00 +0530)] 
zynq: Add CONFIG_ZYNQ_SDHCI1 support

This patch provides a support to use SDHCI1 on existing zynq_sdhci.c
driver. defined regbase as -> CONFIG_ZYNQ_SDHCI_BASEADDR1 and
max, min clock values are initialized as 0.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agozynq: Define CONFIG_ZYNQ_SDHCI0
Jagannadha Sutradharudu Teki [Tue, 9 Apr 2013 06:30:32 +0000 (12:00 +0530)] 
zynq: Define CONFIG_ZYNQ_SDHCI0

Rename SD_BASEADDR to CONFIG_ZYNQ_SDHCI_BASEADDR0.
Defined existing SDHCI support as CONFIG_ZYNQ_SDHCI0 so-that the
respective board configs will to enable this config.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agozynq: sdhci: Move zynq_sdhci_init out of mmc.h
Jagannadha Sutradharudu Teki [Tue, 9 Apr 2013 06:30:30 +0000 (12:00 +0530)] 
zynq: sdhci: Move zynq_sdhci_init out of mmc.h

Call zynq_sdhci_init directly from board.c so no need to define
zynq_mmc_init separately hence removed.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agozynq: sdhci: Donot pass max|min_clk arguments through zynq_sdhci_init
Jagannadha Sutradharudu Teki [Fri, 12 Apr 2013 14:17:14 +0000 (19:47 +0530)] 
zynq: sdhci: Donot pass max|min_clk arguments through zynq_sdhci_init

Instead of passing through zynq_sdhci_init, directly pass these values
as an arguments for add_sdhci.

zynq_sdhci set the max_clk as 52000000Mhz, this is the max clock supported by
eMMC as the same driver supports sd/mmc/emmc cards.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agosf: Add extended address register reading support for winbond and stmicro
Jagannadha Sutradharudu Teki [Fri, 12 Apr 2013 14:01:27 +0000 (19:31 +0530)] 
sf: Add extended address register reading support for winbond and stmicro

This patch provides support to read a flash extended address
register for winbond and stmicro SPI flashes.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agosf: Add extended address register writing support for winbond and stmicro
Jagannadha Sutradharudu Teki [Fri, 12 Apr 2013 14:01:26 +0000 (19:31 +0530)] 
sf: Add extended address register writing support for winbond and stmicro

This patch provides support to program a flash extended address
register for winbond and stmicro SPI flashes.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agospi: zynq: Add extended register read and write commands
Jagannadha Sutradharudu Teki [Fri, 12 Apr 2013 14:01:25 +0000 (19:31 +0530)] 
spi: zynq: Add extended register read and write commands

This patch adds qspi extended register read and write commands
support for numonyx/winbond QSPI flashes.

These commands are useful while accessing greater than 16MB flash
with the help of extended address register if the actual size of
flash is > 16MB.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agoMerge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Albert ARIBAUD [Fri, 12 Apr 2013 06:51:41 +0000 (08:51 +0200)] 
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'

12 years agomx31pdk: Remove watchdog support
Fabio Estevam [Tue, 9 Apr 2013 09:03:52 +0000 (09:03 +0000)] 
mx31pdk: Remove watchdog support

The conversion of mx31pdk to SPL NAND fixed the boot issue, but we start seeing
resets in loop, which prevents us from reaching the U-boot prompt.

Until the proper fix can be identified, disable watchdog, so that mx31pdk
can be functional again.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Stefano Babic <sbabic@denx.de>