Commit 20b27fa33743c6ef77a1248421fab51e8bf21a25
1 parent
7b022d07a0
Exists in
master
and in
7 other branches
sh: Fix up the sh64 zImage build.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Showing 3 changed files with 2 additions and 70 deletions Side-by-side Diff
arch/sh/boot/compressed/Makefile_64
| ... | ... | @@ -14,8 +14,7 @@ |
| 14 | 14 | targets := vmlinux vmlinux.bin vmlinux.bin.gz \ |
| 15 | 15 | head_64.o misc_64.o cache.o piggy.o |
| 16 | 16 | |
| 17 | -OBJECTS := $(obj)/vmlinux_64.lds $(obj)/head_64.o $(obj)/misc_64.o \ | |
| 18 | - $(obj)/cache.o | |
| 17 | +OBJECTS := $(obj)/head_64.o $(obj)/misc_64.o $(obj)/cache.o | |
| 19 | 18 | |
| 20 | 19 | # |
| 21 | 20 | # ZIMAGE_OFFSET is the load offset of the compression loader |
arch/sh/boot/compressed/head_64.S
| ... | ... | @@ -14,6 +14,7 @@ |
| 14 | 14 | * Copyright (C) 2002 Stuart Menefy (stuart.menefy@st.com) |
| 15 | 15 | */ |
| 16 | 16 | #include <asm/cache.h> |
| 17 | +#include <asm/tlb.h> | |
| 17 | 18 | #include <cpu/mmu_context.h> |
| 18 | 19 | #include <cpu/registers.h> |
| 19 | 20 | |
| 20 | 21 | |
| ... | ... | @@ -33,11 +34,7 @@ |
| 33 | 34 | #define ICCR0_INIT_VAL ICCR0_ON | ICCR0_ICI /* ICE + ICI */ |
| 34 | 35 | #define ICCR1_INIT_VAL ICCR1_NOLOCK /* No locking */ |
| 35 | 36 | |
| 36 | -#if 1 | |
| 37 | 37 | #define OCCR0_INIT_VAL OCCR0_ON | OCCR0_OCI | OCCR0_WB /* OCE + OCI + WB */ |
| 38 | -#else | |
| 39 | -#define OCCR0_INIT_VAL OCCR0_OFF | |
| 40 | -#endif | |
| 41 | 38 | #define OCCR1_INIT_VAL OCCR1_NOLOCK /* No locking */ |
| 42 | 39 | |
| 43 | 40 | .text |
arch/sh/boot/compressed/vmlinux_64.lds
| 1 | -/* | |
| 2 | - * ld script to make compressed SuperH/shmedia Linux kernel+decompression | |
| 3 | - * bootstrap | |
| 4 | - * Modified by Stuart Menefy from arch/sh/vmlinux.lds.S written by Niibe Yutaka | |
| 5 | - */ | |
| 6 | - | |
| 7 | - | |
| 8 | -#ifdef CONFIG_LITTLE_ENDIAN | |
| 9 | -/* OUTPUT_FORMAT("elf32-sh64l-linux", "elf32-sh64l-linux", "elf32-sh64l-linux") */ | |
| 10 | -#define NOP 0x6ff0fff0 | |
| 11 | -#else | |
| 12 | -/* OUTPUT_FORMAT("elf32-sh64", "elf32-sh64", "elf32-sh64") */ | |
| 13 | -#define NOP 0xf0fff06f | |
| 14 | -#endif | |
| 15 | - | |
| 16 | -OUTPUT_FORMAT("elf32-sh64-linux") | |
| 17 | -OUTPUT_ARCH(sh) | |
| 18 | -ENTRY(_start) | |
| 19 | - | |
| 20 | -#define ALIGNED_GAP(section, align) (((ADDR(section)+SIZEOF(section)+(align)-1) & ~((align)-1))-ADDR(section)) | |
| 21 | -#define FOLLOWING(section, align) AT (LOADADDR(section) + ALIGNED_GAP(section,align)) | |
| 22 | - | |
| 23 | -SECTIONS | |
| 24 | -{ | |
| 25 | - _text = .; /* Text and read-only data */ | |
| 26 | - | |
| 27 | - .text : { | |
| 28 | - *(.text) | |
| 29 | - *(.text64) | |
| 30 | - *(.text..SHmedia32) | |
| 31 | - *(.fixup) | |
| 32 | - *(.gnu.warning) | |
| 33 | - } = NOP | |
| 34 | - . = ALIGN(4); | |
| 35 | - .rodata : { *(.rodata) } | |
| 36 | - | |
| 37 | - /* There is no 'real' reason for eight byte alignment, four would work | |
| 38 | - * as well, but gdb downloads much (*4) faster with this. | |
| 39 | - */ | |
| 40 | - . = ALIGN(8); | |
| 41 | - .image : { *(.image) } | |
| 42 | - . = ALIGN(4); | |
| 43 | - _etext = .; /* End of text section */ | |
| 44 | - | |
| 45 | - .data : /* Data */ | |
| 46 | - FOLLOWING(.image, 4) | |
| 47 | - { | |
| 48 | - _data = .; | |
| 49 | - *(.data) | |
| 50 | - } | |
| 51 | - _data_image = LOADADDR(.data);/* Address of data section in ROM */ | |
| 52 | - | |
| 53 | - _edata = .; /* End of data section */ | |
| 54 | - | |
| 55 | - .stack : { stack = .; _stack = .; } | |
| 56 | - | |
| 57 | - . = ALIGN(4); | |
| 58 | - __bss_start = .; /* BSS */ | |
| 59 | - .bss : { | |
| 60 | - *(.bss) | |
| 61 | - } | |
| 62 | - . = ALIGN(4); | |
| 63 | - _end = . ; | |
| 64 | -} |