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>

diff --git a/include/asm-ppc/global_data.h b/include/asm-ppc/global_data.h
index db4b1eaa1e919afdbf2861629f973bbd5519c8fd..55e7e2066d8e69cce2b082ab71cc50b48c8586e8 100644 (file)
--- 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 16ea03a6bd44834cac46a5504eb0a94c63257e95..2e8fd8b8b41331dcee601ae07e95231201b1ab14 100644 (file)
--- 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;