projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-mpc85xx
[platform/kernel/u-boot.git]
/
include
/
environment.h
diff --git
a/include/environment.h
b/include/environment.h
index
2bd0ad1
..
cd96676
100644
(file)
--- a/
include/environment.h
+++ b/
include/environment.h
@@
-1,8
+1,7
@@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2002
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
/*
* (C) Copyright 2002
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _ENVIRONMENT_H_
*/
#ifndef _ENVIRONMENT_H_
@@
-158,21
+157,11
@@
extern env_t environment;
#endif /* ENV_IS_EMBEDDED */
extern const unsigned char default_environment[];
#endif /* ENV_IS_EMBEDDED */
extern const unsigned char default_environment[];
-extern env_t *env_ptr;
#if defined(CONFIG_NEEDS_MANUAL_RELOC)
extern void env_reloc(void);
#endif
#if defined(CONFIG_NEEDS_MANUAL_RELOC)
extern void env_reloc(void);
#endif
-#ifdef CONFIG_ENV_IS_IN_MMC
-#include <mmc.h>
-
-extern int mmc_get_env_addr(struct mmc *mmc, int copy, u32 *env_addr);
-# ifdef CONFIG_SYS_MMC_ENV_PART
-extern uint mmc_get_env_part(struct mmc *mmc);
-# endif
-#endif
-
#ifndef DO_DEPS_ONLY
#include <env_attr.h>
#ifndef DO_DEPS_ONLY
#include <env_attr.h>
@@
-273,10
+262,10
@@
void env_crc_update(void);
char *env_get_default(const char *name);
/* [re]set to the default environment */
char *env_get_default(const char *name);
/* [re]set to the default environment */
-void set_default_env(const char *s);
+void set_default_env(const char *s
, int flags
);
/* [re]set individual variables to their value in the default environment */
/* [re]set individual variables to their value in the default environment */
-int set_default_vars(int nvars, char * const vars[]);
+int set_default_vars(int nvars, char * const vars[]
, int flags
);
/* Import from binary representation into hash table */
int env_import(const char *buf, int check);
/* Import from binary representation into hash table */
int env_import(const char *buf, int check);
@@
-293,7
+282,7
@@
int env_import_redund(const char *buf1, int buf1_status,
/**
* env_get_char() - Get a character from the early environment
*
/**
* env_get_char() - Get a character from the early environment
*
- * This reads from the pre-relocation environ
em
nt
+ * This reads from the pre-relocation environ
me
nt
*
* @index: Index of character to read (0 = first)
* @return character read, or -ve on error
*
* @index: Index of character to read (0 = first)
* @return character read, or -ve on error