Changeset b629483 in mainline

Timestamp:

2006-03-15T15:08:29Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

3b05862f

Parents:

0e30dec

Message:

mips: remove load.bin
remove arch/boot infrastructure

Files:

• Makefile (modified) (4 diffs)
• arch/mips32/boot/Makefile (deleted)
• arch/mips32/boot/_link.ld (deleted)
• arch/mips32/boot/boot.S (deleted)
• contrib/conf/msim.conf (modified) (1 diff)

Makefile

@@ -150 +150 @@
 GENARCH_OBJECTS := $(addsuffix .o,$(basename $(GENARCH_SOURCES)))
 
-.PHONY: all build config distclean clean archlinks depend boot disasm
+.PHONY: all build config distclean clean archlinks depend disasm
 
 all:
@@ -161 +161 @@
         $(MAKE) -C . build
 
-build: kernel.bin boot disasm
+build: kernel.bin disasm
 
 config:
@@ -177 +177 @@
         for arch in arch/*; do \
             [ -e $$arch/_link.ld ] && rm $$arch/_link.ld 2>/dev/null;\
-            $(MAKE) -C $$arch/boot clean; \
         done;exit 0
 
@@ -211 +210 @@
         $(OBJCOPY) -O $(BFD) kernel.raw kernel.bin
 
-boot: kernel.bin
-        if [ -d arch/$(ARCH)/boot ] ; then $(MAKE) -C arch/$(ARCH)/boot build KERNEL_SIZE="`cat kernel.bin | wc -c`" CC=$(CC) AS=$(AS) LD=$(LD) ; fi
-
 disasm: kernel.raw
         $(OBJDUMP) -d kernel.raw > kernel.disasm

contrib/conf/msim.conf

@@ -5 +5 @@
 add dcpu mips1
 
-add rwm firstmem        0x0             1M      load "/dev/zero"
-add rwm mainmem         0x00100000      7M      load "kernel/kernel.bin"
-add rom startmem        0x1fc00000      1k      load "kernel/load.bin" 
-add rwm init            0x01000000      1M      load "uspace/init/init"
+add rwm mainmem         0x0                     8M              load    "/dev/zero"
+add rom startmem        0x1fc00000      1024k   load    "image.boot" 
+add rwm init            0x01000000      1M              load    "init"
 
 add dprinter printer 0x10000000