From 1628414b818e012863f0d9807b3230270e7850b2 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Thu, 18 Apr 2002 20:55:01 +0000
Subject: 2002-04-18	Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* irq/irq.c: Reflect changes to <rtems/score/cpu.h>.
	* irq/irq_asm.S: Ditto.
	* network/network.c: Include <rtems/bspIo.h>.
	* start/start.S: Include <asm.h> instead of "asm.h".
	* vectors/vectors.S: Reflect changes to <rtems/score/cpu.h>.
---
 c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog         | 8 ++++++++
 c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.c         | 2 +-
 c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq_asm.S     | 5 ++---
 c/src/lib/libbsp/powerpc/mpc8260ads/network/network.c | 1 +
 c/src/lib/libbsp/powerpc/mpc8260ads/start/start.S     | 2 +-
 c/src/lib/libbsp/powerpc/mpc8260ads/vectors/vectors.S | 5 ++---
 6 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog b/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog
index 1d9245638a..c52321b637 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog
@@ -1,3 +1,11 @@
+2002-04-18	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* irq/irq.c: Reflect changes to <rtems/score/cpu.h>.
+	* irq/irq_asm.S: Ditto.
+	* network/network.c: Include <rtems/bspIo.h>.
+	* start/start.S: Include <asm.h> instead of "asm.h".
+	* vectors/vectors.S: Reflect changes to <rtems/score/cpu.h>.
+
 2002-04-16	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* startup/bspstart.c: Include <libcpu/cpuIdent.h>, <rtems/bspIo.h>.
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.c b/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.c
index 75267e48be..3f9794b7ea 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.c
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.c
@@ -15,13 +15,13 @@
  *  $Id$
  */
   
+#include <rtems/system.h>
 #include <bsp.h>
 #include <bsp/irq.h>
 #include <rtems/score/thread.h>
 #include <rtems/score/apiext.h>
 #include <libcpu/raw_exception.h>
 #include <bsp/vectors.h>
-#include <libcpu/cpu.h>
 /*#include <bsp/8xx_immap.h>*/
 #include <mpc8260.h>
 /*#include <bsp/commproc.h>*/
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq_asm.S b/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq_asm.S
index 3216e63e28..07aa8d57d0 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq_asm.S
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq_asm.S
@@ -13,11 +13,10 @@
  * $Id$
  */
   	
+#include <asm.h>
+#include <rtems/score/cpu.h>
 #include <bsp/vectors.h>
-#include <libcpu/cpu.h>
 #include <libcpu/raw_exception.h>
-#include <rtems/score/cpuopts.h>  /* for PPC_HAS_FPU */
-#include "asm.h"
 	
 
 #define SYNC \
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/network/network.c b/c/src/lib/libbsp/powerpc/mpc8260ads/network/network.c
index 46725bd261..b3c85377cb 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/network/network.c
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/network/network.c
@@ -32,6 +32,7 @@
 #include <stdio.h>
 #include <rtems/error.h>
 #include <rtems/rtems_bsdnet.h>
+#include <rtems/bspIo.h>
 
 #include <sys/param.h>
 #include <sys/mbuf.h>
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/start/start.S b/c/src/lib/libbsp/powerpc/mpc8260ads/start/start.S
index b517c175c9..9d68d1ae75 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/start/start.S
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/start/start.S
@@ -31,7 +31,7 @@
  *
  */
 
-#include "asm.h"
+#include <asm.h>
 
 /*
  *  The initial stack is set to run BELOW the code base address.
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/vectors/vectors.S b/c/src/lib/libbsp/powerpc/mpc8260ads/vectors/vectors.S
index da802bcecd..8692974243 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/vectors/vectors.S
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/vectors/vectors.S
@@ -10,10 +10,9 @@
 	
 
 
+#include <asm.h>
+#include <rtems/score/cpu.h>
 #include <bsp/vectors.h>
-#include <libcpu/cpu.h>
-#include <rtems/score/targopts.h>
-#include "asm.h"
 	
 
 #define SYNC \
-- 
cgit v1.2.3