| /kernel/trunk/arch/mips32/src/mips32.c |
|---|
| 28,7 → 28,6 |
| #include <arch.h> |
| #include <arch/boot.h> |
| #include <arch/cp0.h> |
| #include <arch/exception.h> |
| #include <arch/asm.h> |
| 61,19 → 60,26 |
| #define NORM_EXC ((char *) 0x80000180) |
| #define CACHE_EXC ((char *) 0x80000100) |
| bootinfo_t bootinfo; |
| void arch_pre_main(void) |
| { |
| /* Setup usermode */ |
| init.cnt = bootinfo.cnt; |
| __u32 i; |
| for (i = 0; i < bootinfo.cnt; i++) { |
| init.tasks[i].addr = bootinfo.tasks[i].addr; |
| init.tasks[i].size = bootinfo.tasks[i].size; |
| } |
| init.cnt = 8; |
| init.tasks[0].addr = INIT_ADDRESS; |
| init.tasks[0].size = INIT_SIZE; |
| init.tasks[1].addr = INIT_ADDRESS + 0x100000; |
| init.tasks[1].size = INIT_SIZE; |
| init.tasks[2].addr = INIT_ADDRESS + 0x200000; |
| init.tasks[2].size = INIT_SIZE; |
| init.tasks[3].addr = INIT_ADDRESS + 0x300000; |
| init.tasks[3].size = INIT_SIZE; |
| init.tasks[4].addr = INIT_ADDRESS + 0x400000; |
| init.tasks[4].size = INIT_SIZE; |
| init.tasks[5].addr = INIT_ADDRESS + 0x500000; |
| init.tasks[5].size = INIT_SIZE; |
| init.tasks[6].addr = INIT_ADDRESS + 0x600000; |
| init.tasks[6].size = INIT_SIZE; |
| init.tasks[7].addr = INIT_ADDRESS + 0x700000; |
| init.tasks[7].size = INIT_SIZE; |
| } |
| void arch_pre_mm_init(void) |
| /kernel/trunk/arch/mips32/src/start.S |
|---|
| 182,35 → 182,10 |
| /* Load temporary stack */ |
| lui $sp, %hi(end_stack) |
| ori $sp, $sp, %lo(end_stack) |
| /* $a1 contains physical address of bootinfo_t */ |
| /* $a2 contains size of bootinfo_t */ |
| beq $a2, $0, bootinfo_end |
| /* Not sure about this, but might be needed for PIC code???? */ |
| lui $gp, 0x8000 |
| lui $a3, 0x8000 |
| addu $a1, $a1, $a3 |
| lui $a3, %hi(bootinfo) |
| ori $a3, $a3, %lo(bootinfo) |
| bootinfo_loop: |
| lw $v0, 0($a1) |
| sw $v0, 0($a3) |
| addi $a1, $a1, 4 |
| addi $a3, $a3, 4 |
| addi $a2, $a2, -4 |
| bgtz $a2, bootinfo_loop |
| nop |
| bootinfo_end: |
| jal arch_pre_main |
| nop |
| /kernel/trunk/arch/mips32/include/boot.h |
|---|
| File deleted |
| /kernel/trunk/arch/ppc32/src/boot/boot.S |
|---|
| 48,14 → 48,14 |
| # r3 contains physical address of bootinfo_t |
| # r4 contains size of bootinfo_t |
| cmpwi r4, 0 |
| beq bootinfo_end |
| addis r3, r3, 0x8000 |
| lis r31, bootinfo@ha |
| addi r31, r31, bootinfo@l # r31 = bootinfo |
| cmpwi r4, 0 |
| beq bootinfo_end |
| bootinfo_loop: |
| lwz r30, 0(r3) |
| /kernel/trunk/contrib/conf/msim.conf |
|---|
| 6,6 → 6,14 |
| add rwm mainmem 0x0 8M load "/dev/zero" |
| add rom startmem 0x1fc00000 1024k load "image.boot" |
| add rwm ns 0x01000000 1M load "ns" |
| add rwm kbd 0x01100000 1M load "fb" |
| add rwm fb 0x01200000 1M load "kbd" |
| add rwm console 0x01300000 1M load "console" |
| add rwm init 0x01400000 1M load "init" |
| add rwm tetris 0x01500000 1M load "tetris" |
| add rwm klog 0x01600000 1M load "klog" |
| add rwm ipcc 0x01700000 1M load "ipcc" |
| add dprinter printer 0x10000000 |
| add dkeyboard keyboard 0x10000000 2 |