Changeset 39cb79a in mainline

Timestamp:

2005-10-29T13:37:52Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2cd0485d

Parents:

b9b103d3

Message:

sparc64 work.
Link kernel with load address 0x4000.
Add fragment of Linux image header to force SILO to always load the kernel at 0x4000.
Adjust ofw.h and ofw.c to work also on sparc64.

Files:

• arch/sparc64/Makefile.inc (modified) (1 diff)
• arch/sparc64/_link.ld (modified) (2 diffs)
• arch/sparc64/src/dummy.s (modified) (2 diffs)
• arch/sparc64/src/sparc64.c (added)
• arch/sparc64/src/start.S (modified) (1 diff)
• genarch/include/firmware/ofw/ofw.h (modified) (3 diffs)
• genarch/src/firmware/ofw/ofw.c (modified) (2 diffs)

arch/sparc64/Makefile.inc

@@ -20 +20 @@
 arch_sources= \
         src/arch/dummy.s \
-        src/arch/start.S
+        src/arch/start.S \
+        src/arch/sparc64.c
+

arch/sparc64/_link.ld

@@ -12 +12 @@
 
 SECTIONS {
-        .image 0x80000000: AT (0x80000000) { 
+        .image 0x4000: AT (0x4000) { 
                 ktext_start = .;
                 *(K_TEXT_START)
@@ -31 +31 @@
                 LONG(kdata_end - kdata_start);
                 hardcoded_load_address = .;
-                LONG(0x80000000);
+                LONG(0x4000);
                 *(.bss);                /* uninitialized static variables */    
                 *(COMMON);              /* global variables */

arch/sparc64/src/dummy.s

@@ -29 +29 @@
 .text
 
-.global arch_late_init
-.global arch_post_mm_init
-.global arch_pre_mm_init
 .global asm_delay_loop
 .global before_thread_runs_arch
-.global calibrate_delay_loop
 .global context_restore_arch
 .global context_save_arch
@@ -60 +56 @@
 .global dummy
 
-arch_late_init:
-arch_post_mm_init:
-arch_pre_mm_init:
 asm_delay_loop:
 before_thread_runs_arch:
-calibrate_delay_loop:
 context_restore_arch:
 context_save_arch:

arch/sparc64/src/start.S

@@ -32 +32 @@
 kernel_image_start:
 0:
-        b 0b
+        b 1f
         nop
+
+#
+# This header forces SILO to load the kernel at 0x4000.
+# More precisely, SILO will think this is an old version of Linux.
+#
+.ascii "HdrS"
+.word 0
+.half 0
+
+.align 8
+
+1:
+        set ofw, %l0
+        stx %o4, [%l0]
+
+        call ofw_init
+        nop
+
+2:
+        b 2b
+        nop
+

genarch/include/firmware/ofw/ofw.h

@@ -34 +34 @@
 #define MAX_OFW_ARGS    10
 
-typedef __u32 ofw_arg_t;
-typedef __u32 ihandle;
-typedef __u32 phandle;
+typedef __native ofw_arg_t;
+typedef int ihandle;
+typedef int phandle;
 
 /** OpenFirmware command structure
@@ -43 +43 @@
 typedef struct {
         const char *service;          /**< Command name */
-        __u32 nargs;                  /**< Number of in arguments */
-        __u32 nret;                   /**< Number of out arguments */
+        __native nargs;               /**< Number of in arguments */
+        __native nret;                /**< Number of out arguments */
         ofw_arg_t args[MAX_OFW_ARGS]; /**< List of arguments */
 } ofw_args_t;
@@ -54 +54 @@
 extern void ofw_init(void);
 extern void ofw_done(void);
-extern __address ofw_call(const char *service, const int nargs, const int nret, ...);
+extern __native ofw_call(const char *service, const int nargs, const int nret, ...);
 extern void ofw_putchar(const char ch);
 extern phandle ofw_find_device(const char *name);

genarch/src/firmware/ofw/ofw.c

@@ -50 +50 @@
 void ofw_done(void)
 {
-        ofw_call("exit", 0, 0);
+        (void) ofw_call("exit", 0, 0);
         cpu_halt();
 }
 
-__address ofw_call(const char *service, const int nargs, const int nret, ...)
+__native ofw_call(const char *service, const int nargs, const int nret, ...)
 {
         va_list list;
@@ -82 +82 @@
                 return;
         
-        ofw_call("write", 3, 1, ofw_stdout, &ch, 1);
+        (void) ofw_call("write", 3, 1, ofw_stdout, &ch, 1);
 }
 
 phandle ofw_find_device(const char *name)
 {
-        return ofw_call("finddevice", 1, 1, name);
+        return (phandle) ofw_call("finddevice", 1, 1, name);
 }
 
 int ofw_get_property(const phandle device, const char *name, void *buf, const int buflen)
 {
-        return ofw_call("getprop", 4, 1, device, name, buf, buflen);
+        return (int) ofw_call("getprop", 4, 1, device, name, buf, buflen);
 }