Fix ubldr. uboot/lib uses defines for the loader. It's part of the
loader, but not compile as loader (it's building a library), so we can't just include loader.mk for the defines. Move LOADER_DISK_SUPPORT back to defs.mk for the moment. Sponsored by: Netflix
This commit is contained in:
parent
06d6750e0d
commit
8701bb8fae
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=327351
@ -58,6 +58,13 @@ LIBGELIBOOT= ${BOOTOBJ}/geli/libgeliboot.a
|
|||||||
.endif # MK_LOADER_GELI
|
.endif # MK_LOADER_GELI
|
||||||
.endif # HAVE_GELI
|
.endif # HAVE_GELI
|
||||||
|
|
||||||
|
# These should be confined to loader.mk, but can't because uboot/lib
|
||||||
|
# also uses it. It's part of loader, but isn't a loader so we can't
|
||||||
|
# just include loader.mk
|
||||||
|
.if ${LOADER_DISK_SUPPORT:Uyes} == "yes"
|
||||||
|
CFLAGS+= -DLOADER_DISK_SUPPORT
|
||||||
|
.endif
|
||||||
|
|
||||||
# Machine specific flags for all builds here
|
# Machine specific flags for all builds here
|
||||||
|
|
||||||
# All PowerPC builds are 32 bit. We have no 64-bit loaders on powerpc
|
# All PowerPC builds are 32 bit. We have no 64-bit loaders on powerpc
|
||||||
|
@ -105,16 +105,13 @@ CFLAGS+= -DLOADER_NFS_SUPPORT
|
|||||||
CFLAGS+= -DLOADER_TFTP_SUPPORT
|
CFLAGS+= -DLOADER_TFTP_SUPPORT
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
# Disk and partition support
|
# Partition support
|
||||||
.if ${LOADER_DISK_SUPPORT:Uyes} == "yes"
|
|
||||||
CFLAGS+= -DLOADER_DISK_SUPPORT
|
|
||||||
.if ${LOADER_GPT_SUPPORT:Uyes} == "yes"
|
.if ${LOADER_GPT_SUPPORT:Uyes} == "yes"
|
||||||
CFLAGS+= -DLOADER_GPT_SUPPORT
|
CFLAGS+= -DLOADER_GPT_SUPPORT
|
||||||
.endif
|
.endif
|
||||||
.if ${LOADER_MBR_SUPPORT:Uyes} == "yes"
|
.if ${LOADER_MBR_SUPPORT:Uyes} == "yes"
|
||||||
CFLAGS+= -DLOADER_MBR_SUPPORT
|
CFLAGS+= -DLOADER_MBR_SUPPORT
|
||||||
.endif
|
.endif
|
||||||
.endif
|
|
||||||
|
|
||||||
.if defined(HAVE_ZFS)
|
.if defined(HAVE_ZFS)
|
||||||
CFLAGS+= -DLOADER_ZFS_SUPPORT
|
CFLAGS+= -DLOADER_ZFS_SUPPORT
|
||||||
|
Loading…
Reference in New Issue
Block a user