Date: Wed, 14 Mar 2018 11:09:22 -0700 From: Nathan Whitehorn <nwhitehorn@freebsd.org> To: Justin Hibbits <jrh29@alumni.cwru.edu> Cc: src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r330930 - head/sys/conf Message-ID: <d9a24741-2562-072a-78d8-596c3d2f074b@freebsd.org> In-Reply-To: <CAHSQbTDSS997517qo6X1-EOsyTs=U5oURK3UMmL63=VN=UOD4w@mail.gmail.com> References: <201803141616.w2EGGPOp030624@repo.freebsd.org> <CAHSQbTAJhNdq=GdtyOHRLCVyHjYWgZw-cSLfLHafDnvG_Ewq-w@mail.gmail.com> <76363d7d-e21d-6e97-f638-855342242422@freebsd.org> <CAHSQbTDSS997517qo6X1-EOsyTs=U5oURK3UMmL63=VN=UOD4w@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On 03/14/18 10:59, Justin Hibbits wrote: > On Wed, Mar 14, 2018 at 12:53 PM, Nathan Whitehorn > <nwhitehorn@freebsd.org> wrote: >> >> On 03/14/18 09:19, Justin Hibbits wrote: >>> On Wed, Mar 14, 2018 at 11:16 AM, Nathan Whitehorn >>> <nwhitehorn@freebsd.org> 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 >> > Just mark them standard, since they are really standard. > > - Justin > Done in r330936. -Nathan
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?d9a24741-2562-072a-78d8-596c3d2f074b>