Author: imp
Date: Thu Oct 12 14:56:54 2017
New Revision: 324554
URL: https://svnweb.freebsd.org/changeset/base/324554
Log:
Move crc32.c, util.c and gpt.c over to libsa.
Sponsored by: Netflix
Added:
head/sys/boot/libsa/crc32.c (contents, props changed)
- copied, changed from r324553, head/sys/boot/common/crc32.c
head/sys/boot/libsa/crc32.h (contents, props changed)
- copied, changed from r324553, head/sys/boot/common/crc32.h
head/sys/boot/libsa/gpt.c (contents, props changed)
- copied, changed from r324553, head/sys/boot/common/gpt.c
head/sys/boot/libsa/gpt.h (contents, props changed)
- copied, changed from r324553, head/sys/boot/common/gpt.h
head/sys/boot/libsa/util.c (contents, props changed)
- copied, changed from r324553, head/sys/boot/common/util.c
head/sys/boot/libsa/util.h (contents, props changed)
- copied, changed from r324553, head/sys/boot/common/util.h
Deleted:
head/sys/boot/common/crc32.c
head/sys/boot/common/crc32.h
head/sys/boot/common/gpt.c
head/sys/boot/common/gpt.h
head/sys/boot/common/util.c
head/sys/boot/common/util.h
Modified:
head/sys/boot/common/Makefile.inc
head/sys/boot/i386/gptboot/Makefile
head/sys/boot/i386/gptzfsboot/Makefile
head/sys/boot/i386/zfsboot/Makefile
head/sys/boot/uboot/lib/Makefile
Modified: head/sys/boot/common/Makefile.inc
==============================================================================
--- head/sys/boot/common/Makefile.inc Thu Oct 12 14:56:48 2017
(r324553)
+++ head/sys/boot/common/Makefile.inc Thu Oct 12 14:56:54 2017
(r324554)
@@ -1,5 +1,7 @@
# $FreeBSD$
+.PATH: ${SRCTOP}/sys/boot/common ${SRCTOP}/sys/boot/libsa
+
SRCS+= boot.c commands.c console.c devopen.c interp.c
SRCS+= interp_backslash.c interp_parse.c ls.c misc.c
SRCS+= module.c panic.c
@@ -30,7 +32,6 @@ SRCS+= dev_net.c
SRCS+= disk.c part.c
CFLAGS+= -DLOADER_DISK_SUPPORT
.if !defined(LOADER_NO_GPT_SUPPORT)
-SRCS+= crc32.c
CFLAGS+= -DLOADER_GPT_SUPPORT
.endif
.if !defined(LOADER_NO_MBR_SUPPORT)
Modified: head/sys/boot/i386/gptboot/Makefile
==============================================================================
--- head/sys/boot/i386/gptboot/Makefile Thu Oct 12 14:56:48 2017
(r324553)
+++ head/sys/boot/i386/gptboot/Makefile Thu Oct 12 14:56:54 2017
(r324554)
@@ -1,7 +1,9 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../boot2 ${.CURDIR}/../common ${.CURDIR}/../../common
+.include "../Makefile.inc"
+.PATH: ${.CURDIR}/../boot2 ${.CURDIR}/../common ${SASRC}
+
FILES= gptboot
MAN= gptboot.8
@@ -20,7 +22,7 @@ GPTBOOT_UFS?= UFS1_AND_UFS2
#GPTBOOT_UFS?= UFS2_ONLY
#GPTBOOT_UFS?= UFS1_ONLY
-CFLAGS= -DBOOTPROG=\"gptboot\" \
+CFLAGS+=-DBOOTPROG=\"gptboot\" \
-O1 \
-DGPT \
-D${GPTBOOT_UFS} \
Modified: head/sys/boot/i386/gptzfsboot/Makefile
==============================================================================
--- head/sys/boot/i386/gptzfsboot/Makefile Thu Oct 12 14:56:48 2017
(r324553)
+++ head/sys/boot/i386/gptzfsboot/Makefile Thu Oct 12 14:56:54 2017
(r324554)
@@ -1,10 +1,10 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include "../Makefile.inc"
.PATH: ${.CURDIR}/../boot2 ${.CURDIR}/../gptboot \
${.CURDIR}/../zfsboot ${.CURDIR}/../common \
- ${.CURDIR}/../../common ${.CURDIR}/../../../crypto/skein
+ ${.CURDIR}/../../../crypto/skein ${SASRC}
FILES= gptzfsboot
MAN= gptzfsboot.8
@@ -19,7 +19,7 @@ REL1= 0x700
ORG1= 0x7c00
ORG2= 0x0
-CFLAGS= -DBOOTPROG=\"gptzfsboot\" \
+CFLAGS+=-DBOOTPROG=\"gptzfsboot\" \
-O1 \
-DGPT -DZFS -DBOOT2 \
-DSIOPRT=${BOOT_COMCONSOLE_PORT} \
Modified: head/sys/boot/i386/zfsboot/Makefile
==============================================================================
--- head/sys/boot/i386/zfsboot/Makefile Thu Oct 12 14:56:48 2017
(r324553)
+++ head/sys/boot/i386/zfsboot/Makefile Thu Oct 12 14:56:54 2017
(r324554)
@@ -1,7 +1,9 @@
# $FreeBSD$
+.include "../Makefile.inc"
+
.PATH: ${.CURDIR}/../boot2 ${.CURDIR}/../common \
- ${.CURDIR}/../../common ${.CURDIR}/../../../crypto/skein
+ ${.CURDIR}/../../../crypto/skein ${SASRC}
FILES= zfsboot
MAN= zfsboot.8
Copied and modified: head/sys/boot/libsa/crc32.c (from r324553,
head/sys/boot/common/crc32.c)
==============================================================================
Copied and modified: head/sys/boot/libsa/crc32.h (from r324553,
head/sys/boot/common/crc32.h)
==============================================================================
Copied and modified: head/sys/boot/libsa/gpt.c (from r324553,
head/sys/boot/common/gpt.c)
==============================================================================
Copied and modified: head/sys/boot/libsa/gpt.h (from r324553,
head/sys/boot/common/gpt.h)
==============================================================================
Copied and modified: head/sys/boot/libsa/util.c (from r324553,
head/sys/boot/common/util.c)
==============================================================================
Copied and modified: head/sys/boot/libsa/util.h (from r324553,
head/sys/boot/common/util.h)
==============================================================================
Modified: head/sys/boot/uboot/lib/Makefile
==============================================================================
--- head/sys/boot/uboot/lib/Makefile Thu Oct 12 14:56:48 2017
(r324553)
+++ head/sys/boot/uboot/lib/Makefile Thu Oct 12 14:56:54 2017
(r324554)
@@ -8,7 +8,7 @@ LIB= uboot
INTERNALLIB=
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
CFLAGS+= -ffreestanding -msoft-float
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
