diff options
Diffstat (limited to 'arch/riscv64/conf')
| -rw-r--r-- | arch/riscv64/conf/boot.cmd | 2 | ||||
| -rw-r--r-- | arch/riscv64/conf/init.c | 2 | ||||
| -rw-r--r-- | arch/riscv64/conf/kmi.its (renamed from arch/riscv64/conf/apos.its) | 6 | ||||
| -rwxr-xr-x | arch/riscv64/conf/mkimage.sh | 8 |
4 files changed, 9 insertions, 9 deletions
diff --git a/arch/riscv64/conf/boot.cmd b/arch/riscv64/conf/boot.cmd index a7517fd..47f395a 100644 --- a/arch/riscv64/conf/boot.cmd +++ b/arch/riscv64/conf/boot.cmd @@ -1,4 +1,4 @@ fdt move ${fdt_addr} ${fdt_addr_r} fdt addr ${fdt_addr_r} -load ${devtype} ${devnum} ${kernel_addr_r} apos.itb +load ${devtype} ${devnum} ${kernel_addr_r} kmi.itb bootm ${kernel_addr_r} ${kernel_addr_r} ${fdt_addr_r} diff --git a/arch/riscv64/conf/init.c b/arch/riscv64/conf/init.c index fb7c737..3a1a517 100644 --- a/arch/riscv64/conf/init.c +++ b/arch/riscv64/conf/init.c @@ -19,7 +19,7 @@ #include <stdint.h> #include <stddef.h> -#include "../../../include/apos/syscalls.h" +#include "../../../include/kmi/syscalls.h" struct sys_ret { long a0, a1, a2, a3, a4, a5; diff --git a/arch/riscv64/conf/apos.its b/arch/riscv64/conf/kmi.its index 026fb45..0494030 100644 --- a/arch/riscv64/conf/apos.its +++ b/arch/riscv64/conf/kmi.its @@ -7,10 +7,10 @@ images { kernel { description = "Garbaggio"; - data = /incbin/("../../../apos.bin"); + data = /incbin/("../../../kmi.bin"); type = "kernel"; arch = "riscv"; - os = "apos"; + os = "kmi"; compression = "none"; load = <0x80240000>; entry = <0x80240000>; @@ -24,7 +24,7 @@ data = /incbin/("initrd"); type = "ramdisk"; arch = "riscv"; - os = "apos"; + os = "kmi"; compression = "none"; load = <0x88300000>; hash-1 { diff --git a/arch/riscv64/conf/mkimage.sh b/arch/riscv64/conf/mkimage.sh index 086e0ce..badac4c 100755 --- a/arch/riscv64/conf/mkimage.sh +++ b/arch/riscv64/conf/mkimage.sh @@ -15,17 +15,17 @@ OFFSET=$(fdisk -l rootfs.img | awk '$1=="rootfs.img1" {print $2}') mount -o loop,offset=$((${SSIZE}*${OFFSET})) rootfs.img fs # not entirely pleased with this solution, although eventually I should probably -# move `run` out of the kernel repo and into some `aposos` repo with a runtime +# move `run` out of the kernel repo and into some `kmios` repo with a runtime # and proper initrd etc. so this is good enough for now -../rv${XLEN}/u-boot-apos/tools/mkimage -f arch/riscv${XLEN}/conf/apos.its fs/apos.itb -../rv${XLEN}/u-boot-apos/tools/mkimage -A riscv -O apos -T script \ +../rv${XLEN}/u-boot-kmi/tools/mkimage -f arch/riscv${XLEN}/conf/kmi.its fs/kmi.itb +../rv${XLEN}/u-boot-kmi/tools/mkimage -A riscv -O kmi -T script \ -d arch/riscv64/conf/boot.cmd fs/boot.scr umount -l fs qemu-system-riscv${XLEN} \ -machine virt \ - -kernel ../rv${XLEN}/u-boot-apos/u-boot \ + -kernel ../rv${XLEN}/u-boot-kmi/u-boot \ -bios ../rv${XLEN}/opensbi/build/platform/generic/firmware/fw_jump.elf \ -device virtio-blk-device,drive=hd0 \ -drive file=rootfs.img,format=raw,id=hd0 \ |