u-boot.git/include/configs, branch v2014.10-rc1

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

2014-08-06T12:38:18Z

kmp204x: CPU watchdog enabled

2014-08-01T21:18:34Z

The booting of the board is now protected by the CPU watchdog. A failure during the boot phase will end up in board reset. Signed-off-by: Rainer Boschung Reviewed-by: York Sun

ARM: kirkwood: add mvsdio driver

2014-08-01T15:44:56Z

This patch add Marvell kirkwood MVSDIO/MMC driver and enable it for Sheevaplugs and OpenRD boards. Signed-off-by: Gerald Kerma Reviewed-by: Stefan Roese Acked-by: Pantelis Antoniou

include: remove CONFIG_SPL/CONFIG_TPL definition in config headers

2014-07-30T18:42:03Z

Now CONFIG_SPL and CONFIG_TPL are defined in Kconfig. Remove the redundant definition in config headers. Signed-off-by: Masahiro Yamada Reviewed-by: Simon Glass

kconfig: delete redundant CONFIG_${ARCH} definition

2014-07-30T18:42:02Z

CONFIG_${ARCH} is defined by Kconfig. Signed-off-by: Masahiro Yamada Reviewed-by: Simon Glass

include: define CONFIG_SPL and CONFIG_TPL as 1

2014-07-30T12:48:02Z

We are about to switch to Kconfig in the next commit. But there are something to get done beforehand. In Kconfig, include/generated/autoconf.h defines boolean CONFIG macros as 1. CONFIG_SPL and CONFIG_TPL, if defined, must be set to 1. Otherwise, when switching to Kconfig, the build log would be sprinkled with warning messages like this: warning: "CONFIG_SPL" redefined [enabled by default] Signed-off-by: Masahiro Yamada Reviewed-by: Simon Glass

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

2014-07-29T13:41:35Z

Merge git://www.denx.de/git/u-boot-ppc4xx

2014-07-28T21:48:48Z

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

2014-07-28T18:54:29Z

Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'

2014-07-28T10:26:21Z