arm: unify arm.h header for all arm 32bit flavours.

Signed-off-by: Simon Gerber <simon.gerber@inf.ethz.ch>

diff --git a/kernel/include/arch/armv5/arm.h b/kernel/include/arch/arm/arm.h
similarity index 100%
rename from kernel/include/arch/armv5/arm.h
rename to kernel/include/arch/arm/arm.h

diff --git a/kernel/include/arch/armv7-m/arm.h b/kernel/include/arch/armv7-m/arm.h
deleted file mode 100644 (file)
index 313e2c7..0000000
--- a/kernel/include/arch/armv7-m/arm.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2007, ETH Zurich.
- * All rights reserved.
- *
- * This file is distributed under the terms in the attached LICENSE file.
- * If you do not find this file, copies can be found by writing to:
- * ETH Zurich D-INFK, Haldeneggsteig 4, CH-8092 Zurich. Attn: Systems Group.
- */
-
-#ifndef __ARM_H
-#define __ARM_H
-
-#include <barrelfish_kpi/types.h>
-#include <barrelfish_kpi/cpu.h>
-
-#endif //__ARM_H

diff --git a/kernel/include/arch/armv7/arm.h b/kernel/include/arch/armv7/arm.h
deleted file mode 100644 (file)
index 313e2c7..0000000
--- a/kernel/include/arch/armv7/arm.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2007, ETH Zurich.
- * All rights reserved.
- *
- * This file is distributed under the terms in the attached LICENSE file.
- * If you do not find this file, copies can be found by writing to:
- * ETH Zurich D-INFK, Haldeneggsteig 4, CH-8092 Zurich. Attn: Systems Group.
- */
-
-#ifndef __ARM_H
-#define __ARM_H
-
-#include <barrelfish_kpi/types.h>
-#include <barrelfish_kpi/cpu.h>
-
-#endif //__ARM_H

diff --git a/kernel/include/arch/xscale/arm.h b/kernel/include/arch/xscale/arm.h
deleted file mode 100644 (file)
index 313e2c7..0000000
--- a/kernel/include/arch/xscale/arm.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2007, ETH Zurich.
- * All rights reserved.
- *
- * This file is distributed under the terms in the attached LICENSE file.
- * If you do not find this file, copies can be found by writing to:
- * ETH Zurich D-INFK, Haldeneggsteig 4, CH-8092 Zurich. Attn: Systems Group.
- */
-
-#ifndef __ARM_H
-#define __ARM_H
-
-#include <barrelfish_kpi/types.h>
-#include <barrelfish_kpi/cpu.h>
-
-#endif //__ARM_H