summaryrefslogtreecommitdiff
path: root/include/asm-nios
diff options
context:
space:
mode:
authorPeter Tyser <ptyser@xes-inc.com>2009-09-22 09:27:55 -0500
committerWolfgang Denk <wd@denx.de>2009-10-03 10:17:57 +0200
commit0630535e2d062dd73c1ceca5c6125c86d1127a49 (patch)
treee3a72ebb61dfc2eaae32f93d38d1dea145cd6c5c /include/asm-nios
parent521af04d853361b49344b61892eb0618f9f713c5 (diff)
arm/microblaze/nios/nios2/sh: Remove relocation fixups
These architectures don't need relocation fixups, so reduce their codesize a bit by defining CONFIG_RELOC_FIXUP_WORKS. Also remove the reloc_off field from their global data structures as it is no longer needed. Note that the location of the standalone application jump table pointer in the global data structure is affected by this change, breaking execution of standalone applications compiled for previous versions of U-Boot. We will therefore increment XF_VERSION in the next commit, which also touches this area. Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include/asm-nios')
-rw-r--r--include/asm-nios/config.h3
-rw-r--r--include/asm-nios/global_data.h1
2 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-nios/config.h b/include/asm-nios/config.h
index 049c44eaf8..2efe898b35 100644
--- a/include/asm-nios/config.h
+++ b/include/asm-nios/config.h
@@ -21,4 +21,7 @@
#ifndef _ASM_CONFIG_H_
#define _ASM_CONFIG_H_
+/* Relocation to SDRAM works on all NIOS boards */
+#define CONFIG_RELOC_FIXUP_WORKS
+
#endif
diff --git a/include/asm-nios/global_data.h b/include/asm-nios/global_data.h
index 4929a5b872..fa54ee4dd3 100644
--- a/include/asm-nios/global_data.h
+++ b/include/asm-nios/global_data.h
@@ -31,7 +31,6 @@ typedef struct global_data {
unsigned long cpu_clk; /* CPU clock in Hz! */
unsigned long have_console; /* serial_init() was called */
phys_size_t ram_size; /* RAM size */
- unsigned long reloc_off; /* Relocation Offset */
unsigned long env_addr; /* Address of Environment struct */
unsigned long env_valid; /* Checksum of Environment valid */
#if defined(CONFIG_POST) || defined(CONFIG_LOGBUFFER)