arm: dts: imx7: sync with Linux

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

diff --git a/include/env_default.h b/include/env_default.h
index dd741315ba4e0a6f1dd794abda7a81a1e1f55b2e..54d8124793c52dc073e5691b99c18618a4e95435 100644 (file)
--- a/include/env_default.h
+++ b/include/env_default.h
@@ -1,11 +1,10 @@
+/* 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>
@@ -22,6 +21,7 @@ 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
@@ -74,7 +74,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"
@@ -108,6 +108,9 @@ const uchar default_environment[] = {
        CONFIG_EXTRA_ENV_SETTINGS
 #endif
        "\0"
+#else /* CONFIG_USE_DEFAULT_ENV_FILE */
+#include "generated/defaultenv_autogenerated.h"
+#endif
 #ifdef DEFAULT_ENV_INSTANCE_EMBEDDED
        }
 #endif