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

mpc83xx: CONFIG_83XX_GENERIC_PCI is now synonymous with CONFIG_PCI; remove the former

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

mpc83xx: MPC8315ERDB: Use hwconfig for board type selection

This patch simply converts the board to the hwconfig infrastructure.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Acked-by:

mpc83xx: MPC8315ERDB: Use hwconfig for board type selection

This patch simply converts the board to the hwconfig infrastructure.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Acked-by: Kim Phillips <kim.phillips@freescale.com>

show more ...

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

mpc83xx: set 64BIT_VSPRINTF for boards using nand_util

When enabling NAND support for a board, one must also define
CONFIG_SYS_64BIT_VSPRINTF because this is needed in nand_util.c
for correct output

mpc83xx: set 64BIT_VSPRINTF for boards using nand_util

When enabling NAND support for a board, one must also define
CONFIG_SYS_64BIT_VSPRINTF because this is needed in nand_util.c
for correct output.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Cc: Dave Liu <daveliu@freescale.com>
Cc: Ron Madrid <ron_madrid@sbcglobal.net>
Cc: Anton Vorontsov <avorontsov@ru.mvista.com>

show more ...

Merge branch 'next' of ../master

mpc83xx: 8315erdb: Add USB related CONFIGs

This patch adds CONFIGs for enabling USB in mpc8315erdb and also
adds usb_phy_type in CONFIG_EXTRA_ENV_SETTINGS. Also revamps its
Copyright.

Signed-off-by

mpc83xx: 8315erdb: Add USB related CONFIGs

This patch adds CONFIGs for enabling USB in mpc8315erdb and also
adds usb_phy_type in CONFIG_EXTRA_ENV_SETTINGS. Also revamps its
Copyright.

Signed-off-by: Vivek Mahajan <vivek.mahajan@freescale.com>
Signed-off-by: Remy Bohmer <linux@bohmer.net>

show more ...

83xx: Replace CONFIG_MPC83[0-9]X with MPC83[0-9]x

Use the standard lowercase "x" capitalization that other Freescale
architectures use for CPU defines to prevent confusion and errors

Signed-off-by:

83xx: Replace CONFIG_MPC83[0-9]X with MPC83[0-9]x

Use the standard lowercase "x" capitalization that other Freescale
architectures use for CPU defines to prevent confusion and errors

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>

show more ...

83xx: Replace CONFIG_MPC83XX with CONFIG_MPC83xx

Use the standard lowercase "xx" capitalization that other Freescale
architectures use for CPU defines to prevent confusion and errors

Signed-off-by:

83xx: Replace CONFIG_MPC83XX with CONFIG_MPC83xx

Use the standard lowercase "xx" capitalization that other Freescale
architectures use for CPU defines to prevent confusion and errors

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>

show more ...

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

rename CONFIG_CMD_ENV to CONFIG_CMD_SAVEENV

The CONFIG_CMD_ENV option controls enablement of the `saveenv` command
rather than a generic "env" command, or anything else related to the
environment.

rename CONFIG_CMD_ENV to CONFIG_CMD_SAVEENV

The CONFIG_CMD_ENV option controls enablement of the `saveenv` command
rather than a generic "env" command, or anything else related to the
environment. So, let's make sure the define is named accordingly.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

show more ...

Merge git://git.denx.de/u-boot into u-boot

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

Merge branch 'next'

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

NAND: rename NAND_MAX_CHIPS to CONFIG_SYS_NAND_MAX_CHIPS

This patch renames NAND_MAX_CHIPS to CONFIG_SYS_NAND_MAX_CHIPS and
changes the default from 8 to 1 for the legacy and the new MTD
NAND layer.

NAND: rename NAND_MAX_CHIPS to CONFIG_SYS_NAND_MAX_CHIPS

This patch renames NAND_MAX_CHIPS to CONFIG_SYS_NAND_MAX_CHIPS and
changes the default from 8 to 1 for the legacy and the new MTD
NAND layer. This allows to remove all NAND_MAX_CHIPS definitions
in the board config files because none of the boards use multi
chip support (NAND_MAX_CHIPS > 1) so far. The bamboo and the DU440
define

#define NAND_MAX_CHIPS CONFIG_SYS_MAX_NAND_DEVICE

but that's bogus and did not work anyhow.

Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>

show more ...

mpc83xx: enable eLBC NAND support for MPC8315ERDB board

Signed-off-by: Dave Liu <daveliu@freescale.com>

mpc83xx: Add PCI-E support for MPC8315ERDB boards

MPC8315ERDB boards features PCI-E x1 and Mini PCI-E x1 ports. Let's
support them.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-

mpc83xx: Add PCI-E support for MPC8315ERDB boards

MPC8315ERDB boards features PCI-E x1 and Mini PCI-E x1 ports. Let's
support them.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>

show more ...

Merge branch 'fixes' into cleanups

Conflicts:

board/atmel/atngw100/atngw100.c
board/atmel/atstk1000/atstk1000.c
cpu/at32ap/at32ap700x/gpio.c
include/asm-avr32/arch-at32ap700x/clk.h
include/con

Merge branch 'fixes' into cleanups

Conflicts:

board/atmel/atngw100/atngw100.c
board/atmel/atstk1000/atstk1000.c
cpu/at32ap/at32ap700x/gpio.c
include/asm-avr32/arch-at32ap700x/clk.h
include/configs/atngw100.h
include/configs/atstk1002.h
include/configs/atstk1003.h
include/configs/atstk1004.h
include/configs/atstk1006.h
include/configs/favr-32-ezkit.h
include/configs/hammerhead.h
include/configs/mimc200.h

show more ...

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

mpc83xx: Improve the performance of DDR memory

modify the CAS timings. my understanding is that these
settings decrease various wait times in the DDR interface.
Because these wait times are in clock

mpc83xx: Improve the performance of DDR memory

modify the CAS timings. my understanding is that these
settings decrease various wait times in the DDR interface.
Because these wait times are in clock cycles, and the DDR
clock on the 8315 RDB runs slower than on some other 83xx
platforms, we can dial down these values without a problem,
thereby decreasing the latency of memory a little.

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

show more ...

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

Merge git://git.denx.de/u-boot into x1

Conflicts:

drivers/usb/usb_ohci.c

Merge 'next' branch

Conflicts:

board/freescale/mpc8536ds/mpc8536ds.c
include/configs/mgcoge.h

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

rename CFG_ macros to CONFIG_SYS

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