Conflicts:

	include/configs/socrates.h
Signed-off-by: NWolfgang Denk <wd@denx.de>

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

In case of several PCI USB controllers on a board this variable
specifys which controller to use.
See doc/README.generic_usb_ohci for details.
Signed-off-by: NSergei Poselenov <sposelenov@emcraft.com>

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

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

Signed-off-by: NChristian Eggers <ceggers@gmx.de>
Signed-off-by: NMarkus Klotzbuecher <mk@denx.de>

Signed-off-by: NChristian Eggers <ceggers@gmx.de>
Signed-off-by: NMarkus Klotzbuecher <mk@denx.de>

Add new configuration variable CONFIG_PCI_OHCI_DEVNO.
In case of several PCI USB controllers on a board this variable
specifys which controller to use.

Also add USB support for sokrates board.

See doc/README.generic_usb_ohci for details.
Signed-off-by: NSergei Poselenov <sposelenov@emcraft.com>
Signed-off-by: NMarkus Klotzbuecher <mk@denx.de>

introduced by 53677ef1 "Big white-space cleanup."
Signed-off-by: NWolfgang Denk <wd@denx.de>

Reuse the existing DIU driver in board/freescale/common.
Signed-off-by: NYork Sun <yorksun@freescale.com>

Add DIU and cfb console support to FSL 5121ADS board.

Use #define CONFIG_VIDEO in config file to enable fb console.
Signed-off-by: NYork Sun <yorksun@freescale.com>

Remove DPRINTF macro and replace it with generic debug macro.
Signed-off-by: NYork Sun <yorksun@freescale.com>

The clock divider has different format in 5121 and 8610. This patch moves it to
board specific code.
Signed-off-by: NYork Sun <yorksun@freescale.com>

This commit gets rid of a huge amount of silly white-space issues.
Especially, all sequences of SPACEs followed by TAB characters get
removed (unless they appear in print statements).

Also remove all embedded "vim:" and "vi:" statements which hide
indentation problems.
Signed-off-by: NWolfgang Denk <wd@denx.de>

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

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

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

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

POST: replace the LOGBUFF_INITIALIZED flag in gd->post_log_word (1 << 31) with the GD_FLG_LOGINIT flag in gd->flags.

This way we become able to utilize the full post_log_word for POST
activities (overwise, POST ECC, which has 0x8000 ID, could be
erroneously treated as started in post_output_backlog() even if there
was actually no POST ECC run (because of OCM POST failure, for
example).
Signed-off-by: NYuri Tikhonov <yur@emcraft.com>

Signed-off-by: NIlya Yanok <yanok@emcraft.com>

Don't run futher tests in case of a test fails that is marked as
POST_STOP.
Signed-off-by: NIlya Yanok <yanok@emcraft.com>
Signed-off-by: NYuri Tikhonov <yur@emcraft.com>

Switch the OCM testid with the codec one. The reason is that current
implementation requires the POST_ROM testid to fit into lower 16
bits, and the codec test will never run with POST_ROM hopefully.
Signed-off-by: NIlya Yanok <yanok@emcraft.com>

Signed-off-by: NIlya Yanok <yanok@emcraft.com>

Added OCM test to POST layer. This version runs before all other tests
but doesn't yet interrupt post sequence on failure.
Signed-off-by: NIlya Yanok <yanok@emcraft.com>
Signed-off-by: NYuri Tikhonov <yur@emcraft.com>

Signed-off-by: NIlya Yanok <yanok@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>