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>

diff --git a/common/env_embedded.c b/common/env_embedded.c
index 45325892fd53ea29c05977be423feb302f396cc4..43694db70fe8e146a52bcc25012bd1e6490a07de 100644 (file)
--- 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 ea6704a97299295a2e6113c00ec64fcd735c150f..acd4198443c0cb617e689bd9d82be95485cbab60 100644 (file)
--- 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 */