]> git.ipfire.org Git - people/ms/u-boot.git/commit
arm: am437x: cm-t43: bring back BOOTDELAY feature
authorNikita Kiryanov <nikita@compulab.co.il>
Sun, 21 Feb 2016 11:59:20 +0000 (13:59 +0200)
committerTom Rini <trini@konsulko.com>
Wed, 24 Feb 2016 23:44:10 +0000 (18:44 -0500)
commit4b8f4892890b3921453fa81889d6233343577ab1
treed3f4809cadeb815bf8f8a8d28b1d45d870f85025
parent7d751d661afa526f4433bafa4ce8fe49bc310bdc
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>
include/configs/cm_t43.h