diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 14:02:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 14:02:16 -0700 |
| commit | be15cd72d256e5eb3261a781b8507fac83ab33f6 (patch) | |
| tree | 1a8f95a9960e03149d27d935da25b768878feb3e /arch/arm/kernel/vmlinux.lds.S | |
| parent | e9d52234e35b27ea4ea5f2ab64ca47b1a0c740ab (diff) | |
| parent | 37d07b72ef58f2d5ec7701ab75084fbeee0e503e (diff) | |
| download | kernel_samsung_smdk4412-be15cd72d256e5eb3261a781b8507fac83ab33f6.zip kernel_samsung_smdk4412-be15cd72d256e5eb3261a781b8507fac83ab33f6.tar.gz kernel_samsung_smdk4412-be15cd72d256e5eb3261a781b8507fac83ab33f6.tar.bz2 | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
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 0d5db52..80c8e4c 100644 --- a/arch/arm/kernel/vmlinux.lds.S +++ b/arch/arm/kernel/vmlinux.lds.S @@ -6,14 +6,23 @@ #include <asm-generic/vmlinux.lds.h> #include <linux/config.h> #include <asm/thread_info.h> +#include <asm/memory.h> OUTPUT_ARCH(arm) ENTRY(stext) + #ifndef __ARMEB__ jiffies = jiffies_64; #else jiffies = jiffies_64 + 4; #endif + +#ifdef CONFIG_XIP_KERNEL +#define TEXTADDR XIP_VIRT_ADDR(CONFIG_XIP_PHYS_ADDR) +#else +#define TEXTADDR KERNEL_RAM_ADDR +#endif + SECTIONS { . = TEXTADDR; @@ -95,7 +104,7 @@ SECTIONS #ifdef CONFIG_XIP_KERNEL __data_loc = ALIGN(4); /* location in binary */ - . = DATAADDR; + . = KERNEL_RAM_ADDR; #else . = ALIGN(THREAD_SIZE); __data_loc = .; |