summaryrefslogtreecommitdiff
path: root/include/asm-ppc
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-10-09 00:03:18 +0200
committerWolfgang Denk <wd@denx.de>2009-10-09 00:03:18 +0200
commitcd77dd109c4a439519a78c32eddc42bdebc7a61f (patch)
treec5534647cb1786044ef0f7e4ad4067725eddf11d /include/asm-ppc
parent95c44ec485b46ffb43dbdaa299f1491a500fdadf (diff)
parentafc3ba0fc4195624e79e21244380ed7cc2fd6969 (diff)
Merge branch 'reloc'
Diffstat (limited to 'include/asm-ppc')
-rw-r--r--include/asm-ppc/config.h3
-rw-r--r--include/asm-ppc/global_data.h2
2 files changed, 4 insertions, 1 deletions
diff --git a/include/asm-ppc/config.h b/include/asm-ppc/config.h
index e35b0b77f..eba79010b 100644
--- a/include/asm-ppc/config.h
+++ b/include/asm-ppc/config.h
@@ -47,4 +47,7 @@
#define CONFIG_MAX_CPUS 1
#endif
+/* Relocation to SDRAM works on all PPC boards */
+#define CONFIG_RELOC_FIXUP_WORKS
+
#endif /* _ASM_CONFIG_H_ */
diff --git a/include/asm-ppc/global_data.h b/include/asm-ppc/global_data.h
index db4b1eaa1..55e7e2066 100644
--- a/include/asm-ppc/global_data.h
+++ b/include/asm-ppc/global_data.h
@@ -24,6 +24,7 @@
#ifndef __ASM_GBL_DATA_H
#define __ASM_GBL_DATA_H
+#include "config.h"
#include "asm/types.h"
/*
@@ -124,7 +125,6 @@ typedef struct global_data {
unsigned long flb_clk;
#endif
phys_size_t ram_size; /* RAM size */
- unsigned long reloc_off; /* Relocation Offset */
unsigned long reset_status; /* reset status register at boot */
#if defined(CONFIG_MPC83xx)
unsigned long arbiter_event_attributes;