ddr: altera: Add ECC DRAM scrubbing support for Arria10

[u-boot] / include / env_default.h

diff --git a/include/env_default.h b/include/env_default.h
index a7010269d383f6cae79842918bb8ef579cbc8dca..54d8124793c52dc073e5691b99c18618a4e95435 100644 (file)
--- a/include/env_default.h
+++ b/include/env_default.h
@@ -1,17 +1,16 @@
+/* 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>
 
 #ifdef DEFAULT_ENV_INSTANCE_EMBEDDED
-env_t environment __PPCENV__ = {
+env_t environment __UBOOT_ENV_SECTION__(environment) = {
        ENV_CRC,        /* CRC Sum */
 #ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT
        1,              /* Flags: valid */
@@ -22,13 +21,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
@@ -49,24 +49,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
@@ -92,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,9 +90,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
@@ -122,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