From: Jan Kiszka <jan.kiszka@siemens.com>
To: Henning Schild <henning.schild@siemens.com>
Cc: isar-users <isar-users@googlegroups.com>
Subject: Re: [PATCH v2 06/13] meta-isar: Clean up qemu multiconfigs
Date: Tue, 28 Jan 2020 23:06:12 +0100 [thread overview]
Message-ID: <f387e995-cc70-7b63-49e8-7517d95ea393@siemens.com> (raw)
In-Reply-To: <20200128225152.76cefe74@md1za8fc.ad001.siemens.net>
On 28.01.20 22:51, Henning Schild wrote:
> Not sure i fully get it but this one seems almost independent of the
> risc-v stuff. More like a generic cleanup to be applied before adding
> risc-v. Might be worth factoring out for early merge.
I think this can be freely moved to an earlier position in the queue. I
can try this when sending v3. But it does belong in this context as the
later part of series depends on the cleanup.
Jan
>
> Henning
>
> On Mon, 13 Jan 2020 09:28:11 +0100
> "[ext] Jan Kiszka" <jan.kiszka@siemens.com> wrote:
>
>> 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.
>>
>> 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 ------------ 21 files changed, 69 insertions(+), 208
>> 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"
>
--
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux
next prev parent reply other threads:[~2020-01-28 22:06 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-13 8:28 [PATCH v2 00/13] RISC-V support Jan Kiszka
2020-01-13 8:28 ` [PATCH v2 01/13] meta: Add debian-sid-ports distro config Jan Kiszka
2020-01-13 8:28 ` [PATCH v2 02/13] meta: Add RISC-V architecture Jan Kiszka
2020-01-13 8:28 ` [PATCH v2 03/13] meta: Allow cross-compilation for RISC-V Jan Kiszka
2020-01-13 8:28 ` [PATCH v2 04/13] start_vm: Add RISC-V 64-bit support Jan Kiszka
2020-01-13 8:28 ` [PATCH v2 05/13] meta-isar: Add qemuriscv64 virtual target Jan Kiszka
2020-01-13 8:28 ` [PATCH v2 06/13] meta-isar: Clean up qemu multiconfigs Jan Kiszka
2020-01-28 21:51 ` Henning Schild
2020-01-28 22:06 ` Jan Kiszka [this message]
2020-01-13 8:28 ` [PATCH v2 07/13] u-boot-script: Account for variations of kernel files and boot commands Jan Kiszka
2020-01-13 8:28 ` [PATCH v2 08/13] linux-custom: Tune strip rule to cover vmlinux images as well Jan Kiszka
2020-01-13 8:28 ` [PATCH v2 09/13] linux-custom: Add support for RISC-V Jan Kiszka
2020-01-13 8:28 ` [PATCH v2 10/13] linux-modules: " Jan Kiszka
2020-01-13 8:28 ` [PATCH v2 11/13] linux-mainline: Avoid failing UBIFS test when defconfig does not support it Jan Kiszka
2020-01-13 8:28 ` [PATCH v2 12/13] linux-mainline: Update to 5.4.10 Jan Kiszka
2020-01-13 8:28 ` [PATCH v2 13/13] meta-isar: Add HiFive Unleashed board as physical RISC-V target Jan Kiszka
2020-01-28 11:31 ` [PATCH v2 00/13] RISC-V support Jan Kiszka
2020-01-28 15:51 ` vijai kumar
2020-01-28 16:02 ` Jan Kiszka
2020-01-28 16:09 ` vijai kumar
2020-01-28 19:23 ` vijai kumar
2020-01-28 22:06 ` Jan Kiszka
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=f387e995-cc70-7b63-49e8-7517d95ea393@siemens.com \
--to=jan.kiszka@siemens.com \
--cc=henning.schild@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