diff --git a/Makefile b/Makefile index ebb9e16..56bcd0d 100644 --- 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 b/dainkrnl/build.zig similarity index 100% rename from os/build.zig rename to dainkrnl/build.zig diff --git a/os/linker.ld b/dainkrnl/linker.ld similarity index 100% rename from os/linker.ld rename to dainkrnl/linker.ld diff --git a/os/src/arch.zig b/dainkrnl/src/arch.zig similarity index 100% rename from os/src/arch.zig rename to dainkrnl/src/arch.zig diff --git a/os/src/assets/atarist.vga b/dainkrnl/src/assets/atarist.vga similarity index 100% rename from os/src/assets/atarist.vga rename to dainkrnl/src/assets/atarist.vga diff --git a/os/src/assets/cp437.vga b/dainkrnl/src/assets/cp437.vga similarity index 100% rename from os/src/assets/cp437.vga rename to dainkrnl/src/assets/cp437.vga diff --git a/os/src/assets/energystar.vga b/dainkrnl/src/assets/energystar.vga similarity index 100% rename from os/src/assets/energystar.vga rename to dainkrnl/src/assets/energystar.vga diff --git a/os/src/common b/dainkrnl/src/common similarity index 100% rename from os/src/common rename to dainkrnl/src/common diff --git a/os/src/console/fb.zig b/dainkrnl/src/console/fb.zig similarity index 100% rename from os/src/console/fb.zig rename to dainkrnl/src/console/fb.zig diff --git a/os/src/console/font.zig b/dainkrnl/src/console/font.zig similarity index 100% rename from os/src/console/font.zig rename to dainkrnl/src/console/font.zig diff --git a/os/src/entry.zig b/dainkrnl/src/entry.zig similarity index 100% rename from os/src/entry.zig rename to dainkrnl/src/entry.zig diff --git a/os/src/entry/uart.zig b/dainkrnl/src/entry/uart.zig similarity index 100% rename from os/src/entry/uart.zig rename to dainkrnl/src/entry/uart.zig diff --git a/os/src/exception.s b/dainkrnl/src/exception.s similarity index 100% rename from os/src/exception.s rename to dainkrnl/src/exception.s diff --git a/os/src/exception.zig b/dainkrnl/src/exception.zig similarity index 100% rename from os/src/exception.zig rename to dainkrnl/src/exception.zig diff --git a/os/src/hw.zig b/dainkrnl/src/hw.zig similarity index 100% rename from os/src/hw.zig rename to dainkrnl/src/hw.zig diff --git a/os/src/hw/arm,pl011.zig b/dainkrnl/src/hw/arm,pl011.zig similarity index 100% rename from os/src/hw/arm,pl011.zig rename to dainkrnl/src/hw/arm,pl011.zig diff --git a/os/src/hw/psci.zig b/dainkrnl/src/hw/psci.zig similarity index 100% rename from os/src/hw/psci.zig rename to dainkrnl/src/hw/psci.zig diff --git a/os/src/hw/snps,dw-apb-uart.zig b/dainkrnl/src/hw/snps,dw-apb-uart.zig similarity index 100% rename from os/src/hw/snps,dw-apb-uart.zig rename to dainkrnl/src/hw/snps,dw-apb-uart.zig diff --git a/os/src/hw/uart.zig b/dainkrnl/src/hw/uart.zig similarity index 100% rename from os/src/hw/uart.zig rename to dainkrnl/src/hw/uart.zig diff --git a/os/src/main.zig b/dainkrnl/src/main.zig similarity index 100% rename from os/src/main.zig rename to dainkrnl/src/main.zig diff --git a/os/src/panic.zig b/dainkrnl/src/panic.zig similarity index 100% rename from os/src/panic.zig rename to dainkrnl/src/panic.zig diff --git a/os/src/shell.zig b/dainkrnl/src/shell.zig similarity index 100% rename from os/src/shell.zig rename to dainkrnl/src/shell.zig diff --git a/debug.sh b/debug.sh index 34ca5a4..5e1af42 100644 --- 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 index 111bb3a..5a8059b 100644 --- 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 index 00f4bc7..7f65ea4 100755 --- 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/