1c85e6a35d
filesystem expands the inode to 256 bytes to make space for 64-bit block pointers. It also adds a file-creation time field, an ability to use jumbo blocks per inode to allow extent like pointer density, and space for extended attributes (up to twice the filesystem block size worth of attributes, e.g., on a 16K filesystem, there is space for 32K of attributes). UFS2 fully supports and runs existing UFS1 filesystems. New filesystems built using newfs can be built in either UFS1 or UFS2 format using the -O option. In this commit UFS1 is the default format, so if you want to build UFS2 format filesystems, you must specify -O 2. This default will be changed to UFS2 when UFS2 proves itself to be stable. In this commit the boot code for reading UFS2 filesystems is not compiled (see /sys/boot/common/ufsread.c) as there is insufficient space in the boot block. Once the size of the boot block is increased, this code can be defined. Things to note: the definition of SBSIZE has changed to SBLOCKSIZE. The header file <ufs/ufs/dinode.h> must be included before <ufs/ffs/fs.h> so as to get the definitions of ufs2_daddr_t and ufs_lbn_t. Still TODO: Verify that the first level bootstraps work for all the architectures. Convert the utility ffsinfo to understand UFS2 and test growfs. Add support for the extended attribute storage. Update soft updates to ensure integrity of extended attribute storage. Switch the current extended attribute interfaces to use the extended attribute storage. Add the extent like functionality (framework is there, but is currently never used). Sponsored by: DARPA & NAI Labs. Reviewed by: Poul-Henning Kamp <phk@freebsd.org>
95 lines
2.4 KiB
Makefile
95 lines
2.4 KiB
Makefile
# $FreeBSD$
|
|
|
|
PROG= boot2
|
|
NOMAN=
|
|
STRIP=
|
|
BINDIR?= /boot
|
|
BINMODE= 444
|
|
CLEANFILES+= boot1 boot1.out boot1.o \
|
|
boot2.ldr boot2.bin boot2.ld boot2.out boot2.o boot2.h \
|
|
boot2.s sio.o
|
|
|
|
NM?= nm
|
|
|
|
# A value of 0x80 enables LBA support.
|
|
B1FLAGS= 0x80
|
|
|
|
BOOT_COMCONSOLE_PORT?= 0x3f8
|
|
BOOT_COMCONSOLE_SPEED?= 9600
|
|
B2SIOFMT?= 0x3
|
|
|
|
.if exists(${.OBJDIR}/../btx)
|
|
BTX= ${.OBJDIR}/../btx
|
|
.else
|
|
BTX= ${.CURDIR}/../btx
|
|
.endif
|
|
|
|
ORG1= 0x7c00
|
|
ORG2= 0x1000
|
|
|
|
CFLAGS= -elf -ffreestanding -Os -fno-builtin \
|
|
-fno-guess-branch-probability \
|
|
-mrtd \
|
|
-I${.CURDIR}/../../common \
|
|
-I${.CURDIR}/../btx/lib -I. \
|
|
-Wall -Waggregate-return -Wbad-function-cast -Wcast-align \
|
|
-Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
|
|
-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings
|
|
|
|
LDFLAGS=-nostdlib -static -N
|
|
|
|
all: boot1 boot2
|
|
|
|
boot1: boot1.out
|
|
objcopy -S -O binary boot1.out ${.TARGET}
|
|
|
|
boot1.out: boot1.o
|
|
${LD} ${LDFLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} boot1.o
|
|
|
|
boot1.o: boot1.s
|
|
${AS} ${AFLAGS} --defsym FLAGS=${B1FLAGS} ${.IMPSRC} -o ${.TARGET}
|
|
|
|
boot2.o: boot2.c ${.CURDIR}/../../common/ufsread.c
|
|
${CC} ${CFLAGS} -S -o boot2.s.tmp ${.IMPSRC}
|
|
sed -e '/align/d' -e '/nop/d' < boot2.s.tmp > boot2.s
|
|
rm -f boot2.s.tmp
|
|
${AS} ${AFLAGS} -o boot2.o boot2.s
|
|
|
|
boot2.h: boot1.out
|
|
${NM} -t d ${.ALLSRC} | awk '/([0-9])+ T xread/ \
|
|
{ x = $$1 - ORG1; printf("#define XREADORG 0x7%x\n", x) }' \
|
|
ORG1=`printf "%d" ${ORG1}` > boot2.h
|
|
|
|
boot2: boot2.ldr boot2.bin ${BTX}/btx/btx
|
|
btxld -v -E ${ORG2} -f bin -b ${BTX}/btx/btx -l boot2.ldr \
|
|
-o boot2.ld -P 1 boot2.bin
|
|
@ls -l boot2.ld | awk '{ x = 7680 - $$5; \
|
|
print x " bytes available"; if (x < 0) exit 1 }'
|
|
dd if=boot2.ld of=${.TARGET} obs=7680 conv=osync 2>/dev/null
|
|
|
|
boot2.ldr:
|
|
dd if=/dev/zero of=${.TARGET} bs=512 count=1 2>/dev/null
|
|
|
|
boot2.bin: boot2.out
|
|
objcopy -S -O binary boot2.out ${.TARGET}
|
|
|
|
boot2.out: boot2.o sio.o
|
|
${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} \
|
|
${BTX}/lib/crt0.o boot2.o sio.o ../libi386/libi386.a
|
|
|
|
boot2.o: boot2.h
|
|
|
|
sio.o: sio.s
|
|
${AS} ${AFLAGS} --defsym SIOPRT=${BOOT_COMCONSOLE_PORT} \
|
|
--defsym SIOFMT=${B2SIOFMT} \
|
|
--defsym SIOSPD=${BOOT_COMCONSOLE_SPEED} \
|
|
${.IMPSRC} -o ${.TARGET}
|
|
|
|
install:
|
|
${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
|
|
boot1 ${DESTDIR}${BINDIR}/boot1
|
|
${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
|
|
boot2 ${DESTDIR}${BINDIR}/boot2
|
|
|
|
.include <bsd.prog.mk>
|