From patchwork Fri Mar 3 12:22:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Cassel X-Patchwork-Id: 1751445 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PSnF33v40z23j7 for ; Fri, 3 Mar 2023 23:23:19 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 986594119E; Fri, 3 Mar 2023 12:23:17 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 986594119E X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Py70ISb7EaYn; Fri, 3 Mar 2023 12:23:16 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id D3B15411A3; Fri, 3 Mar 2023 12:23:15 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org D3B15411A3 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 9DD3F1BF239 for ; Fri, 3 Mar 2023 12:23:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 2F54C40242 for ; Fri, 3 Mar 2023 12:23:01 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 2F54C40242 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id H5Nd-CToUiFC for ; Fri, 3 Mar 2023 12:23:00 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 849B94118A Received: from esa6.hgst.iphmx.com (esa6.hgst.iphmx.com [216.71.154.45]) by smtp2.osuosl.org (Postfix) with ESMTPS id 849B94118A for ; Fri, 3 Mar 2023 12:23:00 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.98,230,1673884800"; d="scan'208";a="224726811" Received: from h199-255-45-14.hgst.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 03 Mar 2023 20:22:59 +0800 IronPort-SDR: u+eQNgUt+MQbmWUCIUegZyuHpv5IApi3l/Ynj8H1ZT2vK9BKG9xY0iaWYsbNACGqIRL4GVCixJ xAYcD5e6EUEMYG96o4rQDIvHFZHVubYJtWkA1ZFuJoaXI2jLqQ03NxUTNx1b/EfYiArl1kMXHv 89WSn21c+L/zpEN3C9FiHMy0dzCNd3wP7KyIl5PQg5XArW3PRd4sbJ/T2ihb86x2mp6MUjAs5i RS9q0fYN32TnbXPZYZvVbyu8Kkw/3ZnEra3hgerFpXwtjc9kq3L0Iv4f626wqCZtNkc3vWdL5K M+c= Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 03 Mar 2023 03:39:43 -0800 IronPort-SDR: uimCVxS4Go3CJYm5osa1iBwvxw5IRwb83T5gijt6xX2MuXNn25lcAL6N4mftUW0BjSCnCTP6J4 v6QXAsbW22f1AxBnovFOuaK7x30fvLKqLGF6qJcrNq55QKkOAoZRCpRrqwzhIsl7kQDkNOYOTg roJrLYOj3Siou0tACHsRcG0kHhDgsKzLixOALr1m7e0WTqAvlekUU8jNm+POEoHrKLuSh61xRd oG3+WZvh+SmoMBDcDkTr9gW5n7EjN9SEDC70U4nAg4MpuygSGn2hru7e8x+GX80vtU8pB0YDpV ArY= WDCIronportException: Internal Received: from unknown (HELO x1-carbon.lan) ([10.225.164.35]) by uls-op-cesaip01.wdc.com with ESMTP; 03 Mar 2023 04:22:57 -0800 To: buildroot@buildroot.org Date: Fri, 3 Mar 2023 13:22:49 +0100 Message-Id: <20230303122251.3392998-2-niklas.cassel@wdc.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230303122251.3392998-1-niklas.cassel@wdc.com> References: <20230303122251.3392998-1-niklas.cassel@wdc.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1677846180; x=1709382180; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=/IGWz9rjDG3GnaUH/F2+lwQ43PSqjanCv3Zk02yZzFs=; b=McjCUdjZTn5OaBdn3ePnmohXUE28J15hD/86C/7ufPS5VjOzDO4pC5l6 1Ueu+1853b9F2P04SQ2ZavRYZ+x2+2DIVzo1/sSIG8bliilK/SlC9w6EY gy2Hhw4z7q4x0qpJ2yMyScz+Dha4uZaDCc5ch1AmoTHW/dVt24jt9uhwh zt1rRpcDtdx1mZo1epd0Y+MxAfDxYamqSWM3mhBRod64A+Zihf/K5OgGJ q+3B3hvAWjNFriCRGrg7zOewjtoAsrjPX21KtnCN1Wcht/CeykALKDpKf gGPvmtdD78DXe86EP9CxUfIbjy4p7w5d2/dfdVRP5y1UE/Duu9v7FZKM5 g==; X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key) header.d=wdc.com header.i=@wdc.com header.a=rsa-sha256 header.s=dkim.wdc.com header.b=McjCUdjZ Subject: [Buildroot] [PATCH v2 1/3] board/qemu/aarch64-sbsa: use PARTLABEL to specify root X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Niklas Cassel via buildroot From: Niklas Cassel Reply-To: Niklas Cassel Cc: Niklas Cassel , Romain Naour , =?utf-8?q?Vincent_Stehl=C3=A9?= , Damien Le Moal Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Specifying /dev/sda2 is ambigious, and when booting my arm64 machine this tries to mount the second partition of my ATA drive, instead of the second partition of the USB-stick, simply because the ATA driver is probed earlier than the USB controller driver. To solve this problem, use PARTLABEL=root to specify the root filesystem. This is similar to how it is currently done for board/aarch64-efi/grub.cfg and board/qemu/aarch64-ebbr/grub.cfg. Signed-off-by: Niklas Cassel --- board/qemu/aarch64-sbsa/grub.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/qemu/aarch64-sbsa/grub.cfg b/board/qemu/aarch64-sbsa/grub.cfg index cd486caf4c..39b7842f8f 100644 --- a/board/qemu/aarch64-sbsa/grub.cfg +++ b/board/qemu/aarch64-sbsa/grub.cfg @@ -2,5 +2,5 @@ set default="0" set timeout="5" menuentry "Buildroot" { - linux /Image root=/dev/sda2 rootwait console=ttyAMA0 + linux /Image root=PARTLABEL=root rootwait console=ttyAMA0 } From patchwork Fri Mar 3 12:22:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Cassel X-Patchwork-Id: 1751446 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PSnFH68BPz23j7 for ; Fri, 3 Mar 2023 23:23:31 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 024E841199; Fri, 3 Mar 2023 12:23:30 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 024E841199 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7PFbUf7BgpRE; Fri, 3 Mar 2023 12:23:29 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 45D6F41195; Fri, 3 Mar 2023 12:23:28 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 45D6F41195 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 1BAE81BF239 for ; Fri, 3 Mar 2023 12:23:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 770914118B for ; Fri, 3 Mar 2023 12:23:02 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 770914118B X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id k5MNKPQF_vUz for ; Fri, 3 Mar 2023 12:23:01 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 901FC4118A Received: from esa6.hgst.iphmx.com (esa6.hgst.iphmx.com [216.71.154.45]) by smtp2.osuosl.org (Postfix) with ESMTPS id 901FC4118A for ; Fri, 3 Mar 2023 12:23:01 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.98,230,1673884800"; d="scan'208";a="224726813" Received: from h199-255-45-14.hgst.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 03 Mar 2023 20:23:01 +0800 IronPort-SDR: NaN/v5me1RscMrGttjX+GYmsXHfoG/s8qfwLym+Dsh9CBzKTXwP3gKT9oys1wKNJLuEbkOs6lR gkwoTbVoKyI26YjEM1i7FAgQz96PZU/9/VyXggK0p4l306caxitCJo1dO545VNjVX1+LGe2hh/ sRWBZkT71LVXDOngf1YpsrbrjOaf8pzaT7h//sA0C4eIRacP5FL1WaUj7hOUG1HPZqeVH6oyuF F35R8Z6RueJuXqyLufkTOuQ2+8V2T1c1vjZMH4jq4BW0EN+dgjX7UMbiFk0mt0styisYQYOVG6 5GA= Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 03 Mar 2023 03:39:45 -0800 IronPort-SDR: yV9CMlhIbCjkCa0n3FHYBK3Lz1YH70ORzfogF1aVvl/NQTeCah2Oi4sMzOOCWH/TqJxhFbouku KQ2xCcyIc2ZxMAXFUNOAjroY1cvMJzZNQmUzIgdnOdS77XHg0+XpFE+JekI5JL6yRC1ABMxswf nb4+Z8cGL0cs8ZgHbdKbl+HFiha2ymGQy6fFgEFZeMukNd3J1Hxdvo7/GBtVyT74PdI9Sha0ra vcriym/shuuuke3yfVHF1NrWG6Bnp75U9nqJZmj0Xc+hXWydz9Rg5JXSwHpWfvtfJW804+V0WC IMQ= WDCIronportException: Internal Received: from unknown (HELO x1-carbon.lan) ([10.225.164.35]) by uls-op-cesaip01.wdc.com with ESMTP; 03 Mar 2023 04:22:59 -0800 To: buildroot@buildroot.org Date: Fri, 3 Mar 2023 13:22:50 +0100 Message-Id: <20230303122251.3392998-3-niklas.cassel@wdc.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230303122251.3392998-1-niklas.cassel@wdc.com> References: <20230303122251.3392998-1-niklas.cassel@wdc.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1677846181; x=1709382181; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=3/4hqsEqII86Q5yPAfSYzh8AyXUQOHb8FHL2kMQkJTo=; b=VXnQ3uVLX47e+la0mzSDeOpOJgdajjxEKguVkEJxAbmUa7UpnIUGATFX ASYIXOIfbX8zBC1cQl9u2R3Dz0rsH0AWU/n1bPNoUbqKc9nCRgopvrnEo +YBP+fYZF+DC+C88yTpnzEVtUplxyz3krxnHlOW4RNDxO5Z65CWy2zBZw 3Yt/ZWOjIg8v8rkjr4DYgNwXBoM4dau2tXMCmClCw/pV5A+v/L8HRfMj2 iZGtOp6wt8KxRjEv4uqNVRg85PJbdQejr8u0WLL9+WBjh0R9hDcAQzN+h czSFqklcV4eqy0CKrq62xVlCiyJOcAsNRVXl1+ZBM3Mzr4LpLUK16gnOx Q==; X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key) header.d=wdc.com header.i=@wdc.com header.a=rsa-sha256 header.s=dkim.wdc.com header.b=VXnQ3uVL Subject: [Buildroot] [PATCH v2 2/3] board/qemu/aarch64-sbsa: use the default console specified by ACPI X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Niklas Cassel via buildroot From: Niklas Cassel Reply-To: Niklas Cassel Cc: Niklas Cassel , Romain Naour , =?utf-8?q?Vincent_Stehl=C3=A9?= , Damien Le Moal Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" ARM SBBR (Server Base Boot Requirements) defines SPCR (Serial Port Console Redirection Table) as a mandatory ACPI table that specifies the configuration of a serial console. In the linux kernel, ARM developers have decided that consoles defined by SPCR are always enabled when existing, see e.g.: https://lore.kernel.org/linux-serial/20200430161438.17640-1-alpernebiyasak@gmail.com/T/ Specifying console=ttyAMA0 (which is a serial console) is thus redundant for an ARM SBSA board. (It also blindly assumes that the serial console is on ttyAMA0, which might not be true.) Drop the explicit console=ttyAMA0 on the kernel command line, such that the kernel can pick up the default console defined by SPCR. This is similar to how it is currently done for board/aarch64-efi/grub.cfg. Signed-off-by: Niklas Cassel --- board/qemu/aarch64-sbsa/grub.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/qemu/aarch64-sbsa/grub.cfg b/board/qemu/aarch64-sbsa/grub.cfg index 39b7842f8f..d99e19c4cd 100644 --- a/board/qemu/aarch64-sbsa/grub.cfg +++ b/board/qemu/aarch64-sbsa/grub.cfg @@ -2,5 +2,5 @@ set default="0" set timeout="5" menuentry "Buildroot" { - linux /Image root=PARTLABEL=root rootwait console=ttyAMA0 + linux /Image root=PARTLABEL=root rootwait } From patchwork Fri Mar 3 12:22:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Cassel X-Patchwork-Id: 1751447 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PSnFX2MHWz23j7 for ; Fri, 3 Mar 2023 23:23:44 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 93AEA4118C; Fri, 3 Mar 2023 12:23:42 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 93AEA4118C X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZU2oS8C5NyWc; Fri, 3 Mar 2023 12:23:41 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 8ED14411AB; Fri, 3 Mar 2023 12:23:40 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 8ED14411AB X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id C96371BF239 for ; Fri, 3 Mar 2023 12:23:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 9D8F54118D for ; Fri, 3 Mar 2023 12:23:04 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 9D8F54118D X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aADYBH-cwfHk for ; Fri, 3 Mar 2023 12:23:03 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org B511F4118B Received: from esa6.hgst.iphmx.com (esa6.hgst.iphmx.com [216.71.154.45]) by smtp2.osuosl.org (Postfix) with ESMTPS id B511F4118B for ; Fri, 3 Mar 2023 12:23:03 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.98,230,1673884800"; d="scan'208";a="224726816" Received: from h199-255-45-14.hgst.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 03 Mar 2023 20:23:03 +0800 IronPort-SDR: fO9R1Tmxk3+20TFC+l7NO9Z4LDKwOYFO/KiT1PNAcrCkDS0xuXOslfePbcafC6OqKFwG3re88+ ciD9nuwqyo32ZDtP3sF5RduUvG+EARPzjIdvV+6oo9n+8Y4YMUFBBDh7fphh82AQPezf/P7vFq yVkETZ8/GioeGvDryKTJzeNu4YQcAEe5zYho/GX356nESkTLRJdM2If9pvDXpI32IvlkihZJtf X5trXhqxRO2wigaJ77RsDlyD7Rs7f6rOyn2vjwBbV7J1puEbOsIYQLd0FXEC+thW8ZsemB4ULX v+M= Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 03 Mar 2023 03:39:47 -0800 IronPort-SDR: RAApmnpD397kYSs33sPIsz13zxvyeZnTjiq5raxORixwxGORv67hEdsTjmOWeks6Bf+rUfbvDp 5eZIkZNjvOU2NhP0Gyk40mZaQaxA+6dx9/tQ4NexGJbiveJ1ocqLMPrAblGOKts7HzP5lk//uG pRRT4YEy0KAS8I3sxNoPw1XeqDqozzKlE+d8u2VgpyTNZgKXi33kwZAmKPpMpOafCqShdbwg5s HGzvYETp6klx7Ohoi8bvEJyKnobXfdTNO1ISp5ZYmjyKu6z8NQ0C9zd4Mpk1rI6GiDZYSv/eCV JJ8= WDCIronportException: Internal Received: from unknown (HELO x1-carbon.lan) ([10.225.164.35]) by uls-op-cesaip01.wdc.com with ESMTP; 03 Mar 2023 04:23:02 -0800 To: buildroot@buildroot.org Date: Fri, 3 Mar 2023 13:22:51 +0100 Message-Id: <20230303122251.3392998-4-niklas.cassel@wdc.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230303122251.3392998-1-niklas.cassel@wdc.com> References: <20230303122251.3392998-1-niklas.cassel@wdc.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1677846183; x=1709382183; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=2zvSJKeT/kMiRvBsG02WpL6IDfz+8S4fxxoCMLW9u4U=; b=V0Nj766pdDvYBPkGUTW/4FUqc4xVSpoEcgOL81NYAtGtRzicqE4TNv/t mk2+UT1deoPlLMaLVMcO/OdJHJjgt0NNI5Ctr5RX9E32IT95NfIsnti3v KjM8NIDVO8oNASooamBEoCSEm5bnJwavE9PjGDiiGCBVJG7iBu6FLL/4t i5Egg9tjyRBNd/qUKLnQuybBXaZ/y0H8xU04aahKuSoPH9w2XFI1eD1Cj upCtghbRTQRHyAvuIGkteufxINXOriqAoM/3/Hcpms+wVrEJkf75KkXUq TaHyULpzqL9xfWJxdE8wkX14MJ5g5vOxY/5sh0bNmOM5b/Se7sToqAZ5T w==; X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key) header.d=wdc.com header.i=@wdc.com header.a=rsa-sha256 header.s=dkim.wdc.com header.b=V0Nj766p Subject: [Buildroot] [PATCH v2 3/3] support/testing: use the arch default kernel config in test_edk2.py X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Niklas Cassel via buildroot From: Niklas Cassel Reply-To: Niklas Cassel Cc: Niklas Cassel , Romain Naour , =?utf-8?q?Vincent_Stehl=C3=A9?= , Damien Le Moal Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" The kernel config board/qemu/aarch64-sbsa/linux.config has never been in use by qemu_aarch64_sbsa_defconfig, neither via BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE, nor via BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES. test_edk2.py is using the kernel config board/qemu/aarch64-sbsa/linux.config. However, storing a kernel config that is not used by qemu_aarch64_sbsa_defconfig, in a directory that is "owned" by qemu_aarch64_sbsa_defconfig, is bound to cause confusion. If test_edk2.py really wants to use its own kernel config, that kernel config should be defined in support/testing/tests/boot/test_edk2.py, or should be stored somewhere under support/testing/tests/boot. Since test_edk2.py is already reusing some scripts stored in board/qemu/aarch64-sbsa (which is "owned" by qemu_aarch64_sbsa_defconfig), the most sensible thing is to let test_edk2.py use the same kernel config as qemu_aarch64_sbsa_defconfig (which is the arch default kernel config). Therefore, use the arch default kernel config in test_edk2.py and drop the out of place kernel config. Signed-off-by: Niklas Cassel --- board/qemu/aarch64-sbsa/linux.config | 68 ------------------------- support/testing/tests/boot/test_edk2.py | 7 +-- 2 files changed, 4 insertions(+), 71 deletions(-) delete mode 100644 board/qemu/aarch64-sbsa/linux.config diff --git a/board/qemu/aarch64-sbsa/linux.config b/board/qemu/aarch64-sbsa/linux.config deleted file mode 100644 index a60cce02ec..0000000000 --- a/board/qemu/aarch64-sbsa/linux.config +++ /dev/null @@ -1,68 +0,0 @@ -CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y -CONFIG_NO_HZ_IDLE=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_TASKSTATS=y -CONFIG_SCHED_AUTOGROUP=y -CONFIG_PROFILING=y -CONFIG_ARCH_VEXPRESS=y -CONFIG_COMPAT=y -CONFIG_FW_CFG_SYSFS=y -CONFIG_FW_CFG_SYSFS_CMDLINE=y -CONFIG_ACPI=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_BLK_DEV_BSGLIB=y -CONFIG_BINFMT_MISC=y -CONFIG_TRANSPARENT_HUGEPAGE=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_PACKET_DIAG=y -CONFIG_UNIX=y -CONFIG_NET_KEY=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_BRIDGE=m -CONFIG_NET_SCHED=y -CONFIG_VSOCKETS=y -CONFIG_PCI=y -CONFIG_PCI_HOST_GENERIC=y -CONFIG_DEVTMPFS=y -CONFIG_DEVTMPFS_MOUNT=y -CONFIG_VIRTIO_BLK=y -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_SG=y -CONFIG_SCSI_CONSTANTS=y -CONFIG_SCSI_LOGGING=y -CONFIG_SCSI_SCAN_ASYNC=y -CONFIG_SCSI_VIRTIO=y -CONFIG_ATA=y -CONFIG_SATA_AHCI_PLATFORM=y -CONFIG_NETDEVICES=y -CONFIG_DUMMY=y -CONFIG_MACVLAN=y -CONFIG_VIRTIO_NET=y -CONFIG_NLMON=y -CONFIG_SERIAL_AMBA_PL011=y -CONFIG_SERIAL_AMBA_PL011_CONSOLE=y -CONFIG_VIRTIO_CONSOLE=y -CONFIG_HW_RANDOM=y -CONFIG_HW_RANDOM_VIRTIO=y -CONFIG_TCG_TPM=y -CONFIG_TCG_TIS=y -CONFIG_DRM=y -CONFIG_DRM_VIRTIO_GPU=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_PL031=y -CONFIG_VIRTIO_PCI=y -CONFIG_VIRTIO_MMIO=y -CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y -CONFIG_MAILBOX=y -CONFIG_PL320_MBOX=y -CONFIG_ARM_SMMU_V3=y -CONFIG_EXT4_FS=y -CONFIG_FUSE_FS=y -CONFIG_VIRTIO_FS=y -CONFIG_TMPFS=y -CONFIG_TMPFS_POSIX_ACL=y diff --git a/support/testing/tests/boot/test_edk2.py b/support/testing/tests/boot/test_edk2.py index c1be8fad95..efc4fc9ebb 100644 --- a/support/testing/tests/boot/test_edk2.py +++ b/support/testing/tests/boot/test_edk2.py @@ -12,13 +12,14 @@ class TestEdk2(infra.basetest.BRTest): BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set + BR2_TARGET_ROOTFS_EXT2_SIZE="128M" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/aarch64-sbsa/assemble-flash-images support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/qemu/aarch64-sbsa/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y - BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.34" - BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y - BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-sbsa/linux.config" + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" + BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_EDK2=y BR2_TARGET_EDK2_PLATFORM_QEMU_SBSA=y BR2_TARGET_GRUB2=y