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/compressed | |
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/compressed')
-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 |
4 files changed, 10 insertions, 10 deletions
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 |