commit 4ba910b5b4c2dc27deca4f0e8e26f09c871ec4b9 parent b2219f39d23ed29f4a05a2e3ca28692b30b6fbbb Author: Roberto E. Vargas Caballero <k0ga@shike2.com> Date: Sun, 12 Jul 2020 08:35:03 +0200 kernel: Move drivers inside kernel Having drivers outside doesn't make sense anymore. Change-Id: I15117b7ab019ea4a8bef05632be492708387c396 Diffstat:
30 files changed, 49 insertions(+), 41 deletions(-)
diff --git a/Makefile b/Makefile @@ -2,11 +2,11 @@ PROJECTDIR = . include scripts/rules.mk -DIRS = src target drivers +DIRS = src target all: target -target: src drivers +target: src src: lib bin diff --git a/drivers/Makefile b/drivers/Makefile @@ -1,12 +0,0 @@ -.POSIX: -PROJECTDIR=.. -include $(PROJECTDIR)/scripts/rules.mk - -all clean: devs.mk blobs.mk - $(MAKE) -f Makefile.drv $@ - -devs.mk: $(TARGETDIR)/9os - mkdev $(TARGETDIR)/9os - -blobs.mk: $(TARGETDIR)/9os - mkblob $(TARGETDIR)/9os diff --git a/drivers/Makefile.drv b/drivers/Makefile.drv @@ -1,24 +0,0 @@ -.POSIX: -PROJECTDIR=.. -include $(PROJECTDIR)/scripts/rules.mk -include devs.mk -include blobs.mk - -OBJS = $(DEVS) \ - devc.o \ - -all: builtin.o - -builtin.o: $(OBJS) - $(LD) $(PROJ_LDFLAGS) -r -o $@ $(OBJS) - -devc.c: $(TARGETDIR)/9os - mkdevc $(TARGETDIR)/9os - -devroot.c: blobfil.h blobs.h - -blobs.h: $(TARGETDIR)/9os - mkblobh $(TARGETDIR)/9os - -clean: - rm -f blobfil.h blobs.h blobs.mk devs.mk devc.c diff --git a/src/kernel/Makefile b/src/kernel/Makefile @@ -6,14 +6,24 @@ OBJS =\ svc.o\ ecstr.o\ dlang.o\ + dev/builtin.o\ + +DIRS =\ + dev all: builtin.o builtin.o: $(OBJS) $(LD) $(PROJ_LDFLAGS) -r -o $@ $(OBJS) +dev/builtin.o: dev + +$(DIRS): FORCE + +@cd $@ && $(MAKE) + ecstr.c: ec.h mkecstr ec.h clean: - rm -f rmu.c ecstr.c + rm -f ecstr.c + $(FORALL) diff --git a/drivers/.gitignore b/src/kernel/dev/.gitignore diff --git a/src/kernel/dev/Makefile b/src/kernel/dev/Makefile @@ -0,0 +1,12 @@ +.POSIX: +PROJECTDIR=../../.. +include $(PROJECTDIR)/scripts/rules.mk + +all clean: devs.mk blobs.mk + $(MAKE) -f Makefile.drv $@ + +devs.mk: $(TARGETDIR)/9os + mkdev $(TARGETDIR)/9os + +blobs.mk: $(TARGETDIR)/9os + mkblob $(TARGETDIR)/9os diff --git a/src/kernel/dev/Makefile.drv b/src/kernel/dev/Makefile.drv @@ -0,0 +1,24 @@ +.POSIX: +PROJECTDIR=../../.. +include $(PROJECTDIR)/scripts/rules.mk +include devs.mk +include blobs.mk + +OBJS = $(DEVS) \ + devc.o \ + +all: builtin.o + +builtin.o: $(OBJS) + $(LD) $(PROJ_LDFLAGS) -r -o $@ $(OBJS) + +devc.c: $(TARGETDIR)/9os + mkdevc $(TARGETDIR)/9os + +devroot.c: blobfil.h blobs.h + +blobs.h: $(TARGETDIR)/9os + mkblobh $(TARGETDIR)/9os + +clean: + rm -f blobfil.h blobs.h blobs.mk devs.mk devc.c diff --git a/drivers/blk.h b/src/kernel/dev/blk.h diff --git a/drivers/dev.c b/src/kernel/dev/dev.c diff --git a/drivers/dev.h b/src/kernel/dev/dev.h diff --git a/drivers/devar.c b/src/kernel/dev/devar.c diff --git a/drivers/devblk.c b/src/kernel/dev/devblk.c diff --git a/drivers/devcons.c b/src/kernel/dev/devcons.c diff --git a/drivers/devfip.c b/src/kernel/dev/devfip.c diff --git a/drivers/devroot.c b/src/kernel/dev/devroot.c diff --git a/drivers/devuart.c b/src/kernel/dev/devuart.c diff --git a/drivers/dummyblk.c b/src/kernel/dev/dummyblk.c diff --git a/drivers/dummyuart.c b/src/kernel/dev/dummyuart.c diff --git a/drivers/fip.h b/src/kernel/dev/fip.h diff --git a/drivers/mkblob b/src/kernel/dev/mkblob diff --git a/drivers/mkblobfil b/src/kernel/dev/mkblobfil diff --git a/drivers/mkblobh b/src/kernel/dev/mkblobh diff --git a/drivers/mkdev b/src/kernel/dev/mkdev diff --git a/drivers/mkdevc b/src/kernel/dev/mkdevc diff --git a/drivers/pl011.c b/src/kernel/dev/pl011.c diff --git a/drivers/section b/src/kernel/dev/section diff --git a/drivers/uart.h b/src/kernel/dev/uart.h diff --git a/drivers/uuid.h b/src/kernel/dev/uuid.h diff --git a/target/hosted/Makefile b/target/hosted/Makefile @@ -8,7 +8,6 @@ ROMOBJS = arch.o \ lock.o \ kernel.o \ $(CRT) \ - $(DRVDIR)/builtin.o \ $(SRCDIR)/kernel/builtin.o \ TARGET = $(BINDIR)/kernel.elf diff --git a/target/native/Makefile b/target/native/Makefile @@ -8,7 +8,6 @@ KERNELOBJS =\ arch.o \ debug_lock.o \ sysreg.o \ - $(DRVDIR)/builtin.o \ $(SRCDIR)/romfw/builtin.o \ cache.o \