diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2013-01-22 06:59:30 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2013-02-01 04:00:22 -0500 |
commit | 7034228792cc561e79ff8600f02884bd4c80e287 (patch) | |
tree | 89b77af37d087d9de236fc5d21f60bf552d0a2c6 /arch/mips/boot | |
parent | 405ab01c70e18058d9c01a1256769a61fc65413e (diff) |
MIPS: Whitespace cleanup.
Having received another series of whitespace patches I decided to do this
once and for all rather than dealing with this kind of patches trickling
in forever.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/boot')
-rw-r--r-- | arch/mips/boot/Makefile | 2 | ||||
-rw-r--r-- | arch/mips/boot/compressed/Makefile | 8 | ||||
-rw-r--r-- | arch/mips/boot/compressed/calc_vmlinuz_load_addr.c | 4 | ||||
-rw-r--r-- | arch/mips/boot/compressed/decompress.c | 4 | ||||
-rw-r--r-- | arch/mips/boot/compressed/head.S | 4 | ||||
-rw-r--r-- | arch/mips/boot/ecoff.h | 62 | ||||
-rw-r--r-- | arch/mips/boot/elf2ecoff.c | 8 |
7 files changed, 46 insertions, 46 deletions
diff --git a/arch/mips/boot/Makefile b/arch/mips/boot/Makefile index 85bcb5adc7cb..851261e9fdc0 100644 --- a/arch/mips/boot/Makefile +++ b/arch/mips/boot/Makefile | |||
@@ -24,7 +24,7 @@ strip-flags := $(addprefix --remove-section=,$(drop-sections)) | |||
24 | hostprogs-y := elf2ecoff | 24 | hostprogs-y := elf2ecoff |
25 | 25 | ||
26 | targets := vmlinux.ecoff | 26 | targets := vmlinux.ecoff |
27 | quiet_cmd_ecoff = ECOFF $@ | 27 | quiet_cmd_ecoff = ECOFF $@ |
28 | cmd_ecoff = $(obj)/elf2ecoff $(VMLINUX) $@ $(e2eflag) | 28 | cmd_ecoff = $(obj)/elf2ecoff $(VMLINUX) $@ $(e2eflag) |
29 | $(obj)/vmlinux.ecoff: $(obj)/elf2ecoff $(VMLINUX) FORCE | 29 | $(obj)/vmlinux.ecoff: $(obj)/elf2ecoff $(VMLINUX) FORCE |
30 | $(call if_changed,ecoff) | 30 | $(call if_changed,ecoff) |
diff --git a/arch/mips/boot/compressed/Makefile b/arch/mips/boot/compressed/Makefile index c2a3fb0ffc87..bbaa1d4beb6d 100644 --- a/arch/mips/boot/compressed/Makefile +++ b/arch/mips/boot/compressed/Makefile | |||
@@ -51,7 +51,7 @@ $(obj)/vmlinux.bin.z: $(obj)/vmlinux.bin FORCE | |||
51 | 51 | ||
52 | targets += piggy.o | 52 | targets += piggy.o |
53 | OBJCOPYFLAGS_piggy.o := --add-section=.image=$(obj)/vmlinux.bin.z \ | 53 | OBJCOPYFLAGS_piggy.o := --add-section=.image=$(obj)/vmlinux.bin.z \ |
54 | --set-section-flags=.image=contents,alloc,load,readonly,data | 54 | --set-section-flags=.image=contents,alloc,load,readonly,data |
55 | $(obj)/piggy.o: $(obj)/dummy.o $(obj)/vmlinux.bin.z FORCE | 55 | $(obj)/piggy.o: $(obj)/dummy.o $(obj)/vmlinux.bin.z FORCE |
56 | $(call if_changed,objcopy) | 56 | $(call if_changed,objcopy) |
57 | 57 | ||
@@ -67,9 +67,9 @@ endif | |||
67 | 67 | ||
68 | vmlinuzobjs-y += $(obj)/piggy.o | 68 | vmlinuzobjs-y += $(obj)/piggy.o |
69 | 69 | ||
70 | quiet_cmd_zld = LD $@ | 70 | quiet_cmd_zld = LD $@ |
71 | cmd_zld = $(LD) $(LDFLAGS) -Ttext $(VMLINUZ_LOAD_ADDRESS) -T $< $(vmlinuzobjs-y) -o $@ | 71 | cmd_zld = $(LD) $(LDFLAGS) -Ttext $(VMLINUZ_LOAD_ADDRESS) -T $< $(vmlinuzobjs-y) -o $@ |
72 | quiet_cmd_strip = STRIP $@ | 72 | quiet_cmd_strip = STRIP $@ |
73 | cmd_strip = $(STRIP) -s $@ | 73 | cmd_strip = $(STRIP) -s $@ |
74 | vmlinuz: $(src)/ld.script $(vmlinuzobjs-y) $(obj)/calc_vmlinuz_load_addr | 74 | vmlinuz: $(src)/ld.script $(vmlinuzobjs-y) $(obj)/calc_vmlinuz_load_addr |
75 | $(call cmd,zld) | 75 | $(call cmd,zld) |
@@ -96,7 +96,7 @@ quiet_cmd_32 = OBJCOPY $@ | |||
96 | vmlinuz.32: vmlinuz | 96 | vmlinuz.32: vmlinuz |
97 | $(call cmd,32) | 97 | $(call cmd,32) |
98 | 98 | ||
99 | quiet_cmd_ecoff = ECOFF $@ | 99 | quiet_cmd_ecoff = ECOFF $@ |
100 | cmd_ecoff = $< $(VMLINUZ) $@ $(e2eflag) | 100 | cmd_ecoff = $< $(VMLINUZ) $@ $(e2eflag) |
101 | vmlinuz.ecoff: $(obj)/../elf2ecoff $(VMLINUZ) | 101 | vmlinuz.ecoff: $(obj)/../elf2ecoff $(VMLINUZ) |
102 | $(call cmd,ecoff) | 102 | $(call cmd,ecoff) |
diff --git a/arch/mips/boot/compressed/calc_vmlinuz_load_addr.c b/arch/mips/boot/compressed/calc_vmlinuz_load_addr.c index 9a6243676e22..37fe58c19a90 100644 --- a/arch/mips/boot/compressed/calc_vmlinuz_load_addr.c +++ b/arch/mips/boot/compressed/calc_vmlinuz_load_addr.c | |||
@@ -1,8 +1,8 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2010 "Wu Zhangjin" <wuzhangjin@gmail.com> | 2 | * Copyright (C) 2010 "Wu Zhangjin" <wuzhangjin@gmail.com> |
3 | * | 3 | * |
4 | * This program is free software; you can redistribute it and/or modify it | 4 | * This program is free software; you can redistribute it and/or modify it |
5 | * under the terms of the GNU General Public License as published by the | 5 | * under the terms of the GNU General Public License as published by the |
6 | * Free Software Foundation; either version 2 of the License, or (at your | 6 | * Free Software Foundation; either version 2 of the License, or (at your |
7 | * option) any later version. | 7 | * option) any later version. |
8 | */ | 8 | */ |
diff --git a/arch/mips/boot/compressed/decompress.c b/arch/mips/boot/compressed/decompress.c index 5cad0faefa17..2c9573098c0d 100644 --- a/arch/mips/boot/compressed/decompress.c +++ b/arch/mips/boot/compressed/decompress.c | |||
@@ -5,8 +5,8 @@ | |||
5 | * Copyright (C) 2009 Lemote, Inc. | 5 | * Copyright (C) 2009 Lemote, Inc. |
6 | * Author: Wu Zhangjin <wuzhangjin@gmail.com> | 6 | * Author: Wu Zhangjin <wuzhangjin@gmail.com> |
7 | * | 7 | * |
8 | * This program is free software; you can redistribute it and/or modify it | 8 | * This program is free software; you can redistribute it and/or modify it |
9 | * under the terms of the GNU General Public License as published by the | 9 | * under the terms of the GNU General Public License as published by the |
10 | * Free Software Foundation; either version 2 of the License, or (at your | 10 | * Free Software Foundation; either version 2 of the License, or (at your |
11 | * option) any later version. | 11 | * option) any later version. |
12 | */ | 12 | */ |
diff --git a/arch/mips/boot/compressed/head.S b/arch/mips/boot/compressed/head.S index 4e65a8420bee..409cb483a9ff 100644 --- a/arch/mips/boot/compressed/head.S +++ b/arch/mips/boot/compressed/head.S | |||
@@ -32,8 +32,8 @@ start: | |||
32 | bne a2, a0, 1b | 32 | bne a2, a0, 1b |
33 | addiu a0, a0, 4 | 33 | addiu a0, a0, 4 |
34 | 34 | ||
35 | PTR_LA a0, (.heap) /* heap address */ | 35 | PTR_LA a0, (.heap) /* heap address */ |
36 | PTR_LA sp, (.stack + 8192) /* stack address */ | 36 | PTR_LA sp, (.stack + 8192) /* stack address */ |
37 | 37 | ||
38 | PTR_LA ra, 2f | 38 | PTR_LA ra, 2f |
39 | PTR_LA k0, decompress_kernel | 39 | PTR_LA k0, decompress_kernel |
diff --git a/arch/mips/boot/ecoff.h b/arch/mips/boot/ecoff.h index 8c3eed2877f2..83e5c3813d67 100644 --- a/arch/mips/boot/ecoff.h +++ b/arch/mips/boot/ecoff.h | |||
@@ -2,48 +2,48 @@ | |||
2 | * Some ECOFF definitions. | 2 | * Some ECOFF definitions. |
3 | */ | 3 | */ |
4 | typedef struct filehdr { | 4 | typedef struct filehdr { |
5 | unsigned short f_magic; /* magic number */ | 5 | unsigned short f_magic; /* magic number */ |
6 | unsigned short f_nscns; /* number of sections */ | 6 | unsigned short f_nscns; /* number of sections */ |
7 | long f_timdat; /* time & date stamp */ | 7 | long f_timdat; /* time & date stamp */ |
8 | long f_symptr; /* file pointer to symbolic header */ | 8 | long f_symptr; /* file pointer to symbolic header */ |
9 | long f_nsyms; /* sizeof(symbolic hdr) */ | 9 | long f_nsyms; /* sizeof(symbolic hdr) */ |
10 | unsigned short f_opthdr; /* sizeof(optional hdr) */ | 10 | unsigned short f_opthdr; /* sizeof(optional hdr) */ |
11 | unsigned short f_flags; /* flags */ | 11 | unsigned short f_flags; /* flags */ |
12 | } FILHDR; | 12 | } FILHDR; |
13 | #define FILHSZ sizeof(FILHDR) | 13 | #define FILHSZ sizeof(FILHDR) |
14 | 14 | ||
15 | #define OMAGIC 0407 | 15 | #define OMAGIC 0407 |
16 | #define MIPSEBMAGIC 0x160 | 16 | #define MIPSEBMAGIC 0x160 |
17 | #define MIPSELMAGIC 0x162 | 17 | #define MIPSELMAGIC 0x162 |
18 | 18 | ||
19 | typedef struct scnhdr { | 19 | typedef struct scnhdr { |
20 | char s_name[8]; /* section name */ | 20 | char s_name[8]; /* section name */ |
21 | long s_paddr; /* physical address, aliased s_nlib */ | 21 | long s_paddr; /* physical address, aliased s_nlib */ |
22 | long s_vaddr; /* virtual address */ | 22 | long s_vaddr; /* virtual address */ |
23 | long s_size; /* section size */ | 23 | long s_size; /* section size */ |
24 | long s_scnptr; /* file ptr to raw data for section */ | 24 | long s_scnptr; /* file ptr to raw data for section */ |
25 | long s_relptr; /* file ptr to relocation */ | 25 | long s_relptr; /* file ptr to relocation */ |
26 | long s_lnnoptr; /* file ptr to gp histogram */ | 26 | long s_lnnoptr; /* file ptr to gp histogram */ |
27 | unsigned short s_nreloc; /* number of relocation entries */ | 27 | unsigned short s_nreloc; /* number of relocation entries */ |
28 | unsigned short s_nlnno; /* number of gp histogram entries */ | 28 | unsigned short s_nlnno; /* number of gp histogram entries */ |
29 | long s_flags; /* flags */ | 29 | long s_flags; /* flags */ |
30 | } SCNHDR; | 30 | } SCNHDR; |
31 | #define SCNHSZ sizeof(SCNHDR) | 31 | #define SCNHSZ sizeof(SCNHDR) |
32 | #define SCNROUND ((long)16) | 32 | #define SCNROUND ((long)16) |
33 | 33 | ||
34 | typedef struct aouthdr { | 34 | typedef struct aouthdr { |
35 | short magic; /* see above */ | 35 | short magic; /* see above */ |
36 | short vstamp; /* version stamp */ | 36 | short vstamp; /* version stamp */ |
37 | long tsize; /* text size in bytes, padded to DW bdry*/ | 37 | long tsize; /* text size in bytes, padded to DW bdry*/ |
38 | long dsize; /* initialized data " " */ | 38 | long dsize; /* initialized data " " */ |
39 | long bsize; /* uninitialized data " " */ | 39 | long bsize; /* uninitialized data " " */ |
40 | long entry; /* entry pt. */ | 40 | long entry; /* entry pt. */ |
41 | long text_start; /* base of text used for this file */ | 41 | long text_start; /* base of text used for this file */ |
42 | long data_start; /* base of data used for this file */ | 42 | long data_start; /* base of data used for this file */ |
43 | long bss_start; /* base of bss used for this file */ | 43 | long bss_start; /* base of bss used for this file */ |
44 | long gprmask; /* general purpose register mask */ | 44 | long gprmask; /* general purpose register mask */ |
45 | long cprmask[4]; /* co-processor register masks */ | 45 | long cprmask[4]; /* co-processor register masks */ |
46 | long gp_value; /* the gp value used for this object */ | 46 | long gp_value; /* the gp value used for this object */ |
47 | } AOUTHDR; | 47 | } AOUTHDR; |
48 | #define AOUTHSZ sizeof(AOUTHDR) | 48 | #define AOUTHSZ sizeof(AOUTHDR) |
49 | 49 | ||
@@ -51,7 +51,7 @@ typedef struct aouthdr { | |||
51 | #define NMAGIC 0410 | 51 | #define NMAGIC 0410 |
52 | #define ZMAGIC 0413 | 52 | #define ZMAGIC 0413 |
53 | #define SMAGIC 0411 | 53 | #define SMAGIC 0411 |
54 | #define LIBMAGIC 0443 | 54 | #define LIBMAGIC 0443 |
55 | 55 | ||
56 | #define N_TXTOFF(f, a) \ | 56 | #define N_TXTOFF(f, a) \ |
57 | ((a).magic == ZMAGIC || (a).magic == LIBMAGIC ? 0 : \ | 57 | ((a).magic == ZMAGIC || (a).magic == LIBMAGIC ? 0 : \ |
diff --git a/arch/mips/boot/elf2ecoff.c b/arch/mips/boot/elf2ecoff.c index e19d906236af..8585078ae50e 100644 --- a/arch/mips/boot/elf2ecoff.c +++ b/arch/mips/boot/elf2ecoff.c | |||
@@ -29,7 +29,7 @@ | |||
29 | /* elf2ecoff.c | 29 | /* elf2ecoff.c |
30 | 30 | ||
31 | This program converts an elf executable to an ECOFF executable. | 31 | This program converts an elf executable to an ECOFF executable. |
32 | No symbol table is retained. This is useful primarily in building | 32 | No symbol table is retained. This is useful primarily in building |
33 | net-bootable kernels for machines (e.g., DECstation and Alpha) which | 33 | net-bootable kernels for machines (e.g., DECstation and Alpha) which |
34 | only support the ECOFF object file format. */ | 34 | only support the ECOFF object file format. */ |
35 | 35 | ||
@@ -341,7 +341,7 @@ int main(int argc, char *argv[]) | |||
341 | 341 | ||
342 | /* Figure out if we can cram the program header into an ECOFF | 342 | /* Figure out if we can cram the program header into an ECOFF |
343 | header... Basically, we can't handle anything but loadable | 343 | header... Basically, we can't handle anything but loadable |
344 | segments, but we can ignore some kinds of segments. We can't | 344 | segments, but we can ignore some kinds of segments. We can't |
345 | handle holes in the address space. Segments may be out of order, | 345 | handle holes in the address space. Segments may be out of order, |
346 | so we sort them first. */ | 346 | so we sort them first. */ |
347 | 347 | ||
@@ -514,7 +514,7 @@ int main(int argc, char *argv[]) | |||
514 | 514 | ||
515 | for (i = 0; i < nosecs; i++) { | 515 | for (i = 0; i < nosecs; i++) { |
516 | printf | 516 | printf |
517 | ("Section %d: %s phys %lx size %lx file offset %lx\n", | 517 | ("Section %d: %s phys %lx size %lx file offset %lx\n", |
518 | i, esecs[i].s_name, esecs[i].s_paddr, | 518 | i, esecs[i].s_name, esecs[i].s_paddr, |
519 | esecs[i].s_size, esecs[i].s_scnptr); | 519 | esecs[i].s_size, esecs[i].s_scnptr); |
520 | } | 520 | } |
@@ -551,7 +551,7 @@ int main(int argc, char *argv[]) | |||
551 | } | 551 | } |
552 | 552 | ||
553 | /* | 553 | /* |
554 | * Copy the loadable sections. Zero-fill any gaps less than 64k; | 554 | * Copy the loadable sections. Zero-fill any gaps less than 64k; |
555 | * complain about any zero-filling, and die if we're asked to zero-fill | 555 | * complain about any zero-filling, and die if we're asked to zero-fill |
556 | * more than 64k. | 556 | * more than 64k. |
557 | */ | 557 | */ |