diff --git a/README.MD b/README.md similarity index 53% rename from README.MD rename to README.md index 66aaab4..6bc79ee 100644 --- a/README.MD +++ b/README.md @@ -28,24 +28,34 @@ make run make debug ``` +> 暂不支持交叉编译和调试 + ## 依赖项 * nbd * qemu -## 开发计划 +## 架构支持 -* 重新设置内核分页前的准备: - * multiboot2启动信息 - * 重设显示模式前的内核日志 - * 显示模式设置 - * 键盘的连接 +* [x] x86_64 +* [ ] aarch64 +* [ ] loongarch -## 文档 +## 功能模块 -### kernel - -### libk +* [x] 内存管理 + * [x] 页分配 + * [ ] 页回收 + * [x] 内存分配器 + * [x] raw_allocator +* [x] tty +* [ ] 内核日志 +* [ ] 文件系统 + * [ ] vfs + * [ ] fat32驱动(移植) + * [ ] ext4驱动(移植) +* [ ] 驱动管理 +* [ ] 进程管理 ## 版权声明 diff --git a/qemu/Makefile b/qemu/Makefile index 6221847..9178972 100644 --- a/qemu/Makefile +++ b/qemu/Makefile @@ -1,8 +1,9 @@ TARGET = ../src/metaverse.elf +ARCH := $(shell uname -m) .PHONY: run debug load mount unmount -BIOS = bios/OVMF_CODE.fd +BIOS = bios/${ARCH}.uefi run: @sudo modprobe nbd diff --git a/qemu/bios/OVMF_CODE.fd b/qemu/bios/x86_64.uefi similarity index 100% rename from qemu/bios/OVMF_CODE.fd rename to qemu/bios/x86_64.uefi diff --git a/qemu/bios/OVMF.4m.fd b/qemu/bios/x86_64/OVMF.4m.fd similarity index 100% rename from qemu/bios/OVMF.4m.fd rename to qemu/bios/x86_64/OVMF.4m.fd diff --git a/qemu/bios/OVMF.fd b/qemu/bios/x86_64/OVMF.fd similarity index 100% rename from qemu/bios/OVMF.fd rename to qemu/bios/x86_64/OVMF.fd diff --git a/qemu/bios/OVMF_CODE.4m.fd b/qemu/bios/x86_64/OVMF_CODE.4m.fd similarity index 100% rename from qemu/bios/OVMF_CODE.4m.fd rename to qemu/bios/x86_64/OVMF_CODE.4m.fd diff --git a/qemu/bios/OVMF_CODE.csm.4m.fd b/qemu/bios/x86_64/OVMF_CODE.csm.4m.fd similarity index 100% rename from qemu/bios/OVMF_CODE.csm.4m.fd rename to qemu/bios/x86_64/OVMF_CODE.csm.4m.fd diff --git a/qemu/bios/OVMF_CODE.csm.fd b/qemu/bios/x86_64/OVMF_CODE.csm.fd similarity index 100% rename from qemu/bios/OVMF_CODE.csm.fd rename to qemu/bios/x86_64/OVMF_CODE.csm.fd diff --git a/qemu/bios/x86_64/OVMF_CODE.fd b/qemu/bios/x86_64/OVMF_CODE.fd new file mode 100644 index 0000000..c797c10 Binary files /dev/null and b/qemu/bios/x86_64/OVMF_CODE.fd differ diff --git a/qemu/bios/OVMF_CODE.secboot.4m.fd b/qemu/bios/x86_64/OVMF_CODE.secboot.4m.fd similarity index 100% rename from qemu/bios/OVMF_CODE.secboot.4m.fd rename to qemu/bios/x86_64/OVMF_CODE.secboot.4m.fd diff --git a/qemu/bios/OVMF_CODE.secboot.fd b/qemu/bios/x86_64/OVMF_CODE.secboot.fd similarity index 100% rename from qemu/bios/OVMF_CODE.secboot.fd rename to qemu/bios/x86_64/OVMF_CODE.secboot.fd diff --git a/qemu/bios/OVMF_VARS.4m.fd b/qemu/bios/x86_64/OVMF_VARS.4m.fd similarity index 100% rename from qemu/bios/OVMF_VARS.4m.fd rename to qemu/bios/x86_64/OVMF_VARS.4m.fd diff --git a/qemu/bios/OVMF_VARS.fd b/qemu/bios/x86_64/OVMF_VARS.fd similarity index 100% rename from qemu/bios/OVMF_VARS.fd rename to qemu/bios/x86_64/OVMF_VARS.fd