diff --git a/.gitignore b/.gitignore index b0c0623..ee5c198 100644 --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,6 @@ dep/ *.bin *.ub boot/loader +*.d tools/mksfs .gdb_history diff --git a/Makefile b/Makefile index d2ed414..76902a7 100644 --- a/Makefile +++ b/Makefile @@ -83,12 +83,21 @@ BUILD_DIR += $(USER_OBJDIR) DEPENDS := $(patsubst $(SRCDIR)/%.c, $(DEPDIR)/%.d, $(SRC)) -.PHONY: all checkdirs clean + +CONFIG_FILE := .config_$(ON_FPGA)_$(EN_INT)_$(EN_TLB) + +.PHONY: all checkdirs clean qemu all: checkdirs boot/loader.bin obj/ucore-kernel-initrd $(shell mkdir -p $(DEP_DIR)) +$(CONFIG_FILE): + @rm -f .config_* + touch $@ + +qemu: obj/ucore-kernel-initrd + qemu-system-mipsel -M mipssim -m 32M -nographic -kernel $< -monitor none -serial stdio obj/ucore-kernel: $(OBJ) tools/kernel.ld @echo LINK $@ @@ -99,15 +108,15 @@ obj/ucore-kernel-piggy: $(BUILD_DIR) $(OBJ) $(USER_APP_BINS) tools/kernel.ld $(LD) $(LDFLAGS_SCRIPT) $(OBJ) \ $(addsuffix .piggy.o, $(USER_APP_BINS)) -o $@ -$(DEPDIR)/%.d: $(SRCDIR)/%.c +$(DEPDIR)/%.d: $(SRCDIR)/%.c $(CONFIG_FILE) @echo DEP $< @set -e; rm -f $@; \ $(CC) -MM -MT "$(OBJDIR)/$*.o $@" $(CFLAGS) $(INCLUDES) $< > $@; -$(OBJDIR)/%.o: $(SRCDIR)/%.c +$(OBJDIR)/%.o: $(SRCDIR)/%.c $(CONFIG_FILE) $(CC) -c -mips1 $(INCLUDES) $(CFLAGS) $(MACH_DEF) $< -o $@ -$(OBJDIR)/%.o: $(SRCDIR)/%.S +$(OBJDIR)/%.o: $(SRCDIR)/%.S $(CONFIG_FILE) $(CC) -c -mips32 -D__ASSEMBLY__ $(MACH_DEF) $(INCLUDES) $(CFLAGS) $< -o $@ checkdirs: $(BUILD_DIR) $(DEP_DIR) diff --git a/debug b/debug deleted file mode 100755 index 2eb48d7..0000000 --- a/debug +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -../qemu-thumips/bin/qemu-system-mipsel -M mipssim -m 32M -serial stdio -bios boot/loader.bin -S -s & -sleep 1 -gnome-terminal -e "mips-sde-elf-gdb" - diff --git a/run b/run deleted file mode 100755 index a724ad3..0000000 --- a/run +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -../qemu-thumips/bin/qemu-system-mipsel -M mipssim -m 32M -serial stdio -bios boot/loader.bin -