summaryrefslogtreecommitdiff
path: root/lib_blackfin
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-07-23 16:26:58 -0400
committerMike Frysinger <vapier@gentoo.org>2009-07-24 14:05:04 -0400
commitf51e001143c58447eb50e7aefa2b09eb4cc1410c (patch)
treeed5ac3a70c5efb25034cdb6f5a21e9412cc76dde /lib_blackfin
parentf33b325af666b12eafa9ab235b2cd59832d6e51c (diff)
downloadu-boot-imx-f51e001143c58447eb50e7aefa2b09eb4cc1410c.zip
u-boot-imx-f51e001143c58447eb50e7aefa2b09eb4cc1410c.tar.gz
u-boot-imx-f51e001143c58447eb50e7aefa2b09eb4cc1410c.tar.bz2
Blackfin: restore EVT1 handling in linker script
Sadly, the Blackfin linker script unification lost a small #ifdef logic needed on older parts. Restore that CONFIG_BFIN_BOOTROM_USES_EVT1 logic. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'lib_blackfin')
-rw-r--r--lib_blackfin/u-boot.lds.S9
1 files changed, 8 insertions, 1 deletions
diff --git a/lib_blackfin/u-boot.lds.S b/lib_blackfin/u-boot.lds.S
index 4755153..3604b78 100644
--- a/lib_blackfin/u-boot.lds.S
+++ b/lib_blackfin/u-boot.lds.S
@@ -46,12 +46,19 @@
# define L1_DATA_B_SRAM_SIZE 0
#endif
+/* The 0xC offset is so we don't clobber the tiny LDR jump block. */
+#ifdef CONFIG_BFIN_BOOTROM_USES_EVT1
+# define L1_CODE_ORIGIN L1_INST_SRAM
+#else
+# define L1_CODE_ORIGIN L1_INST_SRAM + 0xC
+#endif
+
OUTPUT_ARCH(bfin)
MEMORY
{
ram : ORIGIN = CONFIG_SYS_MONITOR_BASE, LENGTH = CONFIG_SYS_MONITOR_LEN
- l1_code : ORIGIN = L1_INST_SRAM, LENGTH = L1_INST_SRAM_SIZE
+ l1_code : ORIGIN = L1_CODE_ORIGIN, LENGTH = L1_INST_SRAM_SIZE
l1_data : ORIGIN = L1_DATA_B_SRAM, LENGTH = L1_DATA_B_SRAM_SIZE
}