Date: Sun, 13 Jun 2010 12:46:32 +0000 (UTC) From: Rafal Jaworowski <raj@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r209125 - in head/sys/boot: arm/uboot powerpc/uboot uboot/common Message-ID: <201006131246.o5DCkWna028610@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: raj Date: Sun Jun 13 12:46:32 2010 New Revision: 209125 URL: http://svn.freebsd.org/changeset/base/209125 Log: Fix conditional FDT support in loader(8). Modified: head/sys/boot/arm/uboot/Makefile head/sys/boot/powerpc/uboot/Makefile head/sys/boot/uboot/common/metadata.c Modified: head/sys/boot/arm/uboot/Makefile ============================================================================== --- head/sys/boot/arm/uboot/Makefile Sun Jun 13 12:39:22 2010 (r209124) +++ head/sys/boot/arm/uboot/Makefile Sun Jun 13 12:46:32 2010 (r209125) @@ -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 Modified: head/sys/boot/powerpc/uboot/Makefile ============================================================================== --- head/sys/boot/powerpc/uboot/Makefile Sun Jun 13 12:39:22 2010 (r209124) +++ head/sys/boot/powerpc/uboot/Makefile Sun Jun 13 12:46:32 2010 (r209125) @@ -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 Modified: head/sys/boot/uboot/common/metadata.c ============================================================================== --- head/sys/boot/uboot/common/metadata.c Sun Jun 13 12:39:22 2010 (r209124) +++ head/sys/boot/uboot/common/metadata.c Sun Jun 13 12:46:32 2010 (r209125) @@ -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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201006131246.o5DCkWna028610>