Complete migration of MTDPARTS_DEFAULT / MTDIDS_DEFAULT, include in environment

[platform/kernel/u-boot.git] / include / env_default.h

diff --git a/include/env_default.h b/include/env_default.h
index a701026..4e461c8 100644 (file)
--- a/include/env_default.h
+++ b/include/env_default.h
@@ -1,17 +1,21 @@
+/* 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>
+
+#ifndef USE_HOSTCC
+#include <generated/environment.h>
+#endif
 
 #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 */
@@ -19,28 +23,25 @@ env_t environment __PPCENV__ = {
        {
 #elif defined(DEFAULT_ENV_INSTANCE_STATIC)
 static char default_environment[] = {
+#elif defined(DEFAULT_ENV_IS_RW)
+char default_environment[] = {
 #else
-const uchar default_environment[] = {
+const char 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
        "bootcmd="      CONFIG_BOOTCOMMAND              "\0"
 #endif
-#ifdef CONFIG_RAMBOOTCOMMAND
-       "ramboot="      CONFIG_RAMBOOTCOMMAND           "\0"
-#endif
-#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)
@@ -49,24 +50,6 @@ const uchar default_environment[] = {
 #ifdef CONFIG_LOADS_ECHO
        "loads_echo="   __stringify(CONFIG_LOADS_ECHO)  "\0"
 #endif
-#ifdef CONFIG_ETHADDR
-       "ethaddr="      __stringify(CONFIG_ETHADDR)     "\0"
-#endif
-#ifdef CONFIG_ETH1ADDR
-       "eth1addr="     __stringify(CONFIG_ETH1ADDR)    "\0"
-#endif
-#ifdef CONFIG_ETH2ADDR
-       "eth2addr="     __stringify(CONFIG_ETH2ADDR)    "\0"
-#endif
-#ifdef CONFIG_ETH3ADDR
-       "eth3addr="     __stringify(CONFIG_ETH3ADDR)    "\0"
-#endif
-#ifdef CONFIG_ETH4ADDR
-       "eth4addr="     __stringify(CONFIG_ETH4ADDR)    "\0"
-#endif
-#ifdef CONFIG_ETH5ADDR
-       "eth5addr="     __stringify(CONFIG_ETH5ADDR)    "\0"
-#endif
 #ifdef CONFIG_ETHPRIME
        "ethprime="     CONFIG_ETHPRIME                 "\0"
 #endif
@@ -76,8 +59,8 @@ const uchar default_environment[] = {
 #ifdef CONFIG_SERVERIP
        "serverip="     __stringify(CONFIG_SERVERIP)    "\0"
 #endif
-#ifdef CONFIG_SYS_AUTOLOAD
-       "autoload="     CONFIG_SYS_AUTOLOAD             "\0"
+#ifdef CONFIG_SYS_DISABLE_AUTOLOAD
+       "autoload=0\0"
 #endif
 #ifdef CONFIG_PREBOOT
        "preboot="      CONFIG_PREBOOT                  "\0"
@@ -92,37 +75,63 @@ 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
+#ifdef CONFIG_USE_BOOTFILE
        "bootfile="     CONFIG_BOOTFILE                 "\0"
 #endif
-#ifdef CONFIG_LOADADDR
-       "loadaddr="     __stringify(CONFIG_LOADADDR)    "\0"
-#endif
-#ifdef CONFIG_CLOCKS_IN_MHZ
-       "clocks_in_mhz=1\0"
+#ifdef CONFIG_SYS_LOAD_ADDR
+       "loadaddr="     __stringify(CONFIG_SYS_LOAD_ADDR)"\0"
 #endif
 #if defined(CONFIG_PCI_BOOTDELAY) && (CONFIG_PCI_BOOTDELAY > 0)
        "pcidelay="     __stringify(CONFIG_PCI_BOOTDELAY)"\0"
 #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
 #ifdef CONFIG_SYS_SOC
        "soc="          CONFIG_SYS_SOC                  "\0"
 #endif
+#ifdef CONFIG_ENV_IMPORT_FDT
+       "env_fdt_path=" CONFIG_ENV_FDT_PATH             "\0"
+#endif
+#endif
+#if defined(CONFIG_BOOTCOUNT_BOOTLIMIT) && (CONFIG_BOOTCOUNT_BOOTLIMIT > 0)
+       "bootlimit="    __stringify(CONFIG_BOOTCOUNT_BOOTLIMIT)"\0"
+#endif
+#ifdef CONFIG_MTDIDS_DEFAULT
+        "mtdids="      CONFIG_MTDIDS_DEFAULT           "\0"
+#endif
+#ifdef CONFIG_MTDPARTS_DEFAULT
+       "mtdparts="     CONFIG_MTDPARTS_DEFAULT         "\0"
+#endif
+#ifdef CONFIG_EXTRA_ENV_TEXT
+       /* This is created in the Makefile */
+       CONFIG_EXTRA_ENV_TEXT
 #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
 };
+
+#if !defined(USE_HOSTCC) && !defined(DEFAULT_ENV_INSTANCE_EMBEDDED)
+#include <env_internal.h>
+static_assert(sizeof(default_environment) <= ENV_SIZE,
+             "Default environment is too large");
+#endif