Changeset acc25ee in rtems for c/src/lib/libcpu/powerpc

Timestamp:

12/02/99 14:31:19 (23 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

3a96054

Parents:

4cf56006

Message:

Merged of mcp750 and mvme2307 BSP by Eric Valette <valette@…>.
As part of this effort, the mpc750 libcpu code is now shared with the
ppc6xx.

Location:

c/src/lib/libcpu/powerpc

Files:

• Makefile.in (modified) (1 diff)
• mpc6xx/Makefile.in (added)
• mpc6xx/clock/Makefile.in (added)
• mpc6xx/clock/c_clock.c (added)
• mpc6xx/clock/c_clock.h (added)
• mpc6xx/exceptions/Makefile.in (added)
• mpc6xx/exceptions/asm_utils.S (added)
• mpc6xx/exceptions/raw_exception.c (added)
• mpc6xx/exceptions/raw_exception.h (added)
• mpc6xx/mmu/Makefile.in (added)
• mpc6xx/mmu/bat.c (added)
• mpc6xx/mmu/bat.h (added)
• mpc6xx/mmu/mmuAsm.S (added)
• mpc6xx/wrapup/Makefile.in (added)
• new-exceptions/cpu.c (added)
• new-exceptions/cpu_asm.S (added)
• new_exception_processing/Makefile.in (added)
• new_exception_processing/c_isr.inl (added)
• new_exception_processing/cpu.c (added)
• new_exception_processing/cpu.h (added)
• new_exception_processing/cpu_asm.S (added)
• old-exceptions/README (added)
• old-exceptions/TODO (added)
• old-exceptions/cpu.c (added)
• old-exceptions/cpu_asm.S (added)
• old-exceptions/irq_stub.S (added)
• old-exceptions/ppccache.c (added)
• old_exception_processing/Makefile.in (added)
• old_exception_processing/README (added)
• old_exception_processing/TODO (added)
• old_exception_processing/c_isr.inl (added)
• old_exception_processing/cpu.c (added)
• old_exception_processing/cpu.h (added)
• old_exception_processing/cpu_asm.S (added)
• old_exception_processing/irq_stub.S (added)
• old_exception_processing/ppccache.c (added)
• old_exception_processing/rtems.S (added)
• shared/Makefile.in (modified) (1 diff)
• shared/cpu.h (modified) (1 diff)
• wrapup/Makefile.in (modified) (1 diff)

c/src/lib/libcpu/powerpc/Makefile.in

@@ -19 +19 @@
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
-ifeq ($(wildcard $(RTEMS_CPU_MODEL)),$(RTEMS_CPU_MODEL))
-SHARED_LIB = shared
-endif 
+ifeq ($(RTEMS_CPU_MODEL),mpc750)
+SHARED_LIB = shared mpc6xx
+endif
+ifeq ($(RTEMS_CPU_MODEL),mpc604)
+SHARED_LIB = shared mpc6xx
+endif
 
 SUBDIRS = $(SHARED_LIB) $(wildcard $(RTEMS_CPU_MODEL)) wrapup

c/src/lib/libcpu/powerpc/shared/Makefile.in

@@ -15 +15 @@
 
 # C source names, if any, go here -- minus the .c
-C_PIECES =
+C_PIECES = cpuIdent
 C_FILES = $(C_PIECES:%=%.c)
 C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)

c/src/lib/libcpu/powerpc/shared/cpu.h

@@ -170 +170 @@
 #define SR15    15
 
+#ifndef ASM
+typedef enum {
+  PPC_601       = 0x1,
+  PPC_603       = 0x3,
+  PPC_604       = 0x4,
+  PPC_603e      = 0x6,
+  PPC_603ev     = 0x7,
+  PPC_750       = 0x8,
+  PPC_604e      = 0x9,
+  PPC_604r      = 0xA,
+  PPC_620       = 0x16,
+  PPC_860       = 0x50,
+  PPC_821       = PPC_860,
+  PPC_UNKNOWN   = 0xff
+} ppc_cpu_id_t;
+
+typedef unsigned short ppc_cpu_revision_t;
+
+extern ppc_cpu_id_t get_ppc_cpu_type();
+extern ppc_cpu_id_t current_ppc_cpu;
+extern ppc_cpu_revision_t get_ppc_cpu_revision();
+extern ppc_cpu_revision_t current_ppc_revision;
+#endif
+
 #define _CPU_MSR_GET( _msr_value ) \
   do { \

c/src/lib/libcpu/powerpc/wrapup/Makefile.in

@@ -19 +19 @@
 # So far FAMILY_OBJ is empty and ar dislike it...
 CPU_SPECIFIC_OBJS = $(wildcard ../$(RTEMS_CPU_MODEL)/*/$(ARCH)/*.o)
-FAMILY_OBJS = $(wildcard ../shared/*/$(ARCH)/*.o)
+FAMILY_OBJS = $(wildcard ../shared/$(ARCH)/*.o ../shared/*/$(ARCH)/*.o ../mpc6xx/*/$(ARCH)/*.o)
 
 LIB = $(ARCH)/libcpu.a