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>
This commit is contained in:

committed by
Tom Rini

parent
7653942b10
commit
eaa90e5df2
@@ -35,13 +35,11 @@
|
|||||||
* a seperate section.
|
* a seperate section.
|
||||||
*/
|
*/
|
||||||
#if defined(USE_HOSTCC) /* Native for 'tools/envcrc' */
|
#if defined(USE_HOSTCC) /* Native for 'tools/envcrc' */
|
||||||
# define __PPCENV__ /*XXX DO_NOT_DEL_THIS_COMMENT*/
|
# define __UBOOT_ENV_SECTION__ /*XXX DO_NOT_DEL_THIS_COMMENT*/
|
||||||
# define __PPCTEXT__ /*XXX DO_NOT_DEL_THIS_COMMENT*/
|
|
||||||
|
|
||||||
#else /* Environment is embedded in U-Boot's .text section */
|
#else /* Environment is embedded in U-Boot's .text section */
|
||||||
/* XXX - This only works with GNU C */
|
/* XXX - This only works with GNU C */
|
||||||
# define __PPCENV__ __attribute__ ((section(".text")))
|
# define __UBOOT_ENV_SECTION__ __attribute__ ((section(".text")))
|
||||||
# define __PPCTEXT__ __attribute__ ((section(".text")))
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -72,7 +70,7 @@
|
|||||||
#include <env_default.h>
|
#include <env_default.h>
|
||||||
|
|
||||||
#ifdef CONFIG_ENV_ADDR_REDUND
|
#ifdef CONFIG_ENV_ADDR_REDUND
|
||||||
env_t redundand_environment __PPCENV__ = {
|
env_t redundand_environment __UBOOT_ENV_SECTION__ = {
|
||||||
0, /* CRC Sum: invalid */
|
0, /* CRC Sum: invalid */
|
||||||
0, /* Flags: invalid */
|
0, /* Flags: invalid */
|
||||||
{
|
{
|
||||||
@@ -89,7 +87,7 @@ env_t redundand_environment __PPCENV__ = {
|
|||||||
* .data/.sdata section.
|
* .data/.sdata section.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
unsigned long env_size __PPCTEXT__ = sizeof(env_t);
|
unsigned long env_size __UBOOT_ENV_SECTION__ = sizeof(env_t);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Add in absolutes.
|
* Add in absolutes.
|
||||||
|
@@ -11,7 +11,7 @@
|
|||||||
#include <env_callback.h>
|
#include <env_callback.h>
|
||||||
|
|
||||||
#ifdef DEFAULT_ENV_INSTANCE_EMBEDDED
|
#ifdef DEFAULT_ENV_INSTANCE_EMBEDDED
|
||||||
env_t environment __PPCENV__ = {
|
env_t environment __UBOOT_ENV_SECTION__ = {
|
||||||
ENV_CRC, /* CRC Sum */
|
ENV_CRC, /* CRC Sum */
|
||||||
#ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT
|
#ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT
|
||||||
1, /* Flags: valid */
|
1, /* Flags: valid */
|
||||||
|
Reference in New Issue
Block a user