Title: [8176] trunk/arch/blackfin: unify some more ram/rom kernel changes
- Revision
- 8176
- Author
- vapier
- Date
- 2010-01-18 20:10:38 -0500 (Mon, 18 Jan 2010)
Log Message
unify some more ram/rom kernel changes
Modified Paths
Diff
Modified: trunk/arch/blackfin/kernel/vmlinux.lds.S (8175 => 8176)
--- trunk/arch/blackfin/kernel/vmlinux.lds.S 2010-01-18 19:41:29 UTC (rev 8175)
+++ trunk/arch/blackfin/kernel/vmlinux.lds.S 2010-01-19 01:10:38 UTC (rev 8176)
@@ -21,13 +21,6 @@
. = CONFIG_BOOT_LOAD;
#else
. = CONFIG_ROM_BASE;
- .text.head :
- {
- __text = .;
- _text = .;
- __stext = .;
- *(.head.text)
- }
#endif
/* Neither the text, ro_data or bss section need to be aligned
@@ -35,11 +28,10 @@
*/
.text :
{
-#ifdef CONFIG_RAMKERNEL
__text = .;
_text = .;
__stext = .;
-#endif
+ *(.romhead.text)
TEXT_TEXT
#if !defined(CONFIG_SCHEDULE_L1)
SCHED_TEXT
@@ -73,7 +65,7 @@
/* Just in case the first read only is a 32-bit access */
RO_DATA(4)
__rodata_end = .;
-#if defined(CONFIG_ROMKERNEL)
+#ifdef CONFIG_ROMKERNEL
. = CONFIG_BOOT_LOAD;
.bss : AT(__rodata_end)
#else
Modified: trunk/arch/blackfin/mach-common/head.S (8175 => 8176)
--- trunk/arch/blackfin/mach-common/head.S 2010-01-18 19:41:29 UTC (rev 8175)
+++ trunk/arch/blackfin/mach-common/head.S 2010-01-19 01:10:38 UTC (rev 8176)
@@ -14,10 +14,11 @@
#include <asm/asm-offsets.h>
#ifdef CONFIG_ROMKERNEL
-.section ".head.text","ax"
+.section ".romhead.text","ax"
#else
__INIT
#endif
+
ENTRY(__start)
#ifdef CONFIG_ROMKERNEL
/* mkimage requires entry address = load address + 64 */
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
