Index: arch/ppc32/Makefile.inc =================================================================== --- arch/ppc32/Makefile.inc (revision d1f8a87ac9eee01b7c1dd694d9dba04fb72387be) +++ arch/ppc32/Makefile.inc (revision 06e680501895bfcce735e01900dd2a039317c2cc) @@ -59,7 +59,7 @@ arch/$(ARCH)/src/debug/panic.s \ arch/$(ARCH)/src/fpu_context.S \ + arch/$(ARCH)/src/boot/boot.S \ arch/$(ARCH)/src/ppc32.c \ arch/$(ARCH)/src/dummy.s \ - arch/$(ARCH)/src/start.S \ arch/$(ARCH)/src/asm.S \ arch/$(ARCH)/src/cpu/cpu.c \ Index: arch/ppc32/include/boot/memmap.h =================================================================== --- arch/ppc32/include/boot/memmap.h (revision 06e680501895bfcce735e01900dd2a039317c2cc) +++ arch/ppc32/include/boot/memmap.h (revision 06e680501895bfcce735e01900dd2a039317c2cc) @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2006 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef __ppc32_MEMMAP_H__ +#define __ppc32_MEMMAP_H__ + +#define MEMMAP_MAX_RECORDS 32 + +#ifndef __ASM__ + +#include + +typedef struct { + __address start; + __u32 size; +} memzone_t; + +typedef struct { + __u32 total; + __u32 count; + memzone_t zones[MEMMAP_MAX_RECORDS]; +} memmap_t; + +extern memmap_t memmap; + +#endif + +#endif Index: arch/ppc32/include/mm/memory_init.h =================================================================== --- arch/ppc32/include/mm/memory_init.h (revision d1f8a87ac9eee01b7c1dd694d9dba04fb72387be) +++ arch/ppc32/include/mm/memory_init.h (revision 06e680501895bfcce735e01900dd2a039317c2cc) @@ -34,3 +34,5 @@ size_t get_memory_size(void); +void memory_print_map(void); + #endif Index: arch/ppc32/src/boot/boot.S =================================================================== --- arch/ppc32/src/boot/boot.S (revision 06e680501895bfcce735e01900dd2a039317c2cc) +++ arch/ppc32/src/boot/boot.S (revision 06e680501895bfcce735e01900dd2a039317c2cc) @@ -0,0 +1,71 @@ +# +# Copyright (C) 2005 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +#include +#include +#include +#include + +.section K_TEXT_START + +.global kernel_image_start +kernel_image_start: + + # r10 contains physical address to memmap_t + # from boot loader + + lis r4, 0x80000000@ha + addi r4, r4, 0x80000000@l + + add r10, r10, r4 + + lis r4, memmap@ha + addi r4, r4, memmap@l # r4 = memmap + + lwz r5, 0(r10) # memmap->total + stw r5, 0(r4) + + lwzu r5, 4(r10) # memmap->count + stwu r5, 4(r4) + + cmpwi r5, 0 + beq memmap_end + + mtctr r5 + memmap_loop: + + lwzu r5, 4(r10) # memmap->zones[i].start + stwu r5, 4(r4) + + lwzu r5, 4(r10) # memmap->zones[i].size + stwu r5, 4(r4) + + bdnz memmap_loop + memmap_end: + + b main_bsp Index: arch/ppc32/src/console.c =================================================================== --- arch/ppc32/src/console.c (revision d1f8a87ac9eee01b7c1dd694d9dba04fb72387be) +++ arch/ppc32/src/console.c (revision 06e680501895bfcce735e01900dd2a039317c2cc) @@ -37,4 +37,4 @@ { /* TODO: PCI detection etc. etc. - this is fine in PearPC for now */ - fb_init(0x84000000, 800, 600, 4); + fb_init(0xf0000000, 800, 600, 4); } Index: arch/ppc32/src/mm/memory_init.c =================================================================== --- arch/ppc32/src/mm/memory_init.c (revision d1f8a87ac9eee01b7c1dd694d9dba04fb72387be) +++ arch/ppc32/src/mm/memory_init.c (revision 06e680501895bfcce735e01900dd2a039317c2cc) @@ -27,9 +27,23 @@ */ +#include #include #include +#include + +memmap_t memmap; + size_t get_memory_size(void) { - return 0; + return memmap.total; } + + +void memory_print_map(void) +{ + count_t i; + + for (i = 0; i < memmap.count; i++) + printf("base: %L size: %L\n", memmap.zones[i].start, memmap.zones[i].size); +} Index: arch/ppc32/src/ppc32.c =================================================================== --- arch/ppc32/src/ppc32.c (revision d1f8a87ac9eee01b7c1dd694d9dba04fb72387be) +++ arch/ppc32/src/ppc32.c (revision 06e680501895bfcce735e01900dd2a039317c2cc) @@ -30,4 +30,6 @@ #include +#include + void arch_pre_mm_init(void) { @@ -41,4 +43,5 @@ void arch_pre_smp_init(void) { + memory_print_map(); } Index: arch/ppc32/src/start.S =================================================================== --- arch/ppc32/src/start.S (revision d1f8a87ac9eee01b7c1dd694d9dba04fb72387be) +++ (revision ) @@ -1,37 +1,0 @@ -# -# Copyright (C) 2005 Jakub Jermar -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -#include -#include - -.section K_TEXT_START - -.global kernel_image_start - -kernel_image_start: - b main_bsp