This required manual merging drivers/mtd/nand/Makefile
and adding am335x_evm support for CONFIG_SPL_NAND_DRIVERS

This commit merges branches from samsung, imx and tegra
meant to fix merge issues between u-boot/master and
u-boot-arm/master, as well as a few manual merge fixes.

Conflicts:
	README
	arch/arm/cpu/armv7/exynos/clock.c
	board/samsung/universal_c210/universal.c
	drivers/misc/Makefile
	drivers/power/power_fsl.c
	include/configs/mx35pdk.h
	include/configs/mx53loco.h
	include/configs/seaboard.h

SH7752 has two fast ethernet controllers and two gigabit ethernet
controllers. It is similar to SH7757.
Signed-off-by: NYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Acked-by: NNobuhiro Iwamatsu <iwamatsu@nigauri.org>

The ip is stored in network order, so we can't test it in host order.
Signed-off-by: NJoe Hershberger <joe.hershberger@ni.com>
Reviewed-by: NKim Phillips <kim.phillips@freescale.com>

This prints a tftp speed indication after the download completes. This
is the 3.6 MiB/s indicator below.

Tegra2 (SeaBoard) # tftp ...
Using asx0 device
TFTP from server 172.22.72.144; our IP address is 172.22.73.81
Filename '/tftpboot/uImage-user-seaboard-1'.
Load address: 0x408000
Loading: #################################################
         3.6 MiB/s
done
Signed-off-by: NSimon Glass <sjg@chromium.org>
Acked-by: NIgor Grinberg <grinberg@compulab.co.il>

CONFIG_SYS_TFTP_LOADADDR is defined on severals boards,
but it's never used. So we can safely removed it.
Signed-off-by: NPhilippe Reynes <tremyfr@yahoo.fr>

Marvell 88E1118R has different uid then 88E1118.
Signed-off-by: NMichal Simek <monstr@monstr.eu>
CC: Andy Fleming <afleming@freescale.com>
CC: Zang Roy-R61911 <tie-fei.zang@freescale.com>
CC: Kumar Gala <galak@kernel.crashing.org>

In e1000e driver, Rx descriptor queue is used such that hardware can add only
one descriptor at a time. So the WTHRESH granularity in RXDCTL should be set
to single descriptor. This would ensure that every time controller fills a Rx
descriptor, it is flushed to host memory. Earlier this granularity was in
cache line units i.e 2 descriptors. This leads to controller always waiting
for 2 descriptors before flushing them out. But since not more than one Rx BD
is actually available , the accumulation condition never gets hit.
Signed-off-by: NRuchika Gupta <ruchika.gupta@freescale.com>
Signed-off-by: NVakul Garg <vakul@freescale.com>
Acked-by: NRoy Zang <tie-fei.zang@freescale.com>

- since commit 418396e2 nand write.raw
can take the number of page to be written as an argument. nand_update_full
is passing the size (in bytes) to nand write.raw. This value was previously
ignored but now breaks the write.
- this patch updates the default environment of these boards to provide a
pagecount instead of a size to nand write.raw.
- tested on a mx28evk with a 4k page NAND and on a custom board with a
2k page NAND.
Signed-off-by: NEric Bénard <eric@eukrea.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: NMarek Vasut <marex@denx.de>

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

The #ifdef here is not enough to stop part_efi.c from being built, only
being unused.  And with recent changes this now leads to warnings.  The
easiest solution here is to just let the garbage collection at link time
do its job.
Signed-off-by: NTom Rini <trini@ti.com>

Use the variable access flags to implement the protection for ethaddr
and serial# instead of hard-coding them.
Signed-off-by: NJoe Hershberger <joe.hershberger@ni.com>

Implement a way to delete more than one variable at a time.
Signed-off-by: NJoe Hershberger <joe.hershberger@ni.com>

Now that we have support for permissions, add a way to override them.
Signed-off-by: NJoe Hershberger <joe.hershberger@ni.com>

Add support for read-only, write-once, and change-default.
Signed-off-by: NJoe Hershberger <joe.hershberger@ni.com>

Similar to the env callback command, this will show details about the
options available, the static list, and the currently active variables.
Signed-off-by: NJoe Hershberger <joe.hershberger@ni.com>

Currently just validates variable types as decimal, hexidecimal,
boolean, ip address, and mac address.  Call
env_acl_validate_setenv_params() from setenv() in fw_env.c.

If the entry is not found in the env .flags, then look in the static
one. This allows the env to override the static definitions, but prevents
the need to have every definition in the environment distracting you.

Need to build in _ctype for isdigit for Linux.
Signed-off-by: NJoe Hershberger <joe.hershberger@ni.com>

Currently just validates variable types as decimal, hexidecimal,
boolean, ip address, and mac address.

If the entry is not found in the env ".flags", then look in the static
one. This allows the env to override the static definitions, but prevents
the need to have every definition in the environment distracting you.
Signed-off-by: NJoe Hershberger <joe.hershberger@ni.com>

The silent variable now updates the global data flag anytime it is
changed as well as after the env relocation (in case its value is
different from the default env in such cases as NAND env)
Signed-off-by: NJoe Hershberger <joe.hershberger@ni.com>

Remove the hard-coded console handler and use a callback instead
Signed-off-by: NJoe Hershberger <joe.hershberger@ni.com>

Remove the hard-coded loadaddr handler and use a callback instead
Signed-off-by: NJoe Hershberger <joe.hershberger@ni.com>

Remove the hard-coded baudrate handler and use a callback instead
Signed-off-by: NJoe Hershberger <joe.hershberger@ni.com>

Remove the hard-coded bootfile handler and use a callback instead
Signed-off-by: NJoe Hershberger <joe.hershberger@ni.com>

The callbacks can be bound, but are otherwise invisible.  Add a command
to show what callbacks are available.
Signed-off-by: NJoe Hershberger <joe.hershberger@ni.com>

!!! fix callback command

Add support for per-variable callbacks to the "hashtable" functions.
Signed-off-by: NJoe Hershberger <joe.hershberger@ni.com>

!!!fix comment in callback

When printing all variables with env print, don't print variables that
begin with '.'.  If env print is called with a '-a' switch, then
include variables that begin with '.' (just like the ls command).

Variables printed explicitly will be printed even without the -a.
Signed-off-by: NJoe Hershberger <joe.hershberger@ni.com>

Move the getenv_yesno() to env_common.c and change most checks for
'y' or 'n' to use this helper.
Signed-off-by: NJoe Hershberger <joe.hershberger@ni.com>

Move the read of the old value to inside the check function.  In some
cases it can be avoided all together and at the least the code is only
called from one place.

Also name the function and the callback to more clearly describe what
it does.

Pass the ENTRY instead of just the name for direct access to the whole
data structure.

Pass an enum to the callback that specifies the operation being approved.
Signed-off-by: NJoe Hershberger <joe.hershberger@ni.com>

The same chunk of code was replicated in two places and the following
changes will make that chunk grow a bit, so combine into a static func.
Signed-off-by: NJoe Hershberger <joe.hershberger@ni.com>

Use a flag in hsearch_r for insert mode passed from import to allow the
behavior be different based on use.

Now that "do_check" is called for all imports, ensure console init is
complete before updating the console on relocation import
Signed-off-by: NJoe Hershberger <joe.hershberger@ni.com>

isspace() and strim() are not in the typical user-mode string.h, so
put them in a separate compilation unit so that they can be built into
tools that need them independent of the other common string functions.

This allows code shared by u-boot and the linux user-mode tools to link.
Signed-off-by: NJoe Hershberger <joe.hershberger@ni.com>

Enable support for GPT partition table restoration at Samsung's Trats
development board.
Signed-off-by: NLukasz Majewski <l.majewski@samsung.com>
Signed-off-by: NKyungmin Park <kyungmin.park@samsung.com>
CC: Minkyu Kang <mk7.kang@samsung.com>

New command - "gpt" is supported. It restores the GPT partition table.
It looks into the given environment variable for partitions definition.
It can be enabled at target configuration file with CONFIG_CMD_GPT.
Signed-off-by: NLukasz Majewski <l.majewski@samsung.com>
Signed-off-by: NPiotr Wilczek <p.wilczek@samsung.com>
Signed-off-by: NKyungmin Park <kyungmin.park@samsung.com>

The restoration of GPT table (both primary and secondary) is now possible.
Function 'gpt_restore' presents example of partition restoration process.
Signed-off-by: NLukasz Majewski <l.majewski@samsung.com>
Signed-off-by: NPiotr Wilczek <p.wilczek@samsung.com>
Signed-off-by: NKyungmin Park <kyungmin.park@samsung.com>

Custom definitions of le_XX_to_int functions have been replaced with
standard ones, defined at <compiler.h>

Replacement of several GPT related structures members with ones
indicating its endianness and proper size.
Signed-off-by: NChang Hyun Park <heartinpiece@outlook.com>
Signed-off-by: NLukasz Majewski <l.majewski@samsung.com>
Signed-off-by: NKyungmin Park <kyungmin.park@samsung.com>

Documentation of the GPT format.
Signed-off-by: NLukasz Majewski <l.majewski@samsung.com>
Signed-off-by: NKyungmin Park <kyungmin.park@samsung.com>