diff options
| author | raj <raj@FreeBSD.org> | 2010-06-13 12:46:32 +0000 |
|---|---|---|
| committer | raj <raj@FreeBSD.org> | 2010-06-13 12:46:32 +0000 |
| commit | ac8e9a3b12f627c30db964eb028ecb2d57d0125c (patch) | |
| tree | 5127cf0288cde21b76254071b6f3ee07ab66192a | |
| parent | f78d8ab6d94a4542f6914cff3380cc8d4137326f (diff) | |
| download | FreeBSD-src-ac8e9a3b12f627c30db964eb028ecb2d57d0125c.zip FreeBSD-src-ac8e9a3b12f627c30db964eb028ecb2d57d0125c.tar.gz | |
Fix conditional FDT support in loader(8).
| -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 2cdd9e7..573f948 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 0a827e7..afd1b97 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 ec5e219..2c2ac3c 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" |
