Conflicts:
	board/armltd/vexpress64/vexpress64.c
Signed-off-by: NTom Rini <trini@konsulko.com>

Signed-off-by: NTom Rini <trini@konsulko.com>

Create a new configuration file: at91-sama5_common.h. Which includes the
configurations that reused by all SAMA5 chips.

at91-sama5_common.h includes:
- hw macros (clock, text_base and etc.)
- default commands.
- BOOTARGS
- U-Boot common configs.
NOTE: NOR flash definition should be put before including the common header.

For sama5d3-xplained:
- add CMD_SETEXPR

For sama5d3xek:
- add CMD_SETEXPR
- change CONFIG_SYS_MALLOC_LEN to (4*1024*1024)
Signed-off-by: NJosh Wu <josh.wu@atmel.com>

Enable SPL support for at91sam9n12ek boards, now it supports
boot up from NAND flash, serial flash.
Signed-off-by: NBo Shen <voice.shen@atmel.com>

Enable SPL support for at91sam9x5ek board. Now, it supports
boot up from NAND flash and SPI flash.
Signed-off-by: NBo Shen <voice.shen@atmel.com>

Supports boot up from NAND flash with software ECC eanbled.
And supports boot up from SD/MMC card with FAT file system.

As the boot from SD/MMC card with FAT file system, the BSS
segment is too big to fit into SRAM, so, use the lds to put
it into SDRAM.
Signed-off-by: NBo Shen <voice.shen@atmel.com>

Config MCKR according to the datasheet sequence, or else it
will cause the MCKR configuration failed.

Remove timeout checking for clock configuration, if configure
the clock failed, let the system hang while not run in wrong
clock configuration.
Signed-off-by: NBo Shen <voice.shen@atmel.com>
Tested-by: NHeiko Schocher <hs@denx.de>

Insteading in mmc's raw sectors, this patch will save the environment
in a fat file (uboot.env) in mmc card's first FAT patition by default.

If you want to save in mmc's raw sectors, you only need to define
CONFIG_ENV_IS_IN_MMC.
Signed-off-by: NJosh Wu <josh.wu@atmel.com>
Acked-by: NBo Shen <voice.shen@atmel.com>

Add support for on-flash bad block table. This makes U-Boot handle an existing
BBT correctly.
Signed-off-by: NDavid Dueck <davidcdueck@googlemail.com>
Reviewed-by: NBoris BREZILLON <boris.brezillon@free-electrons.com>
CC: Boris BREZILLON <boris.brezillon@free-electrons.com>
CC: Josh Wu <josh.wu@atmel.com>
CC: Andreas Bießmann <andreas.devel@googlemail.com>
CC: Scott Wood <scottwood@freescale.com>
Acked-by: NJosh Wu <josh.wu@atmel.com>

move MACH_TYPE into defconfig
Signed-off-by: NHeiko Schocher <hs@denx.de>

To facilitate changing lowlevel_init to become s_init, move the current
contents of s_init into board_init_f and add the rest of what
board_init_f does here.
In order to compile clean without CONFIG_SKIP_LOWLEVEL_INIT set, leave an
empty stub of s_init(). It can be removed when lowlevel_init becomes s_init.

Cc: Bo Shen <voice.shen@atmel.com>
Cc: Andreas Bießmann <andreas.devel@googlemail.com>
Tested-by: Matt Porter <mporter@konsulko.com> on sama5d3_xplained
Signed-off-by: NTom Rini <trini@ti.com>
[rebased on current master, leave s_init() as empty stub]
Signed-off-by: NAndreas Bießmann <andreas.devel@googlemail.com>

The commit 8dfafdde (Introduce common timer functions), add common
timer functions, we can use them directly.
Signed-off-by: NBo Shen <voice.shen@atmel.com>
[rebase on current master]
Sigend-off-by: NAndreas Bießmann <andreas.devel@googlemail.com>

Signed-off-by: NBo Shen <voice.shen@atmel.com>
[rebase on current master]
Signed-off-by: NAndreas Bießmann <andreas.devel@googlemail.com>

This patch will display the U-Boot version on LCD.
Signed-off-by: NJosh Wu <josh.wu@atmel.com>
Acked-by: NBo Shen <voice.shen@atmel.com>

Testing showed, that commands like STATUS made the buffer dirty
when executed with NFC_SECSZ set to the page size. It looks
like the controller transfers bogus data when this register
is configured. When setting it to 0, the buffer does not get
altered while the status command still seems to work flawless.
Signed-off-by: NStefan Agner <stefan@agner.ch>

The driver tries to re-use the page buffer by storing the page
number of the current page in the buffer. The page is only read
if the requested page number is not currently in the buffer. When
a block is erased, the page number is marked as invalid if the
erased page equals the one currently in the cache. However, since
a erase block consists of multiple pages, also other page numbers
could be affected.

The commands to reproduce this issue (on a written page):
> nand dump 0x800
> nand erase 0x0 0x20000
> nand dump 0x800

The second nand dump command returns the data from the buffer,
while in fact the page is erased (0xff).

Avoid the hassle to calculate whether the page is affected or not,
but set the page buffer unconditionally to invalid instead.
Signed-off-by: NStefan Agner <stefan@agner.ch>

This command is only enabled by one board, complicates the NAND code,
and doesn't appear to have been functioning properly for several
years.  If there are no bad blocks in the NAND region being written
nand_write_skip_bad() will take the shortcut of calling nand_write()
which bypasses the special yaffs handling.  This causes invalid YAFFS
data to be written. See
http://lists.denx.de/pipermail/u-boot/2011-September/102830.html for
an example and a potential workaround.

U-Boot still retains the ability to mount and access YAFFS partitions
via CONFIG_YAFFS2.
Signed-off-by: NPeter Tyser <ptyser@xes-inc.com>

The CONFIG_MTD_NAND_VERIFY_WRITE has been removed from Linux for some
time and a more generic method of NAND verification now exists in U-Boot.
Signed-off-by: NPeter Tyser <ptyser@xes-inc.com>
Tested-by: NHeiko Schocher <hs@denx.de>
Acked-by: NHeiko Schocher <hs@denx.de>

Previously NAND writes were not verified and could fail silently.  Add
a verification step after all writes to NAND.
Signed-off-by: NPeter Tyser <ptyser@xes-inc.com>
Reviewed-by: NLukasz Majewski <l.majewski@samsung.com>
Tested-by: NHeiko Schocher <hs@denx.de>
Acked-by: NHeiko Schocher <hs@denx.de>

Previously NAND writes were only verified when CONFIG_MTD_NAND_VERIFY_WRITE
was defined.  On boards without this define writes could fail silently.
Boards with CONFIG_MTD_NAND_VERIFY_WRITE could prematurely report
failures which ECC could correct.

Add a verification step after all "nand write[.x]" commands to ensure the
writes were successful.  The verification uses ECC for for "normal"
writes, but does not for raw and yaffs writes.  Some test cases which
inject fake bad bits on a 2K page flash are below.

Test cases with CONFIG_MTD_NAND_VERIFY_WRITE defined:
  Example of an ECC write which previously failed when
  CONFIG_MTD_NAND_VERIFY_WRITE was defined, but now succeeds because ECC
  is used during verification:
      nand erase 0 0x10000
      dhcp /somefile
      mw.b 0x10000 0xff 0x2000
      mw.b 0x10020 0xfe 1
      nand write.raw 0x10000 0x800 1
      mw.b 0x1000020 0x01 1
      nand write 0x1000000 0x800 0x1800

Test cases without CONFIG_MTD_NAND_VERIFY_WRITE defined:
  Example of an ECC write which previously silently failed:
      nand erase 0 0x10000
      dhcp /somefile
      mw.b 0x10000 0xff 0x2000
      mw.b 0x10020 0x00 1
      nand write.raw 0x10000 0x800 1
      mw.b 0x1000020 0xff 1
      nand write 0x1000000 0x800 0x1800

  Example of a raw write which previously failed silently due to stuck
  data bit, but now errors out:
      nand erase 0 0x10000
      dhcp /somefile
      mw.b 0x10000 0xff 0x2000
      mw.b 0x10020 0xfe 1
      nand write.raw 0x10000 0x800 1
      mw.b 0x1000020 0x01 1
      nand write.raw 0x1000000 0x800 3

  Example of a raw write which previously failed silently due to stuck OOB
  bit, but now errors out:
      nand erase 0 0x10000
      dhcp /somefile
      mw.b 0x10000 0xff 0x2000
      mw.b 0x10810 0xfe 1
      nand write.raw 0x10000 0x800 1
      mw.b 0x1000810 0x01 1
      nand write.raw 0x1000000 0x800 3
Signed-off-by: NPeter Tyser <ptyser@xes-inc.com>
Tested-by: NHeiko Schocher <hs@denx.de>
Acked-by: NHeiko Schocher <hs@denx.de>

Add nand_verify() and nand_verify_page_oob().  nand_verify() verifies
NAND contents against an arbitrarily sized buffer using ECC while
nand_verify_page_oob() verifies a NAND page's contents and OOB.
Signed-off-by: NPeter Tyser <ptyser@xes-inc.com>
Tested-by: NHeiko Schocher <hs@denx.de>
Acked-by: NHeiko Schocher <hs@denx.de>

The use of the nand_write_options and nand_read_options structures were
removed in commit dfbf617f.  Remove the
now-unused structures too.
Signed-off-by: NPeter Tyser <ptyser@xes-inc.com>

This option was removed along with legacy NAND support in
be33b046.  Clean up some remnants.
Signed-off-by: NPeter Tyser <ptyser@xes-inc.com>

There is only one pio_word in this DMA transaction so data field must be 1.
Signed-off-by: NLuca Ellero <luca.ellero@brickedbrain.com>

There is only one pio_word in this DMA transaction so data field must be 1.
Signed-off-by: NLuca Ellero <luca.ellero@brickedbrain.com>

Pingroup ATC seems to come out of reset with config set to NAND, so we
need to explicitly configure some other function to this group in order
to avoid clashing settings.
Signed-off-by: NMarcel Ziswiler <marcel@ziswiler.com>
Signed-off-by: NTom Warren <twarren@nvidia.com>

Even the 8-bit case needs KBCB configured, as pin D7 is located in this
pingroup.

Please note that pingroup ATC seems to come out of reset with its
config set to NAND so one needs to explicitly configure some other
function to this group in order to avoid clashing settings which is
outside the scope of this patch.
Signed-off-by: NLucas Stach <dev@lynxeye.de>
Signed-off-by: NMarcel Ziswiler <marcel@ziswiler.com>
Tested-by: NMarcel Ziswiler <marcel@ziswiler.com>
Signed-off-by: NTom Warren <twarren@nvidia.com>

Bring the Colibri T20 configuration in-line with Apalis/Colibri T30.
Signed-off-by: NMarcel Ziswiler <marcel@ziswiler.com>
Signed-off-by: NTom Warren <twarren@nvidia.com>

Fix ASIX USB to Ethernet chip reset.
Signed-off-by: NMarcel Ziswiler <marcel@ziswiler.com>
Acked-by: NStephen Warren <swarren@nvidia.com>
Signed-off-by: NTom Warren <twarren@nvidia.com>

A while ago I got Russell to change the machine type of our Colibri T20
from COLIBRI_TEGRA2 to COLIBRI_T20 which at least in parts is also
reflected in his machine registry:

http://www.arm.linux.org.uk/developer/machines/list.php?id=3323

For us it is really very beneficial to actually still be able to boot
downstream L4T kernel with its working hardware accelerated
graphics/multimedia stack albeit it being proprietary/closed-source.
Signed-off-by: NMarcel Ziswiler <marcel@ziswiler.com>
Acked-by: NStephen Warren <swarren@nvidia.com>
Signed-off-by: NTom Warren <twarren@nvidia.com>

In accordance with our other modules supported by U-Boot and as agreed
upon for Apalis/Colibri T30 get rid of the carrier board in the board/
configuration/device-tree naming.

While at it also bring the prompt more in line with our other products.
Signed-off-by: NMarcel Ziswiler <marcel@ziswiler.com>
Signed-off-by: NTom Warren <twarren@nvidia.com>

As a preparatory step to renaming the board folder as well first get
rid of the colibri_t20-common after having integrated it into
colibri_t20_iris for now.

While at it also migrate to using NVIDIA's common.mk magic.
Signed-off-by: NMarcel Ziswiler <marcel@ziswiler.com>
Signed-off-by: NTom Warren <twarren@nvidia.com>

Requesting a GPIO without a name is not supposed anymore. This causes the
request to fail. Add a name so that the serial console works on seaboard.
Signed-off-by: NSimon Glass <sjg@chromium.org>
Reported-by: NStephen Warren <swarren@nvidia.com>
Signed-off-by: NTom Warren <twarren@nvidia.com>

This CONFIG is not used, so drop it.
Signed-off-by: NSimon Glass <sjg@chromium.org>
Tested-by: NStephen Warren <swarren@wwwdotorg.org>
Acked-by: NStephen Warren <swarren@wwwdotorg.org>
Signed-off-by: NTom Warren <twarren@nvidia.com>

This allows selection between CSI and DSI_B on the MIPI pads.
Signed-off-by: NStephen Warren <swarren@nvidia.com>
Signed-off-by: NTom Warren <twarren@nvidia.com>

Some pinmux controls are in a different register set. Add support for
manipulating those in a similar way to existing pins/groups.
Signed-off-by: NStephen Warren <swarren@nvidia.com>
Signed-off-by: NTom Warren <twarren@nvidia.com>

Move struct pmux_pingrp_desc type and tegra_soc_pingroups variable
declaration together with other pin/mux level definitions. Now the whole
file is grouped/ordered pin/mux-related then drvgrp-related definitions.

Fix typo in ifdef comment.
Signed-off-by: NStephen Warren <swarren@nvidia.com>
Signed-off-by: NTom Warren <twarren@nvidia.com>