From owner-svn-src-projects@FreeBSD.ORG Thu Mar 8 23:59:50 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E5995106566B; Thu, 8 Mar 2012 23:59:49 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CA8908FC08; Thu, 8 Mar 2012 23:59:49 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q28Nxn2u070384; Thu, 8 Mar 2012 23:59:49 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q28NxnTG070381; Thu, 8 Mar 2012 23:59:49 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201203082359.q28NxnTG070381@svn.freebsd.org> From: Jung-uk Kim Date: Thu, 8 Mar 2012 23:59:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r232708 - projects/bigbb/sys/boot/pc98/boot2 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Mar 2012 23:59:50 -0000 Author: jkim Date: Thu Mar 8 23:59:49 2012 New Revision: 232708 URL: http://svn.freebsd.org/changeset/base/232708 Log: MFi386: r232699 Increase UFS2-only boot block size to 16KB (32 sectors). Modified: projects/bigbb/sys/boot/pc98/boot2/Makefile projects/bigbb/sys/boot/pc98/boot2/boot1.S Modified: projects/bigbb/sys/boot/pc98/boot2/Makefile ============================================================================== --- projects/bigbb/sys/boot/pc98/boot2/Makefile Thu Mar 8 23:53:38 2012 (r232707) +++ projects/bigbb/sys/boot/pc98/boot2/Makefile Thu Mar 8 23:59:49 2012 (r232708) @@ -2,7 +2,7 @@ .include -FILES= boot${BOOT_SUFFIX} boot2${BOOT2_SUFFIX} +FILES= boot${BOOT_SUFFIX} boot1${BOOT2_SUFFIX} boot2${BOOT2_SUFFIX} SRCDIR= ${.CURDIR}/../boot2 @@ -17,17 +17,9 @@ ORG1= 0 ORG2= 0x2000 # Decide level of UFS support. -# XXX Currently clang overflows UFS1+UFS2 boot2. -.if ${MK_CLANG} != "no" && \ - (${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang") BOOT2_UFS?= UFS2_ONLY -.else -BOOT2_UFS?= UFS1_AND_UFS2 -.endif +#BOOT2_UFS?= UFS1_AND_UFS2 -.if ${BOOT2_UFS} != UFS1_ONLY -FILES+= boot1 -.endif .if ${BOOT2_UFS} == UFS1_ONLY BOOT_SUFFIX= .ufs1 BOOT2_SUFFIX= ufs1 @@ -35,9 +27,18 @@ BOOT2_SUFFIX= ufs1 BOOT_SUFFIX= .ufs2 BOOT2_SUFFIX= ufs2 LINKS= ${BINDIR}/boot${BOOT_SUFFIX} ${BINDIR}/boot \ + ${BINDIR}/boot1${BOOT2_SUFFIX} ${BINDIR}/boot1 \ ${BINDIR}/boot2${BOOT2_SUFFIX} ${BINDIR}/boot2 .endif +# Decide boot block size. +.if ${BOOT2_UFS} == UFS2_ONLY +BOOT_NSECT= 32 +.else +BOOT_NSECT= 16 +.endif +BOOT2_SIZE= (${BOOT_NSECT}-1)*512 + CFLAGS= -Os \ -fno-guess-branch-probability \ -fomit-frame-pointer \ @@ -47,6 +48,7 @@ CFLAGS= -Os \ -mregparm=3 \ -D${BOOT2_UFS} \ -DFLAGS=${BOOT_BOOT1_FLAGS} \ + -DNSECT=${BOOT_NSECT} \ -DSIOPRT=${BOOT_COMCONSOLE_PORT} \ -DSIOFMT=${B2SIOFMT} \ -DSIOSPD=${BOOT_COMCONSOLE_SPEED} \ @@ -75,12 +77,12 @@ LDFLAGS=-static -N --gc-sections CLEANFILES= boot${BOOT_SUFFIX} -boot${BOOT_SUFFIX}: boot1 boot2${BOOT2_SUFFIX} +boot${BOOT_SUFFIX}: boot1${BOOT2_SUFFIX} boot2${BOOT2_SUFFIX} cat ${.ALLSRC} > ${.TARGET} -CLEANFILES+= boot1 boot1.out boot1.o +CLEANFILES+= boot1${BOOT2_SUFFIX} boot1.out boot1.o -boot1: boot1.out +boot1${BOOT2_SUFFIX}: boot1.out objcopy -S -O binary boot1.out ${.TARGET} boot1.out: boot1.o @@ -90,9 +92,9 @@ CLEANFILES+= boot2${BOOT2_SUFFIX} boot2. boot2.o boot2.s boot2.s.tmp boot2.h sio.o boot2${BOOT2_SUFFIX}: boot2.ld - @set -- `ls -l boot2.ld`; x=$$((7680-$$5)); \ + @set -- `ls -l boot2.ld`; x=$$((${BOOT2_SIZE}-$$5)); \ echo "$$x bytes available"; test $$x -ge 0 - dd if=boot2.ld of=${.TARGET} obs=7680 conv=osync + dd if=boot2.ld of=${.TARGET} obs=$$((${BOOT2_SIZE})) conv=osync boot2.ld: boot2.ldr boot2.bin ${BTXKERN} btxld -v -E ${ORG2} -f bin -b ${BTXKERN} -l boot2.ldr \ Modified: projects/bigbb/sys/boot/pc98/boot2/boot1.S ============================================================================== --- projects/bigbb/sys/boot/pc98/boot2/boot1.S Thu Mar 8 23:53:38 2012 (r232707) +++ projects/bigbb/sys/boot/pc98/boot2/boot1.S Thu Mar 8 23:59:49 2012 (r232708) @@ -57,8 +57,6 @@ .set SIZ_PAG,0x1000 # Page size .set SIZ_SEC,0x200 # Sector size - .set NSECT,0x10 - .globl start .globl read .globl putc