diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-07-26 22:57:11 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-07-26 22:57:11 +0200 |
| commit | e1491288743c3c3547c9b512d03f42eae530a114 (patch) | |
| tree | 64b0e76345999031ddeb8032211f10efc63e2118 | |
| parent | 4e37963af708198f3a5c187edaaf584115ac1df6 (diff) | |
| parent | f51e001143c58447eb50e7aefa2b09eb4cc1410c (diff) | |
| download | u-boot-imx-e1491288743c3c3547c9b512d03f42eae530a114.zip u-boot-imx-e1491288743c3c3547c9b512d03f42eae530a114.tar.gz u-boot-imx-e1491288743c3c3547c9b512d03f42eae530a114.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-blackfin
| -rw-r--r-- | lib_blackfin/u-boot.lds.S | 9 |
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 } |