Changeset 76ca3f7 in mainline for kernel/arch/abs32le

Timestamp:

2010-03-23T20:49:54Z (16 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

e417b96

Parents:

b48ebd19 (diff), 63f8966 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mailnline changes, revision 329

Location:

kernel/arch/abs32le

Files:

• Makefile.inc (modified) (1 diff)
• include/asm.h (modified) (1 diff)
• include/atomic.h (modified) (1 diff)
• include/faddr.h (modified) (1 diff)
• include/fpu_context.h (modified) (1 diff)
• include/interrupt.h (modified) (1 diff)
• include/mm/asid.h (modified) (1 diff)
• include/mm/frame.h (modified) (1 diff)
• include/mm/page.h (modified) (1 diff)
• include/proc/task.h (modified) (1 diff)
• include/proc/thread.h (modified) (1 diff)
• include/types.h (modified) (1 diff)
• src/abs32le.c (modified) (1 diff)
• src/cpu/cpu.c (modified) (1 diff)
• src/ddi/ddi.c (modified) (1 diff)
• src/debug/stacktrace.c (modified) (1 diff)
• src/mm/page.c (modified) (1 diff)
• src/mm/tlb.c (modified) (1 diff)
• src/userspace.c (modified) (1 diff)

kernel/arch/abs32le/Makefile.inc

@@ -27 +27 @@
 #
 
-## Toolchain configuration
-#
-
 BFD = binary
 
 ifeq ($(COMPILER),gcc_cross)
-        TOOLCHAIN_DIR = $(CROSS_PREFIX)/$(CROSS_TARGET)
-        
         ifeq ($(CROSS_TARGET),arm32)
-                TARGET = arm-linux-gnu
                 ATSIGN = %
         endif
         
-        ifeq ($(CROSS_TARGET),ia32)
-                TARGET = i686-pc-linux-gnu
-        endif
-        
         ifeq ($(CROSS_TARGET),mips32)
-                TARGET = mipsel-linux-gnu
                 GCC_CFLAGS += -mno-abicalls
         endif

kernel/arch/abs32le/include/asm.h

@@ -36 +36 @@
 #define KERN_abs32le_ASM_H_
 
-#include <arch/types.h>
 #include <typedefs.h>
 #include <config.h>

kernel/arch/abs32le/include/atomic.h

@@ -36 +36 @@
 #define KERN_abs32le_ATOMIC_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/barrier.h>
 #include <preemption.h>

kernel/arch/abs32le/include/faddr.h

@@ -36 +36 @@
 #define KERN_abs32le_FADDR_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define FADDR(fptr)  ((uintptr_t) (fptr))

kernel/arch/abs32le/include/fpu_context.h

@@ -36 +36 @@
 #define KERN_abs32le_FPU_CONTEXT_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define FPU_CONTEXT_ALIGN  16

kernel/arch/abs32le/include/interrupt.h

@@ -36 +36 @@
 #define KERN_abs32le_INTERRUPT_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define IVT_ITEMS  0

kernel/arch/abs32le/include/mm/asid.h

@@ -34 +34 @@
 #define KERN_abs32le_ASID_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 typedef uint32_t asid_t;

kernel/arch/abs32le/include/mm/frame.h

@@ -41 +41 @@
 #ifdef KERNEL
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 extern void frame_arch_init(void);

kernel/arch/abs32le/include/mm/page.h

@@ -119 +119 @@
 #include <mm/mm.h>
 #include <arch/interrupt.h>
-#include <arch/types.h>
 #include <typedefs.h>
 

kernel/arch/abs32le/include/proc/task.h

@@ -36 +36 @@
 #define KERN_abs32le_TASK_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <adt/bitmap.h>
 

kernel/arch/abs32le/include/proc/thread.h

@@ -36 +36 @@
 #define KERN_abs32le_THREAD_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 typedef struct {

kernel/arch/abs32le/include/types.h

@@ -35 +35 @@
 #ifndef KERN_abs32le_TYPES_H_
 #define KERN_abs32le_TYPES_H_
-
-typedef signed char int8_t;
-typedef signed short int16_t;
-typedef signed long int32_t;
-typedef signed long long int64_t;
-
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned long uint32_t;
-typedef unsigned long long uint64_t;
 
 typedef uint32_t size_t;

kernel/arch/abs32le/src/abs32le.c

@@ -34 +34 @@
 
 #include <arch.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/interrupt.h>
 #include <arch/asm.h>

kernel/arch/abs32le/src/cpu/cpu.c

@@ -35 +35 @@
 #include <arch/cpu.h>
 #include <arch.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <print.h>
 #include <fpu_context.h>

kernel/arch/abs32le/src/ddi/ddi.c

@@ -36 +36 @@
 #include <ddi/ddi.h>
 #include <proc/task.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 /** Enable I/O space range for task.

kernel/arch/abs32le/src/debug/stacktrace.c

@@ -35 +35 @@
 #include <stacktrace.h>
 #include <syscall/copy.h>
-#include <arch/types.h>
 #include <typedefs.h>
 

kernel/arch/abs32le/src/mm/page.c

@@ -39 +39 @@
 #include <mm/page.h>
 #include <mm/as.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <align.h>
 #include <config.h>

kernel/arch/abs32le/src/mm/tlb.c

@@ -34 +34 @@
 #include <arch/mm/asid.h>
 #include <arch/asm.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 void tlb_invalidate_all(void)

kernel/arch/abs32le/src/userspace.c

@@ -34 +34 @@
 
 #include <userspace.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch.h>
 #include <proc/uarg.h>