Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit ddd8418f7f390a39d460e6ab98e8e668f0cf617c

Authored by Joe Hershberger
Committed by Tom Rini
1 parent 6ab6a650a4
Exists in master and in 54 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

env: cosmetic: Consilidate the default env definition 

There used to be a huge structure duplicated 3 times in the source.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Signed-off-by: Tom Rini <trini@ti.com>

Showing 4 changed files with 141 additions and 293 deletions Side-by-side Diff

... ... @@ -37,102 +37,7 @@
37 37 /************************************************************************
38 38 * Default settings to be used when no valid environment is found
39 39 */
40   -
41   -const uchar default_environment[] = {
42   -#ifdef CONFIG_BOOTARGS
43   - "bootargs=" CONFIG_BOOTARGS "\0"
44   -#endif
45   -#ifdef CONFIG_BOOTCOMMAND
46   - "bootcmd=" CONFIG_BOOTCOMMAND "\0"
47   -#endif
48   -#ifdef CONFIG_RAMBOOTCOMMAND
49   - "ramboot=" CONFIG_RAMBOOTCOMMAND "\0"
50   -#endif
51   -#ifdef CONFIG_NFSBOOTCOMMAND
52   - "nfsboot=" CONFIG_NFSBOOTCOMMAND "\0"
53   -#endif
54   -#if defined(CONFIG_BOOTDELAY) && (CONFIG_BOOTDELAY >= 0)
55   - "bootdelay=" __stringify(CONFIG_BOOTDELAY) "\0"
56   -#endif
57   -#if defined(CONFIG_BAUDRATE) && (CONFIG_BAUDRATE >= 0)
58   - "baudrate=" __stringify(CONFIG_BAUDRATE) "\0"
59   -#endif
60   -#ifdef CONFIG_LOADS_ECHO
61   - "loads_echo=" __stringify(CONFIG_LOADS_ECHO) "\0"
62   -#endif
63   -#ifdef CONFIG_ETHADDR
64   - "ethaddr=" __stringify(CONFIG_ETHADDR) "\0"
65   -#endif
66   -#ifdef CONFIG_ETH1ADDR
67   - "eth1addr=" __stringify(CONFIG_ETH1ADDR) "\0"
68   -#endif
69   -#ifdef CONFIG_ETH2ADDR
70   - "eth2addr=" __stringify(CONFIG_ETH2ADDR) "\0"
71   -#endif
72   -#ifdef CONFIG_ETH3ADDR
73   - "eth3addr=" __stringify(CONFIG_ETH3ADDR) "\0"
74   -#endif
75   -#ifdef CONFIG_ETH4ADDR
76   - "eth4addr=" __stringify(CONFIG_ETH4ADDR) "\0"
77   -#endif
78   -#ifdef CONFIG_ETH5ADDR
79   - "eth5addr=" __stringify(CONFIG_ETH5ADDR) "\0"
80   -#endif
81   -#ifdef CONFIG_ETHPRIME
82   - "ethprime=" CONFIG_ETHPRIME "\0"
83   -#endif
84   -#ifdef CONFIG_IPADDR
85   - "ipaddr=" __stringify(CONFIG_IPADDR) "\0"
86   -#endif
87   -#ifdef CONFIG_SERVERIP
88   - "serverip=" __stringify(CONFIG_SERVERIP) "\0"
89   -#endif
90   -#ifdef CONFIG_SYS_AUTOLOAD
91   - "autoload=" CONFIG_SYS_AUTOLOAD "\0"
92   -#endif
93   -#ifdef CONFIG_PREBOOT
94   - "preboot=" CONFIG_PREBOOT "\0"
95   -#endif
96   -#ifdef CONFIG_ROOTPATH
97   - "rootpath=" CONFIG_ROOTPATH "\0"
98   -#endif
99   -#ifdef CONFIG_GATEWAYIP
100   - "gatewayip=" __stringify(CONFIG_GATEWAYIP) "\0"
101   -#endif
102   -#ifdef CONFIG_NETMASK
103   - "netmask=" __stringify(CONFIG_NETMASK) "\0"
104   -#endif
105   -#ifdef CONFIG_HOSTNAME
106   - "hostname=" __stringify(CONFIG_HOSTNAME) "\0"
107   -#endif
108   -#ifdef CONFIG_BOOTFILE
109   - "bootfile=" CONFIG_BOOTFILE "\0"
110   -#endif
111   -#ifdef CONFIG_LOADADDR
112   - "loadaddr=" __stringify(CONFIG_LOADADDR) "\0"
113   -#endif
114   -#ifdef CONFIG_CLOCKS_IN_MHZ
115   - "clocks_in_mhz=1\0"
116   -#endif
117   -#if defined(CONFIG_PCI_BOOTDELAY) && (CONFIG_PCI_BOOTDELAY > 0)
118   - "pcidelay=" __stringify(CONFIG_PCI_BOOTDELAY)"\0"
119   -#endif
120   -#ifdef CONFIG_ENV_VARS_UBOOT_CONFIG
121   - "arch=" CONFIG_SYS_ARCH "\0"
122   - "cpu=" CONFIG_SYS_CPU "\0"
123   - "board=" CONFIG_SYS_BOARD "\0"
124   -#ifdef CONFIG_SYS_VENDOR
125   - "vendor=" CONFIG_SYS_VENDOR "\0"
126   -#endif
127   -#ifdef CONFIG_SYS_SOC
128   - "soc=" CONFIG_SYS_SOC "\0"
129   -#endif
130   -#endif
131   -#ifdef CONFIG_EXTRA_ENV_SETTINGS
132   - CONFIG_EXTRA_ENV_SETTINGS
133   -#endif
134   - "\0"
135   -};
  40 +#include <env_default.h>
136 41  
137 42 struct hsearch_data env_htab = {
138 43 .apply = env_check_apply,
common/env_embedded.c
Diff comments   View file @ ddd8418
... ... @@ -89,107 +89,9 @@
89 89 # define ENV_CRC (~0)
90 90 #endif
91 91  
92   -env_t environment __PPCENV__ = {
93   - ENV_CRC, /* CRC Sum */
94   -#ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT
95   - 1, /* Flags: valid */
96   -#endif
97   - {
98   -#if defined(CONFIG_BOOTARGS)
99   - "bootargs=" CONFIG_BOOTARGS "\0"
100   -#endif
101   -#if defined(CONFIG_BOOTCOMMAND)
102   - "bootcmd=" CONFIG_BOOTCOMMAND "\0"
103   -#endif
104   -#if defined(CONFIG_RAMBOOTCOMMAND)
105   - "ramboot=" CONFIG_RAMBOOTCOMMAND "\0"
106   -#endif
107   -#if defined(CONFIG_NFSBOOTCOMMAND)
108   - "nfsboot=" CONFIG_NFSBOOTCOMMAND "\0"
109   -#endif
110   -#if defined(CONFIG_BOOTDELAY) && (CONFIG_BOOTDELAY >= 0)
111   - "bootdelay=" __stringify(CONFIG_BOOTDELAY) "\0"
112   -#endif
113   -#if defined(CONFIG_BAUDRATE) && (CONFIG_BAUDRATE >= 0)
114   - "baudrate=" __stringify(CONFIG_BAUDRATE) "\0"
115   -#endif
116   -#ifdef CONFIG_LOADS_ECHO
117   - "loads_echo=" __stringify(CONFIG_LOADS_ECHO) "\0"
118   -#endif
119   -#ifdef CONFIG_ETHADDR
120   - "ethaddr=" __stringify(CONFIG_ETHADDR) "\0"
121   -#endif
122   -#ifdef CONFIG_ETH1ADDR
123   - "eth1addr=" __stringify(CONFIG_ETH1ADDR) "\0"
124   -#endif
125   -#ifdef CONFIG_ETH2ADDR
126   - "eth2addr=" __stringify(CONFIG_ETH2ADDR) "\0"
127   -#endif
128   -#ifdef CONFIG_ETH3ADDR
129   - "eth3addr=" __stringify(CONFIG_ETH3ADDR) "\0"
130   -#endif
131   -#ifdef CONFIG_ETH4ADDR
132   - "eth4addr=" __stringify(CONFIG_ETH4ADDR) "\0"
133   -#endif
134   -#ifdef CONFIG_ETH5ADDR
135   - "eth5addr=" __stringify(CONFIG_ETH5ADDR) "\0"
136   -#endif
137   -#ifdef CONFIG_ETHPRIME
138   - "ethprime=" CONFIG_ETHPRIME "\0"
139   -#endif
140   -#ifdef CONFIG_IPADDR
141   - "ipaddr=" __stringify(CONFIG_IPADDR) "\0"
142   -#endif
143   -#ifdef CONFIG_SERVERIP
144   - "serverip=" __stringify(CONFIG_SERVERIP) "\0"
145   -#endif
146   -#ifdef CONFIG_SYS_AUTOLOAD
147   - "autoload=" CONFIG_SYS_AUTOLOAD "\0"
148   -#endif
149   -#ifdef CONFIG_ROOTPATH
150   - "rootpath=" CONFIG_ROOTPATH "\0"
151   -#endif
152   -#ifdef CONFIG_GATEWAYIP
153   - "gatewayip=" __stringify(CONFIG_GATEWAYIP) "\0"
154   -#endif
155   -#ifdef CONFIG_NETMASK
156   - "netmask=" __stringify(CONFIG_NETMASK) "\0"
157   -#endif
158   -#ifdef CONFIG_HOSTNAME
159   - "hostname=" __stringify(CONFIG_HOSTNAME) "\0"
160   -#endif
161   -#ifdef CONFIG_BOOTFILE
162   - "bootfile=" CONFIG_BOOTFILE "\0"
163   -#endif
164   -#ifdef CONFIG_LOADADDR
165   - "loadaddr=" __stringify(CONFIG_LOADADDR) "\0"
166   -#endif
167   -#ifdef CONFIG_PREBOOT
168   - "preboot=" CONFIG_PREBOOT "\0"
169   -#endif
170   -#ifdef CONFIG_CLOCKS_IN_MHZ
171   - "clocks_in_mhz=" "1" "\0"
172   -#endif
173   -#if defined(CONFIG_PCI_BOOTDELAY) && (CONFIG_PCI_BOOTDELAY > 0)
174   - "pcidelay=" __stringify(CONFIG_PCI_BOOTDELAY)"\0"
175   -#endif
176   -#ifdef CONFIG_ENV_VARS_UBOOT_CONFIG
177   - "arch=" CONFIG_SYS_ARCH "\0"
178   - "cpu=" CONFIG_SYS_CPU "\0"
179   - "board=" CONFIG_SYS_BOARD "\0"
180   -#ifdef CONFIG_SYS_VENDOR
181   - "vendor=" CONFIG_SYS_VENDOR "\0"
182   -#endif
183   -#ifdef CONFIG_SYS_SOC
184   - "soc=" CONFIG_SYS_SOC "\0"
185   -#endif
186   -#endif
187   -#ifdef CONFIG_EXTRA_ENV_SETTINGS
188   - CONFIG_EXTRA_ENV_SETTINGS
189   -#endif
190   - "\0" /* Term. env_t.data with 2 NULs */
191   - }
192   -};
  92 +#define DEFAULT_ENV_INSTANCE_EMBEDDED
  93 +#include <env_default.h>
  94 +
193 95 #ifdef CONFIG_ENV_ADDR_REDUND
194 96 env_t redundand_environment __PPCENV__ = {
195 97 0, /* CRC Sum: invalid */
include/env_default.h
Diff comments   View file @ ddd8418
  1 +/*
  2 + * (C) Copyright 2000-2010
  3 + * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  4 + *
  5 + * (C) Copyright 2001 Sysgo Real-Time Solutions, GmbH <www.elinos.com>
  6 + * Andreas Heppel <aheppel@sysgo.de>
  7 + *
  8 + * See file CREDITS for list of people who contributed to this
  9 + * project.
  10 + *
  11 + * This program is free software; you can redistribute it and/or
  12 + * modify it under the terms of the GNU General Public License as
  13 + * published by the Free Software Foundation; either version 2 of
  14 + * the License, or (at your option) any later version.
  15 + *
  16 + * This program is distributed in the hope that it will be useful,
  17 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
  18 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  19 + * GNU General Public License for more details.
  20 + *
  21 + * You should have received a copy of the GNU General Public License
  22 + * along with this program; if not, write to the Free Software
  23 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  24 + * MA 02111-1307 USA
  25 + */
  26 +
  27 +#ifdef DEFAULT_ENV_INSTANCE_EMBEDDED
  28 +env_t environment __PPCENV__ = {
  29 + ENV_CRC, /* CRC Sum */
  30 +#ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT
  31 + 1, /* Flags: valid */
  32 +#endif
  33 + {
  34 +#elif defined(DEFAULT_ENV_INSTANCE_STATIC)
  35 +static char default_environment[] = {
  36 +#else
  37 +const uchar default_environment[] = {
  38 +#endif
  39 +#ifdef CONFIG_BOOTARGS
  40 + "bootargs=" CONFIG_BOOTARGS "\0"
  41 +#endif
  42 +#ifdef CONFIG_BOOTCOMMAND
  43 + "bootcmd=" CONFIG_BOOTCOMMAND "\0"
  44 +#endif
  45 +#ifdef CONFIG_RAMBOOTCOMMAND
  46 + "ramboot=" CONFIG_RAMBOOTCOMMAND "\0"
  47 +#endif
  48 +#ifdef CONFIG_NFSBOOTCOMMAND
  49 + "nfsboot=" CONFIG_NFSBOOTCOMMAND "\0"
  50 +#endif
  51 +#if defined(CONFIG_BOOTDELAY) && (CONFIG_BOOTDELAY >= 0)
  52 + "bootdelay=" __stringify(CONFIG_BOOTDELAY) "\0"
  53 +#endif
  54 +#if defined(CONFIG_BAUDRATE) && (CONFIG_BAUDRATE >= 0)
  55 + "baudrate=" __stringify(CONFIG_BAUDRATE) "\0"
  56 +#endif
  57 +#ifdef CONFIG_LOADS_ECHO
  58 + "loads_echo=" __stringify(CONFIG_LOADS_ECHO) "\0"
  59 +#endif
  60 +#ifdef CONFIG_ETHADDR
  61 + "ethaddr=" __stringify(CONFIG_ETHADDR) "\0"
  62 +#endif
  63 +#ifdef CONFIG_ETH1ADDR
  64 + "eth1addr=" __stringify(CONFIG_ETH1ADDR) "\0"
  65 +#endif
  66 +#ifdef CONFIG_ETH2ADDR
  67 + "eth2addr=" __stringify(CONFIG_ETH2ADDR) "\0"
  68 +#endif
  69 +#ifdef CONFIG_ETH3ADDR
  70 + "eth3addr=" __stringify(CONFIG_ETH3ADDR) "\0"
  71 +#endif
  72 +#ifdef CONFIG_ETH4ADDR
  73 + "eth4addr=" __stringify(CONFIG_ETH4ADDR) "\0"
  74 +#endif
  75 +#ifdef CONFIG_ETH5ADDR
  76 + "eth5addr=" __stringify(CONFIG_ETH5ADDR) "\0"
  77 +#endif
  78 +#ifdef CONFIG_ETHPRIME
  79 + "ethprime=" CONFIG_ETHPRIME "\0"
  80 +#endif
  81 +#ifdef CONFIG_IPADDR
  82 + "ipaddr=" __stringify(CONFIG_IPADDR) "\0"
  83 +#endif
  84 +#ifdef CONFIG_SERVERIP
  85 + "serverip=" __stringify(CONFIG_SERVERIP) "\0"
  86 +#endif
  87 +#ifdef CONFIG_SYS_AUTOLOAD
  88 + "autoload=" CONFIG_SYS_AUTOLOAD "\0"
  89 +#endif
  90 +#ifdef CONFIG_PREBOOT
  91 + "preboot=" CONFIG_PREBOOT "\0"
  92 +#endif
  93 +#ifdef CONFIG_ROOTPATH
  94 + "rootpath=" CONFIG_ROOTPATH "\0"
  95 +#endif
  96 +#ifdef CONFIG_GATEWAYIP
  97 + "gatewayip=" __stringify(CONFIG_GATEWAYIP) "\0"
  98 +#endif
  99 +#ifdef CONFIG_NETMASK
  100 + "netmask=" __stringify(CONFIG_NETMASK) "\0"
  101 +#endif
  102 +#ifdef CONFIG_HOSTNAME
  103 + "hostname=" __stringify(CONFIG_HOSTNAME) "\0"
  104 +#endif
  105 +#ifdef CONFIG_BOOTFILE
  106 + "bootfile=" CONFIG_BOOTFILE "\0"
  107 +#endif
  108 +#ifdef CONFIG_LOADADDR
  109 + "loadaddr=" __stringify(CONFIG_LOADADDR) "\0"
  110 +#endif
  111 +#ifdef CONFIG_CLOCKS_IN_MHZ
  112 + "clocks_in_mhz=1\0"
  113 +#endif
  114 +#if defined(CONFIG_PCI_BOOTDELAY) && (CONFIG_PCI_BOOTDELAY > 0)
  115 + "pcidelay=" __stringify(CONFIG_PCI_BOOTDELAY)"\0"
  116 +#endif
  117 +#ifdef CONFIG_ENV_VARS_UBOOT_CONFIG
  118 + "arch=" CONFIG_SYS_ARCH "\0"
  119 + "cpu=" CONFIG_SYS_CPU "\0"
  120 + "board=" CONFIG_SYS_BOARD "\0"
  121 +#ifdef CONFIG_SYS_VENDOR
  122 + "vendor=" CONFIG_SYS_VENDOR "\0"
  123 +#endif
  124 +#ifdef CONFIG_SYS_SOC
  125 + "soc=" CONFIG_SYS_SOC "\0"
  126 +#endif
  127 +#endif
  128 +#ifdef CONFIG_EXTRA_ENV_SETTINGS
  129 + CONFIG_EXTRA_ENV_SETTINGS
  130 +#endif
  131 + "\0"
  132 +#ifdef DEFAULT_ENV_INSTANCE_EMBEDDED
  133 + }
  134 +#endif
  135 +};
... ... @@ -119,102 +119,8 @@
119 119 /* obsolete_flag must be 0 to efficiently set it on NOR flash without erasing */
120 120 static unsigned char obsolete_flag = 0;
121 121  
122   -
123   -static char default_environment[] = {
124   -#if defined(CONFIG_BOOTARGS)
125   - "bootargs=" CONFIG_BOOTARGS "\0"
126   -#endif
127   -#if defined(CONFIG_BOOTCOMMAND)
128   - "bootcmd=" CONFIG_BOOTCOMMAND "\0"
129   -#endif
130   -#if defined(CONFIG_RAMBOOTCOMMAND)
131   - "ramboot=" CONFIG_RAMBOOTCOMMAND "\0"
132   -#endif
133   -#if defined(CONFIG_NFSBOOTCOMMAND)
134   - "nfsboot=" CONFIG_NFSBOOTCOMMAND "\0"
135   -#endif
136   -#if defined(CONFIG_BOOTDELAY) && (CONFIG_BOOTDELAY >= 0)
137   - "bootdelay=" __stringify(CONFIG_BOOTDELAY) "\0"
138   -#endif
139   -#if defined(CONFIG_BAUDRATE) && (CONFIG_BAUDRATE >= 0)
140   - "baudrate=" __stringify(CONFIG_BAUDRATE) "\0"
141   -#endif
142   -#ifdef CONFIG_LOADS_ECHO
143   - "loads_echo=" __stringify(CONFIG_LOADS_ECHO) "\0"
144   -#endif
145   -#ifdef CONFIG_ETHADDR
146   - "ethaddr=" __stringify(CONFIG_ETHADDR) "\0"
147   -#endif
148   -#ifdef CONFIG_ETH1ADDR
149   - "eth1addr=" __stringify(CONFIG_ETH1ADDR) "\0"
150   -#endif
151   -#ifdef CONFIG_ETH2ADDR
152   - "eth2addr=" __stringify(CONFIG_ETH2ADDR) "\0"
153   -#endif
154   -#ifdef CONFIG_ETH3ADDR
155   - "eth3addr=" __stringify(CONFIG_ETH3ADDR) "\0"
156   -#endif
157   -#ifdef CONFIG_ETH4ADDR
158   - "eth4addr=" __stringify(CONFIG_ETH4ADDR) "\0"
159   -#endif
160   -#ifdef CONFIG_ETH5ADDR
161   - "eth5addr=" __stringify(CONFIG_ETH5ADDR) "\0"
162   -#endif
163   -#ifdef CONFIG_ETHPRIME
164   - "ethprime=" CONFIG_ETHPRIME "\0"
165   -#endif
166   -#ifdef CONFIG_IPADDR
167   - "ipaddr=" __stringify(CONFIG_IPADDR) "\0"
168   -#endif
169   -#ifdef CONFIG_SERVERIP
170   - "serverip=" __stringify(CONFIG_SERVERIP) "\0"
171   -#endif
172   -#ifdef CONFIG_SYS_AUTOLOAD
173   - "autoload=" CONFIG_SYS_AUTOLOAD "\0"
174   -#endif
175   -#ifdef CONFIG_ROOTPATH
176   - "rootpath=" CONFIG_ROOTPATH "\0"
177   -#endif
178   -#ifdef CONFIG_GATEWAYIP
179   - "gatewayip=" __stringify(CONFIG_GATEWAYIP) "\0"
180   -#endif
181   -#ifdef CONFIG_NETMASK
182   - "netmask=" __stringify(CONFIG_NETMASK) "\0"
183   -#endif
184   -#ifdef CONFIG_HOSTNAME
185   - "hostname=" __stringify(CONFIG_HOSTNAME) "\0"
186   -#endif
187   -#ifdef CONFIG_BOOTFILE
188   - "bootfile=" CONFIG_BOOTFILE "\0"
189   -#endif
190   -#ifdef CONFIG_LOADADDR
191   - "loadaddr=" __stringify(CONFIG_LOADADDR) "\0"
192   -#endif
193   -#ifdef CONFIG_PREBOOT
194   - "preboot=" CONFIG_PREBOOT "\0"
195   -#endif
196   -#ifdef CONFIG_CLOCKS_IN_MHZ
197   - "clocks_in_mhz=" "1" "\0"
198   -#endif
199   -#if defined(CONFIG_PCI_BOOTDELAY) && (CONFIG_PCI_BOOTDELAY > 0)
200   - "pcidelay=" __stringify(CONFIG_PCI_BOOTDELAY) "\0"
201   -#endif
202   -#ifdef CONFIG_ENV_VARS_UBOOT_CONFIG
203   - "arch=" CONFIG_SYS_ARCH "\0"
204   - "cpu=" CONFIG_SYS_CPU "\0"
205   - "board=" CONFIG_SYS_BOARD "\0"
206   -#ifdef CONFIG_SYS_VENDOR
207   - "vendor=" CONFIG_SYS_VENDOR "\0"
208   -#endif
209   -#ifdef CONFIG_SYS_SOC
210   - "soc=" CONFIG_SYS_SOC "\0"
211   -#endif
212   -#endif
213   -#ifdef CONFIG_EXTRA_ENV_SETTINGS
214   - CONFIG_EXTRA_ENV_SETTINGS
215   -#endif
216   - "\0" /* Termimate struct environment data with 2 NULs */
217   -};
  122 +#define DEFAULT_ENV_INSTANCE_STATIC
  123 +#include <env_default.h>
218 124  
219 125 static int flash_io (int mode);
220 126 static char *envmatch (char * s1, char * s2);