diff --git a/Makefile b/Makefile index b1518b6..4e9a9fc 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,7 @@ # along with OS/K. If not, see . # #=----------------------------------------------------------------------------=# -.PHONY: all test test32 debug gdb install_mbr clean OS/K +.PHONY: all test test32 debug gdb install_mbr dust clean OS/K ## VARIABLES ----------------------------------------------------------------- # @@ -31,7 +31,8 @@ mode ?= debug # Programs ASM=nasm -LD=ld +LD=x86_64-elf-ld +OBJCOPY=x86_64-elf-objcopy CCNAME=x86_64-elf-gcc ASMFLAGS=-f elf64 LDFLAGS=-melf_x86_64 @@ -185,7 +186,7 @@ clean: $(BINDIR)/kaleid: $(LOBJDIR)/kaleid.x86_64 @echo ${CL2}[$@] ${NC}Objcopy...${CL3} - @x86_64-elf-objcopy -I elf64-x86-64 -O elf32-i386 $(LOBJDIR)/kaleid.x86_64 $(BINDIR)/kaleid + @$(OBJCOPY) -I elf64-x86-64 -O elf32-i386 $(LOBJDIR)/kaleid.x86_64 $(BINDIR)/kaleid @echo ${CL2}[$@] ${CL}Success.${CL3} $(LOBJDIR)/kaleid.x86_64: $(LibCObj) $(KernObj) $(LOBJDIR)/loader.o diff --git a/kaleid/kernel/init/init.c b/kaleid/kernel/init/init.c index 115dc09..96b4c63 100644 --- a/kaleid/kernel/init/init.c +++ b/kaleid/kernel/init/init.c @@ -150,9 +150,7 @@ noreturn void BtStartKern(multiboot_info_t *mbInfo, uint mbMagic) MmInitHeap(); PsInitSched(); - KalAssert(0); - - KeStartPanic("Test Panic %d", 4); + //KeStartPanic("Test Panic %d", 4); // End this machine's suffering KeCrashSystem();