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
video: Convert CONFIG_VIDEO_LOGO to Kconfig
[platform/kernel/u-boot.git]
/
include
/
env_internal.h
diff --git
a/include/env_internal.h
b/include/env_internal.h
index
b7bddcb
..
174c3b1
100644
(file)
--- a/
include/env_internal.h
+++ b/
include/env_internal.h
@@
-54,7
+54,6
@@
# error "is set"
# endif
extern unsigned long nand_env_oob_offset;
# error "is set"
# endif
extern unsigned long nand_env_oob_offset;
-# define CONFIG_ENV_OFFSET nand_env_oob_offset
# endif /* CONFIG_ENV_OFFSET_OOB */
#endif /* CONFIG_ENV_IS_IN_NAND */
# endif /* CONFIG_ENV_OFFSET_OOB */
#endif /* CONFIG_ENV_IS_IN_NAND */
@@
-112,9
+111,9
@@
extern env_t embedded_environment;
#endif /* ENV_IS_EMBEDDED */
#ifdef DEFAULT_ENV_IS_RW
#endif /* ENV_IS_EMBEDDED */
#ifdef DEFAULT_ENV_IS_RW
-extern
unsigned
char default_environment[];
+extern char default_environment[];
#else
#else
-extern const
unsigned
char default_environment[];
+extern const char default_environment[];
#endif
#ifndef DO_DEPS_ONLY
#endif
#ifndef DO_DEPS_ONLY