From df49c60c9671e4a28e636964d744c1f59fb6cb68 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Mon, 12 Jun 2000 15:00:15 +0000
Subject: Merged from 4.5.0-beta3a

---
 cpukit/score/cpu/m68k/Makefile.am        | 7 ++++---
 cpukit/score/cpu/m68k/qsm.h              | 4 ----
 cpukit/score/cpu/m68k/rtems/m68k/qsm.h   | 4 ----
 cpukit/score/cpu/m68k/rtems/m68k/sim.h   | 7 -------
 cpukit/score/cpu/m68k/rtems/score/m68k.h | 9 +++++++++
 cpukit/score/cpu/m68k/sim.h              | 7 -------
 6 files changed, 13 insertions(+), 25 deletions(-)

(limited to 'cpukit/score/cpu/m68k')

diff --git a/cpukit/score/cpu/m68k/Makefile.am b/cpukit/score/cpu/m68k/Makefile.am
index 4ff7a91ff7..cffdcf4fc4 100644
--- a/cpukit/score/cpu/m68k/Makefile.am
+++ b/cpukit/score/cpu/m68k/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
@@ -38,7 +38,8 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%)
 
 TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o
 
-all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) $(TMPINSTALL_FILES)
+all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \
+    $(TMPINSTALL_FILES)
 
 .PRECIOUS: $(REL)
 
diff --git a/cpukit/score/cpu/m68k/qsm.h b/cpukit/score/cpu/m68k/qsm.h
index e1bf33bc12..9853978115 100644
--- a/cpukit/score/cpu/m68k/qsm.h
+++ b/cpukit/score/cpu/m68k/qsm.h
@@ -41,10 +41,6 @@
 #ifndef _QSM_H_
 #define _QSM_H_
 
-
-#include <efi332.h>
-
-
 /* SAM-- shift and mask */
 #undef  SAM
 #define SAM(a,b,c) ((a << b) & c)
diff --git a/cpukit/score/cpu/m68k/rtems/m68k/qsm.h b/cpukit/score/cpu/m68k/rtems/m68k/qsm.h
index e1bf33bc12..9853978115 100644
--- a/cpukit/score/cpu/m68k/rtems/m68k/qsm.h
+++ b/cpukit/score/cpu/m68k/rtems/m68k/qsm.h
@@ -41,10 +41,6 @@
 #ifndef _QSM_H_
 #define _QSM_H_
 
-
-#include <efi332.h>
-
-
 /* SAM-- shift and mask */
 #undef  SAM
 #define SAM(a,b,c) ((a << b) & c)
diff --git a/cpukit/score/cpu/m68k/rtems/m68k/sim.h b/cpukit/score/cpu/m68k/rtems/m68k/sim.h
index e1c637f9bd..9354412390 100644
--- a/cpukit/score/cpu/m68k/rtems/m68k/sim.h
+++ b/cpukit/score/cpu/m68k/rtems/m68k/sim.h
@@ -50,13 +50,6 @@
 #define _SIM_H_
 
 
-/*
- *  XXX Why is a generic file like this including a bsp specific file?
-
-#include <efi332.h>
- */
-
-
 /* SAM-- shift and mask */
 #undef  SAM
 #define SAM(a,b,c) ((a << b) & c)
diff --git a/cpukit/score/cpu/m68k/rtems/score/m68k.h b/cpukit/score/cpu/m68k/rtems/score/m68k.h
index 7408aae231..64639220dd 100644
--- a/cpukit/score/cpu/m68k/rtems/score/m68k.h
+++ b/cpukit/score/cpu/m68k/rtems/score/m68k.h
@@ -79,6 +79,15 @@ extern "C" {
  *    by having each model specify which core it uses and then go from there.
  */
 
+/*
+ *  Figure out all CPU Model Feature Flags based upon compiler 
+ *  predefines.   Notice the only exception to this is that 
+ *  gcc does not distinguish between CPU32 and CPU32+.  This
+ *  feature selection logic is setup such that if RTEMS__mcpu32p__
+ *  is defined, then CPU32+ rules are used.  Otherwise, the safe
+ *  but less efficient CPU32 rules are used for the CPU32+.
+ */
+
 #if defined(__mc68020__)
  
 #define CPU_MODEL_NAME          "m68020"
diff --git a/cpukit/score/cpu/m68k/sim.h b/cpukit/score/cpu/m68k/sim.h
index e1c637f9bd..9354412390 100644
--- a/cpukit/score/cpu/m68k/sim.h
+++ b/cpukit/score/cpu/m68k/sim.h
@@ -50,13 +50,6 @@
 #define _SIM_H_
 
 
-/*
- *  XXX Why is a generic file like this including a bsp specific file?
-
-#include <efi332.h>
- */
-
-
 /* SAM-- shift and mask */
 #undef  SAM
 #define SAM(a,b,c) ((a << b) & c)
-- 
cgit v1.2.3