forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-05-11 04dd17822334871b23ea2862f7798fb0e0007777
kernel/arch/arm/kernel/vmlinux.lds.S
....@@ -8,15 +8,13 @@
88 #include "vmlinux-xip.lds.S"
99 #else
1010
11
-#include <asm-generic/vmlinux.lds.h>
11
+#include <linux/pgtable.h>
12
+#include <asm/vmlinux.lds.h>
1213 #include <asm/cache.h>
1314 #include <asm/thread_info.h>
1415 #include <asm/memory.h>
1516 #include <asm/mpu.h>
1617 #include <asm/page.h>
17
-#include <asm/pgtable.h>
18
-
19
-#include "vmlinux.lds.h"
2018
2119 OUTPUT_ARCH(arm)
2220 ENTRY(stext)
....@@ -42,6 +40,10 @@
4240 ARM_DISCARD
4341 #ifndef CONFIG_SMP_ON_UP
4442 *(.alt.smp.init)
43
+#endif
44
+#ifndef CONFIG_ARM_UNWIND
45
+ *(.ARM.exidx) *(.ARM.exidx.*)
46
+ *(.ARM.extab) *(.ARM.extab.*)
4547 #endif
4648 }
4749
....@@ -80,8 +82,6 @@
8082 #ifdef CONFIG_ARM_UNWIND
8183 ARM_UNWIND_SECTIONS
8284 #endif
83
-
84
- NOTES
8585
8686 #ifdef CONFIG_STRICT_KERNEL_RWX
8787 . = ALIGN(1<<SECTION_SHIFT);
....@@ -143,7 +143,7 @@
143143 __init_end = .;
144144
145145 _sdata = .;
146
- RW_DATA_SECTION(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE)
146
+ RW_DATA(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE)
147147 _edata = .;
148148
149149 BSS_SECTION(0, 0, 0)
....@@ -153,6 +153,10 @@
153153 _end = .;
154154
155155 STABS_DEBUG
156
+ DWARF_DEBUG
157
+ ARM_DETAILS
158
+
159
+ ARM_ASSERTS
156160 }
157161
158162 #ifdef CONFIG_STRICT_KERNEL_RWX
....@@ -171,13 +175,5 @@
171175 */
172176 ASSERT((__proc_info_end - __proc_info_begin), "missing CPU support")
173177 ASSERT((__arch_info_end - __arch_info_begin), "no machine record defined")
174
-
175
-/*
176
- * The HYP init code can't be more than a page long,
177
- * and should not cross a page boundary.
178
- * The above comment applies as well.
179
- */
180
-ASSERT(__hyp_idmap_text_end - (__hyp_idmap_text_start & PAGE_MASK) <= PAGE_SIZE,
181
- "HYP init code too big or misaligned")
182178
183179 #endif /* CONFIG_XIP_KERNEL */