diff options
Diffstat (limited to 'arch/arm/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/arm/kernel/vmlinux.lds.S | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S index 0d5db5279c5c..80c8e4c8cefa 100644 --- a/arch/arm/kernel/vmlinux.lds.S +++ b/arch/arm/kernel/vmlinux.lds.S | |||
| @@ -6,14 +6,23 @@ | |||
| 6 | #include <asm-generic/vmlinux.lds.h> | 6 | #include <asm-generic/vmlinux.lds.h> |
| 7 | #include <linux/config.h> | 7 | #include <linux/config.h> |
| 8 | #include <asm/thread_info.h> | 8 | #include <asm/thread_info.h> |
| 9 | #include <asm/memory.h> | ||
| 9 | 10 | ||
| 10 | OUTPUT_ARCH(arm) | 11 | OUTPUT_ARCH(arm) |
| 11 | ENTRY(stext) | 12 | ENTRY(stext) |
| 13 | |||
| 12 | #ifndef __ARMEB__ | 14 | #ifndef __ARMEB__ |
| 13 | jiffies = jiffies_64; | 15 | jiffies = jiffies_64; |
| 14 | #else | 16 | #else |
| 15 | jiffies = jiffies_64 + 4; | 17 | jiffies = jiffies_64 + 4; |
| 16 | #endif | 18 | #endif |
| 19 | |||
| 20 | #ifdef CONFIG_XIP_KERNEL | ||
| 21 | #define TEXTADDR XIP_VIRT_ADDR(CONFIG_XIP_PHYS_ADDR) | ||
| 22 | #else | ||
| 23 | #define TEXTADDR KERNEL_RAM_ADDR | ||
| 24 | #endif | ||
| 25 | |||
| 17 | SECTIONS | 26 | SECTIONS |
| 18 | { | 27 | { |
| 19 | . = TEXTADDR; | 28 | . = TEXTADDR; |
| @@ -95,7 +104,7 @@ SECTIONS | |||
| 95 | 104 | ||
| 96 | #ifdef CONFIG_XIP_KERNEL | 105 | #ifdef CONFIG_XIP_KERNEL |
| 97 | __data_loc = ALIGN(4); /* location in binary */ | 106 | __data_loc = ALIGN(4); /* location in binary */ |
| 98 | . = DATAADDR; | 107 | . = KERNEL_RAM_ADDR; |
| 99 | #else | 108 | #else |
| 100 | . = ALIGN(THREAD_SIZE); | 109 | . = ALIGN(THREAD_SIZE); |
| 101 | __data_loc = .; | 110 | __data_loc = .; |