Module Name: src
Committed By: kiyohara
Date: Wed Dec 19 13:47:21 UTC 2012
Modified Files:
src/sys/arch/powerpc/stand/mkbootimage: mkbootimage.c
Log Message:
Obsolete options '-s'(standalone) on bebox. bebox can boot no-standalone image
from FD or HDD.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 \
src/sys/arch/powerpc/stand/mkbootimage/mkbootimage.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/stand/mkbootimage/mkbootimage.c
diff -u src/sys/arch/powerpc/stand/mkbootimage/mkbootimage.c:1.15 src/sys/arch/powerpc/stand/mkbootimage/mkbootimage.c:1.16
--- src/sys/arch/powerpc/stand/mkbootimage/mkbootimage.c:1.15 Sat May 19 14:47:37 2012
+++ src/sys/arch/powerpc/stand/mkbootimage/mkbootimage.c Wed Dec 19 13:47:20 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mkbootimage.c,v 1.15 2012/05/19 14:47:37 kiyohara Exp $ */
+/* $NetBSD: mkbootimage.c,v 1.16 2012/12/19 13:47:20 kiyohara Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -604,8 +604,6 @@ bebox_write_header(int bebox_fd, int elf
struct SectionHeader textHdr, dataHdr, ldrHdr;
struct LoaderHeader lh;
- if (saloneflag)
- hsize = 0;
ldrOffset = ULALIGN(sizeof (fileHdr) + sizeof (textHdr) +
sizeof (dataHdr) + sizeof (ldrHdr));
@@ -697,9 +695,6 @@ bebox_build_image(char *kernel, char *bo
struct timeval tp;
Elf32_External_Phdr phdr;
- if (saloneflag)
- hsize = 0;
-
elf_fd = open_file("bootloader", boot, &hdr, &elf_stat);
if (inkernflag) {
kern_fd = open_file("kernel", kernel, &khdr, &kern_stat);
@@ -805,11 +800,6 @@ bebox_build_image(char *kernel, char *bo
close(kern_fd);
close(elf_fd);
- if (saloneflag) {
- close(bebox_fd);
- return 0;
- }
-
/* Now go back and write in the block header */
endoff = lseek(bebox_fd, 0, SEEK_END);
lseek(bebox_fd, 0, SEEK_SET);
