Changeset a0c732e in mainline

Timestamp:

2006-02-26T11:48:05Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

7a255e69

Parents:

13c1a0c

Message:

PPC32 boot loader preparation

Location:

arch/ppc32/boot

Files:

• Makefile (modified) (1 diff)
• main.c (modified) (1 diff)
• main.h (modified) (1 diff)
• ofw.c (added)
• ofw.h (added)
• printf.c (added)
• printf.h (added)

arch/ppc32/boot/Makefile

@@ -2 +2 @@
 
 CFLAGS = -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -I../include
+DEFS = -DKERNEL_LOAD_ADDRESS=0x800000 -DKERNEL_SIZE=40960
+
+SOURCES = \
+        main.c \
+        ofw.c \
+        printf.c \
+        boot.S
+
+OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 
 build: boot.bin
         cp boot.bin ../../../load.bin
 
-boot.bin: boot.o main.o
-        $(LD) -no-check-sections -N -T _link.ld boot.o main.o -o $@
+boot.bin: $(OBJECTS)
+        $(LD) -no-check-sections -N -T _link.ld $(OBJECTS) -o $@
 
-boot.o: boot.S
-        $(CC) $(CFLAGS) -c boot.S -o $@
+%.o: %.S
+        $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@
 
-main.o: main.c
-        $(CC) $(CFLAGS) -c main.c -o $@
+%.o: %.c
+        $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
 
 clean:
-        -rm -f boot.o main.o boot.bin ../../../load.bin
+        -rm -f $(OBJECTS) boot.bin ../../../load.bin

arch/ppc32/boot/main.c

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
- 
-#include "main.h"
 
-ofw_entry ofw;
+#include "main.h" 
+#include "printf.h"
+#include "ofw.h"
 
-phandle ofw_chosen;
-ihandle ofw_stdout;
-
-void init(void)
+static void halt(void)
 {
-        ofw_chosen = ofw_find_device("/chosen");
-        if (ofw_chosen == -1)
-                ofw_call("exit", 0, 0);
-        
-        if (ofw_get_property(ofw_chosen, "stdout",  &ofw_stdout, sizeof(ofw_stdout)) <= 0)      
-                ofw_stdout = 0;
-}
-
-int ofw_call(const char *service, const int nargs, const int nret, ...)
-{
-        va_list list;
-        ofw_args_t args;
-        int i;
-        
-        args.service = service;
-        args.nargs = nargs;
-        args.nret = nret;
-        
-        va_start(list, nret);
-        for (i = 0; i < nargs; i++)
-                args.args[i] = va_arg(list, ofw_arg_t);
-        va_end(list);
-        
-        for (i = 0; i < nret; i++)
-                args.args[i + nargs] = 0;
-        
-        ofw(&args);
-        
-        return args.args[nargs];
-}
-
-void ofw_write(const char *str, const int len)
-{
-        if (ofw_stdout == 0)
-                return;
-        
-        ofw_call("write", 3, 1, ofw_stdout, str, len);
-}
-
-void ofw_puts(const char *str)
-{
-        int len = 0;
-        
-        while (str[len] != 0)
-                len++;
-        
-        ofw_write(str, len);
-}
-
-phandle ofw_find_device(const char *name)
-{
-        return 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);
+        while (1);
 }
 
 void bootstrap(void)
 {
-        ofw_puts("\nHelenOS PPC Bootloader\n");
-
-        while (1);
+        printf("\nHelenOS PPC Bootloader\nKernel size %d, load address %L\n", KERNEL_SIZE, KERNEL_LOAD_ADDRESS);
+        
+        void *addr = ofw_claim((void *) KERNEL_LOAD_ADDRESS, KERNEL_SIZE, 1);
+        if (addr == NULL) {
+                printf("Error: Unable to claim memory");
+                halt();
+        }
+        
+        halt();
 }

arch/ppc32/boot/main.h

@@ -30 +30 @@
 #define __MAIN_H__
 
-#define MAX_OFW_ARGS    10
-
-typedef __builtin_va_list va_list;
-
-#define va_start(ap, last)              __builtin_va_start(ap, last)
-#define va_arg(ap, type)                __builtin_va_arg(ap, type)
-#define va_end(ap)                      __builtin_va_end(ap)
-
-typedef unsigned int ofw_arg_t;
-typedef unsigned int ihandle;
-typedef unsigned int phandle;
-
-/** OpenFirmware command structure
- *
- */
-typedef struct {
-        const char *service;          /**< Command name */
-        unsigned int nargs;           /**< Number of in arguments */
-        unsigned int nret;            /**< Number of out arguments */
-        ofw_arg_t args[MAX_OFW_ARGS]; /**< List of arguments */
-} ofw_args_t;
-
-typedef void (*ofw_entry)(ofw_args_t *);
-
-extern void init(void);
-extern int ofw_call(const char *service, const int nargs, const int nret, ...);
-extern void ofw_write(const char *str, const int len);
-extern void ofw_puts(const char *str);
-extern phandle ofw_find_device(const char *name);
-extern int ofw_get_property(const phandle device, const char *name, void *buf, const int buflen);
 extern void bootstrap(void);