diff options
| author | Tom Rini <trini@konsulko.com> | 2022-01-10 14:01:57 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-01-10 14:01:57 -0500 |
| commit | fe04d885fb540b614a2f989e16e808b300ccb52e (patch) | |
| tree | 613d413c36bda908658fe4c6a24fb1a61de716ce /include/env_default.h | |
| parent | d637294e264adfeb29f390dfc393106fd4d41b17 (diff) | |
| parent | 0dadad6d7c5769d6258baeaf1b8db843b0dfa01f (diff) | |
Merge branch 'next'
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/env_default.h')
| -rw-r--r-- | include/env_default.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/include/env_default.h b/include/env_default.h index 23430dc70d..21afd7f7dc 100644 --- a/include/env_default.h +++ b/include/env_default.h @@ -10,6 +10,10 @@ #include <env_callback.h> #include <linux/stringify.h> +#ifndef USE_HOSTCC +#include <generated/environment.h> +#endif + #ifdef DEFAULT_ENV_INSTANCE_EMBEDDED env_t embedded_environment __UBOOT_ENV_SECTION__(environment) = { ENV_CRC, /* CRC Sum */ @@ -37,12 +41,6 @@ const char default_environment[] = { #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) "bootdelay=" __stringify(CONFIG_BOOTDELAY) "\0" #endif @@ -110,6 +108,13 @@ const char default_environment[] = { #if defined(CONFIG_BOOTCOUNT_BOOTLIMIT) && (CONFIG_BOOTCOUNT_BOOTLIMIT > 0) "bootlimit=" __stringify(CONFIG_BOOTCOUNT_BOOTLIMIT)"\0" #endif +#ifdef CONFIG_EXTRA_ENV_TEXT +# ifdef CONFIG_EXTRA_ENV_SETTINGS +# error "Your board uses a text-file environment, so must not define CONFIG_EXTRA_ENV_SETTINGS" +# endif + /* This is created in the Makefile */ + CONFIG_EXTRA_ENV_TEXT +#endif #ifdef CONFIG_EXTRA_ENV_SETTINGS CONFIG_EXTRA_ENV_SETTINGS #endif |