From owner-svn-src-head@freebsd.org Wed Mar 14 17:53:13 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 A5600F2FE0F; Wed, 14 Mar 2018 17:53:13 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from d.mail.sonic.net (d.mail.sonic.net [64.142.111.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2EAAD6DBC5; Wed, 14 Mar 2018 17:53:12 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from helicon.physics.ucla.edu (helicon.physics.ucla.edu [169.232.156.253]) (authenticated bits=0) by d.mail.sonic.net (8.15.1/8.15.1) with ESMTPSA id w2EHr4NC030327 (version=TLSv1.2 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT); Wed, 14 Mar 2018 10:53:04 -0700 Subject: Re: svn commit: r330930 - head/sys/conf To: Justin Hibbits Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201803141616.w2EGGPOp030624@repo.freebsd.org> From: Nathan Whitehorn Message-ID: <76363d7d-e21d-6e97-f638-855342242422@freebsd.org> Date: Wed, 14 Mar 2018 10:53:04 -0700 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-Sonic-CAuth: UmFuZG9tSVYJY8NSNe1sKCX5bG0mM0HMZEChF7BWn9n9PE5RtekAM/3R7KkabCPAerVHR7eQ/cbD4Hm8z2RMhZUmQhiYnehOKgFefpqWCwI= X-Sonic-ID: C;GtSbi7An6BGjDyAFsE207w== M;LI3Vi7An6BGjDyAFsE207w== X-Spam-Flag: No X-Sonic-Spam-Details: 0.0/5.0 by cerberusd 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: Wed, 14 Mar 2018 17:53:13 -0000 On 03/14/18 09:19, Justin Hibbits wrote: > On Wed, Mar 14, 2018 at 11:16 AM, Nathan Whitehorn > wrote: >> Author: nwhitehorn >> Date: Wed Mar 14 16:16:25 2018 >> New Revision: 330930 >> URL: https://svnweb.freebsd.org/changeset/base/330930 >> >> Log: >> The expression (aim | fdt) is always true on PowerPC. The last PowerPC >> platform that can run without a device tree (PS3) still uses the OF_*() >> functions to check if one exists and OF_* is used unconditionally in >> core parts of the system like powerpc/machdep.c. Reflect this reality >> in files.powerpc, for example by changing occurrences of aim | fdt to >> standard. >> >> Modified: >> head/sys/conf/files.powerpc >> >> Modified: head/sys/conf/files.powerpc >> ============================================================================== >> --- head/sys/conf/files.powerpc Wed Mar 14 14:45:57 2018 (r330929) >> +++ head/sys/conf/files.powerpc Wed Mar 14 16:16:25 2018 (r330930) >> @@ -32,7 +32,7 @@ dev/adb/adb_buttons.c optional adb >> dev/agp/agp_apple.c optional agp powermac >> dev/fb/fb.c optional sc >> # ofwbus depends on simplebus. >> -dev/fdt/simplebus.c optional aim | fdt >> +dev/fdt/simplebus.c optional standard >> dev/hwpmc/hwpmc_e500.c optional hwpmc >> dev/hwpmc/hwpmc_mpc7xxx.c optional hwpmc >> dev/hwpmc/hwpmc_powerpc.c optional hwpmc >> @@ -55,7 +55,7 @@ dev/ofw/ofw_if.m optional aim >> dev/ofw/ofw_bus_subr.c optional aim >> dev/ofw/ofw_console.c optional aim >> dev/ofw/ofw_disk.c optional ofwd aim >> -dev/ofw/ofwbus.c optional aim | fdt >> +dev/ofw/ofwbus.c optional aim > ofwbus is used by Book-E too, not just AIM. And 'aim' is not defined > for Book-E platforms. Maybe it should be 'standard' instead? > > - Justin > See the comment above this line (which isn't in the diff): ofwbus.c can also be brought in by conf/files through the definition of options FDT. This block is just a safety valve for (AIM && !FDT) to make sure we always get it. We could also mark all of these standard; config is smart enough to deduplicate things. Would you prefer that? -Nathan