From owner-svn-src-head@freebsd.org Wed Mar 14 16:19:35 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 6CBCAF5BE4B; Wed, 14 Mar 2018 16:19:35 +0000 (UTC) (envelope-from chmeeedalf@gmail.com) Received: from mail-lf0-x22c.google.com (mail-lf0-x22c.google.com [IPv6:2a00:1450:4010:c07::22c]) (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 D24F16882F; Wed, 14 Mar 2018 16:19:34 +0000 (UTC) (envelope-from chmeeedalf@gmail.com) Received: by mail-lf0-x22c.google.com with SMTP id y19-v6so5707760lfd.4; Wed, 14 Mar 2018 09:19:34 -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=fycUc9k7JlUKV1cVGIpm1kkvnGnSz2Rs58NOnkCqq3Q=; b=FDDHlwNaYfAIZoEUazt0da/d/PpeiJyrnWGzLZzpiit+g68F9DtqlkY+GTuq+j3YV0 ofifY+fgraCgKe52mr28QlbLpmS0qYHFydy03eDg+tTsjQiBFhfK/f4lfAH4WKgL6td8 b0UoGhsTeHmii/hOILShQbssMrbWsjJ0AVczGGoTj26XYHQfh8vFXBZkyOZyKeqoKqJD TWW5fOXFQ/Q1O4dVDlSnBDJYf6vzRaPYcN4DNvOhbhywOwXV2FyMj8vi2aYziK4IhRL5 KTFIyFrfwPSvgi9bbAyhYU7B+VeprsqeGAHKWbi6ubpOKWIxrrcS3+qaSUPSrqXePuow Bwvg== 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=fycUc9k7JlUKV1cVGIpm1kkvnGnSz2Rs58NOnkCqq3Q=; b=k8Km1d1GqQ1C6WygHpwTHYK2yxJSnsbULCt/sl4cPshmSvgh3WJFdEx0JZ5ctrx4uM zjCAJvi4PH1zshf++/KtwVpc736SW/OSbE9N+nQl45vXUnoH0LNYvQK3orG++BUFQq7Q 6jfWvr6Kq8pZBMyUBMMM5WLYR+0+XCgtXBtnbwTbQaVcXgW6637ypvFvv/SflPUALUgB oXWDroG02IlzMqTAKNFHO3FM6O9s3GpoabbcANATitIA2nEB6dBs7L0GKb6509ndOqcN lgoK3PKGLXtZA+oeZ7Usj/U8TO892f7CJ3ZDkCgzhZukJQO5gyFIbh0c+f1DKKRfUc8X 8ajQ== 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=fycUc9k7JlUKV1cVGIpm1kkvnGnSz2Rs58NOnkCqq3Q=; b=frKIfixWPcjggQxAJYu/ZjcF8Kf/f30bbY8F/DzKISRlSmHWth97KUS9LQIesNgI2i Bev+vcDBk+DPmK2qt1sTTX035Lwjipu0ev6ckjpZ2+r5pqTCPJjM3i0bJUAs9mR0Pgb4 w0QyWa9E+GwzVdFCTJTTaF5ly0OpaIE28y6F/xe7+CXoaFqfyOqSCWSMCUevfjXygXHY afsnHKRMtlkMuP7y5mhEvgJKZ9T9IKVx6wkT7P0NMJXvcWV+IxPG7GWOmxWo9b7x+X/s ep2FFUTHlgHzEeHeZbGrtLSyL2QKx0BhEjJwwhmQqPTMmQKK3582BYXMfjeZTumtSfsF ig0g== X-Gm-Message-State: AElRT7GFLW1SClK2T1aEG+o/CF7E9wefvgwUAg25DeRV+ctEFSwFB2dD MARWjsViqzItRtfiB17/6B0eRCiYNjmAhX02WtE= X-Google-Smtp-Source: AG47ELs8nhiFCIAcq92uSNZNv/99GieWwwtmsLzUTEvoEO0iE2qTTJCKjz3VvvseyCS1UsArRTQYhlXrstdcHTweAEU= X-Received: by 2002:a19:2744:: with SMTP id n65-v6mr4030337lfn.67.1521044372198; Wed, 14 Mar 2018 09:19:32 -0700 (PDT) MIME-Version: 1.0 Sender: chmeeedalf@gmail.com Received: by 10.46.85.26 with HTTP; Wed, 14 Mar 2018 09:19:31 -0700 (PDT) In-Reply-To: <201803141616.w2EGGPOp030624@repo.freebsd.org> References: <201803141616.w2EGGPOp030624@repo.freebsd.org> From: Justin Hibbits Date: Wed, 14 Mar 2018 11:19:31 -0500 X-Google-Sender-Auth: Y6EbzJXZz7cCyc4VJ72cuGaU1Yc Message-ID: Subject: Re: svn commit: r330930 - head/sys/conf To: Nathan Whitehorn Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" 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 16:19:35 -0000 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