Signed-off-by: NSergei Poselenov <sposelenov@emcraft.com>
Signed-off-by: NWolfgang Denk <wd@denx.de>

Signed-off-by: NSergei Poselenov <sposelenov@emcraft.com>

Signed off by: Gururaja Hebbar <gururajakr@sanyo.co.in>

Change LCRR clock ratio from 2 to 4 to commodate VSC7385.
Correct TSEC1 vs TSEC2 assignment.
Define ETHADDR and ETH1ADDR always.
Signed-off-by: NYork Sun <yorksun@freescale.com>
Signed-off-by: NTimur Tabi <timur@freescale.com>

Update CHANGELOG for release.
Signed-off-by: NWolfgang Denk <wd@denx.de>

When SATA is selected (via jumper J6) we need to disable the first PCIe
node in the device tree, so that Linux doesn't initialize it. Otherwise
the Linux SATA driver will fail to detect the devices.

The same goes the other way around too. So if PCIe is selected we need
to disable the SATA node in the device tree.

This is because PCIe port 0 and SATA on 460EX share the same pins
(multiplexed) and we have to configure in U-Boot which peripheral is
enabled.
Signed-off-by: NStefan Roese <sr@denx.de>

Signed-off-by: NJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

Signed-off-by: NJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

flash.c:593: warning: dereferencing type-punned pointer will break strict-aliasing rules
flash.c:398: error: label at end of compound statement
Signed-off-by: NJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

Signed-off-by: NJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

Signed-off-by: NJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

Signed-off-by: NJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

...and add to MAKEALL script
Signed-off-by: NWolfgang Denk <wd@denx.de>

env_get_char is not a function, but a pointer to one.
Signed-off-by: NWolfgang Denk <wd@denx.de>

Several board/<...>/config.mk files include dynamically built (by
the Makefile) config files but used the wrong file name of
	$(TOPDIR)/board/$(BOARDDIR)/config.tmp
instead if the correct
	$(OBJTREE)/board/$(BOARDDIR)/config.tmp

The bug is nasty because the build result is correct for the (normal)
in-tree builds, and because 'sinclude' is used no errors get raised
even for out-of-tree build tests. But out-of-tree builds use an
incomplete and thus usually incorrect configuration...
Signed-off-by: NWolfgang Denk <wd@denx.de>

This patch fixes the canyonlands config.mk file to enable correct
out-of-tree builds. Thanks to Wolfgang Denk for spotting this.
Signed-off-by: NStefan Roese <sr@denx.de>

Canyonlands has a file ddr2_fixed.c which needs special treatment when
building in separate directory. It has to be linked to build directory
otherwise it is not seen.
Signed-off-by: NStefan Roese <sr@denx.de>

Signed-off-by: NWolfgang Denk <wd@denx.de>

Signed-off-by: NWolfgang Denk <wd@denx.de>

Canyonlands has a file ddr2_fixed.c which needs special treatment when
building in separate directory. It has to be linked to build directory
otherwise it is not seen.
Signed-off-by: NStefan Roese <sr@denx.de>

Signed-off-by: NWolfgang Denk <wd@denx.de>

Signed-off-by: NStefan Roese <sr@denx.de>

This reverts commit 55774b51
which broke many PowerPC boards.

This reverts commit 1b5605ca
which breaks building on all PPC boards that don't use a log buffer.

Calculation of tail was incorrect when size % 4 == 0.

New code removes the conditional and does the same thing but with arithmetic
Signed-off-by: NNick Spence <nick.spence@freescale.com>

This reverts commit c0559be3
which is known to break booting from dataflash and NAND.

Signed-off-by: NJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

When using dhcp/bootp the "netmask" environment variable is not set
because CONFIG_BOOTP_SUBNETMASK is not defined. But usually this is
desireable, so the following patch adds this this option to the board
config.
Signed-off-by: NMarkus Klotzbuecher <mk@denx.de>
Signed-off-by: NStefan Roese <sr@denx.de>

This patch reworks the default environment on Makalu. Now "net_nfs" for
example uses the device-tree style booting formerly know as "net_nfs_fdt".
Also the addresses in RAM were changed because of the new image booting
support, which check for image overwriting. So the addresses needed to
get adjusted.
Signed-off-by: NStefan Roese <sr@denx.de>

map_physmem currently generates a warning when CONFIG_PHYS_64BIT is
enabled.  This quiets the warning.
Signed-off-by: NBecky Bruce <Becky.Bruce@freescale.com>

Physical addrs need to be represented by phys_addr_t, not
unsigned long.  Otherwise, systems that use CONFIG_PHYS_64BIT
are going to fail mightily.
Signed-off-by: NBecky Bruce <becky.bruce@freescale.com>

This patch enables legacy multi-type images containing only a Linux kernel
and root file system to be loaded, maintaining compatibility with previous
versions of u-boot.

This is required when using old image files such as a Linux 2.4 kernel /
filesystem.
Signed-off-by: NNick Spence <nick.spence@freescale.com>
Acked-by: NBartlomiej Sieka <tur@semihalf.com>

Signed-off-by: NWolfgang Denk <wd@denx.de>

Signed-off-by: NWolfgang Denk <wd@denx.de>

When applying the AT91CAP9 patches upstream, something transformed
the '@' character into the ' <at> ' sequence.

The patch below restores the original form in all the places where
it has been modified (the AT91CAP9 files, the AT91SAM9260 files which
were copied from AT91CAP9, and a couple of other files where the
' <at> ' sequence was present).
Signed-off-by: NStelian Pop <stelian@popies.net>

When doing the AT91CAP9/AT91SAM9 port, a number of header files were
copied from the Linux kernel sources. This patch explicitly specifies
this origin for all the copied headers, and for those missing copyright
information, adds it.

Additionaly, the header file 'at91sam926x_mc.h' has been superceeded
in the latest kernel sources by 'at91sam9_smc.h'.

The copyright information has been confirmed by the AT91 Linux kernel
maintainer, Andrew Victor <avictor.za@gmail.com>.
Signed-off-by: NStelian Pop <stelian@popies.net>