9os

commit a2e973f4892f67b30105c02d9c4571749fb17907
parent c2503d5ce25019d215787d2a198f01d98c837491
Author: Roberto E. Vargas Caballero <k0ga@shike2.com>
Date:   Thu, 19 Aug 2021 08:28:07 +0200

os9/arm64: Create initial pi3 port

This port is the basic skeleton for the pi3 port.
It adds the Makefile infrastructure and it adds
the basic port files needed to complete the build.

Change-Id: I8f3f9635bafc8a121a6393d23b55ed1b97aad410

Diffstat:
M
Makefile
 | 
7
++-----
A
scripts/pi3.sh
 | 
13
+++++++++++++
M
src/os9/arch/arm64/Makefile
 | 
27
++++++++++++++++++++-------
A
src/os9/arch/arm64/pi3.c
 | 
34
++++++++++++++++++++++++++++++++++
A
src/os9/arch/arm64/pi3asm.s
 | 
2
++
A
src/os9/cfg/9pi3
 | 
7
+++++++

6 files changed, 78 insertions(+), 12 deletions(-)
diff --git a/Makefile b/Makefile
@@ -17,11 +17,8 @@ $(DIRS): FORCE
 gen: $(ENVIRON) FORCE
 	+@. $(ENVIRON) && cd src && $(MAKE) gen
 
-fvp:
-	scripts/fvp.sh
-
-host:
-	scripts/host.sh
+pi3 host fvp:
+	scripts/$@.sh
 
 $(DIRS): $(ENVIRON)
 
diff --git a/scripts/pi3.sh b/scripts/pi3.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+os=bin/os9.bin
+
+qemu-system-aarch64 \
+	-machine type=raspi3\
+	-m 1024
+	-bios $os \
+	-serial mon:stdio\
+	-gdb tcp::7000 -S\
+	-no-reboot \
+	-nographic \
+	-bios $os \
diff --git a/src/os9/arch/arm64/Makefile b/src/os9/arch/arm64/Makefile
@@ -2,7 +2,9 @@
 PROJECTDIR = ../../../..
 include $(PROJECTDIR)/scripts/rules.mk
 
-OBJS =\
+FLAGS = $(PROJ_LDFLAGS) $(LINKSCRIPT)
+
+COMMON_OBJS =\
 	trap.o\
 	ecstr.o\
 	main.o\
@@ -10,8 +12,6 @@ OBJS =\
 	debug_lock.o\
 	sysreg.o\
 	ctx.o\
-	fvp.o\
-	fvpasm.o\
 	crt.o\
 	fpu.o\
 	mmu.o\
@@ -19,14 +19,24 @@ OBJS =\
 	gic.o\
 	$(SRCDIR)/os9/builtin.o \
 
-TARGET = $(BINDIR)/os9.bin
+9FVP_OBJS =\
+	$(COMMON_OBJS)\
+	fvp.o\
+	fvpasm.o\
+
+9RPI3_OBJS =\
+	$(COMMON_OBJS)\
+	pi3.o\
+	pi3asm.o\
+
+TARGET = $(BINDIR)/$(OS9).bin
 
 all: $(TARGET)
 
 ecstr.c: ec.h
 	mkecstr ec.h
 
-$(OBJS): sysreg.h
+$(COMMON_OBJS): sysreg.h
 
 main.o: version.h
 
@@ -39,8 +49,11 @@ sysreg.s: sysreg.lst
 version.h:
 	mkver
 
-$(BINDIR)/os9.elf: $(OBJS) $(LIBDEP)
-	$(LD) $(PROJ_LDFLAGS) $(LINKSCRIPT) $(OBJS) -lk -lc $(PROJ_LDLIBS) -o $@
+$(BINDIR)/9fvp.elf: $(9FVP_OBJS) $(LIBDEP)
+	$(LD) $(FLAGS) $(9FVP_OBJS) -lk -lc $(PROJ_LDLIBS) -o $@
+
+$(BINDIR)/9pi3.elf: $(9RPI3_OBJS) $(LIBDEP)
+	$(LD) $(FLAGS) $(9RPI3_OBJS) -lk -lc $(PROJ_LDLIBS) -o $@
 
 clean:
 	rm -f ecstr.c
diff --git a/src/os9/arch/arm64/pi3.c b/src/os9/arch/arm64/pi3.c
@@ -0,0 +1,34 @@
+#include <os9/os9.h>
+
+#include <string.h>
+
+#include "arch.h"
+
+static uint32_t *early = (uint32_t *) 0x1C090000;
+
+
+Mach mach = {
+	.phystack = 0x00080000,
+	.phytext = 0x00000000,
+	.kzero = 0xFFFFFF0000000000 - 0x00000000,
+};
+
+void
+putch(int c)
+{
+	char ch;
+
+	if (console) {
+		ch = c;
+		devwrite(console, &ch, 1);
+	} else {
+		if (c == '\n')
+			putch('\r');
+		while (inm32(early+ 6) & 1<<5)
+			;
+		outm32(c, early);
+	}
+
+	barrier(DATA);
+	barrier(CODE);
+}
diff --git a/src/os9/arch/arm64/pi3asm.s b/src/os9/arch/arm64/pi3asm.s
@@ -0,0 +1,2 @@
+	.GLOBL	buffertab
+	.EQU	buffertab,0xFFFFFF0000080000
diff --git a/src/os9/cfg/9pi3 b/src/os9/cfg/9pi3
@@ -0,0 +1,7 @@
+dev
+	root
+	uart
+		pl011	base=0x1C090000,clk=24000000,rate=115200
+		pl011	base=0x1c0c0000,clk=24000000,rate=115200
+	cons
+end