scripts: uncomment code for initial testing

aarch64 seems to work. x86_64 and armv7 still untested

Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>

1 files changed, 12 insertions, 17 deletions

diff --git a/qemu/run_qemu.sh b/qemu/run_qemu.sh
index 936ee59..f529604 100755
--- a/qemu/run_qemu.sh
+++ b/qemu/run_qemu.sh
@@ -4,8 +4,8 @@ arch="$1"
 disk_image="$2"
 firmware="$3"
 supported_arch='x86_64, arm, aarch64'
-common_args='-nographic -m 4096 -smp 2 -device virtio-rng-pci -show-cursor'
 extra_args=''
+common_args=''
 qemu_prefix='qemu-system-'
 efi_keys='ledge-kernel-uefi-certs.ext4.img'
 ovmf_file='QEMU_EFI.fd'
@@ -20,11 +20,15 @@ print_help () {
 
 [ $# -lt 2 ] && print_help
 
+# common args
+common_args+=' -nographic -m 4096 -smp 2 -show-cursor'
+# setup RNG
+common_args+=' -device virtio-rng-pci '
 # setup common network
 common_args+=' -device virtio-net-pci,netdev=net0,mac=52:54:00:12:34:02 '
 common_args+=' -netdev tap,id=net0,ifname=tap0,script=no,downscript=no '
 
-# Setup common image arguments
+# cetup common image arguments
 common_args+=" -drive id=disk0,file=$disk_image,if=none,format=raw "
 common_args+=' -device virtio-blk-device,drive=disk0 '
 
@@ -47,8 +51,8 @@ case "$arch" in
 		else
 			extra_args+=' -machine virt,secure=on '
 			extra_args+=' -d unimp -semihosting-config enable,target=native'
-    		#extra_args+=" -drive id=disk1,file=$efi_keys,if=none,format=raw"
-			#extra_args+=' -device virtio-blk-device,drive=disk1 '
+			extra_args+=" -drive id=disk1,file=$efi_keys,if=none,format=raw"
+			extra_args+=' -device virtio-blk-device,drive=disk1 '
 		fi
 		;;
 	arm)
@@ -61,9 +65,9 @@ case "$arch" in
 		else
 			extra_args+=' -no-reboot'
 			extra_args+=' -machine virt,secure=on '
-    		extra_args+=' -d unimp -semihosting-config enable,target=native'
+			extra_args+=' -d unimp -semihosting-config enable,target=native'
 			extra_args+=' -dtb ledge-qemuarm.dtb '
-    		extra_args+=" -drive id=disk1,file=$efi_keys,if=none,format=raw"
+			extra_args+=" -drive id=disk1,file=$efi_keys,if=none,format=raw"
 			extra_args+=' -device virtio-blk-device,drive=disk1 '
 			extra_args+=' -serial mon:stdio '
 		fi
@@ -78,17 +82,8 @@ qemu_bin="$qemu_prefix""$arch"
 
 # echo "Binary: $qemu_bin"
 echo "Run: $qemu_bin $common_args $extra_args "
-# $(sudo $qemu_bin $common_args $extra_args)
-
-#${QEMU} \
-	#-serial mon:stdio -object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0
+#$(sudo $qemu_bin $common_args $extra_args)
 
-#qemu-system-arm  \
-    # -device virtio-serial-device \
-    #-chardev null,id=virtcon -device virtconsole,chardev=virtcon
-
-# OVMF 
+# OVMF
 #qemu-system-aarch64 \
    #-bios ${OVMF} -drive id=disk0,file=${DISK},if=none,format=raw -device virtio-blk-device,drive=disk0 
-# U-Boot
-#qemu-system-aarch64 \