From owner-svn-src-all@FreeBSD.ORG  Tue Mar 31 05:29:45 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E712DFF1;
 Tue, 31 Mar 2015 05:29:45 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D1998697;
 Tue, 31 Mar 2015 05:29:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2V5TjXq061757;
 Tue, 31 Mar 2015 05:29:45 GMT (envelope-from jhibbits@FreeBSD.org)
Received: (from jhibbits@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2V5TjIM061756;
 Tue, 31 Mar 2015 05:29:45 GMT (envelope-from jhibbits@FreeBSD.org)
Message-Id: <201503310529.t2V5TjIM061756@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jhibbits set sender to
 jhibbits@FreeBSD.org using -f
From: Justin Hibbits <jhibbits@FreeBSD.org>
Date: Tue, 31 Mar 2015 05:29:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r280892 - head/sys/powerpc/booke
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 31 Mar 2015 05:29:46 -0000

Author: jhibbits
Date: Tue Mar 31 05:29:44 2015
New Revision: 280892
URL: https://svnweb.freebsd.org/changeset/base/280892

Log:
  CCSRBAR_VA is mpc85xx-specific, so add guards, and include the proper header
  file for it.
  
  MFC after:	1 month

Modified:
  head/sys/powerpc/booke/machdep.c

Modified: head/sys/powerpc/booke/machdep.c
==============================================================================
--- head/sys/powerpc/booke/machdep.c	Tue Mar 31 05:26:30 2015	(r280891)
+++ head/sys/powerpc/booke/machdep.c	Tue Mar 31 05:29:44 2015	(r280892)
@@ -141,6 +141,10 @@ __FBSDID("$FreeBSD$");
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/openfirm.h>
 
+#ifdef MPC85XX
+#include <powerpc/mpc85xx/mpc85xx.h>
+#endif
+
 #ifdef DDB
 #include <ddb/ddb.h>
 #endif
@@ -464,7 +468,9 @@ booke_init(uint32_t arg1, uint32_t arg2)
 	debugf(" arg3 mdp = 0x%08x\n", (u_int32_t)mdp);
 	debugf(" end = 0x%08x\n", (u_int32_t)end);
 	debugf(" boothowto = 0x%08x\n", boothowto);
+#ifdef MPC85XX
 	debugf(" kernel ccsrbar = 0x%08x\n", CCSRBAR_VA);
+#endif
 	debugf(" MSR = 0x%08x\n", mfmsr());
 #if defined(BOOKE_E500)
 	debugf(" HID0 = 0x%08x\n", mfspr(SPR_HID0));