Changeset dfbc229 in mainline

Timestamp:

2005-08-30T12:05:06Z (20 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

288a204

Parents:

bcdd9aa

Message:

OpenFirmware support

Location:

arch

Files:

• ia32/src/asm.S (modified) (1 diff)
• ppc/Makefile.inc (modified) (1 diff)
• ppc/include/ppc.h (moved) (moved from arch/ppc/include/vga.h ) (1 diff)
• ppc/src/asm.s (modified) (1 diff)
• ppc/src/drivers/vga.c (deleted)
• ppc/src/dummy.s (modified) (3 diffs)
• ppc/src/ppc.c (modified) (2 diffs)
• ppc/src/start.S (modified) (1 diff)

arch/ia32/src/asm.S ¶

@@ -35 +35 @@
 .text
 
-.global cpu_halt
-.global cpu_sleep
 .global paging_on
 .global enable_l_apic_in_msr

arch/ppc/Makefile.inc ¶

@@ -23 +23 @@
         arch/mm/frame.c \
         arch/mm/page.c \
-        arch/drivers/vga.c
+        arch/drivers/ofw.c

arch/ppc/include/ppc.h ¶

@@ -27 +27 @@
  */
 
-#ifndef __VGA_H__
-#define __VGA_H__
+#ifndef __ppc_PPC_H__
+#define __ppc_PPC_H__
 
-#define ROW             80
-#define ROWS            25
-#define SCREEN          (ROW*ROWS)
-
-extern void vga_init(void);
-extern void vga_putchar(const char ch);
-
-static void vga_check_cursor(void);
-static void vga_display_char(char ch);
+extern void early_init(int r3, int r4, int r5);
 
 #endif

arch/ppc/src/asm.s ¶

@@ -30 +30 @@
 
 .global cpu_halt
+.global cpu_sleep
+
 cpu_halt:
         b cpu_halt
- 
+
+cpu_sleep:
+        b cpu_sleep

arch/ppc/src/dummy.s ¶

@@ -42 +42 @@
 .global cpu_identify
 .global cpu_arch_init
-.global cpu_sleep
 .global cpu_print_report
 .global get_memory_size
@@ -67 +66 @@
 cpu_identify:
 cpu_arch_init:
-cpu_sleep:
 cpu_print_report:
 get_memory_size:
@@ -77 +75 @@
 dummy:
 0:
-        bl 0b
+        b 0b

arch/ppc/src/ppc.c ¶

@@ -1 +1 @@
 /*
- * Copyright (C) 2001-2004 Jakub Jermar
+ * Copyright (C) 2005 Martin Decky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
+#include <arch.h>
+#include <arch/ppc.h>
+#include <arch/drivers/ofw.h>
+
+void early_init(int r3, int r4, int r5)
+{
+        ofw = (ofw_entry) r5;
+        ofw_init();
+}

arch/ppc/src/start.S ¶

@@ -32 +32 @@
 
 kernel_image_start:
+        bl early_init
+        
         b main_bsp