diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-11-09 12:51:47 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-11-09 22:59:47 +0100 |
| commit | 85b8c5c4bf80025de4632ae6c9a8a606e51508a4 (patch) | |
| tree | 7a89b428296ab5baca8f07c4019e3485e452cf42 /include/configs/cm_t35.h | |
| parent | 15c5cdf5aa6b292145e5e3e220ec1f42b11eff6f (diff) | |
| parent | 3285d4ca197928a048d3dda86751b5d26e6e0e86 (diff) | |
| download | u-boot-imx-85b8c5c4bf80025de4632ae6c9a8a606e51508a4.zip u-boot-imx-85b8c5c4bf80025de4632ae6c9a8a606e51508a4.tar.gz u-boot-imx-85b8c5c4bf80025de4632ae6c9a8a606e51508a4.tar.bz2 | |
Merge branch 'iu-boot/master' into 'u-boot-arm/master'
Conflicts:
arch/arm/cpu/arm926ejs/mxs/Makefile
board/compulab/cm_t35/Makefile
board/corscience/tricorder/Makefile
board/ppcag/bg0900/Makefile
drivers/bootcount/Makefile
include/configs/omap4_common.h
include/configs/pdnb3.h
Makefile conflicts are due to additions/removals of
object files on the ARM branch vs KBuild introduction
on the main branch. Resolution consists in adjusting
the list of object files in the main branch version.
This also applies to two files which are not listed
as conflicting but had to be modified:
board/compulab/common/Makefile
board/udoo/Makefile
include/configs/omap4_common.h conflicts are due to
the OMAP4 conversion to ti_armv7_common.h on the ARM
side, and CONFIG_SYS_HZ removal on the main side.
Resolution is to convert as this icludes removal of
CONFIG_SYS_HZ.
include/configs/pdnb3.h is due to a removal on ARM side.
Trivial resolution is to remove the file.
Note: 'git show' will also list two files just because
they are new:
include/configs/am335x_igep0033.h
include/configs/omap3_igep00x0.h
Diffstat (limited to 'include/configs/cm_t35.h')
| -rw-r--r-- | include/configs/cm_t35.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 38fe064..516ef7f 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -23,6 +23,7 @@ #define CONFIG_OMAP /* in a TI OMAP core */ #define CONFIG_OMAP34XX /* which is a 34XX */ #define CONFIG_OMAP_GPIO +#define CONFIG_CMD_GPIO #define CONFIG_CM_T3X /* working with CM-T35 and CM-T3730 */ #define CONFIG_OMAP_COMMON @@ -169,7 +170,7 @@ #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */ /* devices */ /* Environment information */ -#define CONFIG_BOOTDELAY 10 +#define CONFIG_BOOTDELAY 3 #define CONFIG_ZERO_BOOTDELAY_CHECK #define CONFIG_EXTRA_ENV_SETTINGS \ |