d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move crc32.c, util.c and gpt.c over to libsa.

Browse Source 
Sponsored by: Netflix
This commit is contained in:
Warner Losh 2017-10-12 14:56:54 +00:00
parent 917587f435
commit 6f0970a4c6
11 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/boot/common/Makefile.inc
View File

@ -1,5 +1,7 @@
# $FreeBSD$ # $FreeBSD$
.PATH: ${SRCTOP}/sys/boot/common ${SRCTOP}/sys/boot/libsa
SRCS+= boot.c commands.c console.c devopen.c interp.c SRCS+= boot.c commands.c console.c devopen.c interp.c
SRCS+= interp_backslash.c interp_parse.c ls.c misc.c SRCS+= interp_backslash.c interp_parse.c ls.c misc.c
SRCS+= module.c panic.c SRCS+= module.c panic.c
@ -30,7 +32,6 @@ SRCS+= dev_net.c
SRCS+= disk.c part.c SRCS+= disk.c part.c
CFLAGS+= -DLOADER_DISK_SUPPORT CFLAGS+= -DLOADER_DISK_SUPPORT
.if !defined(LOADER_NO_GPT_SUPPORT) .if !defined(LOADER_NO_GPT_SUPPORT)
SRCS+= crc32.c
CFLAGS+= -DLOADER_GPT_SUPPORT CFLAGS+= -DLOADER_GPT_SUPPORT
.endif .endif
.if !defined(LOADER_NO_MBR_SUPPORT) .if !defined(LOADER_NO_MBR_SUPPORT)

6
sys/boot/i386/gptboot/Makefile
View File

@ -1,6 +1,8 @@
# $FreeBSD$ # $FreeBSD$
.PATH: ${.CURDIR}/../boot2 ${.CURDIR}/../common ${.CURDIR}/../../common .include "../Makefile.inc"
.PATH: ${.CURDIR}/../boot2 ${.CURDIR}/../common ${SASRC}
FILES= gptboot FILES= gptboot
MAN= gptboot.8 MAN= gptboot.8
@ -20,7 +22,7 @@ GPTBOOT_UFS?= UFS1_AND_UFS2
#GPTBOOT_UFS?= UFS2_ONLY #GPTBOOT_UFS?= UFS2_ONLY
#GPTBOOT_UFS?= UFS1_ONLY #GPTBOOT_UFS?= UFS1_ONLY
CFLAGS= -DBOOTPROG=\"gptboot\" \ CFLAGS+=-DBOOTPROG=\"gptboot\" \
-O1 \ -O1 \
-DGPT \ -DGPT \
-D${GPTBOOT_UFS} \ -D${GPTBOOT_UFS} \

6
sys/boot/i386/gptzfsboot/Makefile
View File

@ -1,10 +1,10 @@
# $FreeBSD$ # $FreeBSD$
.include <bsd.own.mk> .include "../Makefile.inc"
.PATH: ${.CURDIR}/../boot2 ${.CURDIR}/../gptboot \ .PATH: ${.CURDIR}/../boot2 ${.CURDIR}/../gptboot \
${.CURDIR}/../zfsboot ${.CURDIR}/../common \ ${.CURDIR}/../zfsboot ${.CURDIR}/../common \
${.CURDIR}/../../common ${.CURDIR}/../../../crypto/skein ${.CURDIR}/../../../crypto/skein ${SASRC}
FILES= gptzfsboot FILES= gptzfsboot
MAN= gptzfsboot.8 MAN= gptzfsboot.8
@ -19,7 +19,7 @@ REL1= 0x700
ORG1= 0x7c00 ORG1= 0x7c00
ORG2= 0x0 ORG2= 0x0
CFLAGS= -DBOOTPROG=\"gptzfsboot\" \ CFLAGS+=-DBOOTPROG=\"gptzfsboot\" \
-O1 \ -O1 \
-DGPT -DZFS -DBOOT2 \ -DGPT -DZFS -DBOOT2 \
-DSIOPRT=${BOOT_COMCONSOLE_PORT} \ -DSIOPRT=${BOOT_COMCONSOLE_PORT} \

4
sys/boot/i386/zfsboot/Makefile
View File

@ -1,7 +1,9 @@
# $FreeBSD$ # $FreeBSD$
.include "../Makefile.inc"
.PATH: ${.CURDIR}/../boot2 ${.CURDIR}/../common \ .PATH: ${.CURDIR}/../boot2 ${.CURDIR}/../common \
${.CURDIR}/../../common ${.CURDIR}/../../../crypto/skein ${.CURDIR}/../../../crypto/skein ${SASRC}
FILES= zfsboot FILES= zfsboot
MAN= zfsboot.8 MAN= zfsboot.8

0
sys/boot/common/crc32.c → sys/boot/libsa/crc32.c
View File

0
sys/boot/common/crc32.h → sys/boot/libsa/crc32.h
View File

0
sys/boot/common/gpt.c → sys/boot/libsa/gpt.c
View File

0
sys/boot/common/gpt.h → sys/boot/libsa/gpt.h
View File

0
sys/boot/common/util.c → sys/boot/libsa/util.c
View File

0
sys/boot/common/util.h → sys/boot/libsa/util.h
View File

2
sys/boot/uboot/lib/Makefile
View File

@ -8,7 +8,7 @@ LIB= uboot
INTERNALLIB= INTERNALLIB=
WARNS?= 2 WARNS?= 2
SRCS= crc32.c console.c copy.c devicename.c elf_freebsd.c glue.c SRCS= console.c copy.c devicename.c elf_freebsd.c glue.c
SRCS+= module.c net.c reboot.c time.c SRCS+= module.c net.c reboot.c time.c
CFLAGS+= -ffreestanding -msoft-float CFLAGS+= -ffreestanding -msoft-float