colibri_imx6: fix video stdout in default environment

[oweals/u-boot.git] / include / env_default.h

diff --git a/include/env_default.h b/include/env_default.h
index 54d8124793c52dc073e5691b99c18618a4e95435..a657927e06f5d4c275a8a7739dbaf5e534c170e8 100644 (file)
--- a/include/env_default.h
+++ b/include/env_default.h
@@ -8,9 +8,10 @@
  */
 
 #include <env_callback.h>
+#include <linux/stringify.h>
 
 #ifdef DEFAULT_ENV_INSTANCE_EMBEDDED
-env_t environment __UBOOT_ENV_SECTION__(environment) = {
+env_t embedded_environment __UBOOT_ENV_SECTION__(environment) = {
        ENV_CRC,        /* CRC Sum */
 #ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT
        1,              /* Flags: valid */
@@ -40,7 +41,7 @@ const uchar default_environment[] = {
 #ifdef CONFIG_NFSBOOTCOMMAND
        "nfsboot="      CONFIG_NFSBOOTCOMMAND           "\0"
 #endif
-#if defined(CONFIG_BOOTDELAY) && (CONFIG_BOOTDELAY >= 0)
+#if defined(CONFIG_BOOTDELAY)
        "bootdelay="    __stringify(CONFIG_BOOTDELAY)   "\0"
 #endif
 #if defined(CONFIG_BAUDRATE) && (CONFIG_BAUDRATE >= 0)
@@ -104,6 +105,9 @@ const uchar default_environment[] = {
        "soc="          CONFIG_SYS_SOC                  "\0"
 #endif
 #endif
+#if defined(CONFIG_BOOTCOUNT_BOOTLIMIT) && (CONFIG_BOOTCOUNT_BOOTLIMIT > 0)
+       "bootlimit="    __stringify(CONFIG_BOOTCOUNT_BOOTLIMIT)"\0"
+#endif
 #ifdef CONFIG_EXTRA_ENV_SETTINGS
        CONFIG_EXTRA_ENV_SETTINGS
 #endif