Skip to content

Commit 13d95c2

Browse files
author
dongyongtao
committed
ci: show qemu version when make run_qemu and add zba_zbb_zbc_zbs_zicon to qemu ext flags
Signed-off-by: dongyongtao <[email protected]>
1 parent 796f386 commit 13d95c2

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ jobs:
9898
fi
9999
echo "which $qemucmd" > $SHOWQEMUSH
100100
echo "$qemucmd --version" >> $SHOWQEMUSH
101-
echo "$qemucmd -M nuclei_${SOC},download=flashxip -cpu nuclei-${CORE},ext=$ARCH_EXT -smp 8 -m 2g -bios freeloader_qemu.elf -nographic -drive file=disk.img,if=sd,format=raw" > $RUNQEMUSH
101+
echo "$qemucmd -M nuclei_${SOC},download=flashxip -cpu nuclei-${CORE},ext=${ARCH_EXT}_zba_zbb_zbc_zbs_zicond -smp 8 -m 2g -bios freeloader_qemu.elf -nographic -drive file=disk.img,if=sd,format=raw" > $RUNQEMUSH
102102
chmod +x $RUNQEMUSH
103103
chmod +x $SHOWQEMUSH
104104
unset TIMER_HZ

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ cache:
149149
fi
150150
echo "which $qemucmd" > $SHOWQEMUSH
151151
echo "$qemucmd --version" >> $SHOWQEMUSH
152-
echo "$qemucmd -M nuclei_${SOC},download=flashxip -cpu nuclei-${CORE},ext=$ARCH_EXT -smp 8 -m 2g -bios freeloader_qemu.elf -nographic -drive file=disk.img,if=sd,format=raw" > $RUNQEMUSH
152+
echo "$qemucmd -M nuclei_${SOC},download=flashxip -cpu nuclei-${CORE},ext=${ARCH_EXT}_zba_zbb_zbc_zbs_zicond -smp 8 -m 2g -bios freeloader_qemu.elf -nographic -drive file=disk.img,if=sd,format=raw" > $RUNQEMUSH
153153
chmod +x $RUNQEMUSH
154154
chmod +x $SHOWQEMUSH
155155
- |

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,8 @@ $(qemu_disk): $(boot_zip)
555555

556556
run_qemu: $(qemu_disk) $(freeloader_elf)
557557
@echo "Run on qemu for simulation"
558-
$(qemu) $(QEMU_MACHINE_OPTS) -cpu nuclei-$(CORE),ext=$(ARCH_EXT) -bios $(freeloader_elf) -nographic -drive file=$(qemu_disk),if=sd,format=raw
558+
$(qemu) --version
559+
$(qemu) $(QEMU_MACHINE_OPTS) -cpu nuclei-$(CORE),ext=$(ARCH_EXT)_zba_zbb_zbc_zbs_zicond -bios $(freeloader_elf) -nographic -drive file=$(qemu_disk),if=sd,format=raw
559560

560561
.PHONY: backup snapshot genstamp genboot
561562
# backup your build

0 commit comments

Comments
 (0)