diff -uNr linux-2.6.8.1-homebrew-dol-support.ppc/arch/i386/Kconfig linux-2.6.8.1-vmlinux-lds.i386/arch/i386/Kconfig --- linux-2.6.8.1-homebrew-dol-support.ppc/arch/i386/Kconfig Wed Aug 18 15:00:10 2004 +++ linux-2.6.8.1-vmlinux-lds.i386/arch/i386/Kconfig Wed Aug 18 17:19:40 2004 @@ -865,6 +865,17 @@ generate incorrect output with certain kernel constructs when -mregparm=3 is used. +config LOAD_ADDRESS_MB + int "Physical address where the kernel expects to be loaded (1-112)MB" + range 1 112 + default "1" + help + This option specifies the physical address where the kernel + expects to be loaded, in terms of MB.. + + Note for kexec on panic the recovery kernel must be run at + a different physical address then the kernel that called panic. + config KEXEC bool "kexec system call (EXPERIMENTAL)" depends on EXPERIMENTAL diff -uNr linux-2.6.8.1-homebrew-dol-support.ppc/arch/i386/kernel/vmlinux.lds.S linux-2.6.8.1-vmlinux-lds.i386/arch/i386/kernel/vmlinux.lds.S --- linux-2.6.8.1-homebrew-dol-support.ppc/arch/i386/kernel/vmlinux.lds.S Tue Jun 15 23:19:01 2004 +++ linux-2.6.8.1-vmlinux-lds.i386/arch/i386/kernel/vmlinux.lds.S Wed Aug 18 20:25:26 2004 @@ -2,134 +2,171 @@ * Written by Martin Mares ; */ +#define __ASSEMBLY__ 1 +#include +#define LOAD_OFFSET __PAGE_OFFSET + #include #include +#include OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386") OUTPUT_ARCH(i386) -ENTRY(startup_32) +ENTRY(phys_startup_32) jiffies = jiffies_64; SECTIONS { - . = 0xC0000000 + 0x100000; - /* read-only */ - _text = .; /* Text and read-only data */ - .text : { - *(.text) - SCHED_TEXT - *(.fixup) - *(.gnu.warning) - } = 0x9090 - - _etext = .; /* End of text section */ - - . = ALIGN(16); /* Exception table */ - __start___ex_table = .; - __ex_table : { *(__ex_table) } - __stop___ex_table = .; - - RODATA - - /* writeable */ - .data : { /* Data */ - *(.data) - CONSTRUCTORS + . = LOAD_OFFSET + LOAD_ADDRESS; + phys_startup_32 = startup_32 - LOAD_OFFSET; + + /* read-only */ + _text = .; /* Text and read-only data */ + .text : AT(ADDR(.text) - LOAD_OFFSET) { + *(.text) + SCHED_TEXT + *(.fixup) + *(.gnu.warning) + } = 0x9090 + + _etext = .; /* End of text section */ + + . = ALIGN(16); /* Exception table */ + __start___ex_table = .; + __ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) { + *(__ex_table) } - - . = ALIGN(4096); - __nosave_begin = .; - .data_nosave : { *(.data.nosave) } - . = ALIGN(4096); - __nosave_end = .; - - . = ALIGN(4096); - .data.page_aligned : { *(.data.idt) } - - . = ALIGN(32); - .data.cacheline_aligned : { *(.data.cacheline_aligned) } - - _edata = .; /* End of data section */ - - . = ALIGN(THREAD_SIZE); /* init_task */ - .data.init_task : { *(.data.init_task) } - - /* will be freed after init */ - . = ALIGN(4096); /* Init code and data */ - __init_begin = .; - .init.text : { - _sinittext = .; - *(.init.text) - _einittext = .; - } - .init.data : { *(.init.data) } - . = ALIGN(16); - __setup_start = .; - .init.setup : { *(.init.setup) } - __setup_end = .; - __start___param = .; - __param : { *(__param) } - __stop___param = .; - __initcall_start = .; - .initcall.init : { - *(.initcall1.init) - *(.initcall2.init) - *(.initcall3.init) - *(.initcall4.init) - *(.initcall5.init) - *(.initcall6.init) - *(.initcall7.init) - } - __initcall_end = .; - __con_initcall_start = .; - .con_initcall.init : { *(.con_initcall.init) } - __con_initcall_end = .; - SECURITY_INIT - . = ALIGN(4); - __alt_instructions = .; - .altinstructions : { *(.altinstructions) } - __alt_instructions_end = .; - .altinstr_replacement : { *(.altinstr_replacement) } - /* .exit.text is discard at runtime, not link time, to deal with references - from .altinstructions and .eh_frame */ - .exit.text : { *(.exit.text) } - .exit.data : { *(.exit.data) } - . = ALIGN(4096); - __initramfs_start = .; - .init.ramfs : { *(.init.ramfs) } - __initramfs_end = .; - . = ALIGN(32); - __per_cpu_start = .; - .data.percpu : { *(.data.percpu) } - __per_cpu_end = .; - . = ALIGN(4096); - __init_end = .; - /* freed after init ends here */ - - __bss_start = .; /* BSS */ - .bss : { - *(.bss.page_aligned) - *(.bss) - } - . = ALIGN(4); - __bss_stop = .; - - _end = . ; - - /* This is where the kernel creates the early boot page tables */ - . = ALIGN(4096); - pg0 = .; - - /* Sections to be discarded */ - /DISCARD/ : { - *(.exitcall.exit) + __stop___ex_table = .; + + RODATA + + /* writeable */ + .data : AT(ADDR(.data) - LOAD_OFFSET) { /* Data */ + *(.data) + CONSTRUCTORS } - - /* Stabs debugging sections. */ - .stab 0 : { *(.stab) } - .stabstr 0 : { *(.stabstr) } - .stab.excl 0 : { *(.stab.excl) } - .stab.exclstr 0 : { *(.stab.exclstr) } - .stab.index 0 : { *(.stab.index) } - .stab.indexstr 0 : { *(.stab.indexstr) } - .comment 0 : { *(.comment) } + + . = ALIGN(4096); + __nosave_begin = .; + .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) { + *(.data.nosave) + } + . = ALIGN(4096); + __nosave_end = .; + + . = ALIGN(4096); + .data.page_aligned : AT(ADDR(.data.page_aligned) - LOAD_OFFSET) { + *(.data.idt) + } + + . = ALIGN(32); + .data.cacheline_aligned : AT(ADDR(.data.cacheline_aligned) - LOAD_OFFSET) { + *(.data.cacheline_aligned) + } + + _edata = .; /* End of data section */ + + . = ALIGN(THREAD_SIZE); /* init_task */ + .data.init_task : AT(ADDR(.data.init_task) - LOAD_OFFSET) { + *(.data.init_task) + } + + /* will be freed after init */ + . = ALIGN(4096); /* Init code and data */ + __init_begin = .; + .init.text : AT(ADDR(.init.text) - LOAD_OFFSET) { + _sinittext = .; + *(.init.text) + _einittext = .; + } + .init.data : AT(ADDR(.init.data) - LOAD_OFFSET) { + *(.init.data) + } + . = ALIGN(16); + __setup_start = .; + .init.setup : AT(ADDR(.init.setup) - LOAD_OFFSET) { + *(.init.setup) + } + __setup_end = .; + __start___param = .; + __param : AT(ADDR(__param) - LOAD_OFFSET) { + *(__param) + } + __stop___param = .; + __initcall_start = .; + .initcall.init : AT(ADDR(.initcall.init) - LOAD_OFFSET) { + *(.initcall1.init) + *(.initcall2.init) + *(.initcall3.init) + *(.initcall4.init) + *(.initcall5.init) + *(.initcall6.init) + *(.initcall7.init) + } + __initcall_end = .; + __con_initcall_start = .; + .con_initcall.init : AT(ADDR(.con_initcall.init) - LOAD_OFFSET) { + *(.con_initcall.init) + } + __con_initcall_end = .; + SECURITY_INIT + . = ALIGN(4); + __alt_instructions = .; + .altinstructions : AT(ADDR(.altinstructions) - LOAD_OFFSET) { + *(.altinstructions) + } + __alt_instructions_end = .; + altinstr_replacement : AT(ADDR(altinstr_replacement) - LOAD_OFFSET) { + *(.altinstr_replacement) + } + /* .exit.text is discard at runtime, not link time, to deal with references + from .altinstructions and .eh_frame */ + .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) { + *(.exit.text) + } + .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) { + *(.exit.data) + } + . = ALIGN(4096); + __initramfs_start = .; + .init.ramfs : AT(ADDR(.init.ramfs) - LOAD_OFFSET) { + *(.init.ramfs) + } + __initramfs_end = .; + . = ALIGN(32); + __per_cpu_start = .; + .data.percpu : AT(ADDR(.data.percpu) - LOAD_OFFSET) { + *(.data.percpu) + } + __per_cpu_end = .; + . = ALIGN(4096); + __init_end = .; + /* freed after init ends here */ + + __bss_start = .; /* BSS */ + .bss : AT(ADDR(.bss) - LOAD_OFFSET) { + *(.bss.page_aligned) + *(.bss) + } + . = ALIGN(4); + __bss_stop = .; + + _end = . ; + + /* This is where the kernel creates the early boot page tables */ + . = ALIGN(4096); + pg0 = .; + + /* Sections to be discarded */ + /DISCARD/ : { + *(.exitcall.exit) + } + + /* Stabs debugging sections. */ + .stab 0 : { *(.stab) } + .stabstr 0 : { *(.stabstr) } + .stab.excl 0 : { *(.stab.excl) } + .stab.exclstr 0 : { *(.stab.exclstr) } + .stab.index 0 : { *(.stab.index) } + .stab.indexstr 0 : { *(.stab.indexstr) } + .comment 0 : { *(.comment) } } diff -uNr linux-2.6.8.1-homebrew-dol-support.ppc/include/asm-generic/vmlinux.lds.h linux-2.6.8.1-vmlinux-lds.i386/include/asm-generic/vmlinux.lds.h --- linux-2.6.8.1-homebrew-dol-support.ppc/include/asm-generic/vmlinux.lds.h Tue Jun 15 23:18:56 2004 +++ linux-2.6.8.1-vmlinux-lds.i386/include/asm-generic/vmlinux.lds.h Wed Aug 18 15:42:49 2004 @@ -50,7 +50,7 @@ } #define SECURITY_INIT \ - .security_initcall.init : { \ + .security_initcall.init : AT(ADDR(.security_initcall.init) - LOAD_OFFSET) { \ VMLINUX_SYMBOL(__security_initcall_start) = .; \ *(.security_initcall.init) \ VMLINUX_SYMBOL(__security_initcall_end) = .; \ diff -uNr linux-2.6.8.1-homebrew-dol-support.ppc/include/asm-i386/segment.h linux-2.6.8.1-vmlinux-lds.i386/include/asm-i386/segment.h --- linux-2.6.8.1-homebrew-dol-support.ppc/include/asm-i386/segment.h Tue Jun 15 23:19:02 2004 +++ linux-2.6.8.1-vmlinux-lds.i386/include/asm-i386/segment.h Wed Aug 18 17:19:14 2004 @@ -95,4 +95,7 @@ */ #define IDT_ENTRIES 256 +#define LOAD_ADDRESS (CONFIG_LOAD_ADDRESS_MB * 0x100000) + #endif +