9os

commit 9592390e35a3cef34b896594ff555ecdb9ef1caa
parent be386c9138eebb7bbcbf2fb8822da0615ef46d84
Author: Roberto E. Vargas Caballero <k0ga@shike2.com>
Date:   Sat, 11 Jul 2020 20:32:39 +0200

build: Remove ramfw image

Change-Id: I56bdc6a0c720ea63d6472e3ab3e2c7bcdd1b8351

Diffstat:
M
src/Makefile
 | 
2
+-
D
src/ramfw/.gitignore
 | 
1
-
D
src/ramfw/Makefile
 | 
14
--------------
D
src/ramfw/fs.c
 | 
9
---------
D
src/ramfw/rt.c
 | 
30
------------------------------
M
target/hosted/Makefile
 | 
13
++-----------
D
target/hosted/ram.c
 | 
10
----------
M
target/native/Makefile
 | 
18
+++---------------
D
target/native/ram-crt.s
 | 
2
--
D
target/native/ram.c
 | 
10
----------

10 files changed, 6 insertions(+), 103 deletions(-)
diff --git a/src/Makefile b/src/Makefile
@@ -3,7 +3,7 @@ PROJECTDIR=..
 include $(PROJECTDIR)/scripts/rules.mk
 
 LIBS = lib9p libk libc
-IMGS = ramfw romfw
+IMGS = romfw
 DIRS = $(LIBS) $(IMGS)
 
 all: $(IMGS)
diff --git a/src/ramfw/.gitignore b/src/ramfw/.gitignore
@@ -1 +0,0 @@
-rmctab.c
diff --git a/src/ramfw/Makefile b/src/ramfw/Makefile
@@ -1,14 +0,0 @@
-.POSIX:
-PROJECTDIR=../..
-include $(PROJECTDIR)/scripts/rules.mk
-
-OBJS = fs.o \
-       rt.o \
-
-all: builtin.o
-
-builtin.o: $(OBJS)
-	$(LD) $(RCODE_LDFLAGS) -r -o $@ $(OBJS)
-
-clean:
-	rm -f rmctab.c
diff --git a/src/ramfw/fs.c b/src/ramfw/fs.c
@@ -1,9 +0,0 @@
-#include <rcode/rcode.h>
-
-int create(const char *name, int flags){return 0;}
-int open(const char *name, int flags){return 0;}
-int close(int fd){return 0;}
-int read(int fd, void *buf, int n){return 0;}
-int write(int fd, void *buf, int n){return 0;}
-int seek(int fd, long long off, int whence){return 0;}
-int bind(char *path, char *where){return 0;}
diff --git a/src/ramfw/rt.c b/src/ramfw/rt.c
@@ -1,30 +0,0 @@
-#include <setjmp.h>
-#include <stdint.h>
-
-#include <rcode/ramfw.h>
-#include <rcode/rcode.h>
-
-void
-halt(void)
-{
-	dohalt();
-}
-
-void
-panic(const char *msg)
-{
-	dopanic();
-}
-
-void
-swtch(struct trapframe *fp)
-{
-	doswtch(fp);
-}
-
-/* TODO: Remove trap() from ramfw */
-void
-trap(struct trapframe *fp)
-{
-	panic("trap");
-}
diff --git a/target/hosted/Makefile b/target/hosted/Makefile
@@ -11,13 +11,7 @@ ROMOBJS = arch.o \
           $(DRVDIR)/builtin.o \
           $(SRCDIR)/romfw/builtin.o \
 
-RAMOBJS = arch.o \
-          lock.o \
-          ram.o \
-          $(CRT) \
-          $(SRCDIR)/ramfw/builtin.o \
-
-TARGET = $(BINDIR)/romfw.elf $(BINDIR)/ramfw.elf
+TARGET = $(BINDIR)/romfw.elf
 
 all: $(TARGET) $(BINDIR)/blkfile
 
@@ -27,11 +21,8 @@ $(DIRS): FORCE
 $(BINDIR)/romfw.elf: $(ROMOBJS) $(LIBDEP)
 	$(LD) $(PROJ_LDFLAGS) $(ROMOBJS) $(PROJ_LDLIBS) -o $@
 
-$(BINDIR)/ramfw.elf: $(RAMOBJS) $(LIBDEP)
-	$(LD) $(PROJ_LDFLAGS) $(RAMOBJS) $(PROJ_LDLIBS) -o $@
-
 $(BINDIR)/blkfile:
 	dd bs=512 count=2 if=/dev/zero of=$(BINDIR)/blkfile
 
 clean:
-	rm -f romtab.c ramtab.c $(BINDIR)/blkfile
+	rm -f romtab.c $(BINDIR)/blkfile
diff --git a/target/hosted/ram.c b/target/hosted/ram.c
@@ -1,10 +0,0 @@
-#include <setjmp.h>
-
-#include <rcode/rcode.h>
-#include <rcode/ramfw.h>
-
-int
-main(int argc, char *argv[])
-{
-	return 0;
-}
diff --git a/target/native/Makefile b/target/native/Makefile
@@ -12,21 +12,12 @@ ROMOBJS = rom-crt.o \
           $(SRCDIR)/romfw/builtin.o \
           cache.o \
 
-RAMOBJS = ram-crt.o \
-          ram.o \
-          arch.o \
-          debug_lock.o \
-          sysreg.o \
-          ramtab.o \
-          $(SRCDIR)/ramfw/builtin.o \
-
-TARGET = $(BINDIR)/romfw.bin $(BINDIR)/ramfw.bin
+TARGET = $(BINDIR)/romfw.bin
 
 all: $(TARGET)
 
-ram-crt.o rom-crt.o: crt.s
+rom-crt.o: crt.s
 
-ram.o: version.h
 rom.o: sysreg.h version.h
 cache.o: sysreg.h
 
@@ -42,10 +33,7 @@ version.h:
 $(BINDIR)/romfw.elf: $(ROMOBJS) $(LIBDEP)
 	$(LD) $(PROJ_LDFLAGS) $(LINKSCRIPT) $(ROMOBJS) $(PROJ_LDLIBS) -o $@
 
-$(BINDIR)/ramfw.elf: $(RAMOBJS) $(LIBDEP)
-	$(LD) $(PROJ_LDFLAGS) $(LINKSCRIPT) $(RAMOBJS) $(PROJ_LDLIBS) -o $@
-
 clean:
 	rm -f $(TARGET:.bin=.elf)
 	rm -f sysreg.h sysreg.s version.h
-	rm -f romtab.c ramtab.c
+	rm -f romtab.c
diff --git a/target/native/ram-crt.s b/target/native/ram-crt.s
@@ -1,2 +0,0 @@
-	.file	"ram-crt.s"
-	.include	"crt.s"
diff --git a/target/native/ram.c b/target/native/ram.c
@@ -1,10 +0,0 @@
-#include <rcode/rcode.h>
-
-#include "version.h"
-
-void *text;
-
-void
-main(void)
-{
-}