Changeset 87b4baac in mainline for boot

Timestamp:

2010-12-17T20:16:46Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

424558a

Parents:

463e734 (diff), bbc74af7 (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

Location:

boot

Files:

• arch/ia64/include/types.h (modified) (2 diffs)
• arch/ppc32/include/types.h (modified) (1 diff)
• arch/sparc64/include/types.h (modified) (1 diff)
• genarch/include/ofw.h (modified) (1 diff)

boot/arch/ia64/include/types.h

@@ -35 +35 @@
 
 typedef uint64_t size_t;
-typedef uint64_t unative_t;
+typedef uint64_t sysarg_t;
 typedef uint64_t uintptr_t;
 
@@ -61 +61 @@
         unsigned int memmap_items;
 
-        unative_t *sapic;
+        sysarg_t *sapic;
         unsigned long sys_freq;
         unsigned long freq_scale;

boot/arch/ppc32/include/types.h

@@ -35 +35 @@
 typedef uint32_t size_t;
 typedef uint32_t uintptr_t;
-typedef uint32_t unative_t;
+typedef uint32_t sysarg_t;
 typedef int32_t native_t;
 

boot/arch/sparc64/include/types.h

@@ -35 +35 @@
 typedef uint64_t size_t;
 typedef uint64_t uintptr_t;
-typedef uint64_t unative_t;
+typedef uint64_t sysarg_t;
 typedef int64_t native_t;
 

boot/genarch/include/ofw.h

@@ -40 +40 @@
 #define OFW_TREE_PROPERTY_MAX_VALUELEN  64
 
-typedef unative_t ofw_arg_t;
+typedef sysarg_t ofw_arg_t;
 typedef native_t ofw_ret_t;
 typedef uint32_t ofw_prop_t;