rename os -> dainkrnl

kivikakk · Mar 2, 2021 · 26aded7 · 26aded7
1 parent 7930fca
commit 26aded7
Show file tree

Hide file tree

Showing 25 changed files with 11 additions and 11 deletions.
diff --git a/Makefile b/Makefile
@@ -26,7 +26,7 @@ QEMU_CMD = qemu-system-aarch64 \
 		-device usb-mouse \
 		-usb \
 
-tftp: dainboot/zig-cache/bin/BOOTAA64.rockpro64.efi os/zig-cache/bin/dainkrnl.rockpro64
+tftp: dainboot/zig-cache/bin/BOOTAA64.rockpro64.efi dainkrnl/zig-cache/bin/dainkrnl.rockpro64
 	tools/update-tftp
 
 qemu: target/disk/EFI/BOOT/BOOTAA64.efi target/disk/dainkrnl target/disk/dtb
@@ -36,11 +36,11 @@ dtb/qemu.dtb:
 	$(QEMU_CMD) -machine dumpdtb=$@
 	dtc $@ -o $@
 
-OS_FILES=$(shell find os -name zig-cache -prune -o -type f) $(shell find common -type f)
-os/zig-cache/bin/dainkrnl.%: $(OS_FILES)
-	cd os && zig build -Dboard=$*
+OS_FILES=$(shell find dainkrnl -name zig-cache -prune -o -type f) $(shell find common -type f)
+dainkrnl/zig-cache/bin/dainkrnl.%: $(OS_FILES)
+	cd dainkrnl && zig build -Dboard=$*
 
-target/disk/dainkrnl: os/zig-cache/bin/dainkrnl.qemu
+target/disk/dainkrnl: dainkrnl/zig-cache/bin/dainkrnl.qemu
 	mkdir -p $(@D)
 	cp $< $@
 
@@ -60,13 +60,13 @@ CI_QEMU_ACCEL=tcg
 
 ci: dainboot/zig-cache/bin/BOOTAA64.qemu.efi \
 	dainboot/zig-cache/bin/BOOTAA64.rockpro64.efi \
-	os/zig-cache/bin/dainkrnl.qemu \
-	os/zig-cache/bin/dainkrnl.rockpro64 \
+	dainkrnl/zig-cache/bin/dainkrnl.qemu \
+	dainkrnl/zig-cache/bin/dainkrnl.rockpro64 \
 	target/disk/dainkrnl target/disk/dtb target/disk/EFI/BOOT/BOOTAA64.efi
 	env CI_QEMU_ACCEL="$(CI_QEMU_ACCEL)" tools/ci-expect
 
 clean:
-	-rm -rf dtb/zig-cache os/zig-cache dainboot/zig-cache target
+	-rm -rf dtb/zig-cache dainkrnl/zig-cache dainboot/zig-cache target
 
 %.dts:
 	dtc -I dtb -O dts $*
diff --git a/os/build.zig → dainkrnl/build.zig b/os/build.zig → dainkrnl/build.zig
diff --git a/os/linker.ld → dainkrnl/linker.ld b/os/linker.ld → dainkrnl/linker.ld
diff --git a/os/src/arch.zig → dainkrnl/src/arch.zig b/os/src/arch.zig → dainkrnl/src/arch.zig
diff --git a/os/src/assets/atarist.vga → dainkrnl/src/assets/atarist.vga b/os/src/assets/atarist.vga → dainkrnl/src/assets/atarist.vga
diff --git a/os/src/assets/cp437.vga → dainkrnl/src/assets/cp437.vga b/os/src/assets/cp437.vga → dainkrnl/src/assets/cp437.vga
diff --git a/os/src/assets/energystar.vga → dainkrnl/src/assets/energystar.vga b/os/src/assets/energystar.vga → dainkrnl/src/assets/energystar.vga
diff --git a/os/src/common → dainkrnl/src/common b/os/src/common → dainkrnl/src/common
diff --git a/os/src/console/fb.zig → dainkrnl/src/console/fb.zig b/os/src/console/fb.zig → dainkrnl/src/console/fb.zig
diff --git a/os/src/console/font.zig → dainkrnl/src/console/font.zig b/os/src/console/font.zig → dainkrnl/src/console/font.zig
diff --git a/os/src/entry.zig → dainkrnl/src/entry.zig b/os/src/entry.zig → dainkrnl/src/entry.zig
diff --git a/os/src/entry/uart.zig → dainkrnl/src/entry/uart.zig b/os/src/entry/uart.zig → dainkrnl/src/entry/uart.zig
diff --git a/os/src/exception.s → dainkrnl/src/exception.s b/os/src/exception.s → dainkrnl/src/exception.s
diff --git a/os/src/exception.zig → dainkrnl/src/exception.zig b/os/src/exception.zig → dainkrnl/src/exception.zig
diff --git a/os/src/hw.zig → dainkrnl/src/hw.zig b/os/src/hw.zig → dainkrnl/src/hw.zig
diff --git a/os/src/hw/arm,pl011.zig → dainkrnl/src/hw/arm,pl011.zig b/os/src/hw/arm,pl011.zig → dainkrnl/src/hw/arm,pl011.zig
diff --git a/os/src/hw/psci.zig → dainkrnl/src/hw/psci.zig b/os/src/hw/psci.zig → dainkrnl/src/hw/psci.zig
diff --git a/os/src/hw/snps,dw-apb-uart.zig → dainkrnl/src/hw/snps,dw-apb-uart.zig b/os/src/hw/snps,dw-apb-uart.zig → dainkrnl/src/hw/snps,dw-apb-uart.zig
diff --git a/os/src/hw/uart.zig → dainkrnl/src/hw/uart.zig b/os/src/hw/uart.zig → dainkrnl/src/hw/uart.zig
diff --git a/os/src/main.zig → dainkrnl/src/main.zig b/os/src/main.zig → dainkrnl/src/main.zig
diff --git a/os/src/panic.zig → dainkrnl/src/panic.zig b/os/src/panic.zig → dainkrnl/src/panic.zig
diff --git a/os/src/shell.zig → dainkrnl/src/shell.zig b/os/src/shell.zig → dainkrnl/src/shell.zig
diff --git a/debug.sh b/debug.sh
@@ -1,2 +1,2 @@
 cd "$(dirname "$0")"
-gdb os/zig-cache/bin/dainkrnl.qemu -ex 'set substitute-path /Users/kameliya/Code/daintree/os os' -ex 'set arch aarch64' -ex 'target remote :1234'
+gdb dainkrnl/zig-cache/bin/dainkrnl.qemu -ex 'set substitute-path /Users/kameliya/Code/daintree/dainkrnl dainkrnl' -ex 'set arch aarch64' -ex 'target remote :1234'
diff --git a/objdump.sh b/objdump.sh
@@ -1,2 +1,2 @@
 cd "$(dirname "$0")"
-objdump -dSl --prefix=. --prefix-strip=4 os/zig-cache/bin/dainkrnl|less
+objdump -dSl --prefix=. --prefix-strip=4 dainkrnl/zig-cache/bin/dainkrnl|less
diff --git a/tools/update-tftp b/tools/update-tftp
@@ -1,5 +1,5 @@
 #!/bin/bash
 
 rsync -av dainboot/zig-cache/bin/BOOTAA64.rockpro64.efi toaster.local:/volume1/docker/tftp/efi/boot/BOOTAA64.efi
-rsync -av os/zig-cache/bin/dainkrnl.rockpro64 toaster.local:/volume1/docker/tftp/dainkrnl
+rsync -av dainkrnl/zig-cache/bin/dainkrnl.rockpro64 toaster.local:/volume1/docker/tftp/dainkrnl
 rsync -av dtb/rk3399-rockpro64.dtb toaster.local:/volume1/docker/tftp/dtb/rockchip/