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

Timestamp:

2010-05-08T07:53:23Z (14 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/sparc64/include/asm.h (moved) (moved from boot/arch/sparc64/loader/register.h ) (2 diffs)

boot/arch/sparc64/include/asm.h

@@ -1 +1 @@
 /*
+ * Copyright (c) 2006 Martin Decky
  * Copyright (c) 2006 Jakub Jermar
  * All rights reserved.
@@ -27 +28 @@
  */
 
-#ifndef BOOT_sparc64_REGISTER_H_
-#define BOOT_sparc64_REGISTER_H_
+#ifndef BOOT_sparc64_ASM_H_
+#define BOOT_sparc64_ASM_H_
 
-#define PSTATE_IE_BIT    2
-#define PSTATE_PRIV_BIT  4
-#define PSTATE_AM_BIT    8
+#include <typedefs.h>
 
-#define ASI_ICBUS_CONFIG        0x4a
-#define ICBUS_CONFIG_MID_SHIFT  17
+extern void jump_to_kernel(void *entry, bootinfo_t *bootinfo,
+    uintptr_t physmem_start, uint8_t subarch) __attribute__((noreturn));
 
 #endif