forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-…
…linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (22 commits) MIPS: Ignore vmlinux.* MIPS: Move vmlinux.ecoff to arch/mips/boot MIPS: cpumask_of_node() should handle -1 as a node MIPS: Octeon: Use non-overflowing arithmetic in sched_clock MIPS: Malta, PowerTV: Remove unnecessary "Linux started" MIPS: BCM63xx: Remove duplicate CONFIG_CMDLINE. MIPS: AR7: Remove unused prom_getchar() MIPS: PowerTV: Remove extra r4k_clockevent_init() call MIPS: Cobalt use strlcat() for the command line arguments MIPS: Octeon: Add sched_clock() to csrc-octeon.c MIPS: TXx9: Cleanup builtin-cmdline processing MIPS: PowerTV: simplify prom_init_cmdline() and merge into prom_init() MIPS: PowerTV: Remove unused platform_die() MIPS: PowerTV: Remove mips_machine_halt() MIPS: PowerTV: Remove unused ptv_memsize MIPS: PowerTV: Remove unused prom_getcmdline() MIPS: AR7: Remove kgdb_enabled MIPS: Alchemy: Correct code taking the size of a pointer MIPS: BCM63xx: Fix whitespace damaged board_bcm963xx.c MIPS: VR41xx: Use strlcat() for the command line arguments ...
- Loading branch information
Showing
25 changed files
with
134 additions
and
354 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| mkboot | ||
| elf2ecoff | ||
| vmlinux.* | ||
| zImage | ||
| zImage.tmp |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,150 +1,67 @@ | ||
| /* | ||
| * ld.script for compressed kernel support of MIPS | ||
| * | ||
| * Copyright (C) 2009 Lemote Inc. | ||
| * Author: Wu Zhangjin <[email protected]> | ||
| */ | ||
|
|
||
| OUTPUT_ARCH(mips) | ||
| ENTRY(start) | ||
| SECTIONS | ||
| { | ||
| /* Read-only sections, merged into text segment: */ | ||
| .init : { *(.init) } =0 | ||
| .text : | ||
| { | ||
| _ftext = . ; | ||
| *(.text) | ||
| *(.rodata) | ||
| *(.rodata1) | ||
| /* .gnu.warning sections are handled specially by elf32.em. */ | ||
| *(.gnu.warning) | ||
| } =0 | ||
| .kstrtab : { *(.kstrtab) } | ||
|
|
||
| . = ALIGN(16); /* Exception table */ | ||
| __start___ex_table = .; | ||
| __ex_table : { *(__ex_table) } | ||
| __stop___ex_table = .; | ||
|
|
||
| __start___dbe_table = .; /* Exception table for data bus errors */ | ||
| __dbe_table : { *(__dbe_table) } | ||
| __stop___dbe_table = .; | ||
|
|
||
| __start___ksymtab = .; /* Kernel symbol table */ | ||
| __ksymtab : { *(__ksymtab) } | ||
| __stop___ksymtab = .; | ||
|
|
||
| _etext = .; | ||
|
|
||
| . = ALIGN(8192); | ||
| .data.init_task : { *(.data.init_task) } | ||
|
|
||
| /* Startup code */ | ||
| . = ALIGN(4096); | ||
| __init_begin = .; | ||
| .text.init : { *(.text.init) } | ||
| .data.init : { *(.data.init) } | ||
| . = ALIGN(16); | ||
| __setup_start = .; | ||
| .setup.init : { *(.setup.init) } | ||
| __setup_end = .; | ||
| __initcall_start = .; | ||
| .initcall.init : { *(.initcall.init) } | ||
| __initcall_end = .; | ||
| . = ALIGN(4096); /* Align double page for init_task_union */ | ||
| __init_end = .; | ||
|
|
||
| . = ALIGN(4096); | ||
| .data.page_aligned : { *(.data.idt) } | ||
|
|
||
| . = ALIGN(32); | ||
| .data.cacheline_aligned : { *(.data.cacheline_aligned) } | ||
| /* . = VMLINUZ_LOAD_ADDRESS */ | ||
| /* read-only */ | ||
| _text = .; /* Text and read-only data */ | ||
| .text : { | ||
| _ftext = . ; | ||
| *(.text) | ||
| *(.rodata) | ||
| } = 0 | ||
| _etext = .; /* End of text section */ | ||
|
|
||
| .fini : { *(.fini) } =0 | ||
| .reginfo : { *(.reginfo) } | ||
| /* Adjust the address for the data segment. We want to adjust up to | ||
| the same address within the page on the next page up. It would | ||
| be more correct to do this: | ||
| . = .; | ||
| The current expression does not correctly handle the case of a | ||
| text segment ending precisely at the end of a page; it causes the | ||
| data segment to skip a page. The above expression does not have | ||
| this problem, but it will currently (2/95) cause BFD to allocate | ||
| a single segment, combining both text and data, for this case. | ||
| This will prevent the text segment from being shared among | ||
| multiple executions of the program; I think that is more | ||
| important than losing a page of the virtual address space (note | ||
| that no actual memory is lost; the page which is skipped can not | ||
| be referenced). */ | ||
| . = .; | ||
| .data : | ||
| { | ||
| _fdata = . ; | ||
| *(.data) | ||
| /* writable */ | ||
| .data : { /* Data */ | ||
| _fdata = . ; | ||
| *(.data) | ||
| /* Put the compressed image here, so bss is on the end. */ | ||
| __image_begin = .; | ||
| *(.image) | ||
| __image_end = .; | ||
| CONSTRUCTORS | ||
| } | ||
| .sdata : { *(.sdata) } | ||
| . = ALIGN(4); | ||
| _edata = .; /* End of data section */ | ||
|
|
||
| /* Put the compressed image here, so bss is on the end. */ | ||
| __image_begin = .; | ||
| *(.image) | ||
| __image_end = .; | ||
| /* Align the initial ramdisk image (INITRD) on page boundaries. */ | ||
| . = ALIGN(4096); | ||
| __ramdisk_begin = .; | ||
| *(.initrd) | ||
| __ramdisk_end = .; | ||
| . = ALIGN(4096); | ||
| /* BSS */ | ||
| __bss_start = .; | ||
| _fbss = .; | ||
| .sbss : { *(.sbss) *(.scommon) } | ||
| .bss : { | ||
| *(.dynbss) | ||
| *(.bss) | ||
| *(COMMON) | ||
| } | ||
| . = ALIGN(4); | ||
| _end = . ; | ||
|
|
||
| CONSTRUCTORS | ||
| } | ||
| .data1 : { *(.data1) } | ||
| _gp = . + 0x8000; | ||
| .lit8 : { *(.lit8) } | ||
| .lit4 : { *(.lit4) } | ||
| .ctors : { *(.ctors) } | ||
| .dtors : { *(.dtors) } | ||
| .got : { *(.got.plt) *(.got) } | ||
| .dynamic : { *(.dynamic) } | ||
| /* We want the small data sections together, so single-instruction offsets | ||
| can access them all, and initialized data all before uninitialized, so | ||
| we can shorten the on-disk segment size. */ | ||
| .sdata : { *(.sdata) } | ||
| . = ALIGN(4); | ||
| _edata = .; | ||
| PROVIDE (edata = .); | ||
| /* These are needed for ELF backends which have not yet been converted | ||
| * to the new style linker. */ | ||
|
|
||
| __bss_start = .; | ||
| _fbss = .; | ||
| .sbss : { *(.sbss) *(.scommon) } | ||
| .bss : | ||
| { | ||
| *(.dynbss) | ||
| *(.bss) | ||
| *(COMMON) | ||
| . = ALIGN(4); | ||
| _end = . ; | ||
| PROVIDE (end = .); | ||
| } | ||
| .stab 0 : { *(.stab) } | ||
| .stabstr 0 : { *(.stabstr) } | ||
|
|
||
| /* Sections to be discarded */ | ||
| /DISCARD/ : | ||
| { | ||
| *(.text.exit) | ||
| *(.data.exit) | ||
| *(.exitcall.exit) | ||
| } | ||
| /* These must appear regardless of . */ | ||
| .gptab.sdata : { *(.gptab.data) *(.gptab.sdata) } | ||
| .gptab.sbss : { *(.gptab.bss) *(.gptab.sbss) } | ||
|
|
||
| /* This is the MIPS specific mdebug section. */ | ||
| .mdebug : { *(.mdebug) } | ||
| /* These are needed for ELF backends which have not yet been | ||
| converted to the new style linker. */ | ||
| .stab 0 : { *(.stab) } | ||
| .stabstr 0 : { *(.stabstr) } | ||
| /* DWARF debug sections. | ||
| Symbols in the .debug DWARF section are relative to the beginning of the | ||
| section so we begin .debug at 0. It's not clear yet what needs to happen | ||
| for the others. */ | ||
| .debug 0 : { *(.debug) } | ||
| .debug_srcinfo 0 : { *(.debug_srcinfo) } | ||
| .debug_aranges 0 : { *(.debug_aranges) } | ||
| .debug_pubnames 0 : { *(.debug_pubnames) } | ||
| .debug_sfnames 0 : { *(.debug_sfnames) } | ||
| .line 0 : { *(.line) } | ||
| /* These must appear regardless of . */ | ||
| .gptab.sdata : { *(.gptab.data) *(.gptab.sdata) } | ||
| .gptab.sbss : { *(.gptab.bss) *(.gptab.sbss) } | ||
| .comment : { *(.comment) } | ||
| .note : { *(.note) } | ||
| /* Sections to be discarded */ | ||
| /DISCARD/ : { | ||
| *(.MIPS.options) | ||
| *(.options) | ||
| *(.pdr) | ||
| *(.reginfo) | ||
| *(.comment) | ||
| *(.note) | ||
| } | ||
| } |
Oops, something went wrong.