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

The MCC200 board config file includes version.h for some customer-
specific setting, which causes warnings with "make depend"; build
version.h before depend.
Signed-off-by: NWolfgang Denk <wd@denx.de>

With recent toolchains, the environment sectors were no longer aligned to
sector boundaries. The reason was a combination of two bugs:

1) common/environment.c assumed that CONFIG_TQM8xxL would be defined
   for all TQM8xxL and TQM8xxM boards. But "include/common.h", where
   this gets defined, is not included here (and cannot be included
   without causing lots of problems).

   Added a new #define CFG_USE_PPCENV for all boards which really
   want to put the environment is a ".ppcenv" section.

2) The linker scripts just include environment.o, silently assuming
   that the objects in that file are really in the order in which
   they are coded in the C file, i. e. "environment" first, then
   "redundand_environment", and "env_size" last. However, current
   toolchains (GCC-4.x) reorder the objects, causing the environment
   data not to start on a flash sector boundary:

   Instead of:					we got:

	40008000 T environment			40008000 T env_size
	4000c000 T redundand_environment	40008004 T redundand_environment
	40010000 T env_size			4000c004 T environment

   Note: this patch fixes just the first part, and cures the alignment
   problem by making sure that "env_size" gets placed correctly. However,
   we still have a potential issue because primary and redundant
   environment sectors are actually swapped, i. e. we have now:

	40008000 T redundand_environment
	4000c000 T environment
	40010000 T env_size

   This shall be fixed in the next version.
Signed-off-by: NWolfgang Denk <wd@denx.de>

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

Fixup for the break statement in wrong place.

[Patch by urwithsughosh@gmail.com]
Acked-by: NAndy Fleming <afleming@freescale.com>
Signed-off-by: NWolfgang Denk <wd@denx.de>

Fix usage of do_div() in nand erase|read|write process output.

The last patch to nand_util.c introduced do_div() instead of libgcc's
implementation. But do_div() returns the quotient in its first
macro parameter and not as result.
Signed-off-by: NMatthias Fuchs <matthias.fuchs@esd-electronics.com>

This config option sets the default for the progress information
output behavior that can also be configured through the 'quiet'
environment variable.

The legacy NAND code does not print the current progress info
on the console. So this option is for backward compatibility for
units that are in the field and where setting the quiet variable
is not an option. With CFG_NAND_QUIET set to '1' the console
progress info is turned off. This can still be overwritten
through the environment variable.
Signed-off-by: NMatthias Fuchs <matthias.fuchs@esd-electronics.com>

Signed-off-by: NTsiChungLiew <Tsi-Chung.Liew@freescale.com>

Moved the #include <asm/cache.h> inside the #ifdef CONFIG_FSL_PIXIS.
Signed-off-by: NTsiChungLiew <Tsi-Chung.Liew@freescale.com>

MPC834ITX*_config does not store config.tmp at the correct locatation,
causing MPC8349ITXGP to have the wrong TEXT_BASE.
Signed-off-by: NSam Sparks <SSparks@twacs.com>
Signed-off-by: NGrant Likely <grant.likely@secretlab.ca>

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

As discussed in [1], DECLARE_GLOBAL_DATA_PTR has to be global and not
function local.
Signed-off-by: NDirk Behme <dirk.behme@gmail.com>

[1] http://article.gmane.org/gmane.comp.boot-loaders.u-boot/31805

Signed-off-by: NMarian Balakowicz <m8@semihalf.com>

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

scan on second pci bus.
Signed-off-by: NGrzegorz Bernacki <gjb@semihalf.com>

Bamboo has a file sdram.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: NGrzegorz Bernacki <gjb@semihalf.com>

Signed-off-by: NSean McGoogan <Sean.McGoogan@st.com>
---------------------------------------------------

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

- convert frame size settings to be derived from a single base
- set frame size to the recommended default value
Signed-off-by: NGrzegorz Bernacki <gjb@semihalf.com>

Signed-off-by: NKyungmin Park <kyungmin.park@samsung.com>

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

Signed-off-by: NGrant Likely <grant.likely@secretlab.ca>

- 'pciconfighost' is set by default in order to be able to scan bridges
behind the primary host/PCIe

- 'pciscandelay' env variable is recognized to allow for user-controlled
delay before the PCIe bus enumeration; some peripheral devices require a
significant delay before they can be scanned (e.g. LSI8408E); without the
delay they are not detected
Signed-off-by: NGrzegorz Bernacki <gjb@semihalf.com>

- correct configuration space mapping
- correct bus numbering
- better access to config space

Prior to this patch, the 440SPe host/PCIe bridge was able to configure only the
first device on the first bus. We now allow to configure up to 16 buses;
also, scanning for devices behind the PCIe-PCIe bridge is supported, so
peripheral devices farther in hierarchy can be identified.
Signed-off-by: NGrzegorz Bernacki <gjb@semihalf.com>

Convert using fixup mechanism to suppressing MCK for the duration of config
read/write transaction: while fixups work fine with the case of a precise
exception, we identified a major drawback with this approach when there's
an imprecise case. In this scenario there is the following race condition:
the fixup is (by design) set to catch the instruction following the one
actually causing the exception; if an interrupt (e.g. decrementer) happens
between those two instructions, the ISR code is executed before the fixup
handler the machine check is no longer protected by the fixup handler as it
appears as within the ISR code. In consequence the fixup approach is being
phased out and replaced with explicit suppressing of MCK during a PCIe
config read/write cycle.
Signed-off-by: NGrzegorz Bernacki <gjb@semihalf.com>

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

When frame larger than local RX buffer is received, it is split and handled
by two buffer descriptors. Prior to this patch the FEC driver discarded
contents of a buffer descriptor without the 'LAST' bit set, so the first
part of the frame was lost in case of larger frames. This fix allows to
safely combine the two pieces into the whole frame.
Signed-off-by: NGrzegorz Bernacki <gjb@semihalf.com>

Signed-off-by: NRafal Jaworowski <raj@semihalf.com>

This patch add support for the Trizeps IV module (520Mhz).
Signed-off-by: NStefano Babic <sbabic@denx.de>

This patch adds support for multiple serial ports to the PXA target.
FFUART, BTUART and STUART are supported.
Signed-off-by: NStefano Babic <sbabic@denx.de>

Code is broken for PXA270 due to "invalid lvalue in assignment".

This patch fix it in pxa-regs.h
Signed-off-by: NStefano Babic <sbabic@denx.de>

Signed-off-by: NJason Jin <Jason.jin@freescale.com>

Stop using inline string functions on MIPS as other ARCHs do so,
since the optimized inline asm versions are not small.

This change is triggered by a following MIPS build error:
common/libcommon.a(exports.o)(.text+0xdc): In function `jumptable_init':
common/exports.c:32: undefined reference to `strcmp'
make: *** [u-boot] Error 1
Signed-off-by: NShinya Kuribayashi <shinya.kuribayashi@necel.com>

This patches contains several bugfixes and cleanups in the latest upstream:

 - Don't include linux/config.h
 - Remove buggy inline version of memscan.
 - Merge with Linux 2.6.11-rc3.
 - Fix undefined reference to strcpy in binfmt_misc caused by gcc 3.4.
 - Goodbye mips64.  31704 lines of code bite the dust.
 - Replace extern inline with static inline.
 - Fix return value of strncpy.
 - Remove a bunch more "$1" clobbers.
Signed-off-by: NShinya Kuribayashi <shinya.kuribayashi@necel.com>

Fix incorrect blob address calculation in do_bootm_linux() that prevents
booting the kernel from a multi-file image (kernel + initrd + blob).

Also, make minor updates to the U-Boot's output and to the coding style.
Signed-off-by: NBartlomiej Sieka <tur@semihalf.com>