From: Jan Kiszka <jan.kiszka@siemens.com>
To: isar-users <isar-users@googlegroups.com>
Subject: [PATCH v3 01/14] meta-isar: Clean up qemu multiconfigs
Date: Wed, 29 Jan 2020 11:29:53 +0100 [thread overview]
Message-ID: <262dc68259cbe86c364a7e68935cc335d6e9cc03.1580293806.git.jan.kiszka@siemens.com> (raw)
In-Reply-To: <cover.1580293806.git.jan.kiszka@siemens.com>
In-Reply-To: <cover.1580293806.git.jan.kiszka@siemens.com>
From: Jan Kiszka <jan.kiszka@siemens.com>
Move all the needless duplications from the multiconfigs into the
machine configs, reducing the multiconfigs to MACHINE and DISTRO
settings - with the only exception of qemuamd64-buster-tgz.conf.
Note that this also switches all qemui386 targets to the 686-pae kernel.
So far, only the stretch target used it - for whatever reason.
As the QEMU data is now in the machine config, start_vm also needs to be
updated to pull from there, no longer from any multiconfig.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
meta-isar/conf/machine/qemuamd64.conf | 17 +++++++++++++++--
meta-isar/conf/machine/qemuarm.conf | 16 ++++++++++++++--
meta-isar/conf/machine/qemuarm64.conf | 16 ++++++++++++++--
meta-isar/conf/machine/qemui386.conf | 14 ++++++++++++--
meta-isar/conf/machine/qemumipsel.conf | 16 ++++++++++++++--
meta-isar/conf/multiconfig/qemuamd64-bullseye.conf | 16 ----------------
meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf | 6 ------
meta-isar/conf/multiconfig/qemuamd64-buster.conf | 16 ----------------
meta-isar/conf/multiconfig/qemuamd64-stretch.conf | 13 -------------
meta-isar/conf/multiconfig/qemuarm-bullseye.conf | 12 ------------
meta-isar/conf/multiconfig/qemuarm-buster.conf | 12 ------------
meta-isar/conf/multiconfig/qemuarm-stretch.conf | 12 ------------
meta-isar/conf/multiconfig/qemuarm64-bullseye.conf | 12 ------------
meta-isar/conf/multiconfig/qemuarm64-buster.conf | 12 ------------
meta-isar/conf/multiconfig/qemuarm64-stretch.conf | 12 ------------
meta-isar/conf/multiconfig/qemui386-bullseye.conf | 13 -------------
meta-isar/conf/multiconfig/qemui386-buster.conf | 13 -------------
meta-isar/conf/multiconfig/qemui386-stretch.conf | 13 -------------
meta-isar/conf/multiconfig/qemumipsel-bullseye.conf | 12 ------------
meta-isar/conf/multiconfig/qemumipsel-buster.conf | 12 ------------
meta-isar/conf/multiconfig/qemumipsel-stretch.conf | 12 ------------
scripts/start_vm | 5 +----
22 files changed, 70 insertions(+), 212 deletions(-)
diff --git a/meta-isar/conf/machine/qemuamd64.conf b/meta-isar/conf/machine/qemuamd64.conf
index 1eb85e6b..028b738d 100644
--- a/meta-isar/conf/machine/qemuamd64.conf
+++ b/meta-isar/conf/machine/qemuamd64.conf
@@ -1,7 +1,20 @@
# This software is a part of ISAR.
# Copyright (C) 2017 ilbers GmbH
+DISTRO_ARCH ?= "amd64"
+
+KERNEL_NAME ?= "amd64"
+
+IMAGE_TYPE ?= "wic-img"
+WKS_FILE ?= "sdimage-efi"
+IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}"
+
+IMAGE_INSTALL += "sshd-regen-keys"
+
+QEMU_ARCH ?= "x86_64"
+QEMU_MACHINE ?= "q35"
+QEMU_CPU ?= ""
+QEMU_DISK_ARGS ?= "-hda ##ROOTFS_IMAGE## -bios /usr/local/share/ovmf/OVMF.fd"
+
MACHINE_SERIAL ?= "ttyS0"
BAUDRATE_TTY ?= "115200"
-
-IMAGE_TYPE ?= "ext4-img"
diff --git a/meta-isar/conf/machine/qemuarm.conf b/meta-isar/conf/machine/qemuarm.conf
index 70dd9415..fbbdc233 100644
--- a/meta-isar/conf/machine/qemuarm.conf
+++ b/meta-isar/conf/machine/qemuarm.conf
@@ -1,7 +1,19 @@
# This software is a part of ISAR.
# Copyright (C) 2015-2017 ilbers GmbH
-MACHINE_SERIAL ?= "ttyAMA0"
-BAUDRATE_TTY ?= "115200"
+DISTRO_ARCH ?= "armhf"
+
+KERNEL_NAME ?= "armmp"
IMAGE_TYPE ?= "ext4-img"
+
+QEMU_ROOTFS_DEV ?= "vda"
+
+QEMU_ARCH ?= "arm"
+QEMU_MACHINE ?= "virt"
+QEMU_CPU ?= "cortex-a15"
+# TODO: start_vm doesn't support multiline vars
+QEMU_DISK_ARGS ?= "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0"
+
+MACHINE_SERIAL ?= "ttyAMA0"
+BAUDRATE_TTY ?= "115200"
diff --git a/meta-isar/conf/machine/qemuarm64.conf b/meta-isar/conf/machine/qemuarm64.conf
index 70dd9415..246da5a5 100644
--- a/meta-isar/conf/machine/qemuarm64.conf
+++ b/meta-isar/conf/machine/qemuarm64.conf
@@ -1,7 +1,19 @@
# This software is a part of ISAR.
# Copyright (C) 2015-2017 ilbers GmbH
-MACHINE_SERIAL ?= "ttyAMA0"
-BAUDRATE_TTY ?= "115200"
+DISTRO_ARCH ?= "arm64"
+
+KERNEL_NAME ?= "arm64"
IMAGE_TYPE ?= "ext4-img"
+
+QEMU_ROOTFS_DEV ?= "vda"
+
+QEMU_ARCH ?= "aarch64"
+QEMU_MACHINE ?= "virt"
+QEMU_CPU ?= "cortex-a57"
+# TODO: start_vm doesn't support multiline vars
+QEMU_DISK_ARGS ?= "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0"
+
+MACHINE_SERIAL ?= "ttyAMA0"
+BAUDRATE_TTY ?= "115200"
diff --git a/meta-isar/conf/machine/qemui386.conf b/meta-isar/conf/machine/qemui386.conf
index 1eb85e6b..e6afb06b 100644
--- a/meta-isar/conf/machine/qemui386.conf
+++ b/meta-isar/conf/machine/qemui386.conf
@@ -1,7 +1,17 @@
# This software is a part of ISAR.
# Copyright (C) 2017 ilbers GmbH
+DISTRO_ARCH ?= "i386"
+
+KERNEL_NAME ?= "686-pae"
+
+IMAGE_TYPE ?= "wic-img"
+WKS_FILE ?= "directdisk-isar"
+IMAGER_INSTALL += "${SYSLINUX_BOOTLOADER_INSTALL}"
+
+QEMU_ARCH ?= "i386"
+QEMU_MACHINE ?= "pc"
+QEMU_CPU ?= ""
+QEMU_DISK_ARGS ?= "-hda ##ROOTFS_IMAGE##"
MACHINE_SERIAL ?= "ttyS0"
BAUDRATE_TTY ?= "115200"
-
-IMAGE_TYPE ?= "ext4-img"
diff --git a/meta-isar/conf/machine/qemumipsel.conf b/meta-isar/conf/machine/qemumipsel.conf
index 18191fc9..85178ee9 100644
--- a/meta-isar/conf/machine/qemumipsel.conf
+++ b/meta-isar/conf/machine/qemumipsel.conf
@@ -1,7 +1,19 @@
# This software is a part of ISAR.
# Copyright (C) 2019 Mentor Graphics, a Siemens business
-MACHINE_SERIAL ?= "ttyS0"
-BAUDRATE_TTY ?= "115200"
+DISTRO_ARCH ?= "mipsel"
+
+KERNEL_NAME ?= "4kc-malta"
IMAGE_TYPE ?= "ext4-img"
+
+QEMU_ROOTFS_DEV ?= "sda"
+
+QEMU_ARCH ?= "mipsel"
+QEMU_MACHINE ?= "malta"
+QEMU_CPU ?= "24Kc"
+QEMU_DISK_ARGS ?= "-drive file=##ROOTFS_IMAGE##,format=raw"
+QEMU_KARGS ?= "nokaslr"
+
+MACHINE_SERIAL ?= "ttyS0"
+BAUDRATE_TTY ?= "115200"
diff --git a/meta-isar/conf/multiconfig/qemuamd64-bullseye.conf b/meta-isar/conf/multiconfig/qemuamd64-bullseye.conf
index d0b79f72..1badc889 100644
--- a/meta-isar/conf/multiconfig/qemuamd64-bullseye.conf
+++ b/meta-isar/conf/multiconfig/qemuamd64-bullseye.conf
@@ -1,20 +1,4 @@
# This software is a part of ISAR.
MACHINE ?= "qemuamd64"
-
DISTRO ?= "debian-bullseye"
-DISTRO_ARCH ?= "amd64"
-
-KERNEL_NAME ?= "amd64"
-
-IMAGE_TYPE ?= "wic-img"
-WKS_FILE ?= "sdimage-efi"
-IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}"
-
-IMAGE_INSTALL += "sshd-regen-keys"
-
-QEMU_ARCH ?= "x86_64"
-QEMU_MACHINE ?= "q35"
-QEMU_CPU ?= ""
-QEMU_DISK_ARGS ?= "-hda ##ROOTFS_IMAGE## -bios /usr/local/share/ovmf/OVMF.fd"
-
diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf b/meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf
index 18944545..17de3384 100644
--- a/meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf
+++ b/meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf
@@ -4,12 +4,6 @@
# SPDX-License-Identifier: MIT
MACHINE ?= "qemuamd64"
-
DISTRO ?= "debian-buster"
-DISTRO_ARCH ?= "amd64"
-
-KERNEL_NAME ?= "amd64"
IMAGE_TYPE ?= "targz-img"
-
-IMAGE_INSTALL += "sshd-regen-keys"
diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster.conf b/meta-isar/conf/multiconfig/qemuamd64-buster.conf
index da909939..3fabd675 100644
--- a/meta-isar/conf/multiconfig/qemuamd64-buster.conf
+++ b/meta-isar/conf/multiconfig/qemuamd64-buster.conf
@@ -1,20 +1,4 @@
# This software is a part of ISAR.
MACHINE ?= "qemuamd64"
-
DISTRO ?= "debian-buster"
-DISTRO_ARCH ?= "amd64"
-
-KERNEL_NAME ?= "amd64"
-
-IMAGE_TYPE ?= "wic-img"
-WKS_FILE ?= "sdimage-efi"
-IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}"
-
-IMAGE_INSTALL += "sshd-regen-keys"
-
-QEMU_ARCH ?= "x86_64"
-QEMU_MACHINE ?= "q35"
-QEMU_CPU ?= ""
-QEMU_DISK_ARGS ?= "-hda ##ROOTFS_IMAGE## -bios /usr/local/share/ovmf/OVMF.fd"
-
diff --git a/meta-isar/conf/multiconfig/qemuamd64-stretch.conf b/meta-isar/conf/multiconfig/qemuamd64-stretch.conf
index f9d283ca..f9592c71 100644
--- a/meta-isar/conf/multiconfig/qemuamd64-stretch.conf
+++ b/meta-isar/conf/multiconfig/qemuamd64-stretch.conf
@@ -2,17 +2,4 @@
# Copyright (C) 2017 ilbers GmbH
MACHINE ?= "qemuamd64"
-
DISTRO ?= "debian-stretch"
-DISTRO_ARCH ?= "amd64"
-
-KERNEL_NAME ?= "amd64"
-
-IMAGE_TYPE ?= "wic-img"
-WKS_FILE ?= "sdimage-efi"
-IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}"
-
-QEMU_ARCH ?= "x86_64"
-QEMU_MACHINE ?= "q35"
-QEMU_CPU ?= ""
-QEMU_DISK_ARGS ?= "-hda ##ROOTFS_IMAGE## -bios /usr/local/share/ovmf/OVMF.fd"
diff --git a/meta-isar/conf/multiconfig/qemuarm-bullseye.conf b/meta-isar/conf/multiconfig/qemuarm-bullseye.conf
index 1989d90f..6924f405 100644
--- a/meta-isar/conf/multiconfig/qemuarm-bullseye.conf
+++ b/meta-isar/conf/multiconfig/qemuarm-bullseye.conf
@@ -1,16 +1,4 @@
# This software is a part of ISAR.
MACHINE ?= "qemuarm"
-
DISTRO ?= "debian-bullseye"
-DISTRO_ARCH ?= "armhf"
-
-KERNEL_NAME ?= "armmp"
-
-QEMU_ROOTFS_DEV ?= "vda"
-
-QEMU_ARCH ?= "arm"
-QEMU_MACHINE ?= "virt"
-QEMU_CPU ?= "cortex-a15"
-# TODO: start_vm doesn't support multiline vars
-QEMU_DISK_ARGS ?= "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0"
diff --git a/meta-isar/conf/multiconfig/qemuarm-buster.conf b/meta-isar/conf/multiconfig/qemuarm-buster.conf
index bc84c8b0..96904388 100644
--- a/meta-isar/conf/multiconfig/qemuarm-buster.conf
+++ b/meta-isar/conf/multiconfig/qemuarm-buster.conf
@@ -1,16 +1,4 @@
# This software is a part of ISAR.
MACHINE ?= "qemuarm"
-
DISTRO ?= "debian-buster"
-DISTRO_ARCH ?= "armhf"
-
-KERNEL_NAME ?= "armmp"
-
-QEMU_ROOTFS_DEV ?= "vda"
-
-QEMU_ARCH ?= "arm"
-QEMU_MACHINE ?= "virt"
-QEMU_CPU ?= "cortex-a15"
-# TODO: start_vm doesn't support multiline vars
-QEMU_DISK_ARGS ?= "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0"
diff --git a/meta-isar/conf/multiconfig/qemuarm-stretch.conf b/meta-isar/conf/multiconfig/qemuarm-stretch.conf
index a2e3df16..f3af9fc3 100644
--- a/meta-isar/conf/multiconfig/qemuarm-stretch.conf
+++ b/meta-isar/conf/multiconfig/qemuarm-stretch.conf
@@ -2,16 +2,4 @@
# Copyright (C) 2017 ilbers GmbH
MACHINE ?= "qemuarm"
-
DISTRO ?= "debian-stretch"
-DISTRO_ARCH ?= "armhf"
-
-KERNEL_NAME ?= "armmp"
-
-QEMU_ROOTFS_DEV ?= "vda"
-
-QEMU_ARCH ?= "arm"
-QEMU_MACHINE ?= "virt"
-QEMU_CPU ?= "cortex-a15"
-# TODO: start_vm doesn't support multiline vars
-QEMU_DISK_ARGS ?= "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0"
diff --git a/meta-isar/conf/multiconfig/qemuarm64-bullseye.conf b/meta-isar/conf/multiconfig/qemuarm64-bullseye.conf
index e8dabac1..4b3a8462 100644
--- a/meta-isar/conf/multiconfig/qemuarm64-bullseye.conf
+++ b/meta-isar/conf/multiconfig/qemuarm64-bullseye.conf
@@ -3,16 +3,4 @@
# Copyright (c) Siemens AG, 2019
MACHINE ?= "qemuarm64"
-
DISTRO ?= "debian-bullseye"
-DISTRO_ARCH ?= "arm64"
-
-KERNEL_NAME ?= "arm64"
-
-QEMU_ROOTFS_DEV ?= "vda"
-
-QEMU_ARCH ?= "aarch64"
-QEMU_MACHINE ?= "virt"
-QEMU_CPU ?= "cortex-a57"
-# TODO: start_vm doesn't support multiline vars
-QEMU_DISK_ARGS ?= "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0"
diff --git a/meta-isar/conf/multiconfig/qemuarm64-buster.conf b/meta-isar/conf/multiconfig/qemuarm64-buster.conf
index 40f1d414..60c370ba 100644
--- a/meta-isar/conf/multiconfig/qemuarm64-buster.conf
+++ b/meta-isar/conf/multiconfig/qemuarm64-buster.conf
@@ -3,16 +3,4 @@
# Copyright (c) Siemens AG, 2018
MACHINE ?= "qemuarm64"
-
DISTRO ?= "debian-buster"
-DISTRO_ARCH ?= "arm64"
-
-KERNEL_NAME ?= "arm64"
-
-QEMU_ROOTFS_DEV ?= "vda"
-
-QEMU_ARCH ?= "aarch64"
-QEMU_MACHINE ?= "virt"
-QEMU_CPU ?= "cortex-a57"
-# TODO: start_vm doesn't support multiline vars
-QEMU_DISK_ARGS ?= "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0"
diff --git a/meta-isar/conf/multiconfig/qemuarm64-stretch.conf b/meta-isar/conf/multiconfig/qemuarm64-stretch.conf
index dcef3702..0fd39fca 100644
--- a/meta-isar/conf/multiconfig/qemuarm64-stretch.conf
+++ b/meta-isar/conf/multiconfig/qemuarm64-stretch.conf
@@ -3,16 +3,4 @@
# Copyright (c) Siemens AG, 2018
MACHINE ?= "qemuarm64"
-
DISTRO ?= "debian-stretch"
-DISTRO_ARCH ?= "arm64"
-
-KERNEL_NAME ?= "arm64"
-
-QEMU_ROOTFS_DEV ?= "vda"
-
-QEMU_ARCH ?= "aarch64"
-QEMU_MACHINE ?= "virt"
-QEMU_CPU ?= "cortex-a57"
-# TODO: start_vm doesn't support multiline vars
-QEMU_DISK_ARGS ?= "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0"
diff --git a/meta-isar/conf/multiconfig/qemui386-bullseye.conf b/meta-isar/conf/multiconfig/qemui386-bullseye.conf
index 0a16d105..bc81136d 100644
--- a/meta-isar/conf/multiconfig/qemui386-bullseye.conf
+++ b/meta-isar/conf/multiconfig/qemui386-bullseye.conf
@@ -1,17 +1,4 @@
# This software is a part of ISAR.
MACHINE ?= "qemui386"
-
DISTRO ?= "debian-bullseye"
-DISTRO_ARCH ?= "i386"
-
-KERNEL_NAME ?= "686"
-
-IMAGE_TYPE ?= "wic-img"
-WKS_FILE ?= "directdisk-isar"
-IMAGER_INSTALL += "${SYSLINUX_BOOTLOADER_INSTALL}"
-
-QEMU_ARCH ?= "i386"
-QEMU_MACHINE ?= "pc"
-QEMU_CPU ?= ""
-QEMU_DISK_ARGS ?= "-hda ##ROOTFS_IMAGE##"
diff --git a/meta-isar/conf/multiconfig/qemui386-buster.conf b/meta-isar/conf/multiconfig/qemui386-buster.conf
index 6b5a18e5..d9350c04 100644
--- a/meta-isar/conf/multiconfig/qemui386-buster.conf
+++ b/meta-isar/conf/multiconfig/qemui386-buster.conf
@@ -1,17 +1,4 @@
# This software is a part of ISAR.
MACHINE ?= "qemui386"
-
DISTRO ?= "debian-buster"
-DISTRO_ARCH ?= "i386"
-
-KERNEL_NAME ?= "686"
-
-IMAGE_TYPE ?= "wic-img"
-WKS_FILE ?= "directdisk-isar"
-IMAGER_INSTALL += "${SYSLINUX_BOOTLOADER_INSTALL}"
-
-QEMU_ARCH ?= "i386"
-QEMU_MACHINE ?= "pc"
-QEMU_CPU ?= ""
-QEMU_DISK_ARGS ?= "-hda ##ROOTFS_IMAGE##"
diff --git a/meta-isar/conf/multiconfig/qemui386-stretch.conf b/meta-isar/conf/multiconfig/qemui386-stretch.conf
index 037ba23f..007e82b9 100644
--- a/meta-isar/conf/multiconfig/qemui386-stretch.conf
+++ b/meta-isar/conf/multiconfig/qemui386-stretch.conf
@@ -2,17 +2,4 @@
# Copyright (C) 2017 ilbers GmbH
MACHINE ?= "qemui386"
-
DISTRO ?= "debian-stretch"
-DISTRO_ARCH ?= "i386"
-
-KERNEL_NAME ?= "686-pae"
-
-IMAGE_TYPE ?= "wic-img"
-WKS_FILE ?= "directdisk-isar"
-IMAGER_INSTALL += "${SYSLINUX_BOOTLOADER_INSTALL}"
-
-QEMU_ARCH ?= "i386"
-QEMU_MACHINE ?= "pc"
-QEMU_CPU ?= ""
-QEMU_DISK_ARGS ?= "-hda ##ROOTFS_IMAGE##"
diff --git a/meta-isar/conf/multiconfig/qemumipsel-bullseye.conf b/meta-isar/conf/multiconfig/qemumipsel-bullseye.conf
index aa3a6f82..6f24c59b 100644
--- a/meta-isar/conf/multiconfig/qemumipsel-bullseye.conf
+++ b/meta-isar/conf/multiconfig/qemumipsel-bullseye.conf
@@ -2,16 +2,4 @@
# Copyright (C) 2019 Mentor Graphics, a Siemens busines
MACHINE ?= "qemumipsel"
-
DISTRO ?= "debian-bullseye"
-DISTRO_ARCH ?= "mipsel"
-
-KERNEL_NAME ?= "4kc-malta"
-
-QEMU_ROOTFS_DEV ?= "sda"
-
-QEMU_ARCH ?= "mipsel"
-QEMU_MACHINE ?= "malta"
-QEMU_CPU ?= "24Kc"
-QEMU_DISK_ARGS ?= "-drive file=##ROOTFS_IMAGE##,format=raw"
-QEMU_KARGS ?= "nokaslr"
diff --git a/meta-isar/conf/multiconfig/qemumipsel-buster.conf b/meta-isar/conf/multiconfig/qemumipsel-buster.conf
index ac9058ce..1d369fd5 100644
--- a/meta-isar/conf/multiconfig/qemumipsel-buster.conf
+++ b/meta-isar/conf/multiconfig/qemumipsel-buster.conf
@@ -2,16 +2,4 @@
# Copyright (C) 2019 Mentor Graphics, a Siemens busines
MACHINE ?= "qemumipsel"
-
DISTRO ?= "debian-buster"
-DISTRO_ARCH ?= "mipsel"
-
-KERNEL_NAME ?= "4kc-malta"
-
-QEMU_ROOTFS_DEV ?= "sda"
-
-QEMU_ARCH ?= "mipsel"
-QEMU_MACHINE ?= "malta"
-QEMU_CPU ?= "24Kc"
-QEMU_DISK_ARGS ?= "-drive file=##ROOTFS_IMAGE##,format=raw"
-QEMU_KARGS ?= "nokaslr"
diff --git a/meta-isar/conf/multiconfig/qemumipsel-stretch.conf b/meta-isar/conf/multiconfig/qemumipsel-stretch.conf
index 1fe20042..53009be6 100644
--- a/meta-isar/conf/multiconfig/qemumipsel-stretch.conf
+++ b/meta-isar/conf/multiconfig/qemumipsel-stretch.conf
@@ -2,16 +2,4 @@
# Copyright (C) 2019 Mentor Graphics, a Siemens busines
MACHINE ?= "qemumipsel"
-
DISTRO ?= "debian-stretch"
-DISTRO_ARCH ?= "mipsel"
-
-KERNEL_NAME ?= "4kc-malta"
-
-QEMU_ROOTFS_DEV ?= "sda"
-
-QEMU_ARCH ?= "mipsel"
-QEMU_MACHINE ?= "malta"
-QEMU_CPU ?= "24Kc"
-QEMU_DISK_ARGS ?= "-drive file=##ROOTFS_IMAGE##,format=raw"
-QEMU_KARGS ?= "nokaslr"
diff --git a/scripts/start_vm b/scripts/start_vm
index 71b55f25..321a8c0c 100755
--- a/scripts/start_vm
+++ b/scripts/start_vm
@@ -107,10 +107,7 @@ readonly IMAGE_DIR=$DEPLOY_DIR_IMAGE
readonly ISARROOT="$(dirname "$0")"/..
readonly MACHINE_CONF=$ISARROOT/meta-isar/conf/machine/qemu$ARCH.conf
-eval "$(egrep 'MACHINE_SERIAL' $MACHINE_CONF |bb2sh)"
-
-readonly CONFIG_CONF=$ISARROOT/meta-isar/conf/multiconfig/qemu$ARCH-$DISTRO.conf
-eval "$(egrep 'QEMU_' $CONFIG_CONF |bb2sh)"
+eval "$(egrep 'MACHINE_SERIAL|QEMU_' $MACHINE_CONF |bb2sh)"
eval $(bitbake -e mc:qemu$ARCH-$DISTRO:isar-image-base | grep "^IMAGE_TYPE=")
case "$IMAGE_TYPE" in
--
2.16.4
next prev parent reply other threads:[~2020-01-29 10:30 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-29 10:29 [PATCH v3 00/14] RISC-V support Jan Kiszka
2020-01-29 10:29 ` Jan Kiszka [this message]
2020-01-29 10:29 ` [PATCH v3 02/14] meta: Decouple kernel copy-out from KERNEL_FILE Jan Kiszka
2020-01-29 10:29 ` [PATCH v3 03/14] meta: Add debian-sid-ports distro config Jan Kiszka
2020-01-29 10:29 ` [PATCH v3 04/14] meta: Add RISC-V architecture Jan Kiszka
2020-01-29 10:29 ` [PATCH v3 05/14] meta: Allow cross-compilation for RISC-V Jan Kiszka
2020-01-29 10:29 ` [PATCH v3 06/14] start_vm: Add RISC-V 64-bit support Jan Kiszka
2020-01-29 10:29 ` [PATCH v3 07/14] meta-isar: Add qemuriscv64 virtual target Jan Kiszka
2020-01-29 10:30 ` [PATCH v3 08/14] u-boot-script: Account for variations of kernel files and boot commands Jan Kiszka
2020-01-29 10:30 ` [PATCH v3 09/14] linux-custom: Tune strip rule to cover vmlinux images as well Jan Kiszka
2020-01-29 10:30 ` [PATCH v3 10/14] linux-custom: Add support for RISC-V Jan Kiszka
2020-01-29 10:30 ` [PATCH v3 11/14] linux-modules: " Jan Kiszka
2020-01-29 10:30 ` [PATCH v3 12/14] linux-mainline: Avoid failing UBIFS test when defconfig does not support it Jan Kiszka
2020-01-29 10:30 ` [PATCH v3 13/14] linux-mainline: Update to 5.4.10 Jan Kiszka
2020-01-29 10:30 ` [PATCH v3 14/14] meta-isar: Add HiFive Unleashed board as physical RISC-V target Jan Kiszka
2020-02-12 20:19 ` [PATCH v3 00/14] RISC-V support Baurzhan Ismagulov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=262dc68259cbe86c364a7e68935cc335d6e9cc03.1580293806.git.jan.kiszka@siemens.com \
--to=jan.kiszka@siemens.com \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox