Changeset 04803bf in mainline for boot/arch/ppc32/include/arch.h

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 (needs fixes).

File:

• boot/arch/ppc32/include/arch.h (moved) (moved from boot/arch/mips32/loader/types.h ) (1 diff)

boot/arch/ppc32/include/arch.h

@@ -27 +27 @@
  */
 
-#ifndef BOOT_mips32_TYPES_H_
-#define BOOT_mips32_TYPES_H_
+#ifndef BOOT_ppc32_ARCH_H_
+#define BOOT_ppc32_ARCH_H_
 
-#include <gentypes.h>
+#define PAGE_WIDTH  12
+#define PAGE_SIZE   (1 << PAGE_WIDTH)
 
-typedef signed char int8_t;
+#define BOOT_OFFSET  0x8000
 
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned int uint32_t;
-typedef unsigned long long uint64_t;
+#define LOADER_ADDRESS  0x01000000
 
-typedef uint32_t uintptr_t;
-typedef uint32_t unative_t;
+#ifndef __ASM__
+        #define PA2KA(addr)  (((uintptr_t) (addr)) + 0x80000000)
+#else
+        #define PA2KA(addr)  ((addr) + 0x80000000)
+#endif
 
 #endif