Changeset 646b996 in mainline for kernel/arch/arm32

Timestamp:

2009-07-30T15:58:54Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

30885b9

Parents:

76093ae

Message:

cleanup some of the dirty hacks introduced into the arm32 port
add default configurations for the two supported arm32 variants

Location:

kernel/arch/arm32

Files:

• Makefile.inc (modified) (1 diff)
• include/mach/integratorcp/integratorcp.h (modified) (1 diff)
• include/mach/testarm/testarm.h (modified) (1 diff)
• src/arm32.c (modified) (2 diffs)
• src/exception.c (modified) (1 diff)
• src/interrupt.c (modified) (2 diffs)
• src/mm/frame.c (modified) (1 diff)

kernel/arch/arm32/Makefile.inc

@@ -61 +61 @@
         arch/$(KARCH)/src/mm/page.c \
         arch/$(KARCH)/src/mm/tlb.c \
-        arch/$(KARCH)/src/mm/page_fault.c 
-ifeq ($(MACHINE), testarm)
-        ARCH_SOURCES += arch/$(KARCH)/src/mach/testarm/testarm.c
-else ifeq ($(MACHINE), integratorcp)
-        ARCH_SOURCES += arch/$(KARCH)/src/mach/integratorcp/integratorcp.c
+        arch/$(KARCH)/src/mm/page_fault.c
+
+ifeq ($(MACHINE),testarm)
+        ARCH_SOURCES += arch/$(KARCH)/src/mach/testarm/testarm.c
 endif
-ifeq ($(CONFIG_PL050), y)
+
+ifeq ($(MACHINE),integratorcp)
+        ARCH_SOURCES += arch/$(KARCH)/src/mach/integratorcp/integratorcp.c
+endif
+
+ifeq ($(CONFIG_PL050),y)
         ARCH_SOURCES += genarch/src/drivers/pl050/pl050.c
 endif

kernel/arch/arm32/include/mach/integratorcp/integratorcp.h

@@ -36 +36 @@
  */
 
-#ifndef KERN_arm32_ICP_H_
-#define KERN_arm32_ICP_H_
+#ifndef KERN_arm32_MACHINE_H_
+#define KERN_arm32_MACHINE_H_
 
 #include <arch/machine_func.h>

kernel/arch/arm32/include/mach/testarm/testarm.h

@@ -37 +37 @@
  */
 
-#ifndef KERN_arm32_GXEMUL_H_
-#define KERN_arm32_GXEMUL_H_
+#ifndef KERN_arm32_MACHINE_H_
+#define KERN_arm32_MACHINE_H_
 
 #include <arch/machine_func.h>

kernel/arch/arm32/src/arm32.c

@@ -41 +41 @@
 #include <console/console.h>
 #include <ddi/irq.h>
-#include <arch/machine.h>
 #include <print.h>
 #include <config.h>
@@ -50 +49 @@
 #include <string.h>
 
+#ifdef MACHINE_testarm
+        #include <arch/mach/testarm/testarm.h>
+#endif
+
+#ifdef MACHINE_integratorcp
+        #include <arch/mach/integratorcp/integratorcp.h>
+#endif
+
+
 /** Performs arm32-specific initialization before main_bsp() is called. */
 void arch_pre_main(void *entry __attribute__((unused)), bootinfo_t *bootinfo)

kernel/arch/arm32/src/exception.c

@@ -40 +40 @@
 #include <arch/mm/page_fault.h>
 #include <arch/barrier.h>
-#include <arch/machine.h>
 #include <print.h>
 #include <syscall/syscall.h>
+
+#ifdef MACHINE_testarm
+        #include <arch/mach/testarm/testarm.h>
+#endif
+
+#ifdef MACHINE_integratorcp
+        #include <arch/mach/integratorcp/integratorcp.h>
+#endif
 
 /** Offset used in calculation of exception handler's relative address.

kernel/arch/arm32/src/interrupt.c

@@ -36 +36 @@
 #include <arch/asm.h>
 #include <arch/regutils.h>
-#include <arch/machine.h>
 #include <ddi/irq.h>
 #include <ddi/device.h>
 #include <interrupt.h>
+
+#ifdef MACHINE_testarm
+        #include <arch/mach/testarm/testarm.h>
+#endif
+
+#ifdef MACHINE_integratorcp
+        #include <arch/mach/integratorcp/integratorcp.h>
+#endif
 
 /** Initial size of a table holding interrupt handlers. */
@@ -97 +104 @@
         irq_init(IRQ_COUNT, IRQ_COUNT);
         machine_timer_irq_start();
-        
 }
 

kernel/arch/arm32/src/mm/frame.c

@@ -36 +36 @@
 #include <mm/frame.h>
 #include <arch/mm/frame.h>
-#include <arch/machine.h>
 #include <config.h>
+
+#ifdef MACHINE_testarm
+        #include <arch/mach/testarm/testarm.h>
+#endif
+
+#ifdef MACHINE_integratorcp
+        #include <arch/mach/integratorcp/integratorcp.h>
+#endif
 
 /** Address of the last frame in the memory. */