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

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

2014-08-11T08:21:03Z

Conflicts: boards.cfg Signed-off-by: Stefano Babic

i.MX31 PDK: Enable generic board for i.MX31 PDK

2014-08-08T08:29:41Z

Enable CONFIG_SYS_GENERIC_BOARD for the i.MX31 PDK board. Tested on actual hardware. Signed-off-by: Magnus Lilja Acked-by: Fabio Estevam

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

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

configs: imx: Make CONFIG_SYS_PROMPT uniform across FSL boards

2013-11-13T09:09:09Z

There is no real benefit in adding the board name into U-boot's prompt, so remove the custom CONFIG_SYS_PROMPT definitions so that the standard "=> " prompt is used across FSL boards. Signed-off-by: Fabio Estevam

config: remove platform CONFIG_SYS_HZ definition part 2/2

2013-11-04T16:06:16Z

Remove platform CONFIG_SYS_HZ definition for configs a-z*. Signed-off-by: Rob Herring

Coding Style cleanup: remove trailing white space

2013-10-14T20:06:53Z

Signed-off-by: Wolfgang Denk

Add GPL-2.0+ SPDX-License-Identifier to source files

2013-07-24T13:44:38Z

Signed-off-by: Wolfgang Denk [trini: Fixup common/cmd_io.c] Signed-off-by: Tom Rini

mx31pdk: add CONFIG_SPL_LIBGENERIC_SUPPORT

2013-05-01T20:24:02Z

In order to use the generic hang() later on pull libgeneric in SPL. This has no impact on the SPL size. Signed-off-by: Andreas Bießmann

mx31pdk: Remove watchdog support

2013-04-12T06:47:42Z

The conversion of mx31pdk to SPL NAND fixed the boot issue, but we start seeing resets in loop, which prevents us from reaching the U-boot prompt. Until the proper fix can be identified, disable watchdog, so that mx31pdk can be functional again. Signed-off-by: Fabio Estevam Acked-by: Stefano Babic