summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Tyser <ptyser@xes-inc.com>2009-09-21 11:20:37 -0500
committerWolfgang Denk <wd@denx.de>2009-10-03 10:17:57 +0200
commit3469424cb6d939c7aedf1e0efdec44a797c0a18c (patch)
tree3c33806b668d4309b78b06260ce2c6dbcf92c130
parent0630535e2d062dd73c1ceca5c6125c86d1127a49 (diff)
downloadu-boot-imx-3469424cb6d939c7aedf1e0efdec44a797c0a18c.zip
u-boot-imx-3469424cb6d939c7aedf1e0efdec44a797c0a18c.tar.gz
u-boot-imx-3469424cb6d939c7aedf1e0efdec44a797c0a18c.tar.bz2
ppc: Remove reloc_off field from global_data structure
Now that proper relocation is supported, the reloc_off field is no longer necessary. 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 therefore increment XF_VERSION to 6 Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Wolfgang Denk <wd@denx.de>
-rw-r--r--include/asm-ppc/global_data.h2
-rw-r--r--include/exports.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-ppc/global_data.h b/include/asm-ppc/global_data.h
index db4b1ea..55e7e20 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;
diff --git a/include/exports.h b/include/exports.h
index 16ea03a..2e8fd8b 100644
--- a/include/exports.h
+++ b/include/exports.h
@@ -47,7 +47,7 @@ enum {
XF_MAX
};
-#define XF_VERSION 5
+#define XF_VERSION 6
#if defined(CONFIG_I386)
extern gd_t *global_data;