From owner-svn-src-all@freebsd.org Wed Mar 14 17:59:04 2018 Return-Path: <owner-svn-src-all@freebsd.org> Delivered-To: svn-src-all@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 980F3F30512; Wed, 14 Mar 2018 17:59:04 +0000 (UTC) (envelope-from chmeeedalf@gmail.com) Received: from mail-lf0-x244.google.com (mail-lf0-x244.google.com [IPv6:2a00:1450:4010:c07::244]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F2DE26E090; Wed, 14 Mar 2018 17:59:03 +0000 (UTC) (envelope-from chmeeedalf@gmail.com) Received: by mail-lf0-x244.google.com with SMTP id m69-v6so6126619lfe.8; Wed, 14 Mar 2018 10:59:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=XdmrOrzpJJzHOkbpFJMbhkZdJa1tVZnL8eo6Uq/nNPg=; b=jcH+GRf9RJkAI4xT5E/Re7kOvDh/caXBstb6OfMbmtdAxqY4x+GpmHr48tqVjbzSq1 h+nx8w+G70iCOivjQTtLsU9xSDoWLuUn78FJEjCauKalfrzkeIWARR2kOVLhy/OUEUrS jN60qS6t+Zfm4AarlfP7M+9ATbY7AJLEr4TrNpVl9OA+wZJ2MjciWTwLf+omNAYYJLIm bZT1y23jpeyjMnPdMVyKXR8i6i7ko4NGoTyZLC6vsi46krhvBccNr/WO2eK3J+76Augh zSfXTif3Z0nsYuLhgD218Pwbbb6w0T19atF5AJdPV6HiqxQTjmJxV1aFMt3gVdzAmD9j Nu5Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alumni-cwru-edu.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=XdmrOrzpJJzHOkbpFJMbhkZdJa1tVZnL8eo6Uq/nNPg=; b=VjBsGbfj34gG782usEhA3/Qv59avXJvoO31dGne3YitEk2m7HxOZf+M9E9NYYYYf3H C5A0WoZ/yAUKttnHZlfqqmR0Qblxha7SSn4nrA8k5mkZGBuOyiu5fexmhp+G6NeukLih e5DTVbgiQp68RrziIyru4ZG5Io9qDf5p3oWMkJdX9KJnGSLhmVOgBaNGKuXOtUwjXGwm JO8HV1stqd2T6TuSWbQL+qZG99DoWNYx5xI90ISEGd2EnR1eqSpzTmbiq5Kf0Zi4aStr uojHiakN9Fr/kUFcECQXIWt5h0blmANvrFCbTh0L27YcLjYceaWJ4m+mYh6kwJd+Bv7s aaHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=XdmrOrzpJJzHOkbpFJMbhkZdJa1tVZnL8eo6Uq/nNPg=; b=adYZWfaKyZipXPzqGdj4ve3wT+mDT7bwt5EZDyVbg16S6+RLP8jOVa8GYx+f/cKeSD ZpeTrPpyu3+E/S5uzn1AG0GsgR5W1DfyCQ85OE+EO5YmNciBoO2/qigQ/4dZL04xhvfr JBgjd1+UseqyYqkTkNPq/p/XnUNmUMZ7VG5ubql5uuL5TZhH63DKy2LRl3YeVjqxfdKq 4KWo+sCUxhtWRD3Z9HOuurRix7lNa25TEC8NGunh5hj7gg95BfPTJXroIv7ttK64GKh7 LdrT4Gi6/ty/JvLopl5/asvO0AGj3OxHK6f+tUvJBRzdwBtzSXSJb4FjJb8+f6IJff27 nfIw== X-Gm-Message-State: AElRT7Fp79jzc1MfErXcd9cVo3LOkSLHvhK/qtzdCApuiOQb7YYkOO/V jZzqIOON038DsTMfo+9+oZwVPuXIpEqygv866eE= X-Google-Smtp-Source: AG47ELvraFY6hvsezWueB+nDjFWlrxBi+SKr5aIzhFB+dcMLBfi37d7U7yvzxMdYfLUh7wV7nHIvGAq2NIo0Ac7Sa1k= X-Received: by 2002:a19:d5c2:: with SMTP id m185-v6mr3929104lfg.5.1521050342157; Wed, 14 Mar 2018 10:59:02 -0700 (PDT) MIME-Version: 1.0 Sender: chmeeedalf@gmail.com Received: by 10.46.85.26 with HTTP; Wed, 14 Mar 2018 10:59:01 -0700 (PDT) In-Reply-To: <76363d7d-e21d-6e97-f638-855342242422@freebsd.org> References: <201803141616.w2EGGPOp030624@repo.freebsd.org> <CAHSQbTAJhNdq=GdtyOHRLCVyHjYWgZw-cSLfLHafDnvG_Ewq-w@mail.gmail.com> <76363d7d-e21d-6e97-f638-855342242422@freebsd.org> From: Justin Hibbits <jrh29@alumni.cwru.edu> Date: Wed, 14 Mar 2018 12:59:01 -0500 X-Google-Sender-Auth: TZxz2Djoflh2Ellbx8IwiubujVM Message-ID: <CAHSQbTDSS997517qo6X1-EOsyTs=U5oURK3UMmL63=VN=UOD4w@mail.gmail.com> Subject: Re: svn commit: r330930 - head/sys/conf To: Nathan Whitehorn <nwhitehorn@freebsd.org> Cc: src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" <svn-src-all.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>, <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/> List-Post: <mailto:svn-src-all@freebsd.org> List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>, <mailto:svn-src-all-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 14 Mar 2018 17:59:04 -0000 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