Changeset d81e6bdf in mainline

Timestamp:

2006-02-26T12:58:18Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

1bedc54

Parents:

3c1dec0

Message:

create ppc32 boot image

Location:

arch/ppc32

Files:

• Makefile.inc (modified) (1 diff)
• loader/Makefile (modified) (2 diffs)
• loader/main.c (modified) (2 diffs)
• loader/main.h (modified) (1 diff)

arch/ppc32/Makefile.inc

@@ -30 +30 @@
 
 image.boot: kernel
-        make -C arch/$(ARCH)/loader COMPILER=$(COMPILER)
+        make -C arch/$(ARCH)/loader COMPILER=$(COMPILER) KERNEL=../../../$(KERNELDIR)/kernel.bin
 
 clean: clean_kernel
         make -C arch/$(ARCH)/loader clean
-        -rm -f image.boot
 
 arch_distclean: distclean_kernel

arch/ppc32/loader/Makefile

@@ -48 +48 @@
 
 CFLAGS = -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3
+DEFS = 
 
 SOURCES = \
@@ -57 +58 @@
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 
-loader.bin: $(OBJECTS)
-        $(LD) -no-check-sections -N -T _link.ld $(OBJECTS) -o $@
+.PHONY: all clean depend
+
+all: ../image.boot
+
+-include Makefile.depend
+
+../image.boot: depend $(OBJECTS) kernel.o
+        $(LD) -no-check-sections -N -T _link.ld $(OBJECTS) kernel.o -o $@
+
+depend:
+        -makedepend $(DEFS) $(CFLAGS) -f - $(SOURCES) > Makefile.depend 2> /dev/null
 
 clean:
-        -rm -f $(OBJECTS) loader.bin
+        -rm -f $(OBJECTS) ../image.boot kernel.o Makefile.depend
+
+kernel.o: $(KERNEL)
+        $(OBJCOPY) -I binary -O elf32-powerpc -B powerpc $(KERNEL) $@
 
 %.o: %.S

arch/ppc32/loader/main.c

@@ -31 +31 @@
 #include "ofw.h"
 
+#define KERNEL_LOAD_ADDRESS 0x800000
+#define KERNEL_SIZE _binary_____________kernel_kernel_bin_size
+
 static void halt(void)
 {
@@ -38 +41 @@
 void bootstrap(void)
 {
-        printf("\nHelenOS PPC Bootloader\nKernel size %d, load address %L\n", kernel_size, kernel_load_address);
+        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);
+        void *addr = ofw_claim((void *) KERNEL_LOAD_ADDRESS, KERNEL_SIZE, 1);
         if (addr == NULL) {
                 printf("Error: Unable to claim memory");

arch/ppc32/loader/main.h

@@ -30 +30 @@
 #define __MAIN_H__
 
-extern unsigned int kernel_size;
-extern void *kernel_load_address;
+extern unsigned int _binary_____________kernel_kernel_bin_size;
+extern void *_binary_____________kernel_kernel_bin_start;
 extern void bootstrap(void);