Signed-off-by: Simon Horman <[EMAIL PROTECTED]>
Index: kexec-tools-sh/kexec/arch/sh/Makefile
===================================================================
--- kexec-tools-sh.orig/kexec/arch/sh/Makefile 2007-02-01 16:30:48.000000000
+0900
+++ kexec-tools-sh/kexec/arch/sh/Makefile 2007-02-01 16:31:50.000000000
+0900
@@ -1,8 +1,8 @@
#
# kexec sh (linux booting linux)
#
-KEXEC_C_SRCS+= kexec/arch/sh/kexec-sh.c
-KEXEC_C_SRCS+= kexec/arch/sh/kexec-zImage-sh.c
-KEXEC_C_SRCS+= kexec/arch/sh/kexec-netbsd-sh.c
+KEXEC_C_SRCS+= kexec/arch/sh/kexec-sh.c
+KEXEC_C_SRCS+= kexec/arch/sh/kexec-zImage-sh.c
+KEXEC_C_SRCS+= kexec/arch/sh/kexec-netbsd-sh.c
KEXEC_C_SRCS+= kexec/arch/sh/kexec-elf-rel-sh.c
KEXEC_S_SRCS+= kexec/arch/sh/netbsd_booter.S
Index: kexec-tools-sh/kexec/arch/sh/kexec-netbsd-sh.c
===================================================================
--- kexec-tools-sh.orig/kexec/arch/sh/kexec-netbsd-sh.c 2007-02-01
16:30:48.000000000 +0900
+++ kexec-tools-sh/kexec/arch/sh/kexec-netbsd-sh.c 2007-02-01
16:32:40.000000000 +0900
@@ -53,7 +53,7 @@
void netbsd_sh_usage(void)
{
- printf(
+ printf(
" --howto=VALUE NetBSD kernel boot option.\n"
" --miniroot=FILE NetBSD miniroot ramdisk.\n\n");
}
@@ -141,12 +141,12 @@
/* howto & bootinfo */
param = xmalloc(4096);
memset(param, 0, 4096);
- paraml = (unsigned long *) ¶m[256];
+ paraml = (unsigned long *) ¶m[256];
memcpy(param, netbsd_booter, 256);
paraml[0] = entry;
paraml[1] = howto_value;
add_segment(info, param, 4096, start, 4096);
-
+
/* For now we don't have arguments to pass :( */
info->entry = (void *) (start | 0xa0000000);
return 0;
Index: kexec-tools-sh/kexec/arch/sh/kexec-sh.c
===================================================================
--- kexec-tools-sh.orig/kexec/arch/sh/kexec-sh.c 2007-02-01
16:30:48.000000000 +0900
+++ kexec-tools-sh/kexec/arch/sh/kexec-sh.c 2007-02-01 16:32:25.000000000
+0900
@@ -57,7 +57,7 @@
" --empty-zero=0x%08x\n\n"
" STRING of --appned is set form /proc/cmdline as default.\n"
" ADDRESS of --empty-zero can be set SHELL environment variable\n"
- " KEXEC_EMPTY_ZERO as default.\n\n"
+ " KEXEC_EMPTY_ZERO as default.\n\n"
" ADDRESS can be get in the following method in your system. \n"
" 1) \"grep empty_zero /proc/kallsyms\". \n"
" 2) \"grep empty_zero System.map\". \n"
@@ -90,9 +90,9 @@
case '?':
usage();
return -1;
- case OPT_APPEND:
- case OPT_NBSD_HOWTO:
- case OPT_NBSD_MROOT:
+ case OPT_APPEND:
+ case OPT_NBSD_HOWTO:
+ case OPT_NBSD_MROOT:
;
}
}
@@ -113,10 +113,10 @@
return -1;
}
if ( (strcmp(utsname.machine, "sh3") == 0) ||
- (strcmp(utsname.machine, "sh4") == 0))
+ (strcmp(utsname.machine, "sh4") == 0))
{
- /* For compatibility with older patches
+ /* For compatibility with older patches
* use KEXEC_ARCH_DEFAULT instead of KEXEC_ARCH_IA64 here.
*/
*flags |= KEXEC_ARCH_DEFAULT;
@@ -142,7 +142,7 @@
if(s){
env = s;
- }else if(!env){
+ }else if(!env){
env = "0x0c001000";
}
return 0x1fffffff & strtoul(env,(char **)NULL,0);
Index: kexec-tools-sh/kexec/arch/sh/kexec-zImage-sh.c
===================================================================
--- kexec-tools-sh.orig/kexec/arch/sh/kexec-zImage-sh.c 2007-02-01
16:30:48.000000000 +0900
+++ kexec-tools-sh/kexec/arch/sh/kexec-zImage-sh.c 2007-02-01
16:32:07.000000000 +0900
@@ -46,7 +46,6 @@
void zImage_sh_usage(void)
{
printf(
-
" --append=STRING Set the kernel command line to STRING.\n"
" --empty-zero=ADDRESS Set the kernel top ADDRESS. \n\n");
@@ -84,7 +83,7 @@
command_line = optarg;
break;
case OPT_EMPTYZERO:
- empty_zero = get_empty_zero(optarg);
+ empty_zero = get_empty_zero(optarg);
break;
}
}
Index: kexec-tools-sh/kexec/arch/sh/netbsd_booter.S
===================================================================
--- kexec-tools-sh.orig/kexec/arch/sh/netbsd_booter.S 2007-02-01
16:30:48.000000000 +0900
+++ kexec-tools-sh/kexec/arch/sh/netbsd_booter.S 2007-02-01
16:31:27.000000000 +0900
@@ -1,5 +1,5 @@
.globl netbsd_booter
-netbsd_booter:
+netbsd_booter:
mov.l ccr,r0
mov #0,r1
mov.l r1,@r0
@@ -17,17 +17,17 @@
mov.l @r0,r1
add #4,r0
mov.l @r0,r4 ! howto
- add #4,r0
+ add #4,r0
mov r0,r5 ! bootinfo
jmp @r1
nop
nop
nop
.align 4
-ccr: .long 0xff00001c
-
+ccr: .long 0xff00001c
+
.align 8
-netbsd_start:
+netbsd_start:
.long 0x8c001000
.long 0x200 ! howto
.long 0 ! bootinfo
--
--
Horms
H: http://www.vergenet.net/~horms/
W: http://www.valinux.co.jp/en/
_______________________________________________
fastboot mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/fastboot
