summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--common/console.c4
-rw-r--r--include/reloc.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/common/console.c b/common/console.c
index 7199d9afb8..889c26232d 100644
--- a/common/console.c
+++ b/common/console.c
@@ -51,7 +51,7 @@ static void display_banner (void)
printf(RELOC("Board: " CONFIG_BOARDINFO "\n"));
}
-static int __initdata initialized = 0;
+static int __early_initdata initialized = 0;
static int console_std_set(struct device_d *dev, struct param_d *param,
const char *val)
@@ -246,7 +246,7 @@ int tstc(void)
}
EXPORT_SYMBOL(tstc);
-void __initdata *early_console_base;
+void __early_initdata *early_console_base;
void console_putc(unsigned int ch, char c)
{
diff --git a/include/reloc.h b/include/reloc.h
index a5ad7575b1..22cb886ccf 100644
--- a/include/reloc.h
+++ b/include/reloc.h
@@ -30,7 +30,7 @@ void early_init(void);
* put a variable into early init RAM. This section will
* be relocated into SRAM during early init
*/
-#define __initdata __attribute__ ((__section__ (".early_init_data")))
+#define __early_initdata __attribute__ ((__section__ (".early_init_data")))
/* Access init data */
#define INITDATA(var) *(typeof(var) *)((ulong)(&var) - \
@@ -53,7 +53,7 @@ static inline void early_init(void)
#define RELOC(a) a
#define RELOC_VAR(v) v
-#define __initdata
+#define __early_initdata
#define INITDATA(var) var