Subversion Repositories HelenOS-historic

Compare Revisions

Ignore whitespace Rev 1016 → Rev 1017

/kernel/trunk/contrib/conf/msim.conf
4,10 → 4,9
 
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
add dkeyboard keyboard 0x10000000 2
/kernel/trunk/Makefile
149,7 → 149,7
ARCH_OBJECTS := $(addsuffix .o,$(basename $(ARCH_SOURCES)))
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:
tools/config.py default $(NARCH)
160,7 → 160,7
endif
$(MAKE) -C . build
 
build: kernel.bin boot disasm
build: kernel.bin disasm
 
config:
-rm Makefile.depend
176,7 → 176,6
find generic/src/ arch/*/src/ genarch/src/ test/ -name '*.o' -follow -exec rm \{\} \;
for arch in arch/*; do \
[ -e $$arch/_link.ld ] && rm $$arch/_link.ld 2>/dev/null;\
$(MAKE) -C $$arch/boot clean; \
done;exit 0
 
archlinks:
210,9 → 209,6
kernel.bin: kernel.raw
$(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
 
/kernel/trunk/arch/mips32/boot/boot.S
File deleted
/kernel/trunk/arch/mips32/boot/_link.ld
File deleted
/kernel/trunk/arch/mips32/boot/Makefile
File deleted