From 47ab28465a0d69e9ac973b7485ac447a0f565d8e Mon Sep 17 00:00:00 2001 From: Ian Moffett Date: Sat, 13 Sep 2025 20:10:17 -0400 Subject: project: 'kern' -> 'os' Signed-off-by: Ian Moffett --- src/sys/Makefile | 10 +++++----- src/sys/kern/Makefile | 25 ------------------------- src/sys/kern/amd64 | Bin 1302 -> 0 bytes src/sys/kern/kern_init.c | 10 ---------- src/sys/os/Makefile | 25 +++++++++++++++++++++++++ src/sys/os/kern_init.c | 10 ++++++++++ 6 files changed, 40 insertions(+), 40 deletions(-) delete mode 100644 src/sys/kern/Makefile delete mode 100644 src/sys/kern/amd64 delete mode 100644 src/sys/kern/kern_init.c create mode 100644 src/sys/os/Makefile create mode 100644 src/sys/os/kern_init.c (limited to 'src/sys') diff --git a/src/sys/Makefile b/src/sys/Makefile index 6e1cc74..fdd9c54 100644 --- a/src/sys/Makefile +++ b/src/sys/Makefile @@ -6,11 +6,11 @@ LD = AS = .PHONY: all -all: kern md +all: os md -.PHONY: kern -kern: - cd kern; make CC=$(CC) LD=$(LD) AS=$(AS) TARGETDIR=$(TARGETDIR) +.PHONY: os +os: + cd os; make CC=$(CC) LD=$(LD) AS=$(AS) TARGETDIR=$(TARGETDIR) .PHONY: md md: @@ -19,4 +19,4 @@ md: .PHONY: clean clean: cd $(TARGETDIR); make clean - cd kern; make clean + cd os; make clean diff --git a/src/sys/kern/Makefile b/src/sys/kern/Makefile deleted file mode 100644 index dda389b..0000000 --- a/src/sys/kern/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -include ../conf/sys.mk - -.SILENT: -override PROMPT := printf "%s\t\t%s\n" - -TARGET = ../target/libkern.a -CFLAGS = -I../include/ -I../include/lib/ -I../target/header/ $(MI_CFLAGS) -CFILES = $(shell find . -name "*.c") - -DEPS = $(CFILES:.c=.d) -OBJECTS = $(CFILES:%.c=%.o) - -.PHONY: all -all: $(OBJECTS) - $(PROMPT) " MI.AR " $< - ar rcs $(TARGET) $(OBJECTS) - --include $(DEPS) -%.o: %.c - $(PROMPT) " MI.CC " $< - $(CC) -c $(CFLAGS) $< -o $@ - -.PHONY: clean -clean: - rm -f $(DEPS) $(OBJECTS) diff --git a/src/sys/kern/amd64 b/src/sys/kern/amd64 deleted file mode 100644 index 8b9342e..0000000 Binary files a/src/sys/kern/amd64 and /dev/null differ diff --git a/src/sys/kern/kern_init.c b/src/sys/kern/kern_init.c deleted file mode 100644 index 6cf35f0..0000000 --- a/src/sys/kern/kern_init.c +++ /dev/null @@ -1,10 +0,0 @@ -#include - -/* - * Kernel entrypoint - */ -__dead void -main(void) -{ - for (;;); -} diff --git a/src/sys/os/Makefile b/src/sys/os/Makefile new file mode 100644 index 0000000..dda389b --- /dev/null +++ b/src/sys/os/Makefile @@ -0,0 +1,25 @@ +include ../conf/sys.mk + +.SILENT: +override PROMPT := printf "%s\t\t%s\n" + +TARGET = ../target/libkern.a +CFLAGS = -I../include/ -I../include/lib/ -I../target/header/ $(MI_CFLAGS) +CFILES = $(shell find . -name "*.c") + +DEPS = $(CFILES:.c=.d) +OBJECTS = $(CFILES:%.c=%.o) + +.PHONY: all +all: $(OBJECTS) + $(PROMPT) " MI.AR " $< + ar rcs $(TARGET) $(OBJECTS) + +-include $(DEPS) +%.o: %.c + $(PROMPT) " MI.CC " $< + $(CC) -c $(CFLAGS) $< -o $@ + +.PHONY: clean +clean: + rm -f $(DEPS) $(OBJECTS) diff --git a/src/sys/os/kern_init.c b/src/sys/os/kern_init.c new file mode 100644 index 0000000..6cf35f0 --- /dev/null +++ b/src/sys/os/kern_init.c @@ -0,0 +1,10 @@ +#include + +/* + * Kernel entrypoint + */ +__dead void +main(void) +{ + for (;;); +} -- cgit v1.2.3