Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Remove fdisk/mbr for macppc which was blindly pulled from Op...



details:   https://anonhg.NetBSD.org/src/rev/fdcd3b7766a9
branches:  trunk
changeset: 749356:fdcd3b7766a9
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Fri Nov 27 15:37:32 2009 +0000

description:
Remove fdisk/mbr for macppc which was blindly pulled from OpenBSD.
It just fakes MBR partition map which contains 1MB FAT16B partition
and ~1GB OpenBSD partition, and we can always create necessary
MBR partitions for OpenFirmware by the fdisk(8) command itself.

diffstat:

 distrib/sets/lists/base/md.macppc |   4 ++--
 sbin/fdisk/Makefile               |   4 +---
 sbin/fdisk/mbr/Makefile           |  33 ---------------------------------
 sbin/fdisk/mbr/mbr_macppc.S       |  24 ------------------------
 4 files changed, 3 insertions(+), 62 deletions(-)

diffs (97 lines):

diff -r c7c570dd265f -r fdcd3b7766a9 distrib/sets/lists/base/md.macppc
--- a/distrib/sets/lists/base/md.macppc Fri Nov 27 14:39:39 2009 +0000
+++ b/distrib/sets/lists/base/md.macppc Fri Nov 27 15:37:32 2009 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: md.macppc,v 1.27 2008/11/29 17:57:34 tsutsui Exp $
+# $NetBSD: md.macppc,v 1.28 2009/11/27 15:37:32 tsutsui Exp $
 ./sbin/pdisk                                   base-sysutil-root
 ./usr/mdec/bootxx                              base-sysutil-bin
 ./usr/mdec/installboot                         base-obsolete           obsolete
-./usr/mdec/mbr                                 base-sysutil-bin
+./usr/mdec/mbr                                 base-obsolete           obsolete
 ./usr/mdec/ofwboot                             base-sysutil-bin
 ./usr/mdec/ofwboot.elf                         base-sysutil-bin
 ./usr/mdec/ofwboot.xcf                         base-sysutil-bin
diff -r c7c570dd265f -r fdcd3b7766a9 sbin/fdisk/Makefile
--- a/sbin/fdisk/Makefile       Fri Nov 27 14:39:39 2009 +0000
+++ b/sbin/fdisk/Makefile       Fri Nov 27 15:37:32 2009 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.40 2009/06/01 19:57:33 christos Exp $
+#      $NetBSD: Makefile,v 1.41 2009/11/27 15:37:32 tsutsui Exp $
 
 PROG=  fdisk 
 SRCS=  fdisk.c
@@ -16,8 +16,6 @@
 .include <bsd.prog.mk>
 
 .if (${HOSTPROG:U} == "")
-SUBDIR=        mbr
 DPADD+=        ${LIBUTIL} ${LIBZ}
 LDADD+=        -lutil -lz
-.include <bsd.subdir.mk>
 .endif
diff -r c7c570dd265f -r fdcd3b7766a9 sbin/fdisk/mbr/Makefile
--- a/sbin/fdisk/mbr/Makefile   Fri Nov 27 14:39:39 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-#      $NetBSD: Makefile,v 1.20 2006/06/28 15:03:00 lukem Exp $
-
-NOMAN=
-BINDIR=        /usr/mdec
-BINMODE=444
-
-STRIPFLAG=
-
-.include <bsd.own.mk>
-
-LDFLAGS+= -nostdlib
-.if ${OBJECT_FMT} == "ELF"
-LDFLAGS+= -Wl,-e,start
-.else
-LDFLAGS+= -Wl,-e,_start -Wl,-N
-.endif
-
-.if ${MACHINE} == "macppc"
-
-PROG=  mbr
-SRCS=  mbr_macppc.S
-
-CLEANFILES+=   ${PROG}.tmp
-
-${PROG}: ${OBJS}
-       ${_MKTARGET_LINK}
-       ${CC} -o ${PROG}.tmp ${LDFLAGS} -Wl,-Ttext,0x600 ${OBJS}
-       ${STRIP} ${PROG}.tmp
-       ${OBJCOPY} -O binary ${PROG}.tmp ${PROG}
-
-.endif # macppc
-
-.include <bsd.prog.mk>
diff -r c7c570dd265f -r fdcd3b7766a9 sbin/fdisk/mbr/mbr_macppc.S
--- a/sbin/fdisk/mbr/mbr_macppc.S       Fri Nov 27 14:39:39 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*     $NetBSD: mbr_macppc.S,v 1.1 2002/06/17 15:25:45 itojun Exp $    */
-
-/*
- * macppc master boot code - generates /usr/mdec/mbr identical to OpenBSD's.
- * not sure what it means, but it makes OpenFirmware happy
- */
-
-#include <machine/asm.h>
-
-       .text
-ENTRY(start)
-       . = _C_LABEL(start) + 0x1be
-       .byte   0x80
-       . = _C_LABEL(start) + 0x1c2
-       .byte   0x06
-       . = _C_LABEL(start) + 0x1c6
-       .byte   0x01
-       . = _C_LABEL(start) + 0x1cb
-       .byte   0x08
-       . = _C_LABEL(start) + 0x1ef
-       .byte   0x06
-       . = _C_LABEL(start) + 0x1f0
-       .byte   0x22, 0x02, 0xa6, 0x06, 0xb6, 0xa7, 0x01, 0x08
-       .byte   0x00, 0x00, 0x59, 0x6f, 0x1f, 0x00, 0x55, 0xaa



Home | Main Index | Thread Index | Old Index