diff options
| author | Rafal Jaworowski <raj@FreeBSD.org> | 2010-06-13 12:46:32 +0000 |
|---|---|---|
| committer | Rafal Jaworowski <raj@FreeBSD.org> | 2010-06-13 12:46:32 +0000 |
| commit | 29d268b567608d6cc12b205ed6a87334ca88ef29 (patch) | |
| tree | 5127cf0288cde21b76254071b6f3ee07ab66192a /sys | |
| parent | 2a008fddd8af0bed9f03b3d82ee5811bde9cf5d7 (diff) | |
| download | src-29d268b567608d6cc12b205ed6a87334ca88ef29.tar.gz src-29d268b567608d6cc12b205ed6a87334ca88ef29.zip | |
Fix conditional FDT support in loader(8).
Notes
Notes:
svn path=/head/; revision=209125
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/boot/arm/uboot/Makefile | 4 | ||||
| -rw-r--r-- | sys/boot/powerpc/uboot/Makefile | 4 | ||||
| -rw-r--r-- | sys/boot/uboot/common/metadata.c | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/sys/boot/arm/uboot/Makefile b/sys/boot/arm/uboot/Makefile index 2cdd9e7f12f5..573f9489f353 100644 --- a/sys/boot/arm/uboot/Makefile +++ b/sys/boot/arm/uboot/Makefile @@ -1,5 +1,7 @@ # $FreeBSD$ +.include <bsd.own.mk> + PROG= ubldr NEWVERSWHAT= "U-Boot loader" ${MACHINE_ARCH} BINDIR?= /boot @@ -18,7 +20,7 @@ LOADER_NFS_SUPPORT?= yes LOADER_TFTP_SUPPORT?= no LOADER_GZIP_SUPPORT?= no LOADER_BZIP2_SUPPORT?= no -.if defined(WITH_FDT) +.if ${MK_FDT} != "no" LOADER_FDT_SUPPORT= yes .else LOADER_FDT_SUPPORT= no diff --git a/sys/boot/powerpc/uboot/Makefile b/sys/boot/powerpc/uboot/Makefile index 0a827e7bf7fc..afd1b97aa89d 100644 --- a/sys/boot/powerpc/uboot/Makefile +++ b/sys/boot/powerpc/uboot/Makefile @@ -1,5 +1,7 @@ # $FreeBSD$ +.include <bsd.own.mk> + PROG= ubldr NEWVERSWHAT= "U-Boot loader" ${MACHINE_ARCH} BINDIR?= /boot @@ -18,7 +20,7 @@ LOADER_NFS_SUPPORT?= yes LOADER_TFTP_SUPPORT?= no LOADER_GZIP_SUPPORT?= no LOADER_BZIP2_SUPPORT?= no -.if defined(WITH_FDT) +.if ${MK_FDT} != "no" LOADER_FDT_SUPPORT= yes .else LOADER_FDT_SUPPORT= no diff --git a/sys/boot/uboot/common/metadata.c b/sys/boot/uboot/common/metadata.c index ec5e21962aa3..2c2ac3c31aa8 100644 --- a/sys/boot/uboot/common/metadata.c +++ b/sys/boot/uboot/common/metadata.c @@ -36,7 +36,9 @@ __FBSDID("$FreeBSD$"); #include <machine/elf.h> #include <machine/metadata.h> +#if !defined(LOADER_FDT_SUPPORT) #include <machine/bootinfo.h> +#endif #include "api_public.h" #include "bootstrap.h" |