commit 20d45f83d49a9a010f7be8c43800a057f7144b96 parent 49178309eb97e750b3e8664796d2150b2611d9f1 Author: Roberto E. Vargas Caballero <k0ga@shike2.com> Date: Wed, 16 Sep 2020 20:32:03 +0200 kernel: Change directory name to os9 Kernel is a bad name for a directory, and this change is the first step to change the name of the kernel to os9, because 9os creates a lot of problems in the code because it begins with a digit and it is not a valid identifier. Change-Id: I2c21f6358c628379e6b77d1eb40eb14a26a69c6c Diffstat:
58 files changed, 77 insertions(+), 73 deletions(-)
diff --git a/scripts/rules.mk b/scripts/rules.mk @@ -6,7 +6,6 @@ include $(PROJECTDIR)/config/toolchain/$(TOOL).mk INCDIR = $(PROJECTDIR)/include LIBDIR = $(PROJECTDIR)/lib BINDIR = $(PROJECTDIR)/bin -TARGETDIR = $(PROJECTDIR)/src/kernel/arch/$(MODE) DRVDIR = $(PROJECTDIR)/drivers FSDIR = $(PROJECTDIR)/fs SRCDIR = $(PROJECTDIR)/src diff --git a/src/Makefile b/src/Makefile @@ -2,13 +2,18 @@ PROJECTDIR=.. include $(PROJECTDIR)/scripts/rules.mk -LIBS = lib9p libk libc -IMGS = kernel -DIRS = $(LIBS) $(IMGS) +LIBS =\ + lib9p\ + libk\ + libc\ -all: $(IMGS) +DIRS =\ + os9\ + $(LIBS)\ -$(IMGS): $(LIBS) +all: os9 + +os9: $(LIBS) $(DIRS): FORCE +@cd $@ && $(MAKE) diff --git a/src/kernel/arch/arm64/Makefile b/src/kernel/arch/arm64/Makefile @@ -1,41 +0,0 @@ -.POSIX: -PROJECTDIR = ../../../.. -include $(PROJECTDIR)/scripts/rules.mk - -OBJS =\ - svc.o \ - ecstr.o \ - crt.o \ - main.o \ - arch.o \ - debug_lock.o \ - sysreg.o \ - cache.o \ - $(SRCDIR)/kernel/builtin.o \ - -TARGET = $(BINDIR)/9os.bin - -all: $(TARGET) - -ecstr.c: ec.h - mkecstr ec.h - -main.o: sysreg.h version.h -cache.o: sysreg.h - -sysreg.h: sysreg.lst - mksysreg -h sysreg.lst - -sysreg.s: sysreg.lst - mksysreg -s sysreg.lst - -version.h: - mkver - -$(BINDIR)/9os.elf: $(OBJS) $(LIBDEP) - $(LD) $(PROJ_LDFLAGS) $(LINKSCRIPT) $(OBJS) $(PROJ_LDLIBS) -o $@ - -clean: - rm -f ecstr.c - rm -f $(TARGET) - rm -f sysreg.h sysreg.s version.h diff --git a/src/kernel/hosted/Makefile b/src/kernel/hosted/Makefile @@ -1,26 +0,0 @@ -.POSIX: -PROJECTDIR = ../../.. -include $(PROJECTDIR)/scripts/rules.mk - -OBJS =\ - arch.o \ - lock.o \ - main.o \ - $(LIBDIR)/crt.o \ - $(SRCDIR)/kernel/builtin.o \ - -TARGET = $(BINDIR)/9os.elf - -all: $(TARGET) $(BINDIR)/blkfile - -$(DIRS): FORCE - cd $@ && $(MAKE) - -$(BINDIR)/9os.elf: $(OBJS) $(LIBDEP) - $(LD) $(PROJ_LDFLAGS) $(OBJS) $(PROJ_LDLIBS) -o $@ - -$(BINDIR)/blkfile: - dd bs=512 count=2 if=/dev/zero of=$(BINDIR)/blkfile - -clean: - rm -f $(BINDIR)/blkfile diff --git a/src/kernel/Makefile b/src/os9/Makefile diff --git a/src/kernel/arch/Makefile b/src/os9/arch/Makefile diff --git a/src/kernel/arch/arm64/.gitignore b/src/os9/arch/arm64/.gitignore diff --git a/src/os9/arch/arm64/Makefile b/src/os9/arch/arm64/Makefile @@ -0,0 +1,41 @@ +.POSIX: +PROJECTDIR = ../../../.. +include $(PROJECTDIR)/scripts/rules.mk + +OBJS =\ + svc.o \ + ecstr.o \ + crt.o \ + main.o \ + arch.o \ + debug_lock.o \ + sysreg.o \ + cache.o \ + $(SRCDIR)/os9/builtin.o \ + +TARGET = $(BINDIR)/9os.bin + +all: $(TARGET) + +ecstr.c: ec.h + mkecstr ec.h + +main.o: sysreg.h version.h +cache.o: sysreg.h + +sysreg.h: sysreg.lst + mksysreg -h sysreg.lst + +sysreg.s: sysreg.lst + mksysreg -s sysreg.lst + +version.h: + mkver + +$(BINDIR)/9os.elf: $(OBJS) $(LIBDEP) + $(LD) $(PROJ_LDFLAGS) $(LINKSCRIPT) $(OBJS) $(PROJ_LDLIBS) -o $@ + +clean: + rm -f ecstr.c + rm -f $(TARGET) + rm -f sysreg.h sysreg.s version.h diff --git a/src/kernel/arch/arm64/arch.h b/src/os9/arch/arm64/arch.h diff --git a/src/kernel/arch/arm64/arch.s b/src/os9/arch/arm64/arch.s diff --git a/src/kernel/arch/arm64/cache.c b/src/os9/arch/arm64/cache.c diff --git a/src/kernel/arch/arm64/crt.s b/src/os9/arch/arm64/crt.s diff --git a/src/kernel/arch/arm64/debug_lock.c b/src/os9/arch/arm64/debug_lock.c diff --git a/src/kernel/arch/arm64/ec.h b/src/os9/arch/arm64/ec.h diff --git a/src/kernel/arch/arm64/lock.s b/src/os9/arch/arm64/lock.s diff --git a/src/kernel/arch/arm64/main.c b/src/os9/arch/arm64/main.c diff --git a/src/kernel/arch/arm64/mkecstr b/src/os9/arch/arm64/mkecstr diff --git a/src/kernel/arch/arm64/mksysreg b/src/os9/arch/arm64/mksysreg diff --git a/src/kernel/arch/arm64/mkver b/src/os9/arch/arm64/mkver diff --git a/src/kernel/arch/arm64/svc.c b/src/os9/arch/arm64/svc.c diff --git a/src/kernel/arch/arm64/sysreg.lst b/src/os9/arch/arm64/sysreg.lst diff --git a/src/kernel/cfg/9fvp b/src/os9/cfg/9fvp diff --git a/src/kernel/cfg/9hosted b/src/os9/cfg/9hosted diff --git a/src/kernel/dev/.gitignore b/src/os9/dev/.gitignore diff --git a/src/kernel/dev/Makefile b/src/os9/dev/Makefile diff --git a/src/kernel/dev/Makefile.drv b/src/os9/dev/Makefile.drv diff --git a/src/kernel/dev/blk.h b/src/os9/dev/blk.h diff --git a/src/kernel/dev/dev.c b/src/os9/dev/dev.c diff --git a/src/kernel/dev/dev.h b/src/os9/dev/dev.h diff --git a/src/kernel/dev/devar.c b/src/os9/dev/devar.c diff --git a/src/kernel/dev/devblk.c b/src/os9/dev/devblk.c diff --git a/src/kernel/dev/devcons.c b/src/os9/dev/devcons.c diff --git a/src/kernel/dev/devfip.c b/src/os9/dev/devfip.c diff --git a/src/kernel/dev/devproc.c b/src/os9/dev/devproc.c diff --git a/src/kernel/dev/devroot.c b/src/os9/dev/devroot.c diff --git a/src/kernel/dev/devuart.c b/src/os9/dev/devuart.c diff --git a/src/kernel/dev/dummyblk.c b/src/os9/dev/dummyblk.c diff --git a/src/kernel/dev/dummyuart.c b/src/os9/dev/dummyuart.c diff --git a/src/kernel/dev/fip.h b/src/os9/dev/fip.h diff --git a/src/kernel/dev/mkblob b/src/os9/dev/mkblob diff --git a/src/kernel/dev/mkblobfil b/src/os9/dev/mkblobfil diff --git a/src/kernel/dev/mkblobh b/src/os9/dev/mkblobh diff --git a/src/kernel/dev/mkdev b/src/os9/dev/mkdev diff --git a/src/kernel/dev/mkdevc b/src/os9/dev/mkdevc diff --git a/src/kernel/dev/pl011.c b/src/os9/dev/pl011.c diff --git a/src/kernel/dev/section b/src/os9/dev/section diff --git a/src/kernel/dev/uart.h b/src/os9/dev/uart.h diff --git a/src/kernel/dev/uuid.h b/src/os9/dev/uuid.h diff --git a/src/kernel/dlang.c b/src/os9/dlang.c diff --git a/src/kernel/dlang.h b/src/os9/dlang.h diff --git a/src/kernel/hosted/.gitignore b/src/os9/hosted/.gitignore diff --git a/src/os9/hosted/Makefile b/src/os9/hosted/Makefile @@ -0,0 +1,26 @@ +.POSIX: +PROJECTDIR = ../../.. +include $(PROJECTDIR)/scripts/rules.mk + +OBJS =\ + arch.o \ + lock.o \ + main.o \ + $(LIBDIR)/crt.o \ + $(SRCDIR)/os9/builtin.o \ + +TARGET = $(BINDIR)/9os.elf + +all: $(TARGET) $(BINDIR)/blkfile + +$(DIRS): FORCE + cd $@ && $(MAKE) + +$(BINDIR)/9os.elf: $(OBJS) $(LIBDEP) + $(LD) $(PROJ_LDFLAGS) $(OBJS) $(PROJ_LDLIBS) -o $@ + +$(BINDIR)/blkfile: + dd bs=512 count=2 if=/dev/zero of=$(BINDIR)/blkfile + +clean: + rm -f $(BINDIR)/blkfile diff --git a/src/kernel/hosted/arch.c b/src/os9/hosted/arch.c diff --git a/src/kernel/hosted/hosted.h b/src/os9/hosted/hosted.h diff --git a/src/kernel/hosted/lock.c b/src/os9/hosted/lock.c diff --git a/src/kernel/hosted/main.c b/src/os9/hosted/main.c diff --git a/src/kernel/panic.c b/src/os9/panic.c diff --git a/src/kernel/sched.c b/src/os9/sched.c