API: Provide dummy halt() in the glue layer.

This fixes a demo app link failure on platforms configured with CONFIG_PANIC_HANG.

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

API: Convert conditional building to the new scheme.

This fixes a build breakage with CONFIG_API enabled, which appeared after
the recent changes in the U-Boot build system.

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

inka4x0: remove dead code

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

Coding Style Cleanup; update CHANGELOG

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

Merge ../custodians

Merge branch 'master' of git://www.denx.de/git/u-boot-ixp

Merge ../custodians

Merge branch 'master' of git://www.denx.de/git/u-boot-mips

Merge ../custodians

Merge branch 'master' of git://www.denx.de/git/u-boot-sh

Merge ../custodians

Merge branch 'master' of git://www.denx.de/git/u-boot-avr32

Coding Style Cleanup; update CHANGELOG

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

Merge branch 'master' of git://www.denx.de/git/u-boot-coldfire

Merge branch 'master' of git://www.denx.de/git/u-boot-net

Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx

Merge branch 'master' of git://www.denx.de/git/u-boot-mpc86xx

Merge branch 'master' of git://www.denx.de/git/u-boot-mpc85xx

mpc83xx: Correct the struct spi8xxx in mpc8xxx_spi.h

The commit 04a9e1180ac76a7bacc15a6fcd95ad839d65bddb
cause the 83xx immap broken, so the DMA and PCI will
be failed.

The patch fix the struct spi8xxx and rm struct spi83xx.

Signed-off-by: Dave Liu <daveliu@freescale.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>

Merge branch 'master' of git://www.denx.de/git/u-boot

AVR32: ATNGW100 board support

Add support for the ATNGW100 Network Gateway reference design,
including flash, ethernet and MMC support.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>

AVR32: Initialize ipaddr, loadaddr and bootfile at startup

I don't know why the relevant layers can't do this by itself, but this
is what ppc does.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>

Add AcTux board support

Hi,

The patch adds 4 boards, called AcTux-1 .. AcTux-4. This patch contains the
files that
contain changes for multiple boards, the board-specific files follow as
separate patches.

Signed-off-by: Michael Schwingen <michael@schwingen.org>

add AcTux-4 board support

Signed-off-by: Michael Schwingen <michael@schwingen.org>

add AcTux-3 board support

Signed-off-by: Michael Schwingen <michael@schwingen.org>

add AcTux-2 board support

Signed-off-by: Michael Schwingen <michael@schwingen.org>

add AcTux-1 board support

Signed-off-by: Michael Schwingen <michael@schwingen.org>

ARM: remove useless function board_post_init

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

IXP: enable RTS

enables the RTS signal with CONFIG_SERIAL_RTS_ACTIVE.
No handshaking is done, but the active RTS signal allows to
connect to the target using a PC which is using RTS/CTS
handshake, and does no harm if the PC is set to ignore RTS.

Signed-off-by: Michael Schwingen <michael@schwingen.org>

IXP: add dynamic microcode addr

allow to load the microde from flash or ram by download it through
the serial or other.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: Stefan Roese <sr@denx.de>

load ixp42x NPE firmware from separate flash block, remove dead code

Hi,

the following patch adds support to move the IXP42X NPE firmware to a
separate flash block, whose start address is defined in
CONFIG_IXP4XX_NPE_EXT_UCODE_BASE. Using that, it is possible to build
NPE-enabled u-boot without copyright problems due to the NPE firmware.

I hope the patch applies, I get whitespace-related differences in the NPE
files due to trailing whitespace in the original versions.

Signed-off-by: Michael Schwingen <michael@schwingen.org>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

Merge branch 'kumar'

ColdFire: MCF547x_8x - Add M5475EVB and M5485EVB support

Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
Signed-off by: John Rigby <jrigby@freescale.com>

ColdFire: MCF547x_8x - Add M547xEVB and M548xEVB board

Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
Signed-off by: John Rigby <jrigby@freescale.com>

ColdFire: Add MCF547x_8x FEC driver

Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Signed-off by: John Rigby <jrigby@freescale.com>

ColdFire: Add MCF547x_8x dma code and header files

Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
Signed-off by: John Rigby <jrigby@freescale.com>

ColdFire: Add MCF547x_8x dma code - 2

Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
Signed-off by: John Rigby <jrigby@freescale.com>

ColdFire: Add MCF547x_8x dma code - 1

Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
Signed-off by: John Rigby <jrigby@freescale.com>

ColdFire: Add MCF547x_8x related header files

Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Signed-off by: John Rigby <jrigby@freescale.com>

ColdFire: Add MCF547x_8x cpu arch

Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
Signed-off by: John Rigby <jrigby@freescale.com>

ColdFire: Add MCF5227x cpu and M52277EVB support-3

Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
Signed-off by: John Rigby <jrigby@freescale.com>

ColdFire: Add MCF5227x cpu and MCF52277EVB support-2

Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
Signed-off by: John Rigby <jrigby@freescale.com>

ColdFire: Add MCF5227x cpu and M52277EVB support-1

Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
Signed-off by: John Rigby <jrigby@freescale.com>

ColdFire: Fix CFI Flash low level Read/Write macro

Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
Signed-off by: John Rigby <jrigby@freescale.com>

ColdFire: Add M5373EVB platform support - 2

Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
Signed-off by: John Rigby <jrigby@freescale.com>

ColdFire: Add M5373EVB platform support - 1

Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
Signed-off by: John Rigby <jrigby@freescale.com>

ColdFire: Update FlexBus CS for MCF532x

Definition update and change from 16bit to 32bit

Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
Signed-off by: John Rigby <jrigby@freescale.com>

ColdFire: PCI and misc updates for MCF5445x

Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
Signed-off by: John Rigby <jrigby@freescale.com>

ColdFire: MCF5445x header files cleanup

Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
Signed-off by: John Rigby <jrigby@freescale.com>

ColdFire: MCF532x header files cleanup

Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
Signed-off by: John Rigby <jrigby@freescale.com>

ColdFire: Add modules header files

Add CF specific modules header files

Signed-off-by: TsiChung Liew <Tsi-Chung.Liew@freescale.com>
Signed-off-by: John Rigby <jrigby@freescale.com>

codingstyle cleanup for spi driver

..and rm unused CONFIG_FSL_SPI define

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>

FSL: Fix common EEPROM_data structure definition

- Fix EEPROM_data structure definition according to System EEPROM Data Format.
- Read MAC addresses from EEPROM to ethXaddr before saving ethXaddr to
  bd->bi_ethaddr.

Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>

86xx: enable command-line editing

Enable command-line editing for all MPC86xx boards.

Signed-off-by: Timur Tabi <timur@freescale.com>

Implement hard SPI driver on MPC8349EMDS

This patch implements the fsl_spi driver on the MPC8349EMDS evaluation board.
This board has an ST M25P40 4Mbit EEPROM on its SPI bus

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>

Add support for a Freescale non-CPM SPI controller

This patch adds support for the SPI controller found on Freescale PowerPC
processors such as the MCP834x family.  Additionally, a new config option,
CONFIG_HARD_SPI, is added for general purpose SPI controller use.

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>

mpc83xx: Fix the fatal conflict of merge

The commit 9e89647889cd4b5ada5b5e7cad6cbe55737a08d7
will cause the mpc8315erdb board can't boot up.

The patch fix that bug, and remove the duplicated #ifdef
CFG_SPCR_TSECEP code and clean the SCCR_TSEC2 for
MPC8313E processor.

Signed-off-by: Dave Liu <daveliu@freescale.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>

Merge branch 'master' of /home/stefan/git/u-boot/u-boot

Merge Sequoia beautification into Korat code

Signed-off-by: Larry Johnson <lrj@acm.org>

net: add 'ethrotate' environment variable

[PATCH] net: add 'ethrotate' environment variable

This patch replaces the buildtime configuration option
CONFIG_NET_DO_NOT_TRY_ANOTHER through the 'ethrotate' runtime
configuration veriable. See README.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>

ppc4xx: Fix compilation warnings and coding style issues in HCU4/HCU5

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

sh: Remove CONFIG_COMMANDS from MS7720SE config file

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>

ppc4xx: Netstal HCU4 board: added various fixes and POST

- Moved some common code to netstal/common/nm_bsp.c.
- sdram initialisation goes go netstal/common/fixed_sdram.c.
- Added support for POST.
- Stylistic cleanups (multi-line comments/ enforce 80 colomn width)

Signed-off-by: Niklaus Giger <niklaus.giger@netstal.com>

ppc4xx: netstal/common define routines used by all boards

Added some routines used by all Netstal boards:
- nm_bsp.c: - nm_show_print and
        -  common_misc_init_r
        - set_params_for_sw_install. Very specific code to handle our SW
          installation procedure
- fixed_sdram.c: Common routines for HCU4 (and upcoming) MCU25 boards
  to handle sdram initialization.
- nm.h: Common header

Signed-off-by: Niklaus Giger <niklaus.giger@netstal.com>

ppc4xx: Netstal HCU5 board: added various fixes and POST

- Moved some common code to nestal/common/nm_bsp.c.
- Added support for the vxWorks EDR.
- Enable trace for Lauterbach, if present.
- Added support for POST.
- Stylistic cleanups (multi-line comments/ enforce 80 colomn width)

Signed-off-by: Niklaus Giger <niklaus.giger@netstal.com>

ppc4xx: Netstal HCU5 board. Added POST. Various fixes

- Various fixes
- Reduced rom_size from 384 to 320 kB
- Environment is now in flash
- Added POST
- Support for OF

Signed-off-by: Niklaus Giger <niklaus.giger@netstal.com>

ppc4xx: Netstal HCU4 board. Added POST. Various fixes

- Various fixes
- Reduced rom_size from 384 to 320 kB
- Environment is now in flash
- Added POST
- Support for OF

Signed-off-by: Niklaus Giger <niklaus.giger@netstal.com>

ppc4xx: Complete DU440 board support

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>

ppc4xx: Add DU440 board support

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>

Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master

sh: Update SuperH SCIF driver

This patch fixed wrong SH7720 CPU macro and changed macro that
calculated value of SCBRR register.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>

Set ips dividor to 1/4 of csb clock.

Previous setting cause ips clock to be out of spec. This bug was found by John
Rigby from Freescale.

Signed-off-by: Grzegorz Bernacki <gjb@semihalf.com>

85xx: Get ride of old TLB setup code

Now that all boards have been converted, remove old config code and the
config option for the new style.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

85xx: Convert TQM85xx to new TLB setup

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

85xx: Convert STXGP3 & STXSSA to new TLB setup

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

85xx: Convert SBC8540/SBC8560/SBC8548 to new TLB setup

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

85xx: Convert PM854/PM856 to new TLB setup

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

85xx: Convert MPC8540EVAL to new TLB setup

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

85xx: Convert MPC8568 MDS to new TLB setup

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

85xx: Convert MPC8541/MPC8555/MPC8548 CDS to new TLB setup

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

85xx: Convert MPC8540/MPC8560 ADS to new TLB setup

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

85xx: Convert ATUM8548 to new TLB setup

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

85xx: Convert MPC8544 DS to new TLB setup

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

85xx: Reworked initial processor init

Reworked the initial processor initialzation sequence:
* introduced cpu_early_init_f that is run in address space 1 (AS=1)
* Moved TLB/LAW and CCSR init into cpu_early_init_f()
* Reworked initial asm code to do most of the core init before TLBs

The main reasons for these changes are to allow handling of 36-bit phys
addresses in the future and some of the issues that will exist when we
do that.

There are a few caveats on what can be initialized via the LAW and TLB
static tables:
* TLB entry 14/15 can't be initialized via the TLB table
* any LAW that covers the implicit boot window (4G-8M to 4G) must map to
  the code that is currently executing.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

85xx: Introduce new tlb API

Add a set of functions to manipulate TLB entries:
 * set_tlb() - write a tlb entry
 * invalidate_tlb() - invalidate a tlb array
 * disable_tlb() - disable a variable size tlb entry
 * init_tlbs() - setup initial tlbs based on static table

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

ppc4xx: Fix remaining CONFIG_COMMANDS in 4xx files

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

85xx: Use proper defines for PCI addresses

We should be using the _MEM_PHYS for LAW and TLB setup and not _MEM_BASE.
While _MEM_BASE & _MEM_PHYS are normally the same, _MEM_BASE should only
be used for configuring the PCI ATMU.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

85xx: Remove old style of LAW init

All boards are now using the new fsl_law code so we can drop the old version.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

85xx: convert remaining 85xx boards over to use new LAW init code

Converted ATUM8548, MPC8568 MDS, MPC8540 EVAL, and TQM85xx boards over
to use new LAW init code.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

85xx: convert STXGP3/STXSSA over to use new LAW init code

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

85xx: convert PM854/PM856 over to use new LAW init code

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

85xx: convert SBC8540/SBC8560/SBC8548 over to use new LAW init code

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

85xx: convert MPC8541/MPC8555/MPC8548 CDS over to use new LAW init code

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

85xx: convert MPC8540/MPC8560 ADS over to use new LAW init code

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

85xx: convert MPC8544 DS over to use new LAW init code

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

85xx: Move LAW init code into C

Move the initialization of the LAWs into C code and provide an API
to allow modification of LAWs after init.

Board code is responsible to provide a law_table and num_law_entries.

We should be able to use the same code on 86xx as well.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

qemu-mips: active HUSH PARSER, AUTO_COMPLETE and CMDLINE_EDITING

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

MIPS:Target support for qemu -M mips

With serial, NE2000, IDE support. Tested in big-endian mode.
Memory size hard-coded to 128M for now, so don't play with
the -m option.

Signed-off-by: Vlad Lungu <vlad@comsys.ro>

Fix nfs command help to reflect that the serverip is optional

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>

bf537-stamp: remove already defined is_zero_ether_addr and is_multicast_ether_addr

and move is_valid_ether_addr board file

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>