| /boot/trunk/arch/ppc32/loader/debug.inc |
|---|
| File deleted |
| /boot/trunk/arch/ppc32/loader/asm.S |
|---|
| 28,7 → 28,6 |
| #include "asm.h" |
| #include "regname.h" |
| #include "debug.inc" |
| .text |
| 109,8 → 108,6 |
| # r5 = trans (pa) |
| # r6 = bytes to copy |
| # r7 = real_mode (pa) |
| # r8 = framebuffer (pa) |
| # r9 = scanline |
| # disable interrupts |
| 126,7 → 123,7 |
| mfmsr r31 |
| lis r30, ~0@h |
| ori r30, r30, ~(msr_ir | msr_dr | msr_ee)@l |
| ori r30, r30, ~(msr_ir | msr_dr)@l |
| and r31, r31, r30 |
| mtspr srr1, r31 |
| 139,15 → 136,11 |
| .global real_mode |
| real_mode: |
| DEBUG_real_mode |
| # copy kernel to proper location |
| # |
| # r5 = trans (pa) |
| # r6 = bytes to copy |
| # r8 = framebuffer (pa) |
| # r9 = scanline |
| li r31, PAGE_SIZE >> 2 |
| li r30, 0 |
| 258,8 → 251,6 |
| sync |
| isync |
| DEBUG_rfi |
| rfi |
| .align PAGE_WIDTH |
| /boot/trunk/arch/ppc32/loader/main.c |
|---|
| 150,5 → 150,5 |
| fix_overlap(&bootinfo, &bootinfo_pa, "boot info", &top); |
| printf("\nBooting the kernel...\n"); |
| jump_to_kernel(bootinfo_pa, sizeof(bootinfo), trans_pa, pages << PAGE_WIDTH, real_mode_pa, bootinfo.screen.addr, bootinfo.screen.scanline); |
| jump_to_kernel(bootinfo_pa, sizeof(bootinfo), trans_pa, pages << PAGE_WIDTH, real_mode_pa); |
| } |
| /boot/trunk/arch/ppc32/loader/asm.h |
|---|
| 44,7 → 44,7 |
| extern void *trans[TRANS_SIZE]; |
| extern void halt(); |
| extern void jump_to_kernel(void *bootinfo, unsigned int bootinfo_size, void *trans, unsigned int kernel_size, void *real_mode, void *fb, unsigned int scanline) __attribute__((noreturn)); |
| extern void jump_to_kernel(void *bootinfo, unsigned int bootinfo_size, void *trans, unsigned int kernel_size, void *real_mode) __attribute__((noreturn)); |
| extern void real_mode(); |
| #endif |
| /boot/trunk/arch/ppc32/loader/Makefile |
|---|
| 47,6 → 47,7 |
| endif |
| CFLAGS = -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -mcpu=powerpc -msoft-float -m32 |
| DEFS = |
| SOURCES = \ |
| main.c \ |
| /boot/trunk/arch/ppc32/loader/regname.h |
|---|
| 210,7 → 210,6 |
| /* MSR bits */ |
| #define msr_ir (1 << 4) |
| #define msr_dr (1 << 5) |
| #define msr_ee (1 << 15) |
| /* HID0 bits */ |
| #define hid0_ice (1 << 15) |
| /boot/trunk/arch/ppc32/Makefile.inc |
|---|
| 29,7 → 29,7 |
| build: image.boot |
| image.boot: kernel uspace |
| make -C arch/$(ARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) "DEFS=$(DEFS)" |
| make -C arch/$(ARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) |
| cp arch/$(ARCH)/loader/image.boot image.boot |
| clean: clean_kernel clean_uspace |
| /boot/trunk/boot.config |
|---|
| 16,9 → 16,6 |
| ! [ARCH=ppc32] PPC32_COMPILER (choice) |
| % [ARCH=ppc32] SAVEAS PPC32_COMPILER COMPILER |
| # Debug bootloader |
| ! [ARCH=ppc32] CONFIG_DEBUG (y/n) |
| # PPC64 Compiler |
| @ "cross" Cross-compiler |
| @ "native" Native |
| /boot/trunk/Makefile |
|---|
| 43,10 → 43,6 |
| -include arch/$(ARCH)/Makefile.inc |
| ifeq ($(CONFIG_DEBUG),y) |
| DEFS += -DCONFIG_DEBUG |
| endif |
| .PHONY: all build config distclean arch_distclean clean kernel uspace clean_kernel clean_uspace distclean_kernel distclean_uspace |
| all: |