summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNikita Kiryanov <nikita@compulab.co.il>2016-02-21 13:59:20 +0200
committerTom Rini <trini@konsulko.com>2016-02-24 18:44:10 -0500
commit4b8f4892890b3921453fa81889d6233343577ab1 (patch)
treed3f4809cadeb815bf8f8a8d28b1d45d870f85025 /include
parent7d751d661afa526f4433bafa4ce8fe49bc310bdc (diff)
downloadu-boot-imx-4b8f4892890b3921453fa81889d6233343577ab1.zip
u-boot-imx-4b8f4892890b3921453fa81889d6233343577ab1.tar.gz
u-boot-imx-4b8f4892890b3921453fa81889d6233343577ab1.tar.bz2
arm: am437x: cm-t43: bring back BOOTDELAY feature
Commit 755324 (configs: Use config_distro_defaults.h in ti_armv7_common.h) made ti_armv7_common.h include config_distro_defaults.h. This breaks the bootdelay feature in cm_t43 because now the - #include ti_armv7_common.h (#define CONFIG_BOOTDELAY 1) - #undef CONFIG_BOOTDELAY - #include config_distro_defaults.h (#define CONFIG_BOOTDELAY 2) dance in cm_t43.h is no longer valid and in fact leads to CONFIG_BOOTDELAY not being defined. Adapt the config file to the new inclusion hierarchy. Cc: Tom Rini <trini@konsulko.com> Cc: Albert Aribaud <albert.u.boot@aribaud.net> Cc: Igor Grinberg <grinberg@compulab.co.il> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il> Reviewed-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include')
-rw-r--r--include/configs/cm_t43.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h
index ae15095..1c1951c 100644
--- a/include/configs/cm_t43.h
+++ b/include/configs/cm_t43.h
@@ -98,10 +98,8 @@
#undef CONFIG_SPL_OS_BOOT
#undef CONFIG_SPL_GPIO_SUPPORT
#undef CONFIG_SPL_NAND_SUPPORT
-#undef CONFIG_BOOTDELAY
#undef CONFIG_SYS_MONITOR_LEN
#undef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR
-#include <config_distro_defaults.h>
#define CONFIG_ZERO_BOOTDELAY_CHECK
#undef CONFIG_CMD_IMLS