Changeset 63cda71 in mainline for boot/arch/ppc32

Timestamp:

2006-07-13T14:58:57Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

94d614e

Parents:

eda7bf81

Message:

Fix ofw_memmap() in boot infrastructure.
The cell size is 32-bit and not equal sizeof(ofw_arg_t).
Define architecture dependant #address-cells and #size-cells for cases
the respective properties are missing in the OpenFirmware device tree.
The algorithm now works both for ppc32 and sparc64.

Add memmap_t, screen_t and keyboard_t to sparc64 bootinfo structure.
Be more verbose during sparc64 boot.

Move ALIGN_UP to generic part of boot/.

Change header guards in several places so that they don't contain double underscore.

Location:

boot/arch/ppc32/loader

Files:

• Makefile (modified) (1 diff)
• asm.h (modified) (1 diff)
• boot.S (modified) (1 diff)
• main.c (modified) (1 diff)
• main.h (modified) (1 diff)
• ofwarch.c (moved) (moved from boot/arch/ppc32/loader/ofw.c ) (2 diffs)
• ofwarch.h (moved) (moved from boot/arch/sparc64/loader/ofw.c ) (2 diffs)
• types.h (modified) (1 diff)

boot/arch/ppc32/loader/Makefile

@@ -51 +51 @@
 SOURCES = \
         main.c \
-        ofw.c \
+        ofwarch.c \
         ../../../genarch/ofw.c \
         ../../../generic/printf.c \

boot/arch/ppc32/loader/asm.h

@@ -27 +27 @@
  */
 
-#ifndef __ASM_H__
-#define __ASM_H__
+#ifndef BOOT_ppc32_ASM_H_
+#define BOOT_ppc32_ASM_H_
 
 #define PAGE_SIZE 4096

boot/arch/ppc32/loader/boot.S

@@ -38 +38 @@
         stw r5, 0(r4)
         
-        bl init
+        bl ofw_init
         
         b bootstrap

boot/arch/ppc32/loader/main.c

@@ -31 +31 @@
 #include "asm.h"
 #include "_components.h"
+#include <ofw.h>
+#include <align.h>
 
 #define HEAP_GAP 1024000

boot/arch/ppc32/loader/main.h

@@ -27 +27 @@
  */
 
-#ifndef __MAIN_H__
-#define __MAIN_H__
+#ifndef BOOT_ppc32_MAIN_H_
+#define BOOT_ppc32_MAIN_H_
 
 #include "ofw.h"
-
-/** Align to the nearest higher address.
- *
- * @param addr  Address or size to be aligned.
- * @param align Size of alignment, must be power of 2.
- */
-#define ALIGN_UP(addr, align) (((addr) + ((align) - 1)) & ~((align) - 1))
 
 #define TASKMAP_MAX_RECORDS 32

boot/arch/ppc32/loader/ofwarch.c

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
- 
+
+#include <ofwarch.h> 
 #include <ofw.h>
 #include <printf.h>
@@ -56 +57 @@
         if (ofw_get_property(device, "assigned-addresses", &macio, sizeof(macio)) <= 0)
                 return false;
-        keyboard->addr = macio.addr.addr_lo;
+        keyboard->addr = (void *) macio.addr.addr_lo;
         keyboard->size = macio.size_lo;
 

boot/arch/ppc32/loader/ofwarch.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2005 Martin Decky
+ * Copyright (C) 2006 Jakub Jermar
  * All rights reserved.
  *
@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
- 
-#include <ofw.h>
-#include <printf.h>
 
-void write(const char *str, const int len)
-{
-        int i;
-        
-        for (i = 0; i < len; i++) {
-                if (str[i] == '\n')
-                        ofw_write("\r", 1);
-                ofw_write(&str[i], 1);
-        }
-}
+#ifndef BOOT_ppc32_OFWARCH_H_
+#define BOOT_ppc32_OFWARCH_H_
 
-int ofw_translate_failed(ofw_arg_t flag)
-{
-        return flag != -1;
-}
+#define OFW_ADDRESS_CELLS       1
+#define OFW_SIZE_CELLS          1
+
+#endif

boot/arch/ppc32/loader/types.h

@@ -27 +27 @@
  */
 
-#ifndef TYPES_H__
-#define TYPES_H__
+#ifndef BOOT_ppc32_TYPES_H_
+#define BOOT_ppc32_TYPES_H_
 
 #include <gentypes.h>