From owner-svn-src-head@freebsd.org Sun Mar 11 01:09:32 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 636BAF479A9; Sun, 11 Mar 2018 01:09:32 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 17BA36F7AE; Sun, 11 Mar 2018 01:09:32 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 11DBF1580A; Sun, 11 Mar 2018 01:09:32 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2B19VaE088241; Sun, 11 Mar 2018 01:09:31 GMT (envelope-from nwhitehorn@FreeBSD.org) Received: (from nwhitehorn@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2B19V9c088240; Sun, 11 Mar 2018 01:09:31 GMT (envelope-from nwhitehorn@FreeBSD.org) Message-Id: <201803110109.w2B19V9c088240@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: nwhitehorn set sender to nwhitehorn@FreeBSD.org using -f From: Nathan Whitehorn Date: Sun, 11 Mar 2018 01:09:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r330754 - head/sys/powerpc/ofw X-SVN-Group: head X-SVN-Commit-Author: nwhitehorn X-SVN-Commit-Paths: head/sys/powerpc/ofw X-SVN-Commit-Revision: 330754 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Mar 2018 01:09:32 -0000 Author: nwhitehorn Date: Sun Mar 11 01:09:31 2018 New Revision: 330754 URL: https://svnweb.freebsd.org/changeset/base/330754 Log: Make FDT-using parts of ofw_machdep.c condition on options FDT. This fixes the kernel build when options FDT is absent. Modified: head/sys/powerpc/ofw/ofw_machdep.c Modified: head/sys/powerpc/ofw/ofw_machdep.c ============================================================================== --- head/sys/powerpc/ofw/ofw_machdep.c Sun Mar 11 00:38:08 2018 (r330753) +++ head/sys/powerpc/ofw/ofw_machdep.c Sun Mar 11 01:09:31 2018 (r330754) @@ -223,6 +223,7 @@ parse_ofw_memory(phandle_t node, const char *prop, str return (sz); } +#ifdef FDT static int excise_fdt_reserved(struct mem_region *avail, int asz) { @@ -310,6 +311,7 @@ excise_fdt_reserved(struct mem_region *avail, int asz) return (asz); } +#endif /* * This is called during powerpc_init, before the system is really initialized. @@ -348,9 +350,11 @@ ofw_mem_regions(struct mem_region *memp, int *memsz, asz += res/sizeof(struct mem_region); } +#ifdef FDT phandle = OF_finddevice("/chosen"); if (OF_hasprop(phandle, "fdtmemreserv")) asz = excise_fdt_reserved(availp, asz); +#endif *memsz = msz; *availsz = asz; @@ -409,6 +413,7 @@ OF_bootstrap() } else #endif if (fdt != NULL) { +#ifdef FDT #ifdef AIM bus_space_tag_t fdt_bt; vm_offset_t tmp_fdt_ptr; @@ -445,6 +450,7 @@ OF_bootstrap() err = OF_init((void *)fdt_va); #else err = OF_init(fdt); +#endif #endif }