| Message ID | fa83e565-8950-4ca7-837b-1c513a119bfa@siemens.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [isar-cip-core] qemu-arm/arm64/riscv64: Switch to cip_merged_defconfig | expand |
On 30.10.24 14:20, Jan Kiszka wrote: > From: Jan Kiszka <jan.kiszka@siemens.com> > > This allows to pick up all common features someone brings into the > merged config, like we already do for qemu-amd64. > > Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> > --- > > This is actually a so far missed pre-condition for the EROFS changes in > https://lore.kernel.org/cip-dev/cover.1730289107.git.jan.kiszka@siemens.com > > conf/machine/qemu-arm.conf | 2 +- Grrr, too early for this arch at least, we are missing some more switches in the merged config. Quirin is checking this again. Jan > conf/machine/qemu-arm64.conf | 2 +- > conf/machine/qemu-riscv64.conf | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/conf/machine/qemu-arm.conf b/conf/machine/qemu-arm.conf > index d2dd81f4..17c08832 100644 > --- a/conf/machine/qemu-arm.conf > +++ b/conf/machine/qemu-arm.conf > @@ -11,7 +11,7 @@ DISTRO_ARCH = "armhf" > > IMAGE_FSTYPES ?= "ext4" > USE_CIP_KERNEL_CONFIG = "1" > -KERNEL_DEFCONFIG ?= "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm/qemu_arm_defconfig" > +KERNEL_DEFCONFIG ?= "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm/cip_merged_defconfig" > > # watchdog is not yet supported in our QEMU executor for this platform, disable it > WDOG_TIMEOUT = "0" > diff --git a/conf/machine/qemu-arm64.conf b/conf/machine/qemu-arm64.conf > index 7acf1079..a2c5e53e 100644 > --- a/conf/machine/qemu-arm64.conf > +++ b/conf/machine/qemu-arm64.conf > @@ -10,7 +10,7 @@ DISTRO_ARCH = "arm64" > > IMAGE_FSTYPES ?= "ext4" > USE_CIP_KERNEL_CONFIG = "1" > -KERNEL_DEFCONFIG ?= "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm64/qemu_arm64_defconfig" > +KERNEL_DEFCONFIG ?= "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm64/cip_merged_defconfig" > > # watchdog is not yet supported in our QEMU executor for this platform, disable it > WDOG_TIMEOUT = "0" > diff --git a/conf/machine/qemu-riscv64.conf b/conf/machine/qemu-riscv64.conf > index 02bb60a0..36d6d943 100644 > --- a/conf/machine/qemu-riscv64.conf > +++ b/conf/machine/qemu-riscv64.conf > @@ -14,7 +14,7 @@ DISTRO_ARCH = "riscv64" > IMAGE_FSTYPES ?= "ext4" > USE_CIP_KERNEL_CONFIG = "1" > > -KERNEL_DEFCONFIG ?= "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/riscv/qemu_riscv64_defconfig" > +KERNEL_DEFCONFIG ?= "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/riscv/cip_merged_defconfig" > > # watchdog is not yet supported in our QEMU executor for this platform, disable it > WDOG_TIMEOUT = "0"
diff --git a/conf/machine/qemu-arm.conf b/conf/machine/qemu-arm.conf index d2dd81f4..17c08832 100644 --- a/conf/machine/qemu-arm.conf +++ b/conf/machine/qemu-arm.conf @@ -11,7 +11,7 @@ DISTRO_ARCH = "armhf" IMAGE_FSTYPES ?= "ext4" USE_CIP_KERNEL_CONFIG = "1" -KERNEL_DEFCONFIG ?= "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm/qemu_arm_defconfig" +KERNEL_DEFCONFIG ?= "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm/cip_merged_defconfig" # watchdog is not yet supported in our QEMU executor for this platform, disable it WDOG_TIMEOUT = "0" diff --git a/conf/machine/qemu-arm64.conf b/conf/machine/qemu-arm64.conf index 7acf1079..a2c5e53e 100644 --- a/conf/machine/qemu-arm64.conf +++ b/conf/machine/qemu-arm64.conf @@ -10,7 +10,7 @@ DISTRO_ARCH = "arm64" IMAGE_FSTYPES ?= "ext4" USE_CIP_KERNEL_CONFIG = "1" -KERNEL_DEFCONFIG ?= "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm64/qemu_arm64_defconfig" +KERNEL_DEFCONFIG ?= "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm64/cip_merged_defconfig" # watchdog is not yet supported in our QEMU executor for this platform, disable it WDOG_TIMEOUT = "0" diff --git a/conf/machine/qemu-riscv64.conf b/conf/machine/qemu-riscv64.conf index 02bb60a0..36d6d943 100644 --- a/conf/machine/qemu-riscv64.conf +++ b/conf/machine/qemu-riscv64.conf @@ -14,7 +14,7 @@ DISTRO_ARCH = "riscv64" IMAGE_FSTYPES ?= "ext4" USE_CIP_KERNEL_CONFIG = "1" -KERNEL_DEFCONFIG ?= "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/riscv/qemu_riscv64_defconfig" +KERNEL_DEFCONFIG ?= "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/riscv/cip_merged_defconfig" # watchdog is not yet supported in our QEMU executor for this platform, disable it WDOG_TIMEOUT = "0"