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

	* shared/include/cpu.h: Removed.
	* shared/include/Makefile.am: Reflect changes above.
	* shared/include/spr.h: Include rtems/powerpc/registers.h instead of
	libcpu/cpu.h.
	* mpc6xx/clock/c_clock.c: Reflect changes to <rtems/score/cpu.h>.
	* mpc6xx/exceptions/asm_utils.S: Ditto.
	* mpc6xx/exceptions/raw_exception.c: Ditto.
	* mpc6xx/mmu/mmuAsm.S: Ditto.
	* mpc6xx/timer/timer.c: Ditto.
	* mpc8260/exceptions/asm_utils.S: Ditto.
	* mpc8260/exceptions/raw_exception.c: Ditto.
	* mpc8xx/exceptions/asm_utils.S: Ditto.
	* mpc8xx/exceptions/raw_exception.c: Ditto.
	* ppc403/vectors/vectors.S: Include <asm.h> instead of "asm.h".
---
 c/src/lib/libcpu/powerpc/mpc6xx/clock/c_clock.c            | 2 +-
 c/src/lib/libcpu/powerpc/mpc6xx/exceptions/asm_utils.S     | 5 ++---
 c/src/lib/libcpu/powerpc/mpc6xx/exceptions/raw_exception.c | 4 +---
 c/src/lib/libcpu/powerpc/mpc6xx/mmu/mmuAsm.S               | 5 ++---
 c/src/lib/libcpu/powerpc/mpc6xx/timer/timer.c              | 2 +-
 5 files changed, 7 insertions(+), 11 deletions(-)

(limited to 'c/src/lib/libcpu/powerpc/mpc6xx')

diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/clock/c_clock.c b/c/src/lib/libcpu/powerpc/mpc6xx/clock/c_clock.c
index 1805be88a2..90bd3aaaab 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/clock/c_clock.c
+++ b/c/src/lib/libcpu/powerpc/mpc6xx/clock/c_clock.c
@@ -19,11 +19,11 @@
  *  $Id$
  */
 
+#include <rtems/system.h>
 #include <rtems.h>
 #include <rtems/libio.h>
 #include <stdlib.h>                     /* for atexit() */
 #include <assert.h>
-#include <libcpu/cpu.h>
 #include <libcpu/c_clock.h>
 #include <rtems/bspIo.h>                     /* for printk() */
 
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/asm_utils.S b/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/asm_utils.S
index f046915404..6ceed5b644 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/asm_utils.S
+++ b/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/asm_utils.S
@@ -10,10 +10,9 @@
  *
  */
 
-#include <libcpu/cpu.h>
+#include <asm.h>
+#include <rtems/score/cpu.h>
 #include <libcpu/io.h>
-#include <rtems/score/targopts.h>
-#include "asm.h"
 
 	.globl  codemove
 codemove:
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/raw_exception.c b/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/raw_exception.c
index 175f14b6db..7c6730a81b 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/raw_exception.c
+++ b/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/raw_exception.c
@@ -20,12 +20,10 @@
  *
  * $Id$
  */
-#include <rtems/score/targopts.h>
+#include <rtems/system.h>
 #include <rtems/score/ppc.h>
 #include <rtems/system.h>
-#include <rtems/score/cpu.h>
 #include <libcpu/raw_exception.h>
-#include <libcpu/cpu.h>
 #include <libcpu/cpuIdent.h>
 
 static rtems_raw_except_connect_data* 		raw_except_table;
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/mmuAsm.S b/c/src/lib/libcpu/powerpc/mpc6xx/mmu/mmuAsm.S
index b5a76704c2..470bf45ae7 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/mmuAsm.S
+++ b/c/src/lib/libcpu/powerpc/mpc6xx/mmu/mmuAsm.S
@@ -14,10 +14,9 @@
  *	
  */
 
-#include <libcpu/cpu.h>
+#include <asm.h>
+#include <rtems/score/cpu.h>
 #include <libcpu/io.h>
-#include <rtems/score/targopts.h>
-#include "asm.h"
 
 /*
  * Each setdbat routine start by invalidating the DBAT as some
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/timer/timer.c b/c/src/lib/libcpu/powerpc/mpc6xx/timer/timer.c
index c722ad31ce..32f5aa33de 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/timer/timer.c
+++ b/c/src/lib/libcpu/powerpc/mpc6xx/timer/timer.c
@@ -14,9 +14,9 @@
  *  $Id$
  */
 
+#include <rtems/system.h>
 #include <assert.h>
 #include <rtems.h>
-#include <libcpu/cpu.h>
 #include <bsp.h>
 
 rtems_unsigned64 Timer_driver_Start_time;
-- 
cgit v1.2.3