projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
arm: dts: rockchip: Add initial DT for Pinebook Pro
[oweals/u-boot.git]
/
env
/
embedded.c
diff --git
a/env/embedded.c
b/env/embedded.c
index 43694db70fe8e146a52bcc25012bd1e6490a07de..208553e6af172489d4da74774eb1e68f9dab3322 100644
(file)
--- a/
env/embedded.c
+++ b/
env/embedded.c
@@
-1,8
+1,7
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2001
* Erik Theisen, Wave 7 Optics, etheisen@mindspring.com.
/*
* (C) Copyright 2001
* Erik Theisen, Wave 7 Optics, etheisen@mindspring.com.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <linux/kconfig.h>
*/
#include <linux/kconfig.h>
@@
-13,7
+12,7
@@
#define __ASM_STUB_PROCESSOR_H__ /* don't include asm/processor. */
#include <config.h>
#undef __ASSEMBLY__
#define __ASM_STUB_PROCESSOR_H__ /* don't include asm/processor. */
#include <config.h>
#undef __ASSEMBLY__
-#include <env
ironment
.h>
+#include <env
_internal
.h>
#include <linux/stringify.h>
/* Handle HOSTS that have prepended crap on symbol names, not TARGETS. */
#include <linux/stringify.h>
/* Handle HOSTS that have prepended crap on symbol names, not TARGETS. */
@@
-35,11
+34,11
@@
* a seperate section.
*/
#if defined(USE_HOSTCC) /* Native for 'tools/envcrc' */
* a seperate section.
*/
#if defined(USE_HOSTCC) /* Native for 'tools/envcrc' */
-# define __UBOOT_ENV_SECTION__
/*XXX DO_NOT_DEL_THIS_COMMENT*/
+# define __UBOOT_ENV_SECTION__
(name)
/*XXX DO_NOT_DEL_THIS_COMMENT*/
#else /* Environment is embedded in U-Boot's .text section */
/* XXX - This only works with GNU C */
#else /* Environment is embedded in U-Boot's .text section */
/* XXX - This only works with GNU C */
-# define __UBOOT_ENV_SECTION__
__attribute__ ((section(".text"
)))
+# define __UBOOT_ENV_SECTION__
(name) __attribute__ ((section(".text."#name
)))
#endif
/*
#endif
/*
@@
-70,7
+69,7
@@
#include <env_default.h>
#ifdef CONFIG_ENV_ADDR_REDUND
#include <env_default.h>
#ifdef CONFIG_ENV_ADDR_REDUND
-env_t redundand_environment __UBOOT_ENV_SECTION__ = {
+env_t redundand_environment __UBOOT_ENV_SECTION__
(redundand_environment)
= {
0, /* CRC Sum: invalid */
0, /* Flags: invalid */
{
0, /* CRC Sum: invalid */
0, /* Flags: invalid */
{
@@
-87,11
+86,11
@@
env_t redundand_environment __UBOOT_ENV_SECTION__ = {
* .data/.sdata section.
*
*/
* .data/.sdata section.
*
*/
-unsigned long env_size __UBOOT_ENV_SECTION__ = sizeof(env_t);
+unsigned long env_size __UBOOT_ENV_SECTION__
(env_size)
= sizeof(env_t);
/*
* Add in absolutes.
*/
/*
* Add in absolutes.
*/
-GEN_ABS(env_offset,
CONFIG_ENV_OFFSET
);
+GEN_ABS(env_offset,
(CONFIG_ENV_ADDR - CONFIG_SYS_FLASH_BASE)
);
#endif /* ENV_IS_EMBEDDED */
#endif /* ENV_IS_EMBEDDED */