| Message ID | 1456055960-17039-1-git-send-email-nikita@compulab.co.il |
|---|---|
| State | Accepted |
| Commit | 4b8f4892890b3921453fa81889d6233343577ab1 |
| Delegated to: | Tom Rini |
| Headers | show |
On Sun, Feb 21, 2016 at 01:59:20PM +0200, Nikita Kiryanov wrote: > 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>
On Sun, Feb 21, 2016 at 01:59:20PM +0200, Nikita Kiryanov wrote: > 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> Applied to u-boot/master, thanks!
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
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> --- NOTE: this patch depends on the cm-t43 maintenance series: https://www.mail-archive.com/u-boot@lists.denx.de/msg204112.html include/configs/cm_t43.h | 2 -- 1 file changed, 2 deletions(-)