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 3096576836addf602971e6ea492c9588d55d9a31..a657927e06f5d4c275a8a7739dbaf5e534c170e8 100644 (file)
--- a/include/env_default.h
+++ b/include/env_default.h
@@ -1,17 +1,17 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2000-2010
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
  * (C) Copyright 2001 Sysgo Real-Time Solutions, GmbH <www.elinos.com>
  * Andreas Heppel <aheppel@sysgo.de>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <env_callback.h>
+#include <linux/stringify.h>
 
 #ifdef DEFAULT_ENV_INSTANCE_EMBEDDED
-env_t environment __PPCENV__ = {
+env_t embedded_environment __UBOOT_ENV_SECTION__(environment) = {
        ENV_CRC,        /* CRC Sum */
 #ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT
        1,              /* Flags: valid */
@@ -22,13 +22,14 @@ static char default_environment[] = {
 #else
 const uchar default_environment[] = {
 #endif
+#ifndef CONFIG_USE_DEFAULT_ENV_FILE
 #ifdef CONFIG_ENV_CALLBACK_LIST_DEFAULT
        ENV_CALLBACK_VAR "=" CONFIG_ENV_CALLBACK_LIST_DEFAULT "\0"
 #endif
 #ifdef CONFIG_ENV_FLAGS_LIST_DEFAULT
        ENV_FLAGS_VAR "=" CONFIG_ENV_FLAGS_LIST_DEFAULT "\0"
 #endif
-#ifdef CONFIG_BOOTARGS
+#ifdef CONFIG_USE_BOOTARGS
        "bootargs="     CONFIG_BOOTARGS                 "\0"
 #endif
 #ifdef CONFIG_BOOTCOMMAND
@@ -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)
@@ -74,7 +75,7 @@ const uchar default_environment[] = {
        "netmask="      __stringify(CONFIG_NETMASK)     "\0"
 #endif
 #ifdef CONFIG_HOSTNAME
-       "hostname="     __stringify(CONFIG_HOSTNAME)    "\0"
+       "hostname="     CONFIG_HOSTNAME "\0"
 #endif
 #ifdef CONFIG_BOOTFILE
        "bootfile="     CONFIG_BOOTFILE                 "\0"
@@ -90,9 +91,13 @@ const uchar default_environment[] = {
 #endif
 #ifdef CONFIG_ENV_VARS_UBOOT_CONFIG
        "arch="         CONFIG_SYS_ARCH                 "\0"
+#ifdef CONFIG_SYS_CPU
        "cpu="          CONFIG_SYS_CPU                  "\0"
+#endif
+#ifdef CONFIG_SYS_BOARD
        "board="        CONFIG_SYS_BOARD                "\0"
        "board_name="   CONFIG_SYS_BOARD                "\0"
+#endif
 #ifdef CONFIG_SYS_VENDOR
        "vendor="       CONFIG_SYS_VENDOR               "\0"
 #endif
@@ -100,10 +105,16 @@ 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
        "\0"
+#else /* CONFIG_USE_DEFAULT_ENV_FILE */
+#include "generated/defaultenv_autogenerated.h"
+#endif
 #ifdef DEFAULT_ENV_INSTANCE_EMBEDDED
        }
 #endif