diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2010-02-15 22:56:22 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2010-02-15 22:56:22 +0000 |
| commit | dcee9e694056fe3401c58de69b8c555a891c1496 (patch) | |
| tree | 56eb89fe12e6c78d4871dec2df2362c5a3689a0b /sys/arch/socppc | |
| parent | 8e0409bb6771650acdd75cb90b9dc2892bbbf27f (diff) | |
Simplify MBR and install it as /usr/mdec/mbr instead of /usr/mdec/mbr.mini
since it makes a fairly decent template for fdisk -i. Change the procedure
that makes the rb600 installation miniroot image to use fdisk -i instead of
dd(1) to create the MBR for the image. Adjust the miniroot disk type in
/etc/disktab to the slightly different layout that fdisk -i creates.
Diffstat (limited to 'sys/arch/socppc')
| -rw-r--r-- | sys/arch/socppc/stand/mbr/Makefile | 4 | ||||
| -rw-r--r-- | sys/arch/socppc/stand/mbr/mbr.S | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/socppc/stand/mbr/Makefile b/sys/arch/socppc/stand/mbr/Makefile index 7d6e19be453..ee73ec018d3 100644 --- a/sys/arch/socppc/stand/mbr/Makefile +++ b/sys/arch/socppc/stand/mbr/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1 2010/02/15 13:43:24 kettenis Exp $ +# $OpenBSD: Makefile,v 1.2 2010/02/15 22:56:21 kettenis Exp $ .include <bsd.own.mk> @@ -6,7 +6,7 @@ NOMAN= #MAN= mbr.8 .if ${MACHINE} == "socppc" -PROG= mbr.mini +PROG= mbr SRCS= mbr.S AFLAGS+=-I${.OBJDIR} -I${.CURDIR}/../../.. #-Wa,a LDFLAGS+=-N -e start -Ttext 0 diff --git a/sys/arch/socppc/stand/mbr/mbr.S b/sys/arch/socppc/stand/mbr/mbr.S index 4da867aab49..b71472d8840 100644 --- a/sys/arch/socppc/stand/mbr/mbr.S +++ b/sys/arch/socppc/stand/mbr/mbr.S @@ -16,8 +16,8 @@ ENTRY(start) */ . = _C_LABEL(start) + 0x1be _pbr_part0: - .byte 0x80, 1, 1, 0, 0x27, 9, 8, 0 - .byte 0x3f, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00 + .byte 0x80, 0, 0, 0, 0x27, 0, 0, 0 + .byte 0x3f, 0, 0, 0, 0, 0x02, 0, 0 _pbr_part1: .byte 0, 0, 0, 0, 0, 0, 0, 0 .byte 0, 0, 0, 0, 0, 0, 0, 0 @@ -25,8 +25,8 @@ _pbr_part2: .byte 0, 0, 0, 0, 0, 0, 0, 0 .byte 0, 0, 0, 0, 0, 0, 0, 0 _pbr_part3: - .byte 0, 9, 9, 0, 0xa6, 15, 63, 7 - .byte 0x3f, 0x02, 0x00, 0x00, 0x41, 0x1d, 0x00, 0x00 + .byte 0, 0, 0, 0, 0, 0, 0, 0 + .byte 0, 0, 0, 0, 0, 0, 0, 0 . = _C_LABEL(start) + 0x1fe magic: |