Changeset 25a76ab8 in mainline for boot/arch/arm32/include/arch.h

Timestamp:

2010-05-08T07:53:23Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

051bc69a

Parents:

6c39a907 (diff), 1317380 (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 mainline changes.

File:

• boot/arch/arm32/include/arch.h (moved) (moved from boot/arch/ia64/loader/types.h ) (2 diffs)

boot/arch/arm32/include/arch.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Martin Decky
+ * Copyright (c) 2010 Martin Decky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-#ifndef BOOT_ia64_TYPES_H_
-#define BOOT_ia64_TYPES_H_
+#ifndef BOOT_arm32_ARCH_H
+#define BOOT_arm32_ARCH_H
 
-#include <gentypes.h>
+#define PAGE_WIDTH  12
+#define PAGE_SIZE   (1 << PAGE_WIDTH)
 
-typedef signed char int8_t;
+#define PTL0_ENTRIES     4096
+#define PTL0_ENTRY_SIZE  4
 
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned int uint32_t;
-typedef unsigned long uint64_t;
+#define BOOT_OFFSET  0xa00000
 
-typedef uint64_t uintptr_t;
-typedef uint64_t unative_t;
+#ifndef __ASM__
+        #define PA2KA(addr)  (((uintptr_t) (addr)) + 0x80000000)
+#else
+        #define PA2KA(addr)  ((addr) + 0x80000000)
+#endif
 
 #endif
+
+/** @}
+ */