diff options
| author | Chris Zankel <chris@zankel.net> | 2014-11-10 00:24:48 -0800 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2014-11-10 00:24:48 -0800 |
| commit | c0d7aa07504a8f4abd7b02b9144c4a92b7565f45 (patch) | |
| tree | a983f40010592c96e43def4f1293392bb3c99f2d /arch/xtensa/boot/boot-elf/boot.lds.S | |
| parent | aeb589734251aaf4c28d80d0efb5da01dc0ce868 (diff) | |
| parent | 4006e565e1500db40b8546dcc6011737bc5d986c (diff) | |
| download | op-kernel-dev-c0d7aa07504a8f4abd7b02b9144c4a92b7565f45.zip op-kernel-dev-c0d7aa07504a8f4abd7b02b9144c4a92b7565f45.tar.gz | |
Merge tag 'xtensa-for-next-20141021-2' of git://github.com/jcmvbkbc/linux-xtensa into for_next
Xtensa improvements for 3.18:
- fix nommu support;
- remove s6000 variant and s6105 platform.
Diffstat (limited to 'arch/xtensa/boot/boot-elf/boot.lds.S')
| -rw-r--r-- | arch/xtensa/boot/boot-elf/boot.lds.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/xtensa/boot/boot-elf/boot.lds.S b/arch/xtensa/boot/boot-elf/boot.lds.S index 932b58e..958b33a 100644 --- a/arch/xtensa/boot/boot-elf/boot.lds.S +++ b/arch/xtensa/boot/boot-elf/boot.lds.S @@ -41,6 +41,7 @@ SECTIONS __bss_end = .; } +#ifdef CONFIG_MMU /* * This is a remapped copy of the Reset Vector Code. * It keeps gdb in sync with the PC after switching @@ -51,4 +52,5 @@ SECTIONS { *(.ResetVector.remapped_text) } +#endif } |
