From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 26 May 2026 21:37:54 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1wRxb8-0048if-0g for lore@lore.pengutronix.de; Tue, 26 May 2026 21:37:54 +0200 Received: from [127.0.0.1] (helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1wRxb7-0002wI-Gk; Tue, 26 May 2026 21:37:53 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1wRxb4-0002nn-2I; Tue, 26 May 2026 21:37:50 +0200 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1wRxb3-001zPo-1P; Tue, 26 May 2026 21:37:50 +0200 Received: from [::1] (helo=dude05.red.stw.pengutronix.de) by dude05.red.stw.pengutronix.de with esmtp (Exim 4.98.2) (envelope-from ) id 1wRxb3-00000001DHA-3k29; Tue, 26 May 2026 21:37:49 +0200 From: Ahmad Fatoum To: distrokit@pengutronix.de Date: Tue, 26 May 2026 21:36:46 +0200 Message-ID: <20260526193736.288664-6-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260526193736.288664-1-a.fatoum@pengutronix.de> References: <20260526193736.288664-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [DistroKit] [PATCH 5/9] v7a: run: drop non-functional scsi option X-BeenThere: distrokit@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: DistroKit Mailinglist List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ahmad Fatoum Sender: "DistroKit" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: distrokit-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false We never enabled CONFIG_SCSI_VIRTIO for the v7a platform, so I am unsure if this ever worked. It doesn't work now though and I don't see the upside compared to the configs/platform-v7a/run mmc, which does work, so drop it. Signed-off-by: Ahmad Fatoum --- configs/platform-v7a/run | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/configs/platform-v7a/run b/configs/platform-v7a/run index 9d0d7a0a9179..c4c70677e95d 100755 --- a/configs/platform-v7a/run +++ b/configs/platform-v7a/run @@ -79,21 +79,6 @@ QEMU_ARGS=( "${QEMU_ARGS[@]}" -rtc base=2000-01-01 ) # no watchdog available on vexpress #QEMU_ARGS=( "${QEMU_ARGS[@]}" -watchdog i6300esb -watchdog-action poweroff ) QEMU_ARGS=( "${QEMU_ARGS[@]}" -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-device,rng=rng0 ) -# SCSI bus -QEMU_ARGS=( "${QEMU_ARGS[@]}" -device virtio-scsi-device,id=scsi ) -# Add virtual SCSI device if available -if [ -e "${PTXDIST_PLATFORMDIR}/images/usbstick.img" ]; then - echo "SCSI unplug/plug in the QEMU console (C-a c):" - echo - echo "device_del plug" - echo - echo "drive_add 0 if=none,format=raw,id=scsiplug,file=${PTXDIST_PLATFORMDIR}/images/usbstick.img" - echo "device_add scsi-hd,drive=scsiplug,removable=true,id=plug" - echo - QEMU_EXTRA_ARGS=( \ - -drive if=none,format=raw,id=scsiplug,file=${PTXDIST_PLATFORMDIR}/images/usbstick.img \ - -device scsi-hd,drive=scsiplug,removable=true,id=plug ) -fi QEMU_LINUX_ARGS=( -kernel ${PTXDIST_PLATFORMDIR}/images/linuximage -dtb ${PTXDIST_PLATFORMDIR}/images/vexpress-v2p-ca9.dtb ) # the barebox device tree has a state node for bootchooser QEMU_BAREBOX_ARGS=( -dtb ${PTXDIST_PLATFORMDIR}/images/barebox-vexpress-v2p-ca9.dtb ) @@ -135,17 +120,6 @@ run_qemu_nfs() { -append "root=/dev/nfs nfsroot=/root,v3,tcp,port=2049,mountport=2049 ip=dhcp ${BASE_CMDLINE}" } -run_qemu_scsi() { - check_hd - exec ${QEMU_EXEC} \ - "${QEMU_ARGS[@]}" \ - -drive if=none,format=raw,file=${PTXDIST_PLATFORMDIR}/images/hd.img,id=disk0 \ - -device scsi-hd,drive=disk0 \ - "${QEMU_EXTRA_ARGS[@]}" \ - "${QEMU_LINUX_ARGS[@]}" \ - -append "root=/dev/sda1 rootfstype=ext4 rootwait ${BASE_CMDLINE}" -} - run_qemu_mmc() { check_hd exec ${QEMU_EXEC} \ -- 2.47.3