From patchwork Wed Oct 30 13:20:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 13856510 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6DAF6D5CCAD for ; Wed, 30 Oct 2024 13:25:34 +0000 (UTC) Received: from EUR03-AM7-obe.outbound.protection.outlook.com (EUR03-AM7-obe.outbound.protection.outlook.com [40.107.105.65]) by mx.groups.io with SMTP id smtpd.web10.14694.1730294456988488729 for ; Wed, 30 Oct 2024 06:20:57 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@siemens.com header.s=selector2 header.b=qSQHMnQD; spf=pass (domain: siemens.com, ip: 40.107.105.65, mailfrom: jan.kiszka@siemens.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=d3qv812WF/x4O/vzX5VsPWA8gurPGeesT/Vm7GxJu40tQkFjcb9sUefTzEaAetoAmGR4kxm5TBG06YUDpYSlPEcsphOZMnZ60bn9bnl6HH4QA68blALP9qjYwRGL2JdKYaYY1emm9k7W+RESE5I4FRz+8cn6MRAUOwR4p+E1wvcSPmNIr1UB2qc53Ttmk85B14FXFNjOa9ww3XUpQZ0tQ8PoPVUdUW6VDJlvnAz2Tm+TT838RmSe1ixknnaURehzOtkBIZQriZGI+hp9pfOjc4dtD8l5x+l/L5KO7sWFj72BAbR3OyT6ks0toQbR2CkGvGVrePPBiAx2z/HAA+Ykbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=/KZnGI+KrTw1HT2aRewcIs2H+dskpgXN4bM8AS+ISB8=; b=g7bhLbHfv7p6RddgfJ6LL6U4rD0+ebuXojYXU9Bxn0mEH2PbxNMHf+2rwqTeb9wufjXGAayoycXgsK9xxuQ5J6H8TVAcb2ilNY00xVOp8pcyMOCwgkGQ8VS0RP/GDJgQ23cPkTWVtDTgYOaZPexa3PkR1iy+52v3gWX/PVUDlqpS89EV4k0xnugtGpogrBqeQ99pVd3WYjOy2hzcRXTasbt1R506seQYQ6HWwKcJNLbAtZDfPB7abuFe0zZcMYnf8raLP9NWI9c4CxctBd8kfPv8xi4H0BCTcH66XvR/pvWTOk3I+/Oj9dpSZQCQixzZKjgKQmb0yKZLkCkQhucMAQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/KZnGI+KrTw1HT2aRewcIs2H+dskpgXN4bM8AS+ISB8=; b=qSQHMnQDmNv1mGEaEZZaVQdQsH7xWr64KAVnKOf1eCGdUBiEBNys5myrYc/JFBvrd5Mk3s0uIGCPBUHHovo4By9rIGP9CB3EYbsQuIh2nbVdxfHWVR/3NIgbg8OIefAnvYVi8EI/bt2S0W/HBHE+tN/C4dysmWi8AkBXT1+aKao//Q+/oSX169X1KoUHAwcoKtf9V6v1jD1kaWZajSr8WTDwEo3VfNcYsuafvfPvlZxsIcQGdC5+rRznkk7jBovpPk3V+/pg52Jmzi2HFWBZBVMNYKv79q6EiXCGJ5ScBy9yGY05wdkUJYFaT1ZAG00Nokk9egD0bl/zuyHuzi/COQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) by GV2PR10MB6383.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:150:b3::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8093.18; Wed, 30 Oct 2024 13:20:53 +0000 Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::8fe1:7e71:cf4a:7408]) by AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::8fe1:7e71:cf4a:7408%3]) with mapi id 15.20.8114.015; Wed, 30 Oct 2024 13:20:53 +0000 Message-ID: Date: Wed, 30 Oct 2024 14:20:51 +0100 User-Agent: Mozilla Thunderbird From: Jan Kiszka To: cip-dev Subject: [isar-cip-core][PATCH] qemu-arm/arm64/riscv64: Switch to cip_merged_defconfig Content-Language: en-US Autocrypt: addr=jan.kiszka@siemens.com; keydata= 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 X-ClientProxiedBy: FR4P281CA0185.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:ca::18) To AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR10MB6181:EE_|GV2PR10MB6383:EE_ X-MS-Office365-Filtering-Correlation-Id: 4e91063a-f439-4e35-25e8-08dcf8e5ae12 X-MS-Exchange-AtpMessageProperties: SA X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?2WFrRjaTnlw7xor8It19EgPJQNbgYIN?= =?utf-8?q?TOXj+WF51N5D+PdrGy8qvGd5EGELiKlhkTniI6Hm785y25V/rf1d1DYc1o76GzBUq?= =?utf-8?q?KK6+7+JHO9qd46CPNXnXp7AvCsd+VxIICiLhlWp0wXOjVDth9RdXVterwoyXyE4Cb?= =?utf-8?q?b2lwSTYnZO1nAOLTish44eB9dYBoX7i61hGWGb5OJMIiWSEkKn6t9jkr7UpSosOer?= =?utf-8?q?5hL16cKR2kYfqMiGKMUG7Leo5UiGKOU1ukASYMEyObRe4u9+yiLH+MdGYHyqQHYPW?= =?utf-8?q?SdHtOC7kQmG1QzhQjdxGAlWbA+26iHHDqIqp7r6nQRztpfdJ6Z0xfcd2d/N1awh/k?= =?utf-8?q?txfnPWkwaAroIlfLSW554siLEexhjV2e3E6UUeXTFMkWSkx46nCJHEJ/mQwexa45E?= =?utf-8?q?hTMfmR6SXtbesh6aK4o5/Pif53FMplJl0p3evSWPZRa24lSEH6PDSaFsbyqNEiScU?= =?utf-8?q?wfAsw+307fQzsKVsBlfWzV6qjnxqyeeI1qhkoY7AwMFKoGPgzlbHd+38mlOzjhupN?= =?utf-8?q?U1odZyqXQvaKRTY2zGjES68zA+5q2tJDiSEeB61CJ9sGpXMhhSitM6tU7Vnsnlt7+?= =?utf-8?q?M8jDo6buYB3St3wtLnTbxNK3isqrCpKtolhxcq/HWxVlAD9OHijINW5e/jblNuNoR?= =?utf-8?q?XRgnyAeO+8kSrIRjxpi3pSUgMxN0jo3jF9nC7HAt/nZATNbif46OQ1KN+dG3O0IYI?= =?utf-8?q?cD78kS4ojZi3cksC22B1AodCl1xX1Vja7QRVhYNLz+aIrcd4dGCIqFyd5smbtekNi?= =?utf-8?q?OQak/4IPdjwbo8LVW++UHJ7x1Y2etU3gILmj8GOYL9kxJh2BYpnvj9KpvofdeNxpK?= =?utf-8?q?soWW3FfMnfg+6uG/JtRfV4dgtmgetDT/hnY12m+PF4g3xNJO/Lii29uoCtoLfj8Fp?= =?utf-8?q?ukRKPfQjR0reVlYLWr5vj8U491oXA1biLbTWZ22V7HttxSb3dIdShhrxpWchLrmYg?= =?utf-8?q?fvG1LNbnLYEvG3XwtFnp/yOpAz7Jn1iyFh66inLMh9OIQgwscTka81t5H3pVPo2Z3?= =?utf-8?q?JhAtt4Lqaqp9NJqoFubE8CarKiMn+OUgWMl7iraA2RSyTRlH1CYOV5nZFyRFXEkjf?= =?utf-8?q?L+cyS8Q2eS9ulvKM/pFez6FWYb++QoMYmxPVvszYAB0mRYDrUHdjxIZQsHiJr8Z1i?= =?utf-8?q?i3j8pCopfoq/FcC5LSYHvTfX6uoq/vvM7SiINzGrcqR9hhtX7ub/N6ep0lbwXLRl2?= =?utf-8?q?i7avNjUadRh0F2gmeU/vqu+Gef4R92bvl682SaoohJXzKe6ZKIH1DBugyOnqeMO7w?= =?utf-8?q?Czw1QtTfuvaHE?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?arKbN4QF7jNclSBlZozcpRUvyEiA?= =?utf-8?q?YeUt10OezAoYZrGQKUlsix6fUj0KM8Ha/wHhoT0xiskRXJBCVGa9q5A1Vh9nQtQW+?= =?utf-8?q?v/Zu6UNF+G+ch8IWVJWcimZQ4tcL+Q/54ba7WzQouKrxK3HROJ4EMiw0Ui7Em1YaA?= =?utf-8?q?2v670YIBmNtvwA0W1Gb2s6/KuylFG26XUURxZv28Y4fOcacm8R7Di8+t+AtjzGsdj?= =?utf-8?q?G+YadRM7G0+Xu3RbvHxnObacrSQcNki66rqAWMbdpZBenA3NvEElOotulQx07n4cH?= =?utf-8?q?QliMU2ihHHVQZlIFeF6M6PCdcIBNqeA2HJdBGikJGpc9lGzG4fRyCx0o33u3GyE2q?= =?utf-8?q?Aq40yInRpcxx6ZnpnQhXL7g3M/ztXcUFo4bGKtQ2QHkVF0X+FMgLZqN8sfU+JXAFV?= =?utf-8?q?vG1/2741kAE4B+eK0oeKOv/6ycvfVC2gwAr+hSDVkvDpeZjxfcvtEZefMnFIpEwg5?= =?utf-8?q?qr/oZQNBhMKbNSrXk7i6Q5nLVWHttp8WAQkLnI/7dtg3lCEiYHDLR8TIRwOlkjQxQ?= =?utf-8?q?XCUdjBkf85Pd4X946nW58qw2FLF0V9Q6GPfJBsf6M5GlMIbgaUiN1NQmvTT0WfGZU?= =?utf-8?q?FrksPnVAGi5PIGPFrBoes1sXgf3QvB0j2d0L0eh0PKaDOrxRT1FvoZ83BrjtguZJW?= =?utf-8?q?5mETdNwzICjEj7Gpz/wvrrT+7FiEzLquOtnno4MWI73HQVSnLH3shW9FDfgKxJlVt?= =?utf-8?q?YodBKg5Rx2x2mllX9aPr7HRi3SMsEOwNyftpvvrzhA9oi+Y0rQmIRje9Q2OBlZj3J?= =?utf-8?q?Kc7B7KQWamFupsZUiJCDmHSS51eLnpVcZOvxUJw9C8y2FLLmWrrr8luGxA00RxQCx?= =?utf-8?q?ZC3CLK3g2olNu8X8n1bxlGsMKEjP+xEl1VaS29uojvk/aRA+I4nhnfkNvAoHUC9GP?= =?utf-8?q?ZRtS+sj5+1OUSxgAZlCvnyXw74yel4opyln8I0aHA4atSgVwHqMK8robp0Frs3u0Y?= =?utf-8?q?05ZkJ9/0gnOrKbtztZluIUYEUd0Alv5WFqAL6Mm214SSDoJs4Cv8dhoY1ISoNWr4/?= =?utf-8?q?U0atbl/tmhhciYrZpA7JwOmQV+wWoPzwG0NpHW2tv5FHed+hLMBTbqC1ukCSJ1HqR?= =?utf-8?q?iy6+fHCr2M6oJIqMrsP7RxG/lFF3e9V56MNr6qvNK2srJiAH9o9mr+0UZ4y6XNDf7?= =?utf-8?q?iDGN1wakss0b+7MDd9gUPNJ2i+OIjpEu3wfOYSUNc5HEGfVc2k6jPy5PxZe+zCKXO?= =?utf-8?q?MLBpqI9s7IiS/cbWzwKEtfaTcczGxJhgtbs2MwJrBUJr0421d+fHQ5xQcZbJ479ii?= =?utf-8?q?JXYgnQUdHfWkdxfLzZKnl0gwsRZyoQghTNZdnkmss5W5b2MDl9ekabGPx6wTBsVHI?= =?utf-8?q?FcpWZi3V84yhQNBTuaG0Ym1mnh6kBLSreUkHBrchTsQXi/s4702p/3D3fiMCrWVOu?= =?utf-8?q?cocmc63yyfL2WLhwly7ouGhKOWLejVkmdX6PEP2snReYu7bLsBC9KuRpbrezvsqmu?= =?utf-8?q?M0w4etgeohPSBv2a/ILwOyzPqITs06f+ANRJNcAYb7aMt/+3bR0EFphhgfsWMDL+E?= =?utf-8?q?xpBO4Cc388wY?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4e91063a-f439-4e35-25e8-08dcf8e5ae12 X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Oct 2024 13:20:53.3261 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: I9NK9aaXwoleyogH5y1VXzrYiurFn+9uOIEJ0geyLuhoGWuAFKHALp1Uv6oCk3F+n8OfHN8M5wR7/8KYBZAlPA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2PR10MB6383 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 30 Oct 2024 13:25:34 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/17121 From: Jan Kiszka 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 --- 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 +- 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"