diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-07-28 23:46:38 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-08-04 20:38:39 -0400 |
| commit | eaa90e5df2a4a1cb12fb73571978a9379242d0b5 (patch) | |
| tree | 29117684749a536532ca287af2daece03592a126 | |
| parent | 7653942b10e9eac61532bf635a422e3424cbcdb9 (diff) | |
| download | u-boot-eaa90e5df2a4a1cb12fb73571978a9379242d0b5.tar.gz | |
common/env_embedded.c: rename PPCENV/PPCTEXT macros
The environment has pretty much nothing to do with just "PPC", so
rename the macros to just __UBOOT_ENV_SECTION__ which is more
readable.
In addition, only a single macro is needed: the environment now goes
either to the default section (USE_HOSTCC is defined) or in the .text
section.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
| -rw-r--r-- | common/env_embedded.c | 10 | ||||
| -rw-r--r-- | include/env_default.h | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/common/env_embedded.c b/common/env_embedded.c index 45325892fd..43694db70f 100644 --- a/common/env_embedded.c +++ b/common/env_embedded.c @@ -35,13 +35,11 @@ * a seperate section. */ #if defined(USE_HOSTCC) /* Native for 'tools/envcrc' */ -# define __PPCENV__ /*XXX DO_NOT_DEL_THIS_COMMENT*/ -# define __PPCTEXT__ /*XXX DO_NOT_DEL_THIS_COMMENT*/ +# define __UBOOT_ENV_SECTION__ /*XXX DO_NOT_DEL_THIS_COMMENT*/ #else /* Environment is embedded in U-Boot's .text section */ /* XXX - This only works with GNU C */ -# define __PPCENV__ __attribute__ ((section(".text"))) -# define __PPCTEXT__ __attribute__ ((section(".text"))) +# define __UBOOT_ENV_SECTION__ __attribute__ ((section(".text"))) #endif /* @@ -72,7 +70,7 @@ #include <env_default.h> #ifdef CONFIG_ENV_ADDR_REDUND -env_t redundand_environment __PPCENV__ = { +env_t redundand_environment __UBOOT_ENV_SECTION__ = { 0, /* CRC Sum: invalid */ 0, /* Flags: invalid */ { @@ -89,7 +87,7 @@ env_t redundand_environment __PPCENV__ = { * .data/.sdata section. * */ -unsigned long env_size __PPCTEXT__ = sizeof(env_t); +unsigned long env_size __UBOOT_ENV_SECTION__ = sizeof(env_t); /* * Add in absolutes. diff --git a/include/env_default.h b/include/env_default.h index ea6704a972..acd4198443 100644 --- a/include/env_default.h +++ b/include/env_default.h @@ -11,7 +11,7 @@ #include <env_callback.h> #ifdef DEFAULT_ENV_INSTANCE_EMBEDDED -env_t environment __PPCENV__ = { +env_t environment __UBOOT_ENV_SECTION__ = { ENV_CRC, /* CRC Sum */ #ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT 1, /* Flags: valid */ |