Subversion Repositories HelenOS-historic

Compare Revisions

Ignore whitespace Rev 887 → Rev 886

/boot/trunk/arch/ppc32/Makefile.inc
29,9 → 29,10
build: image.boot
 
image.boot: kernel
make -C arch/$(ARCH)/loader COMPILER=$(COMPILER) KERNEL=../../../$(KERNELDIR)/kernel.bin
make -C arch/$(ARCH)/loader COMPILER=$(COMPILER)
 
clean: clean_kernel
make -C arch/$(ARCH)/loader clean
-rm -f image.boot
 
arch_distclean: distclean_kernel
/boot/trunk/arch/ppc32/loader/main.c
30,9 → 30,6
#include "printf.h"
#include "ofw.h"
 
#define KERNEL_LOAD_ADDRESS 0x800000
#define KERNEL_SIZE _binary_____________kernel_kernel_bin_size
 
static void halt(void)
{
while (1);
40,9 → 37,9
 
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");
halt();
/boot/trunk/arch/ppc32/loader/main.h
29,8 → 29,8
#ifndef __MAIN_H__
#define __MAIN_H__
 
extern unsigned int _binary_____________kernel_kernel_bin_size;
extern void *_binary_____________kernel_kernel_bin_start;
extern unsigned int kernel_size;
extern void *kernel_load_address;
extern void bootstrap(void);
 
#endif
/boot/trunk/arch/ppc32/loader/Makefile
47,7 → 47,6
endif
 
CFLAGS = -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3
DEFS =
 
SOURCES = \
main.c \
57,24 → 56,12
 
OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 
.PHONY: all clean depend
loader.bin: $(OBJECTS)
$(LD) -no-check-sections -N -T _link.ld $(OBJECTS) -o $@
 
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) ../image.boot kernel.o Makefile.depend
-rm -f $(OBJECTS) loader.bin
 
kernel.o: $(KERNEL)
$(OBJCOPY) -I binary -O elf32-powerpc -B powerpc $(KERNEL) $@
 
%.o: %.S
$(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@