From d7af5349ec1f9269e9bcf20c1b03a321f4d58cf2 Mon Sep 17 00:00:00 2001 From: Rafal Jaworowski Date: Sun, 13 Jun 2010 12:53:44 +0000 Subject: [PATCH] Do not set WITH_FDT by default based on arch, as this does not work for a bootstrap stage tool. FDT-enabled platforms will have to specify WITH_FDT explicitly at buildworld time for now until TBEMD is complete, which is going to provide means for such arch based selection of build components. Discussed with: imp --- share/mk/bsd.own.mk | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 8839bb4d1e0b..43fcc5156bec 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -278,15 +278,6 @@ WITH_HESIOD= WITH_IDEA= .endif -# Enable FDT by default for selected platforms. -.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "powerpc" -# XXX this is temporarily disabled until all FDT support code is in place. -#_fdt= FDT -_no_fdt= FDT -.else -_no_fdt= FDT -.endif - # # Default behaviour of MK_CLANG depends on the architecture. # @@ -335,7 +326,6 @@ _clang_no=CLANG DICT \ DYNAMICROOT \ EXAMPLES \ - ${_fdt} \ FLOPPY \ FORTH \ FP_LIBC \ @@ -431,7 +421,7 @@ MK_${var}:= yes BIND_SIGCHASE \ BIND_XML \ ${_clang_no} \ - ${_no_fdt} \ + FDT \ HESIOD \ IDEA .if defined(WITH_${var}) && defined(WITHOUT_${var})