From: Nikita Kiryanov <nikita@compulab.co.il>
Date: Sun, 21 Feb 2016 11:59:20 +0000 (+0200)
Subject: arm: am437x: cm-t43: bring back BOOTDELAY feature
X-Git-Tag: v2016.03-rc3~30
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4b8f4892890b3921453fa81889d6233343577ab1;p=oweals%2Fu-boot.git

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>
---

diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h
index ae15095837..1c1951c4c5 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