diff options
Diffstat (limited to 'arch/mips/boot')
-rw-r--r-- | arch/mips/boot/.gitignore | 1 | ||||
-rw-r--r-- | arch/mips/boot/Makefile | 10 | ||||
-rw-r--r-- | arch/mips/boot/addinitrd.c | 131 | ||||
-rw-r--r-- | arch/mips/boot/compressed/Makefile | 105 | ||||
-rw-r--r-- | arch/mips/boot/compressed/dbg.c | 37 | ||||
-rw-r--r-- | arch/mips/boot/compressed/decompress.c | 120 | ||||
-rw-r--r-- | arch/mips/boot/compressed/dummy.c | 4 | ||||
-rw-r--r-- | arch/mips/boot/compressed/head.S | 56 | ||||
-rw-r--r-- | arch/mips/boot/compressed/ld.script | 67 | ||||
-rw-r--r-- | arch/mips/boot/compressed/uart-16550.c | 43 | ||||
-rw-r--r-- | arch/mips/boot/compressed/uart-alchemy.c | 7 |
11 files changed, 443 insertions, 138 deletions
diff --git a/arch/mips/boot/.gitignore b/arch/mips/boot/.gitignore index ba63401c6e10..4667a5f9280b 100644 --- a/arch/mips/boot/.gitignore +++ b/arch/mips/boot/.gitignore | |||
@@ -1,4 +1,5 @@ | |||
1 | mkboot | 1 | mkboot |
2 | elf2ecoff | 2 | elf2ecoff |
3 | vmlinux.* | ||
3 | zImage | 4 | zImage |
4 | zImage.tmp | 5 | zImage.tmp |
diff --git a/arch/mips/boot/Makefile b/arch/mips/boot/Makefile index 2a209d74f0b4..e39a08edcaaa 100644 --- a/arch/mips/boot/Makefile +++ b/arch/mips/boot/Makefile | |||
@@ -25,10 +25,10 @@ strip-flags = $(addprefix --remove-section=,$(drop-sections)) | |||
25 | 25 | ||
26 | VMLINUX = vmlinux | 26 | VMLINUX = vmlinux |
27 | 27 | ||
28 | all: vmlinux.ecoff vmlinux.srec addinitrd | 28 | all: vmlinux.ecoff vmlinux.srec |
29 | 29 | ||
30 | vmlinux.ecoff: $(obj)/elf2ecoff $(VMLINUX) | 30 | vmlinux.ecoff: $(obj)/elf2ecoff $(VMLINUX) |
31 | $(obj)/elf2ecoff $(VMLINUX) vmlinux.ecoff $(E2EFLAGS) | 31 | $(obj)/elf2ecoff $(VMLINUX) $(obj)/vmlinux.ecoff $(E2EFLAGS) |
32 | 32 | ||
33 | $(obj)/elf2ecoff: $(obj)/elf2ecoff.c | 33 | $(obj)/elf2ecoff: $(obj)/elf2ecoff.c |
34 | $(HOSTCC) -o $@ $^ | 34 | $(HOSTCC) -o $@ $^ |
@@ -39,11 +39,7 @@ vmlinux.bin: $(VMLINUX) | |||
39 | vmlinux.srec: $(VMLINUX) | 39 | vmlinux.srec: $(VMLINUX) |
40 | $(OBJCOPY) -S -O srec $(strip-flags) $(VMLINUX) $(obj)/vmlinux.srec | 40 | $(OBJCOPY) -S -O srec $(strip-flags) $(VMLINUX) $(obj)/vmlinux.srec |
41 | 41 | ||
42 | $(obj)/addinitrd: $(obj)/addinitrd.c | 42 | clean-files += elf2ecoff \ |
43 | $(HOSTCC) -o $@ $^ | ||
44 | |||
45 | clean-files += addinitrd \ | ||
46 | elf2ecoff \ | ||
47 | vmlinux.bin \ | 43 | vmlinux.bin \ |
48 | vmlinux.ecoff \ | 44 | vmlinux.ecoff \ |
49 | vmlinux.srec | 45 | vmlinux.srec |
diff --git a/arch/mips/boot/addinitrd.c b/arch/mips/boot/addinitrd.c deleted file mode 100644 index b5b3febc10cc..000000000000 --- a/arch/mips/boot/addinitrd.c +++ /dev/null | |||
@@ -1,131 +0,0 @@ | |||
1 | /* | ||
2 | * addinitrd - program to add a initrd image to an ecoff kernel | ||
3 | * | ||
4 | * (C) 1999 Thomas Bogendoerfer | ||
5 | * minor modifications, cleanup: Guido Guenther <agx@sigxcpu.org> | ||
6 | * further cleanup: Maciej W. Rozycki | ||
7 | */ | ||
8 | |||
9 | #include <sys/types.h> | ||
10 | #include <sys/stat.h> | ||
11 | #include <fcntl.h> | ||
12 | #include <unistd.h> | ||
13 | #include <stdio.h> | ||
14 | #include <netinet/in.h> | ||
15 | |||
16 | #include "ecoff.h" | ||
17 | |||
18 | #define MIPS_PAGE_SIZE 4096 | ||
19 | #define MIPS_PAGE_MASK (MIPS_PAGE_SIZE-1) | ||
20 | |||
21 | #define swab16(x) \ | ||
22 | ((unsigned short)( \ | ||
23 | (((unsigned short)(x) & (unsigned short)0x00ffU) << 8) | \ | ||
24 | (((unsigned short)(x) & (unsigned short)0xff00U) >> 8) )) | ||
25 | |||
26 | #define swab32(x) \ | ||
27 | ((unsigned int)( \ | ||
28 | (((unsigned int)(x) & (unsigned int)0x000000ffUL) << 24) | \ | ||
29 | (((unsigned int)(x) & (unsigned int)0x0000ff00UL) << 8) | \ | ||
30 | (((unsigned int)(x) & (unsigned int)0x00ff0000UL) >> 8) | \ | ||
31 | (((unsigned int)(x) & (unsigned int)0xff000000UL) >> 24) )) | ||
32 | |||
33 | #define SWAB(a) (swab ? swab32(a) : (a)) | ||
34 | |||
35 | void die(char *s) | ||
36 | { | ||
37 | perror(s); | ||
38 | exit(1); | ||
39 | } | ||
40 | |||
41 | int main(int argc, char *argv[]) | ||
42 | { | ||
43 | int fd_vmlinux, fd_initrd, fd_outfile; | ||
44 | FILHDR efile; | ||
45 | AOUTHDR eaout; | ||
46 | SCNHDR esecs[3]; | ||
47 | struct stat st; | ||
48 | char buf[1024]; | ||
49 | unsigned long loadaddr; | ||
50 | unsigned long initrd_header[2]; | ||
51 | int i, cnt; | ||
52 | int swab = 0; | ||
53 | |||
54 | if (argc != 4) { | ||
55 | printf("Usage: %s <vmlinux> <initrd> <outfile>\n", argv[0]); | ||
56 | exit(1); | ||
57 | } | ||
58 | |||
59 | if ((fd_vmlinux = open (argv[1], O_RDONLY)) < 0) | ||
60 | die("open vmlinux"); | ||
61 | if (read (fd_vmlinux, &efile, sizeof efile) != sizeof efile) | ||
62 | die("read file header"); | ||
63 | if (read (fd_vmlinux, &eaout, sizeof eaout) != sizeof eaout) | ||
64 | die("read aout header"); | ||
65 | if (read (fd_vmlinux, esecs, sizeof esecs) != sizeof esecs) | ||
66 | die("read section headers"); | ||
67 | /* | ||
68 | * check whether the file is good for us | ||
69 | */ | ||
70 | /* TBD */ | ||
71 | |||
72 | /* | ||
73 | * check, if we have to swab words | ||
74 | */ | ||
75 | if (ntohs(0xaa55) == 0xaa55) { | ||
76 | if (efile.f_magic == swab16(MIPSELMAGIC)) | ||
77 | swab = 1; | ||
78 | } else { | ||
79 | if (efile.f_magic == swab16(MIPSEBMAGIC)) | ||
80 | swab = 1; | ||
81 | } | ||
82 | |||
83 | /* make sure we have an empty data segment for the initrd */ | ||
84 | if (eaout.dsize || esecs[1].s_size) { | ||
85 | fprintf(stderr, "Data segment not empty. Giving up!\n"); | ||
86 | exit(1); | ||
87 | } | ||
88 | if ((fd_initrd = open (argv[2], O_RDONLY)) < 0) | ||
89 | die("open initrd"); | ||
90 | if (fstat (fd_initrd, &st) < 0) | ||
91 | die("fstat initrd"); | ||
92 | loadaddr = ((SWAB(esecs[2].s_vaddr) + SWAB(esecs[2].s_size) | ||
93 | + MIPS_PAGE_SIZE-1) & ~MIPS_PAGE_MASK) - 8; | ||
94 | if (loadaddr < (SWAB(esecs[2].s_vaddr) + SWAB(esecs[2].s_size))) | ||
95 | loadaddr += MIPS_PAGE_SIZE; | ||
96 | initrd_header[0] = SWAB(0x494E5244); | ||
97 | initrd_header[1] = SWAB(st.st_size); | ||
98 | eaout.dsize = esecs[1].s_size = initrd_header[1] = SWAB(st.st_size+8); | ||
99 | eaout.data_start = esecs[1].s_vaddr = esecs[1].s_paddr = SWAB(loadaddr); | ||
100 | |||
101 | if ((fd_outfile = open (argv[3], O_RDWR|O_CREAT|O_TRUNC, 0666)) < 0) | ||
102 | die("open outfile"); | ||
103 | if (write (fd_outfile, &efile, sizeof efile) != sizeof efile) | ||
104 | die("write file header"); | ||
105 | if (write (fd_outfile, &eaout, sizeof eaout) != sizeof eaout) | ||
106 | die("write aout header"); | ||
107 | if (write (fd_outfile, esecs, sizeof esecs) != sizeof esecs) | ||
108 | die("write section headers"); | ||
109 | /* skip padding */ | ||
110 | if(lseek(fd_vmlinux, SWAB(esecs[0].s_scnptr), SEEK_SET) == (off_t)-1) | ||
111 | die("lseek vmlinux"); | ||
112 | if(lseek(fd_outfile, SWAB(esecs[0].s_scnptr), SEEK_SET) == (off_t)-1) | ||
113 | die("lseek outfile"); | ||
114 | /* copy text segment */ | ||
115 | cnt = SWAB(eaout.tsize); | ||
116 | while (cnt) { | ||
117 | if ((i = read (fd_vmlinux, buf, sizeof buf)) <= 0) | ||
118 | die("read vmlinux"); | ||
119 | if (write (fd_outfile, buf, i) != i) | ||
120 | die("write vmlinux"); | ||
121 | cnt -= i; | ||
122 | } | ||
123 | if (write (fd_outfile, initrd_header, sizeof initrd_header) != sizeof initrd_header) | ||
124 | die("write initrd header"); | ||
125 | while ((i = read (fd_initrd, buf, sizeof buf)) > 0) | ||
126 | if (write (fd_outfile, buf, i) != i) | ||
127 | die("write initrd"); | ||
128 | close(fd_vmlinux); | ||
129 | close(fd_initrd); | ||
130 | return 0; | ||
131 | } | ||
diff --git a/arch/mips/boot/compressed/Makefile b/arch/mips/boot/compressed/Makefile new file mode 100644 index 000000000000..790ddd397620 --- /dev/null +++ b/arch/mips/boot/compressed/Makefile | |||
@@ -0,0 +1,105 @@ | |||
1 | # | ||
2 | # This file is subject to the terms and conditions of the GNU General Public | ||
3 | # License. | ||
4 | # | ||
5 | # Adapted for MIPS Pete Popov, Dan Malek | ||
6 | # | ||
7 | # Copyright (C) 1994 by Linus Torvalds | ||
8 | # Adapted for PowerPC by Gary Thomas | ||
9 | # modified by Cort (cort@cs.nmt.edu) | ||
10 | # | ||
11 | # Copyright (C) 2009 Lemote Inc. & DSLab, Lanzhou University | ||
12 | # Author: Wu Zhangjin <wuzhangjin@gmail.com> | ||
13 | # | ||
14 | |||
15 | # compressed kernel load addr: VMLINUZ_LOAD_ADDRESS > VMLINUX_LOAD_ADDRESS + VMLINUX_SIZE | ||
16 | VMLINUX_SIZE := $(shell wc -c $(objtree)/$(KBUILD_IMAGE) 2>/dev/null | cut -d' ' -f1) | ||
17 | VMLINUX_SIZE := $(shell [ -n "$(VMLINUX_SIZE)" ] && echo -n $$(($(VMLINUX_SIZE) + (65536 - $(VMLINUX_SIZE) % 65536)))) | ||
18 | # VMLINUZ_LOAD_ADDRESS = concat "high32 of VMLINUX_LOAD_ADDRESS" and "(low32 of VMLINUX_LOAD_ADDRESS) + VMLINUX_SIZE" | ||
19 | HIGH32 := $(shell A=$(VMLINUX_LOAD_ADDRESS); [ $${\#A} -gt 10 ] && expr substr "$(VMLINUX_LOAD_ADDRESS)" 3 $$(($${\#A} - 10))) | ||
20 | LOW32 := $(shell [ -n "$(HIGH32)" ] && A=11 || A=3; expr substr "$(VMLINUX_LOAD_ADDRESS)" $${A} 8) | ||
21 | VMLINUZ_LOAD_ADDRESS := 0x$(shell [ -n "$(VMLINUX_SIZE)" -a -n "$(LOW32)" ] && printf "$(HIGH32)%08x" $$(($(VMLINUX_SIZE) + 0x$(LOW32)))) | ||
22 | |||
23 | # set the default size of the mallocing area for decompressing | ||
24 | BOOT_HEAP_SIZE := 0x400000 | ||
25 | |||
26 | # Disable Function Tracer | ||
27 | KBUILD_CFLAGS := $(shell echo $(KBUILD_CFLAGS) | sed -e "s/-pg//") | ||
28 | |||
29 | KBUILD_CFLAGS := $(LINUXINCLUDE) $(KBUILD_CFLAGS) -D__KERNEL__ \ | ||
30 | -DBOOT_HEAP_SIZE=$(BOOT_HEAP_SIZE) -D"VMLINUX_LOAD_ADDRESS_ULL=$(VMLINUX_LOAD_ADDRESS)ull" | ||
31 | |||
32 | KBUILD_AFLAGS := $(LINUXINCLUDE) $(KBUILD_AFLAGS) -D__ASSEMBLY__ \ | ||
33 | -DBOOT_HEAP_SIZE=$(BOOT_HEAP_SIZE) \ | ||
34 | -DKERNEL_ENTRY=0x$(shell $(NM) $(objtree)/$(KBUILD_IMAGE) 2>/dev/null | grep " kernel_entry" | cut -f1 -d \ ) | ||
35 | |||
36 | obj-y := $(obj)/head.o $(obj)/decompress.o $(obj)/dbg.o | ||
37 | |||
38 | ifdef CONFIG_DEBUG_ZBOOT | ||
39 | obj-$(CONFIG_SYS_SUPPORTS_ZBOOT_UART16550) += $(obj)/uart-16550.o | ||
40 | obj-$(CONFIG_MACH_ALCHEMY) += $(obj)/uart-alchemy.o | ||
41 | endif | ||
42 | |||
43 | OBJCOPYFLAGS_vmlinux.bin := $(OBJCOPYFLAGS) -O binary -R .comment -S | ||
44 | $(obj)/vmlinux.bin: $(KBUILD_IMAGE) | ||
45 | $(call if_changed,objcopy) | ||
46 | |||
47 | suffix_$(CONFIG_KERNEL_GZIP) = gz | ||
48 | suffix_$(CONFIG_KERNEL_BZIP2) = bz2 | ||
49 | suffix_$(CONFIG_KERNEL_LZMA) = lzma | ||
50 | suffix_$(CONFIG_KERNEL_LZO) = lzo | ||
51 | tool_$(CONFIG_KERNEL_GZIP) = gzip | ||
52 | tool_$(CONFIG_KERNEL_BZIP2) = bzip2 | ||
53 | tool_$(CONFIG_KERNEL_LZMA) = lzma | ||
54 | tool_$(CONFIG_KERNEL_LZO) = lzo | ||
55 | $(obj)/vmlinux.$(suffix_y): $(obj)/vmlinux.bin | ||
56 | $(call if_changed,$(tool_y)) | ||
57 | |||
58 | $(obj)/piggy.o: $(obj)/vmlinux.$(suffix_y) $(obj)/dummy.o | ||
59 | $(Q)$(OBJCOPY) $(OBJCOPYFLAGS) \ | ||
60 | --add-section=.image=$< \ | ||
61 | --set-section-flags=.image=contents,alloc,load,readonly,data \ | ||
62 | $(obj)/dummy.o $@ | ||
63 | |||
64 | LDFLAGS_vmlinuz := $(LDFLAGS) -Ttext $(VMLINUZ_LOAD_ADDRESS) -T | ||
65 | vmlinuz: $(src)/ld.script $(obj-y) $(obj)/piggy.o | ||
66 | $(call if_changed,ld) | ||
67 | $(Q)$(OBJCOPY) $(OBJCOPYFLAGS) $@ | ||
68 | |||
69 | # | ||
70 | # Some DECstations need all possible sections of an ECOFF executable | ||
71 | # | ||
72 | ifdef CONFIG_MACH_DECSTATION | ||
73 | E2EFLAGS = -a | ||
74 | else | ||
75 | E2EFLAGS = | ||
76 | endif | ||
77 | |||
78 | # elf2ecoff can only handle 32bit image | ||
79 | |||
80 | ifdef CONFIG_32BIT | ||
81 | VMLINUZ = vmlinuz | ||
82 | else | ||
83 | VMLINUZ = vmlinuz.32 | ||
84 | endif | ||
85 | |||
86 | vmlinuz.32: vmlinuz | ||
87 | $(Q)$(OBJCOPY) -O $(32bit-bfd) $(OBJCOPYFLAGS) $< $@ | ||
88 | |||
89 | vmlinuz.ecoff: $(obj)/../elf2ecoff $(VMLINUZ) | ||
90 | $(Q)$(obj)/../elf2ecoff $(VMLINUZ) vmlinuz.ecoff $(E2EFLAGS) | ||
91 | |||
92 | $(obj)/../elf2ecoff: $(src)/../elf2ecoff.c | ||
93 | $(Q)$(HOSTCC) -o $@ $^ | ||
94 | |||
95 | OBJCOPYFLAGS_vmlinuz.bin := $(OBJCOPYFLAGS) -O binary | ||
96 | vmlinuz.bin: vmlinuz | ||
97 | $(call if_changed,objcopy) | ||
98 | |||
99 | OBJCOPYFLAGS_vmlinuz.srec := $(OBJCOPYFLAGS) -S -O srec | ||
100 | vmlinuz.srec: vmlinuz | ||
101 | $(call if_changed,objcopy) | ||
102 | |||
103 | clean: | ||
104 | clean-files += *.o \ | ||
105 | vmlinu* | ||
diff --git a/arch/mips/boot/compressed/dbg.c b/arch/mips/boot/compressed/dbg.c new file mode 100644 index 000000000000..134a6162e394 --- /dev/null +++ b/arch/mips/boot/compressed/dbg.c | |||
@@ -0,0 +1,37 @@ | |||
1 | /* | ||
2 | * MIPS-specific debug support for pre-boot environment | ||
3 | * | ||
4 | * NOTE: putc() is board specific, if your board have a 16550 compatible uart, | ||
5 | * please select SYS_SUPPORTS_ZBOOT_UART16550 for your machine. othewise, you | ||
6 | * need to implement your own putc(). | ||
7 | */ | ||
8 | #include <linux/compiler.h> | ||
9 | #include <linux/init.h> | ||
10 | #include <linux/types.h> | ||
11 | |||
12 | void __weak putc(char c) | ||
13 | { | ||
14 | } | ||
15 | |||
16 | void puts(const char *s) | ||
17 | { | ||
18 | char c; | ||
19 | while ((c = *s++) != '\0') { | ||
20 | putc(c); | ||
21 | if (c == '\n') | ||
22 | putc('\r'); | ||
23 | } | ||
24 | } | ||
25 | |||
26 | void puthex(unsigned long long val) | ||
27 | { | ||
28 | |||
29 | unsigned char buf[10]; | ||
30 | int i; | ||
31 | for (i = 7; i >= 0; i--) { | ||
32 | buf[i] = "0123456789ABCDEF"[val & 0x0F]; | ||
33 | val >>= 4; | ||
34 | } | ||
35 | buf[8] = '\0'; | ||
36 | puts(buf); | ||
37 | } | ||
diff --git a/arch/mips/boot/compressed/decompress.c b/arch/mips/boot/compressed/decompress.c new file mode 100644 index 000000000000..5db43c58b1bf --- /dev/null +++ b/arch/mips/boot/compressed/decompress.c | |||
@@ -0,0 +1,120 @@ | |||
1 | /* | ||
2 | * Misc. bootloader code for many machines. | ||
3 | * | ||
4 | * Copyright 2001 MontaVista Software Inc. | ||
5 | * Author: Matt Porter <mporter@mvista.com> Derived from | ||
6 | * arch/ppc/boot/prep/misc.c | ||
7 | * | ||
8 | * Copyright (C) 2009 Lemote, Inc. | ||
9 | * Author: Wu Zhangjin <wuzhangjin@gmail.com> | ||
10 | * | ||
11 | * This program is free software; you can redistribute it and/or modify it | ||
12 | * under the terms of the GNU General Public License as published by the | ||
13 | * Free Software Foundation; either version 2 of the License, or (at your | ||
14 | * option) any later version. | ||
15 | */ | ||
16 | |||
17 | #include <linux/types.h> | ||
18 | #include <linux/kernel.h> | ||
19 | |||
20 | #include <asm/addrspace.h> | ||
21 | |||
22 | /* These two variables specify the free mem region | ||
23 | * that can be used for temporary malloc area | ||
24 | */ | ||
25 | unsigned long free_mem_ptr; | ||
26 | unsigned long free_mem_end_ptr; | ||
27 | char *zimage_start; | ||
28 | |||
29 | /* The linker tells us where the image is. */ | ||
30 | extern unsigned char __image_begin, __image_end; | ||
31 | |||
32 | /* debug interfaces */ | ||
33 | extern void puts(const char *s); | ||
34 | extern void puthex(unsigned long long val); | ||
35 | |||
36 | void error(char *x) | ||
37 | { | ||
38 | puts("\n\n"); | ||
39 | puts(x); | ||
40 | puts("\n\n -- System halted"); | ||
41 | |||
42 | while (1) | ||
43 | ; /* Halt */ | ||
44 | } | ||
45 | |||
46 | /* activate the code for pre-boot environment */ | ||
47 | #define STATIC static | ||
48 | |||
49 | #ifdef CONFIG_KERNEL_GZIP | ||
50 | void *memcpy(void *dest, const void *src, size_t n) | ||
51 | { | ||
52 | int i; | ||
53 | const char *s = src; | ||
54 | char *d = dest; | ||
55 | |||
56 | for (i = 0; i < n; i++) | ||
57 | d[i] = s[i]; | ||
58 | return dest; | ||
59 | } | ||
60 | #include "../../../../lib/decompress_inflate.c" | ||
61 | #endif | ||
62 | |||
63 | #ifdef CONFIG_KERNEL_BZIP2 | ||
64 | void *memset(void *s, int c, size_t n) | ||
65 | { | ||
66 | int i; | ||
67 | char *ss = s; | ||
68 | |||
69 | for (i = 0; i < n; i++) | ||
70 | ss[i] = c; | ||
71 | return s; | ||
72 | } | ||
73 | #include "../../../../lib/decompress_bunzip2.c" | ||
74 | #endif | ||
75 | |||
76 | #ifdef CONFIG_KERNEL_LZMA | ||
77 | #include "../../../../lib/decompress_unlzma.c" | ||
78 | #endif | ||
79 | |||
80 | #ifdef CONFIG_KERNEL_LZO | ||
81 | #include "../../../../lib/decompress_unlzo.c" | ||
82 | #endif | ||
83 | |||
84 | void decompress_kernel(unsigned long boot_heap_start) | ||
85 | { | ||
86 | int zimage_size; | ||
87 | |||
88 | /* | ||
89 | * We link ourself to an arbitrary low address. When we run, we | ||
90 | * relocate outself to that address. __image_beign points to | ||
91 | * the part of the image where the zImage is. -- Tom | ||
92 | */ | ||
93 | zimage_start = (char *)(unsigned long)(&__image_begin); | ||
94 | zimage_size = (unsigned long)(&__image_end) - | ||
95 | (unsigned long)(&__image_begin); | ||
96 | |||
97 | /* | ||
98 | * The zImage and initrd will be between start and _end, so they've | ||
99 | * already been moved once. We're good to go now. -- Tom | ||
100 | */ | ||
101 | puts("zimage at: "); | ||
102 | puthex((unsigned long)zimage_start); | ||
103 | puts(" "); | ||
104 | puthex((unsigned long)(zimage_size + zimage_start)); | ||
105 | puts("\n"); | ||
106 | |||
107 | /* this area are prepared for mallocing when decompressing */ | ||
108 | free_mem_ptr = boot_heap_start; | ||
109 | free_mem_end_ptr = boot_heap_start + BOOT_HEAP_SIZE; | ||
110 | |||
111 | /* Display standard Linux/MIPS boot prompt for kernel args */ | ||
112 | puts("Uncompressing Linux at load address "); | ||
113 | puthex(VMLINUX_LOAD_ADDRESS_ULL); | ||
114 | puts("\n"); | ||
115 | /* Decompress the kernel with according algorithm */ | ||
116 | decompress(zimage_start, zimage_size, 0, 0, | ||
117 | (void *)VMLINUX_LOAD_ADDRESS_ULL, 0, error); | ||
118 | /* FIXME: is there a need to flush cache here? */ | ||
119 | puts("Now, booting the kernel...\n"); | ||
120 | } | ||
diff --git a/arch/mips/boot/compressed/dummy.c b/arch/mips/boot/compressed/dummy.c new file mode 100644 index 000000000000..31dbf45bf99c --- /dev/null +++ b/arch/mips/boot/compressed/dummy.c | |||
@@ -0,0 +1,4 @@ | |||
1 | int main(void) | ||
2 | { | ||
3 | return 0; | ||
4 | } | ||
diff --git a/arch/mips/boot/compressed/head.S b/arch/mips/boot/compressed/head.S new file mode 100644 index 000000000000..4e65a8420bee --- /dev/null +++ b/arch/mips/boot/compressed/head.S | |||
@@ -0,0 +1,56 @@ | |||
1 | /* | ||
2 | * This file is subject to the terms and conditions of the GNU General Public | ||
3 | * License. See the file "COPYING" in the main directory of this archive | ||
4 | * for more details. | ||
5 | * | ||
6 | * Copyright (C) 1994, 1995 Waldorf Electronics | ||
7 | * Written by Ralf Baechle and Andreas Busse | ||
8 | * Copyright (C) 1995 - 1999 Ralf Baechle | ||
9 | * Copyright (C) 1996 Paul M. Antoine | ||
10 | * Modified for DECStation and hence R3000 support by Paul M. Antoine | ||
11 | * Further modifications by David S. Miller and Harald Koerfgen | ||
12 | * Copyright (C) 1999 Silicon Graphics, Inc. | ||
13 | */ | ||
14 | |||
15 | #include <asm/asm.h> | ||
16 | #include <asm/regdef.h> | ||
17 | |||
18 | .set noreorder | ||
19 | .cprestore | ||
20 | LEAF(start) | ||
21 | start: | ||
22 | /* Save boot rom start args */ | ||
23 | move s0, a0 | ||
24 | move s1, a1 | ||
25 | move s2, a2 | ||
26 | move s3, a3 | ||
27 | |||
28 | /* Clear BSS */ | ||
29 | PTR_LA a0, _edata | ||
30 | PTR_LA a2, _end | ||
31 | 1: sw zero, 0(a0) | ||
32 | bne a2, a0, 1b | ||
33 | addiu a0, a0, 4 | ||
34 | |||
35 | PTR_LA a0, (.heap) /* heap address */ | ||
36 | PTR_LA sp, (.stack + 8192) /* stack address */ | ||
37 | |||
38 | PTR_LA ra, 2f | ||
39 | PTR_LA k0, decompress_kernel | ||
40 | jr k0 | ||
41 | nop | ||
42 | 2: | ||
43 | move a0, s0 | ||
44 | move a1, s1 | ||
45 | move a2, s2 | ||
46 | move a3, s3 | ||
47 | PTR_LI k0, KERNEL_ENTRY | ||
48 | jr k0 | ||
49 | nop | ||
50 | 3: | ||
51 | b 3b | ||
52 | nop | ||
53 | END(start) | ||
54 | |||
55 | .comm .heap,BOOT_HEAP_SIZE,4 | ||
56 | .comm .stack,4096*2,4 | ||
diff --git a/arch/mips/boot/compressed/ld.script b/arch/mips/boot/compressed/ld.script new file mode 100644 index 000000000000..613a35b02f50 --- /dev/null +++ b/arch/mips/boot/compressed/ld.script | |||
@@ -0,0 +1,67 @@ | |||
1 | /* | ||
2 | * ld.script for compressed kernel support of MIPS | ||
3 | * | ||
4 | * Copyright (C) 2009 Lemote Inc. | ||
5 | * Author: Wu Zhangjin <wuzj@lemote.com> | ||
6 | */ | ||
7 | |||
8 | OUTPUT_ARCH(mips) | ||
9 | ENTRY(start) | ||
10 | SECTIONS | ||
11 | { | ||
12 | /* . = VMLINUZ_LOAD_ADDRESS */ | ||
13 | /* read-only */ | ||
14 | _text = .; /* Text and read-only data */ | ||
15 | .text : { | ||
16 | _ftext = . ; | ||
17 | *(.text) | ||
18 | *(.rodata) | ||
19 | } = 0 | ||
20 | _etext = .; /* End of text section */ | ||
21 | |||
22 | /* writable */ | ||
23 | .data : { /* Data */ | ||
24 | _fdata = . ; | ||
25 | *(.data) | ||
26 | /* Put the compressed image here, so bss is on the end. */ | ||
27 | __image_begin = .; | ||
28 | *(.image) | ||
29 | __image_end = .; | ||
30 | CONSTRUCTORS | ||
31 | } | ||
32 | .sdata : { *(.sdata) } | ||
33 | . = ALIGN(4); | ||
34 | _edata = .; /* End of data section */ | ||
35 | |||
36 | /* BSS */ | ||
37 | __bss_start = .; | ||
38 | _fbss = .; | ||
39 | .sbss : { *(.sbss) *(.scommon) } | ||
40 | .bss : { | ||
41 | *(.dynbss) | ||
42 | *(.bss) | ||
43 | *(COMMON) | ||
44 | } | ||
45 | . = ALIGN(4); | ||
46 | _end = . ; | ||
47 | |||
48 | /* These are needed for ELF backends which have not yet been converted | ||
49 | * to the new style linker. */ | ||
50 | |||
51 | .stab 0 : { *(.stab) } | ||
52 | .stabstr 0 : { *(.stabstr) } | ||
53 | |||
54 | /* These must appear regardless of . */ | ||
55 | .gptab.sdata : { *(.gptab.data) *(.gptab.sdata) } | ||
56 | .gptab.sbss : { *(.gptab.bss) *(.gptab.sbss) } | ||
57 | |||
58 | /* Sections to be discarded */ | ||
59 | /DISCARD/ : { | ||
60 | *(.MIPS.options) | ||
61 | *(.options) | ||
62 | *(.pdr) | ||
63 | *(.reginfo) | ||
64 | *(.comment) | ||
65 | *(.note) | ||
66 | } | ||
67 | } | ||
diff --git a/arch/mips/boot/compressed/uart-16550.c b/arch/mips/boot/compressed/uart-16550.c new file mode 100644 index 000000000000..c9caaf4fbf60 --- /dev/null +++ b/arch/mips/boot/compressed/uart-16550.c | |||
@@ -0,0 +1,43 @@ | |||
1 | /* | ||
2 | * 16550 compatible uart based serial debug support for zboot | ||
3 | */ | ||
4 | |||
5 | #include <linux/types.h> | ||
6 | #include <linux/serial_reg.h> | ||
7 | #include <linux/init.h> | ||
8 | |||
9 | #include <asm/addrspace.h> | ||
10 | |||
11 | #if defined(CONFIG_MACH_LOONGSON) || defined(CONFIG_MIPS_MALTA) | ||
12 | #define UART_BASE 0x1fd003f8 | ||
13 | #define PORT(offset) (CKSEG1ADDR(UART_BASE) + (offset)) | ||
14 | #endif | ||
15 | |||
16 | #ifdef CONFIG_AR7 | ||
17 | #include <ar7.h> | ||
18 | #define PORT(offset) (CKSEG1ADDR(AR7_REGS_UART0) + (4 * offset)) | ||
19 | #endif | ||
20 | |||
21 | #ifndef PORT | ||
22 | #error please define the serial port address for your own machine | ||
23 | #endif | ||
24 | |||
25 | static inline unsigned int serial_in(int offset) | ||
26 | { | ||
27 | return *((char *)PORT(offset)); | ||
28 | } | ||
29 | |||
30 | static inline void serial_out(int offset, int value) | ||
31 | { | ||
32 | *((char *)PORT(offset)) = value; | ||
33 | } | ||
34 | |||
35 | void putc(char c) | ||
36 | { | ||
37 | int timeout = 1024; | ||
38 | |||
39 | while (((serial_in(UART_LSR) & UART_LSR_THRE) == 0) && (timeout-- > 0)) | ||
40 | ; | ||
41 | |||
42 | serial_out(UART_TX, c); | ||
43 | } | ||
diff --git a/arch/mips/boot/compressed/uart-alchemy.c b/arch/mips/boot/compressed/uart-alchemy.c new file mode 100644 index 000000000000..1bff22fa089b --- /dev/null +++ b/arch/mips/boot/compressed/uart-alchemy.c | |||
@@ -0,0 +1,7 @@ | |||
1 | #include <asm/mach-au1x00/au1000.h> | ||
2 | |||
3 | void putc(char c) | ||
4 | { | ||
5 | /* all current (Jan. 2010) in-kernel boards */ | ||
6 | alchemy_uart_putchar(UART0_PHYS_ADDR, c); | ||
7 | } | ||