kernel/Makefile

@@ -19,7 +19,7 @@ TARGET := kernel
 CFILES    := $(shell find src -path src/arch -prune -o -type f -name '*.c' -print)
 ARCHFILES := $(ARCHFILES) $(shell find src/arch/$(ARCH) -type f -name '*.c' -print)
 HFILES    := $(shell find src -type f -name '*.h')
-OBJ       := $(patsubst src/%,obj/$(ARCH)/%.o,$(CFILES) $(ARCHFILES))
+OBJ       := $(patsubst src/%.c,obj/$(ARCH)/%.o,$(CFILES) $(ARCHFILES))
 
 .PHONY: all clean obj $(ARCHES)
 
@@ -32,9 +32,9 @@ $(ARCHES):
 bin/$(TARGET)-$(ARCH): $(OBJ)
 	@mkdir -p $(@D)
 	@echo Linking $@
-	$(LD) $(LDFLAGS) $(OBJ) -o $@
+	@$(LD) $(LDFLAGS) $(OBJ) -o $@
 
-obj/$(ARCH)/%.c.o: src/%.c $(HFILES)
+obj/$(ARCH)/%.o: src/%.c $(HFILES)
 	@mkdir -p $(@D)
 	@echo $(CC) $<
 	@$(CC) $(CFLAGS) -c $< -o $@

kernel/make/i386/make.config

@@ -1,3 +1 @@
 -include make/x86/make.config
-
-NASM := nasm -felf32

kernel/make/x86/make.config

@@ -1,9 +1,2 @@
-ARCHFILES   := $(shell find src/arch/x86 -type f -name '*.c' -print) \
-				$(shell find src/arch/x86 -type f -name '*.nasm' -print) \
-				$(shell find src/arch/$(ARCH) -type f -name '*.nasm' -print)
-ARCH_CFLAGS := -masm=intel
-
-obj/$(ARCH)/%.nasm.o: src/%.nasm
-	@mkdir -p $(@D)
-	@echo nasm $<
-	@$(NASM) $(NASMFLAGS) $< -o $@
+ARCHFILES   := $(shell find src/arch/x86 -type f -name '*.c' -print)
+ARCH_CFLAGS := -masm=intel

kernel/make/x86_64/make.config

@@ -1,4 +1,3 @@
 -include make/x86/make.config
 
-NASM            := nasm -felf64
 ARCH_CFLAGS 	:= $(ARCH_CFLAGS) -mcmodel=kernel

kernel/src/arch/i386/entry-stivale2.c

@@ -29,5 +29,6 @@ void stivale2_main(struct stivale2_struct *info) {
         );
     printf("PAGE TABLE AT: %x\n", cr3);
 
-    kmain();
+	char *argv[3] = {"stivale2", info->bootloader_brand, info->bootloader_version};
+    kmain(3, argv);
 }

kernel/src/arch/i386/info.c

@@ -1,2 +1 @@
- extern char archval;
- const char *arch = &archval;
+const char *arch = "i386";

kernel/src/arch/i386/info.nasm

@@ -1,2 +0,0 @@
-global archval
-archval db "i386-nasm", 0

kernel/src/arch/x86_64/info.c

@@ -1,3 +1 @@
- extern char archval;
- const char *arch = &archval;
-
+const char *arch = "x86_64";

kernel/src/arch/x86_64/info.nasm

@@ -1,2 +0,0 @@
-global archval
-archval db "x86_64-nasm", 0

kernel/src/main.h

@@ -1 +1 @@
-void kmain();
+void kmain(int argc, char** argv);