summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-10-15 22:13:37 +0200
committerWolfgang Denk <wd@denx.de>2009-10-15 22:13:37 +0200
commit9efe379a0eb127e616d780533a711f99b52ea64a (patch)
treea93be31becad046d17d9bd0a682180dbb811da3d /include
parenta380279b2abe130c2d3d2c8de36f8ff98bc6b3b0 (diff)
parentd087d19a994e741f0ce526124be117c90be482ae (diff)
Merge branch 'master' of git://git.denx.de/u-boot-blackfin
Diffstat (limited to 'include')
-rw-r--r--include/asm-blackfin/config.h3
-rw-r--r--include/asm-blackfin/global_data.h1
2 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-blackfin/config.h b/include/asm-blackfin/config.h
index 25794dd4bf..327843d0b6 100644
--- a/include/asm-blackfin/config.h
+++ b/include/asm-blackfin/config.h
@@ -18,6 +18,9 @@
# define CONFIG_BFIN_SCRATCH_REG retn
#endif
+/* Relocation to SDRAM works on all Blackfin boards */
+#define CONFIG_RELOC_FIXUP_WORKS
+
/* Make sure the structure is properly aligned */
#if ((CONFIG_SYS_GBL_DATA_ADDR & -4) != CONFIG_SYS_GBL_DATA_ADDR)
# error CONFIG_SYS_GBL_DATA_ADDR: must be 4 byte aligned
diff --git a/include/asm-blackfin/global_data.h b/include/asm-blackfin/global_data.h
index 3194b72a53..b78b04cd6b 100644
--- a/include/asm-blackfin/global_data.h
+++ b/include/asm-blackfin/global_data.h
@@ -44,7 +44,6 @@ typedef struct global_data {
unsigned long baudrate;
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)