[U-Boot] [PATCH] arm: am437x: cm-t43: bring back BOOTDELAY feature

2016-02-21 Thread Nikita Kiryanov 
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 
Cc: Albert Aribaud 
Cc: Igor Grinberg 
Signed-off-by: Nikita Kiryanov 
---
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(-)

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 
 #define CONFIG_ZERO_BOOTDELAY_CHECK
 #undef CONFIG_CMD_IMLS
 
-- 
1.9.1

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Re: [U-Boot] [PATCH] arm: am437x: cm-t43: bring back BOOTDELAY feature

2016-02-21 Thread Tom Rini 
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 
> Cc: Albert Aribaud 
> Cc: Igor Grinberg 
> Signed-off-by: Nikita Kiryanov 

Reviewed-by: Tom Rini 

-- 
Tom


signature.asc
Description: Digital signature
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot