Mercurial > hg > Gears > Gears-xv6

changeset 3:30904ab847f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
...
author kono
date Sat, 20 Jan 2024 10:36:30 +0900
parents 04d36d597077
children 8832d937a490
files run.sh xv6-aarch64/Makefile
diffstat 2 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/run.sh	Thu Jan 18 15:50:44 2024 +0900
+++ b/run.sh	Sat Jan 20 10:36:30 2024 +0900
@@ -1,9 +1,11 @@
 #!/bin/sh
+export sif=/mnt/ssd1/user/kono/src/xv6/xv6-aauefi.sif
 export XV6=/mnt/ssd1/user/e205729
 singularity shell --shell /bin/zsh  \
    -B /mnt/ssd1/user/kono/src/xv6-UEFI:/mnt/ssd1/user/kono/src/xv6-UEFI \
+   -B /mnt/ssd1/user/kono/src/xv6-x86_64:/mnt/ssd1/user/kono/src/xv6-x86_64 \
    -B /mnt/ssd1/user/kono/src/xv6:/mnt/ssd1/user/kono/src/xv6 \
-   xv6-aauefi.sif
+   $sif
 
 #   -B ${XV6}/xv6-UEFI:${XV6}/xv6-UEFI \
 #    ${XV6}//xv6-UEFI/xv6-aauefi.sif
--- a/xv6-aarch64/Makefile	Thu Jan 18 15:50:44 2024 +0900
+++ b/xv6-aarch64/Makefile	Sat Jan 20 10:36:30 2024 +0900
@@ -168,9 +168,15 @@
 	$(QEMU) $(QEMUOPTS) -S $(QEMUGDB)
 
 uefi:  $K/kernel fs.img
+	cp fs.img EFI/BOOT
+	cp $K/kernel EFI/BOOT
+	cp ../../xv6-UEFI/gnu-efi-3.0.12/aarch64/apps/bootloader.efi  EFI/BOOT
 	$(QEMU) -bios QEMU_EFI.fd fat:rw:EFI/BOOT/  $(QEMUOPTS) 
 
 uefi-gdb: $K/kernel .gdbinit fs.img
+	cp fs.img EFI/BOOT
+	cp $K/kernel EFI/BOOT
+	cp ../../xv6-UEFI/gnu-efi-3.0.12/aarch64/apps/bootloader.efi  EFI/BOOT
 	@echo "*** Now run 'gdb' in another window." 1>&2
 	$(QEMU) -bios QEMU_EFI.fd fat:rw:EFI/BOOT/  $(QEMUOPTS) -S $(QEMUGDB)