summaryrefslogtreecommitdiffstats
path: root/arch/xtensa/boot/boot-elf/boot.lds.S
diff options
context:
space:
mode:
authorMax Filippov <jcmvbkbc@gmail.com>2014-10-02 22:03:27 +0400
committerMax Filippov <jcmvbkbc@gmail.com>2014-10-21 13:28:52 +0400
commitccd0ef38be3b9e0cc6efff407c53c43f648d598b (patch)
tree578c346322d590e459b02d6716068614eb88e930 /arch/xtensa/boot/boot-elf/boot.lds.S
parentbe603092ccc09f2d5ecf64cdf3c702b332a5dde3 (diff)
downloadblackbird-op-linux-ccd0ef38be3b9e0cc6efff407c53c43f648d598b.tar.gz
blackbird-op-linux-ccd0ef38be3b9e0cc6efff407c53c43f648d598b.zip
xtensa: nommu: fix Image.elf reset code and ld script
Don't hardcode kernel entry address as 0x3000 or 0xd0003000, use LOAD_MEMORY_ADDRESS macro. Don't compile MMU remapping code and don't try to link it when building noMMU configuration. Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Diffstat (limited to 'arch/xtensa/boot/boot-elf/boot.lds.S')
-rw-r--r--arch/xtensa/boot/boot-elf/boot.lds.S2
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 932b58ef33d4..958b33af96b7 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
}
OpenPOWER on IntegriCloud