diff options
| author | Nikita Kiryanov <nikita@compulab.co.il> | 2016-02-21 13:59:20 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-02-24 18:44:10 -0500 |
| commit | 4b8f4892890b3921453fa81889d6233343577ab1 (patch) | |
| tree | d3f4809cadeb815bf8f8a8d28b1d45d870f85025 | |
| parent | 7d751d661afa526f4433bafa4ce8fe49bc310bdc (diff) | |
| download | talos-obmc-uboot-4b8f4892890b3921453fa81889d6233343577ab1.tar.gz talos-obmc-uboot-4b8f4892890b3921453fa81889d6233343577ab1.zip | |
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>
| -rw-r--r-- | include/configs/cm_t43.h | 2 |
1 files changed, 0 insertions, 2 deletions
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 |
