| Message ID | 20220729145229.1250221-3-burzalodowa@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | automation: qemu-smoke-arm64.sh: Minor fixes to prevent confusion | expand |
On Fri, 29 Jul 2022, Xenia Ragiadakou wrote: > Rename the device tree from virt-gicv3 to virt-gicv2 to avoid confusion > since the version of the generic interrupt controller used for this test > is the v2 and not the v3. > > Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com> Reviewed-by: Stefano Stabellini <sstabellini@kernel.org> > --- > automation/scripts/qemu-smoke-arm64.sh | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/automation/scripts/qemu-smoke-arm64.sh b/automation/scripts/qemu-smoke-arm64.sh > index f483a2ffc1..7ac82b2278 100755 > --- a/automation/scripts/qemu-smoke-arm64.sh > +++ b/automation/scripts/qemu-smoke-arm64.sh > @@ -36,11 +36,11 @@ curl -fsSLO https://github.com/qemu/qemu/raw/v5.2.0/pc-bios/efi-virtio.rom > -machine virtualization=true \ > -cpu cortex-a57 -machine type=virt \ > -m 1024 -display none \ > - -machine dumpdtb=binaries/virt-gicv3.dtb > + -machine dumpdtb=binaries/virt-gicv2.dtb > # XXX disable pl061 to avoid Linux crash > -dtc -I dtb -O dts binaries/virt-gicv3.dtb > binaries/virt-gicv3.dts > -sed 's/compatible = "arm,pl061.*/status = "disabled";/g' binaries/virt-gicv3.dts > binaries/virt-gicv3-edited.dts > -dtc -I dts -O dtb binaries/virt-gicv3-edited.dts > binaries/virt-gicv3.dtb > +dtc -I dtb -O dts binaries/virt-gicv2.dtb > binaries/virt-gicv2.dts > +sed 's/compatible = "arm,pl061.*/status = "disabled";/g' binaries/virt-gicv2.dts > binaries/virt-gicv2-edited.dts > +dtc -I dts -O dtb binaries/virt-gicv2-edited.dts > binaries/virt-gicv2.dtb > > > # Busybox > @@ -73,7 +73,7 @@ cd .. > echo 'MEMORY_START="0x40000000" > MEMORY_END="0x80000000" > > -DEVICE_TREE="virt-gicv3.dtb" > +DEVICE_TREE="virt-gicv2.dtb" > XEN="xen" > DOM0_KERNEL="Image" > DOM0_RAMDISK="initrd" > -- > 2.34.1 >
diff --git a/automation/scripts/qemu-smoke-arm64.sh b/automation/scripts/qemu-smoke-arm64.sh index f483a2ffc1..7ac82b2278 100755 --- a/automation/scripts/qemu-smoke-arm64.sh +++ b/automation/scripts/qemu-smoke-arm64.sh @@ -36,11 +36,11 @@ curl -fsSLO https://github.com/qemu/qemu/raw/v5.2.0/pc-bios/efi-virtio.rom -machine virtualization=true \ -cpu cortex-a57 -machine type=virt \ -m 1024 -display none \ - -machine dumpdtb=binaries/virt-gicv3.dtb + -machine dumpdtb=binaries/virt-gicv2.dtb # XXX disable pl061 to avoid Linux crash -dtc -I dtb -O dts binaries/virt-gicv3.dtb > binaries/virt-gicv3.dts -sed 's/compatible = "arm,pl061.*/status = "disabled";/g' binaries/virt-gicv3.dts > binaries/virt-gicv3-edited.dts -dtc -I dts -O dtb binaries/virt-gicv3-edited.dts > binaries/virt-gicv3.dtb +dtc -I dtb -O dts binaries/virt-gicv2.dtb > binaries/virt-gicv2.dts +sed 's/compatible = "arm,pl061.*/status = "disabled";/g' binaries/virt-gicv2.dts > binaries/virt-gicv2-edited.dts +dtc -I dts -O dtb binaries/virt-gicv2-edited.dts > binaries/virt-gicv2.dtb # Busybox @@ -73,7 +73,7 @@ cd .. echo 'MEMORY_START="0x40000000" MEMORY_END="0x80000000" -DEVICE_TREE="virt-gicv3.dtb" +DEVICE_TREE="virt-gicv2.dtb" XEN="xen" DOM0_KERNEL="Image" DOM0_RAMDISK="initrd"
Rename the device tree from virt-gicv3 to virt-gicv2 to avoid confusion since the version of the generic interrupt controller used for this test is the v2 and not the v3. Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com> --- automation/scripts/qemu-smoke-arm64.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)