Changeset 25a76ab8 in mainline for boot/arch/ppc32/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/ppc32/include/asm.h (moved) (moved from boot/arch/mips32/loader/msim.c ) (1 diff)

boot/arch/ppc32/include/asm.h

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
- 
-#include "msim.h"
-#include <printf.h>
 
-#define MSIM_VIDEORAM            0xB0000000
+#ifndef BOOT_ppc32_ASM_H_
+#define BOOT_ppc32_ASM_H_
 
-void write(const char *str, const int len)
-{
-        int i;
-        
-        for (i = 0; i < len; i++)
-                *((char *) MSIM_VIDEORAM) = str[i];
-}
+#include <typedefs.h>
+#include <arch/main.h>
+
+extern void jump_to_kernel(void *, void *, size_t, void *)
+    __attribute__((noreturn));
+extern void real_mode();
+
+#endif