[src/trunk]: src/sys/arch/powerpc/stand/mkbootimage Obsolete options '-s'(sta...

[kiyohara <kiyohara%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e8fde93116a7
branches:  trunk
changeset: 783404:e8fde93116a7
user:      kiyohara <kiyohara%NetBSD.org@localhost>
date:      Wed Dec 19 13:47:20 2012 +0000

description:
Obsolete options '-s'(standalone) on bebox.  bebox can boot no-standalone image
from FD or HDD.

diffstat:

 sys/arch/powerpc/stand/mkbootimage/mkbootimage.c |  12 +-----------
 1 files changed, 1 insertions(+), 11 deletions(-)

diffs (40 lines):

diff -r 2d2932a66570 -r e8fde93116a7 sys/arch/powerpc/stand/mkbootimage/mkbootimage.c
--- a/sys/arch/powerpc/stand/mkbootimage/mkbootimage.c  Wed Dec 19 13:35:45 2012 +0000
+++ b/sys/arch/powerpc/stand/mkbootimage/mkbootimage.c  Wed Dec 19 13:47:20 2012 +0000
@@ -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 @@
        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 @@
        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 @@
                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);