From patchwork Fri Oct 20 11:42:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Neal Frager X-Patchwork-Id: 1852493 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::136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SBjPz3vHPz23jM for ; Fri, 20 Oct 2023 22:43:03 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 3185B607DE; Fri, 20 Oct 2023 11:43:01 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 3185B607DE X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6X59F0ZCBI4f; Fri, 20 Oct 2023 11:42:58 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id AF3736113B; Fri, 20 Oct 2023 11:42:57 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org AF3736113B X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 8E4281BF3A9 for ; Fri, 20 Oct 2023 11:42:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 73360848F8 for ; Fri, 20 Oct 2023 11:42:56 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 73360848F8 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CnRsvH3MTxJB for ; Fri, 20 Oct 2023 11:42:53 +0000 (UTC) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on20626.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e8d::626]) by smtp1.osuosl.org (Postfix) with ESMTPS id E7690848F7 for ; Fri, 20 Oct 2023 11:42:52 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org E7690848F7 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UgyS1MCZNWiO7f78GLcZbORXIIr5NivSoMwZGiG5lHZzgWrAETdg+HwHuiVPWLd5QHCMjru2T9oJPWNCkQ+tQ4J+XT95gcQZ8Ygvc5QU0cepulW9+pqJejTVpFTjLq2G+2ts3COeVLSbJHwkBuUI+JFIkd/D2bB0XeSdWHy+EEGKXTBqDyLVjj8qX86fXlFs1ioflLKTfayjXsCOADaBxvKl8uhM1PwcsJqgnioVDR7dk+5AVDnNCEXs/JWpSEkrOHFR6uFIQ3n0rAsV+1P0aHrvY1RAquQICmtJaGSoVd5N5AkCAOM0AsXGYEuMlG6rbem65O4C4BvRJebcMUBOVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=hFONIDu9sj+uXMo7rrGke+YKl+6Jz8ggXuS0/RJrSAw=; b=KKay8iImjYsGAR63iMjWUt7qJ6BQVRIs/CqOIXdlFwqvzIXV5PrtX9K63z8Qr3Yku3N32S1Anc1/0cnFZuhLBB8prAW8eGN4KrzIhrQXe1GxWka1hi28V9ICsoKjiXh5AfD6w1lP7xhkG3xVuZQZ7jq2ycQolv3m0TeGL/DyqJWeuvT12MpwbUYKaO9qbWHMcWr9zcDoR1ljjfJY70kGFQsTBz9eue754/6SjmOpKX4cz4pztUh3FrjhqXj/LxTBQzOTPKG1VDOd/2BhydSmKxbIy4gqK+PkPMcajVbwRMqfzSLxm8Bi+GSz1Y5nh1OBNTIR63W46jfhQoqdkRePag== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=buildroot.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none Received: from DS7PR03CA0287.namprd03.prod.outlook.com (2603:10b6:5:3ad::22) by PH7PR12MB7115.namprd12.prod.outlook.com (2603:10b6:510:1ee::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.26; Fri, 20 Oct 2023 11:42:47 +0000 Received: from CY4PEPF0000EE37.namprd05.prod.outlook.com (2603:10b6:5:3ad:cafe::e2) by DS7PR03CA0287.outlook.office365.com (2603:10b6:5:3ad::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.25 via Frontend Transport; Fri, 20 Oct 2023 11:42:47 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB03.amd.com; pr=C Received: from SATLEXMB03.amd.com (165.204.84.17) by CY4PEPF0000EE37.mail.protection.outlook.com (10.167.242.43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6838.22 via Frontend Transport; Fri, 20 Oct 2023 11:42:47 +0000 Received: from SATLEXMB05.amd.com (10.181.40.146) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Fri, 20 Oct 2023 06:42:46 -0500 Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB05.amd.com (10.181.40.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Fri, 20 Oct 2023 06:42:46 -0500 Received: from xirengwts09.xilinx.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.27 via Frontend Transport; Fri, 20 Oct 2023 06:42:44 -0500 To: Date: Fri, 20 Oct 2023 12:42:27 +0100 Message-ID: <20231020114236.4129636-1-neal.frager@amd.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EE37:EE_|PH7PR12MB7115:EE_ X-MS-Office365-Filtering-Correlation-Id: 621bf2dc-c32e-4855-ee9d-08dbd161aeaa X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AaFpzGE8aV1KPjL3zn7NilftCScKpKhvEj8Vd/FWbLENbDXe6Jvo4xHAmEzD9sJnwAnKqCyHKsIDs97h6/bHWM3NH90CUAEwXjWxLt/6r7ikf8EtQlUzMQSUOfSNlQ0omPN6rPSX/hVuRmqQYkkQaeE6gpD1HkN7tF6DtlkLUnSy/fPzmFjK6UA3bu+GxyDOlsOaup4l9rMBL6ZArhrRxcdUAEfDVdVZ3ATuiHRy71YiiSvnQy/6bvcXbh3SmvEgqSOKGLf0iaKTJfsUHGKgiDYq9K6F6aZ1oAN1U9JXKTaQtxpjGesAcHPjUbbg3SewOA7ewMDJYhaaQyF6tQQSkEh3KNOuyrZxSgjQM6po8F4SGtn0OzV/H7x5ouMpMAsPDEh55YxLMJ+NCSGOxjlTJHDJzPzhpkQR/sTrzeFMRnH7jzN6Qi0UVJkqVmR03rhA8QvsCOmdDDUl61yEKi+yOSF1j3iZgAyQrhlbVf1CGN8Tetop0ZOhlxDPYLHLSFGDI2UKyhr9JQcdOhPbspTFrL4zpK7rbdbqpN3a1ja2FbX5DbsZbb98Xk5jKqGaXhVxt0bvyzTU6wEbZtwgIPTV9Pqz5We9lpHAnxF4b7dsJy9Cd5qFIupfxsCXSZt0u6AEMeqe9ROhGR7Ev3LL54/pYc9VkzEU7CM4hK6HfrH9FiRVzRlX9hTiswJnIWvn/Ph/8iWoEEnucWkpqlOM71bkm8K+MoMb8vObPSrwKGCR/0PRetXFYWGfQcgvc7wrGMc0gEGUFbWTGJXNQugpXLsrM1AoxOLqsrBkCcO8TK9DZLo= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB03.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230031)(4636009)(136003)(376002)(396003)(346002)(39860400002)(230922051799003)(82310400011)(64100799003)(1800799009)(451199024)(186009)(40470700004)(36840700001)(46966006)(66574015)(19627235002)(47076005)(36756003)(336012)(81166007)(26005)(356005)(70206006)(6916009)(82740400003)(36860700001)(426003)(316002)(70586007)(54906003)(966005)(478600001)(6666004)(1076003)(2616005)(83380400001)(8676002)(4326008)(8936002)(5660300002)(2906002)(40480700001)(41300700001)(44832011)(40460700003)(30864003)(86362001)(36900700001)(579004); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2023 11:42:47.4590 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 621bf2dc-c32e-4855-ee9d-08dbd161aeaa X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000EE37.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB7115 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hFONIDu9sj+uXMo7rrGke+YKl+6Jz8ggXuS0/RJrSAw=; b=UIC8Wn+8rsAzSRba5sTBMVa+k4OUJ01mnXY0JT/FJEz/xGmfgttr+ngW2DMEwUgzUNh2MVh1heEa9VMedudlLegqceHNowK8lkol16qg6V27q4ZJpq1enpFyMz0DxgpEHZq5/wRlYRAtju60tqjmzCFVR4vwcOS/HpLDvf3hxGc= X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (1024-bit key, unprotected) header.d=amd.com header.i=@amd.com header.a=rsa-sha256 header.s=selector1 header.b=UIC8Wn+8 Subject: [Buildroot] [PATCH v6 01/10] package/binutils-bare-metal: new package 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: Neal Frager via buildroot From: Neal Frager Reply-To: Neal Frager Cc: ibai.erkiaga-elorza@amd.com, luca.ceresoli@bootlin.com, thomas.petazzoni@bootlin.com, Neal Frager , michal.simek@amd.com Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" This patch adds a new package for building binutils for a bare-metal toolchain. The cpu architecture is defined by a toolchain-bare-metal virtual package. While any cpu architecture could be used, the default configuration will be a Xilinx microblaze little endian architecture, so that buildroot will be able to build the microblaze firmware applications for zynqmp and versal. In order to build the zynqmp pmufw and versal plm applications without error, binutils version 2.41 or higher is required with the following patches. All six of these patches have been submitted upstream with five of them already applied. 0003-opcodes-microblaze-Add-wdc-instructions.patch: https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=a4045fdf2e859a23b7817f6dd5b18a1f6d22fc49 0004-opcodes-microblaze-Add-suspend-instructions.patch: https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=6487710babec2e7dcae997f79e03b9ec7d78e1c3 0005-opcodes-microblaze-Add-address-entension-instructions.patch: https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=b90eb3e5b25c22ec6ee476e500aa902f77b43349 0006-opcodes-microblaze-Add-new-bit-field-instructions.patch: https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=bb0d05ff74fda6b8f3f83712ebba3ea36bff1426 0007-bfd-microblaze-Add-32_NONE-reloc-type.patch: https://patchwork.sourceware.org/project/binutils/patch/20231017084007.229397-1-neal.frager@amd.com/ 0008-opcodes-microblaze-Fix-bit-masking-bug.patch: https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=2d1777b530d7832db5d8d7017378354c28816554 Signed-off-by: Ibai Erkiaga Signed-off-by: Neal Frager Tested-by: Luca Ceresoli Reviewed-by: Luca Ceresoli --- V1->V2: - removed default enable to be replaced with toolchain select config V2->V3: - no changes V3->V4: - split tar instruction into multiple lines - replaced unnecessary =? with = for assignments - changed xlnx-rel-v2023.1.tar.gz hash to sha256 - improved menuconfig help comment V4->V5: - moved to upstream version 2.41 with needed patches - reduced all lines to <80 chars V5->V6: - migrated to toolchain-bare-metal-buildroot --- DEVELOPERS | 4 + .../2.41/0001-sh-conf.patch | 1 + .../2.41/0002-poison-system-directories.patch | 1 + ...odes-microblaze-Add-wdc-instructions.patch | 83 ++++++ ...-microblaze-Add-suspend-instructions.patch | 24 ++ ...e-Add-address-entension-instructions.patch | 78 ++++++ ...blaze-Add-new-bit-field-instructions.patch | 265 ++++++++++++++++++ ...fd-microblaze-Add-32_NONE-reloc-type.patch | 220 +++++++++++++++ ...codes-microblaze-Fix-bit-masking-bug.patch | 80 ++++++ package/binutils-bare-metal/Config.in.host | 15 + .../binutils-bare-metal.hash | 6 + .../binutils-bare-metal.mk | 39 +++ 12 files changed, 816 insertions(+) create mode 120000 package/binutils-bare-metal/2.41/0001-sh-conf.patch create mode 120000 package/binutils-bare-metal/2.41/0002-poison-system-directories.patch create mode 100644 package/binutils-bare-metal/2.41/0003-opcodes-microblaze-Add-wdc-instructions.patch create mode 100644 package/binutils-bare-metal/2.41/0004-opcodes-microblaze-Add-suspend-instructions.patch create mode 100644 package/binutils-bare-metal/2.41/0005-opcodes-microblaze-Add-address-entension-instructions.patch create mode 100644 package/binutils-bare-metal/2.41/0006-opcodes-microblaze-Add-new-bit-field-instructions.patch create mode 100644 package/binutils-bare-metal/2.41/0007-bfd-microblaze-Add-32_NONE-reloc-type.patch create mode 100644 package/binutils-bare-metal/2.41/0008-opcodes-microblaze-Fix-bit-masking-bug.patch create mode 100644 package/binutils-bare-metal/Config.in.host create mode 100644 package/binutils-bare-metal/binutils-bare-metal.hash create mode 100644 package/binutils-bare-metal/binutils-bare-metal.mk diff --git a/DEVELOPERS b/DEVELOPERS index 57015e245e..9c2b664426 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1366,6 +1366,9 @@ F: package/mrp/ N: Ian Haylock F: package/python-rpi-gpio/ +N: Ibai Erkiaga +F: package/binutils-bare-metal/ + N: Ignacy GawÄ™dzki F: package/angularjs/ @@ -2197,6 +2200,7 @@ F: configs/zynq_zc706_defconfig F: configs/zynqmp_kria_kv260_defconfig F: configs/zynqmp_zcu102_defconfig F: configs/zynqmp_zcu106_defconfig +F: package/binutils-bare-metal/ F: package/bootgen/ F: package/versal-firmware/ diff --git a/package/binutils-bare-metal/2.41/0001-sh-conf.patch b/package/binutils-bare-metal/2.41/0001-sh-conf.patch new file mode 120000 index 0000000000..26dff99523 --- /dev/null +++ b/package/binutils-bare-metal/2.41/0001-sh-conf.patch @@ -0,0 +1 @@ +../../binutils/2.41/0001-sh-conf.patch \ No newline at end of file diff --git a/package/binutils-bare-metal/2.41/0002-poison-system-directories.patch b/package/binutils-bare-metal/2.41/0002-poison-system-directories.patch new file mode 120000 index 0000000000..9979f954a9 --- /dev/null +++ b/package/binutils-bare-metal/2.41/0002-poison-system-directories.patch @@ -0,0 +1 @@ +../../binutils/2.41/0002-poison-system-directories.patch \ No newline at end of file diff --git a/package/binutils-bare-metal/2.41/0003-opcodes-microblaze-Add-wdc-instructions.patch b/package/binutils-bare-metal/2.41/0003-opcodes-microblaze-Add-wdc-instructions.patch new file mode 100644 index 0000000000..db102aacaf --- /dev/null +++ b/package/binutils-bare-metal/2.41/0003-opcodes-microblaze-Add-wdc-instructions.patch @@ -0,0 +1,83 @@ +From a4045fdf2e859a23b7817f6dd5b18a1f6d22fc49 Mon Sep 17 00:00:00 2001 +From: Neal Frager +Date: Wed, 27 Sep 2023 14:47:01 +0100 +Subject: [PATCH] opcodes: microblaze: Add wdc.ext.clear and wdc.ext.flush + insns + +--- + opcodes/microblaze-opc.h | 31 +++++++++++++++++-------------- + opcodes/microblaze-opcm.h | 4 ++-- + 2 files changed, 19 insertions(+), 16 deletions(-) + +diff --git a/opcodes/microblaze-opc.h b/opcodes/microblaze-opc.h +index 94048e67551..7c70c80a27b 100644 +--- a/opcodes/microblaze-opc.h ++++ b/opcodes/microblaze-opc.h +@@ -74,24 +74,25 @@ + #define IMMVAL_MASK_MTS 0x4000 + #define IMMVAL_MASK_MFS 0x0000 + +-#define OPCODE_MASK_H 0xFC000000 /* High 6 bits only. */ +-#define OPCODE_MASK_H1 0xFFE00000 /* High 11 bits. */ +-#define OPCODE_MASK_H2 0xFC1F0000 /* High 6 and bits 20-16. */ +-#define OPCODE_MASK_H12 0xFFFF0000 /* High 16. */ +-#define OPCODE_MASK_H4 0xFC0007FF /* High 6 and low 11 bits. */ +-#define OPCODE_MASK_H13S 0xFFE0E7F0 /* High 11 16:18 21:27 bits, 19:20 bits ++#define OPCODE_MASK_H 0xFC000000 /* High 6 bits only. */ ++#define OPCODE_MASK_H1 0xFFE00000 /* High 11 bits. */ ++#define OPCODE_MASK_H2 0xFC1F0000 /* High 6 and bits 20-16. */ ++#define OPCODE_MASK_H12 0xFFFF0000 /* High 16. */ ++#define OPCODE_MASK_H4 0xFC0007FF /* High 6 and low 11 bits. */ ++#define OPCODE_MASK_H13S 0xFFE0E7F0 /* High 11 16:18 21:27 bits, 19:20 bits + and last nibble of last byte for spr. */ +-#define OPCODE_MASK_H23S 0xFC1FC000 /* High 6, 20-16 and 15:1 bits and last ++#define OPCODE_MASK_H23S 0xFC1FC000 /* High 6, 20-16 and 15:1 bits and last + nibble of last byte for spr. */ +-#define OPCODE_MASK_H34 0xFC00FFFF /* High 6 and low 16 bits. */ +-#define OPCODE_MASK_H14 0xFFE007FF /* High 11 and low 11 bits. */ +-#define OPCODE_MASK_H24 0xFC1F07FF /* High 6, bits 20-16 and low 11 bits. */ ++#define OPCODE_MASK_H34 0xFC00FFFF /* High 6 and low 16 bits. */ ++#define OPCODE_MASK_H14 0xFFE007FF /* High 11 and low 11 bits. */ ++#define OPCODE_MASK_H24 0xFC1F07FF /* High 6, bits 20-16 and low 11 bits. */ + #define OPCODE_MASK_H124 0xFFFF07FF /* High 16, and low 11 bits. */ + #define OPCODE_MASK_H1234 0xFFFFFFFF /* All 32 bits. */ +-#define OPCODE_MASK_H3 0xFC000600 /* High 6 bits and bits 21, 22. */ +-#define OPCODE_MASK_H32 0xFC00FC00 /* High 6 bits and bit 16-21. */ +-#define OPCODE_MASK_H34B 0xFC0000FF /* High 6 bits and low 8 bits. */ +-#define OPCODE_MASK_H34C 0xFC0007E0 /* High 6 bits and bits 21-26. */ ++#define OPCODE_MASK_H3 0xFC000600 /* High 6 bits and bits 21, 22. */ ++#define OPCODE_MASK_H32 0xFC00FC00 /* High 6 bits and bit 16-21. */ ++#define OPCODE_MASK_H34B 0xFC0000FF /* High 6 bits and low 8 bits. */ ++#define OPCODE_MASK_H35B 0xFC0004FF /* High 6 bits and low 9 bits. */ ++#define OPCODE_MASK_H34C 0xFC0007E0 /* High 6 bits and bits 21-26. */ + + /* New Mask for msrset, msrclr insns. */ + #define OPCODE_MASK_H23N 0xFC1F8000 /* High 6 and bits 11 - 16. */ +@@ -174,7 +175,9 @@ const struct op_code_struct + {"wic", INST_TYPE_R1_R2_SPECIAL, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x90000068, OPCODE_MASK_H34B, wic, special_inst }, + {"wdc", INST_TYPE_R1_R2_SPECIAL, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x90000064, OPCODE_MASK_H34B, wdc, special_inst }, + {"wdc.clear", INST_TYPE_R1_R2_SPECIAL, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x90000066, OPCODE_MASK_H34B, wdcclear, special_inst }, ++ {"wdc.ext.clear", INST_TYPE_R1_R2_SPECIAL, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x90000466, OPCODE_MASK_H35B, wdcextclear, special_inst }, + {"wdc.flush", INST_TYPE_R1_R2_SPECIAL, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x90000074, OPCODE_MASK_H34B, wdcflush, special_inst }, ++ {"wdc.ext.flush", INST_TYPE_R1_R2_SPECIAL, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x90000476, OPCODE_MASK_H35B, wdcextflush, special_inst }, + {"mts", INST_TYPE_SPECIAL_R1, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_MTS, 0x9400C000, OPCODE_MASK_H13S, mts, special_inst }, + {"mfs", INST_TYPE_RD_SPECIAL, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_MFS, 0x94008000, OPCODE_MASK_H23S, mfs, special_inst }, + {"br", INST_TYPE_R2, INST_PC_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x98000000, OPCODE_MASK_H124, br, branch_inst }, +diff --git a/opcodes/microblaze-opcm.h b/opcodes/microblaze-opcm.h +index 4cf6f077219..92c245dc0fd 100644 +--- a/opcodes/microblaze-opcm.h ++++ b/opcodes/microblaze-opcm.h +@@ -33,8 +33,8 @@ enum microblaze_instr + /* 'or/and/xor' are C++ keywords. */ + microblaze_or, microblaze_and, microblaze_xor, + andn, pcmpbf, pcmpbc, pcmpeq, pcmpne, sra, src, srl, sext8, sext16, +- wic, wdc, wdcclear, wdcflush, mts, mfs, mbar, br, brd, +- brld, bra, brad, brald, microblaze_brk, beq, beqd, bne, bned, blt, ++ wic, wdc, wdcclear, wdcextclear, wdcflush, wdcextflush, mts, mfs, mbar, br, ++ brd, brld, bra, brad, brald, microblaze_brk, beq, beqd, bne, bned, blt, + bltd, ble, bled, bgt, bgtd, bge, bged, ori, andi, xori, andni, + imm, rtsd, rtid, rtbd, rted, bri, brid, brlid, brai, braid, bralid, + brki, beqi, beqid, bnei, bneid, blti, bltid, blei, bleid, bgti, +-- +2.39.3 + diff --git a/package/binutils-bare-metal/2.41/0004-opcodes-microblaze-Add-suspend-instructions.patch b/package/binutils-bare-metal/2.41/0004-opcodes-microblaze-Add-suspend-instructions.patch new file mode 100644 index 0000000000..9f791bfb8a --- /dev/null +++ b/package/binutils-bare-metal/2.41/0004-opcodes-microblaze-Add-suspend-instructions.patch @@ -0,0 +1,24 @@ +From 6487710babec2e7dcae997f79e03b9ec7d78e1c3 Mon Sep 17 00:00:00 2001 +From: Neal frager +Date: Wed, 4 Oct 2023 16:35:44 +0100 +Subject: [PATCH] opcodes: microblaze: Add hibernate and suspend instructions + +--- + opcodes/microblaze-opc.h | 2 ++ + 1 files changed, 2 insertions(+) + +diff --git a/opcodes/microblaze-opc.h b/opcodes/microblaze-opc.h +index 7c70c80a27b..6b9701bb67c 100644 +--- a/opcodes/microblaze-opc.h ++++ b/opcodes/microblaze-opc.h +@@ -405,6 +405,8 @@ const struct op_code_struct + {"clz", INST_TYPE_RD_R1, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x900000E0, OPCODE_MASK_H34, clz, special_inst }, + {"mbar", INST_TYPE_IMM5, INST_PC_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xB8020004, OPCODE_MASK_HN, mbar, special_inst }, + {"sleep", INST_TYPE_NONE, INST_PC_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xBA020004, OPCODE_MASK_HN, invalid_inst, special_inst }, /* translates to mbar 16. */ ++ {"hibernate", INST_TYPE_NONE, INST_PC_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xB9020004, OPCODE_MASK_HN, invalid_inst, special_inst }, /* translates to mbar 8. */ ++ {"suspend", INST_TYPE_NONE, INST_PC_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xBB020004, OPCODE_MASK_HN, invalid_inst, special_inst }, /* translates to mbar 24. */ + {"swapb", INST_TYPE_RD_R1, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x900001E0, OPCODE_MASK_H4, swapb, arithmetic_inst }, + {"swaph", INST_TYPE_RD_R1, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x900001E2, OPCODE_MASK_H4, swaph, arithmetic_inst }, + {NULL, 0, 0, 0, 0, 0, 0, 0, 0}, +-- +2.39.3 diff --git a/package/binutils-bare-metal/2.41/0005-opcodes-microblaze-Add-address-entension-instructions.patch b/package/binutils-bare-metal/2.41/0005-opcodes-microblaze-Add-address-entension-instructions.patch new file mode 100644 index 0000000000..dd92bd0d3f --- /dev/null +++ b/package/binutils-bare-metal/2.41/0005-opcodes-microblaze-Add-address-entension-instructions.patch @@ -0,0 +1,78 @@ +From b90eb3e5b25c22ec6ee476e500aa902f77b43349 Mon Sep 17 00:00:00 2001 +From: Neal frager +Date: Thu, 5 Oct 2023 10:59:03 +0100 +Subject: [PATCH] microblaze: Add address extension instructions + + * microblaze-opcm.h (struct op_code_struct): Add address extension entries. + * microblaze-opc.h: Add address extension instructions. +--- + opcodes/microblaze-opc.h | 9 +++++++++ + opcodes/microblaze-opcm.h | 10 +++++----- + 2 files changed, 14 insertions(+), 5 deletions(-) + +diff --git a/opcodes/microblaze-opc.h b/opcodes/microblaze-opc.h +index 6b9701bb67c..7398e9e246a 100644 +--- a/opcodes/microblaze-opc.h ++++ b/opcodes/microblaze-opc.h +@@ -178,8 +178,11 @@ const struct op_code_struct + {"wdc.ext.clear", INST_TYPE_R1_R2_SPECIAL, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x90000466, OPCODE_MASK_H35B, wdcextclear, special_inst }, + {"wdc.flush", INST_TYPE_R1_R2_SPECIAL, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x90000074, OPCODE_MASK_H34B, wdcflush, special_inst }, + {"wdc.ext.flush", INST_TYPE_R1_R2_SPECIAL, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x90000476, OPCODE_MASK_H35B, wdcextflush, special_inst }, ++ {"wdc.clear.ea", INST_TYPE_R1_R2_SPECIAL, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x900000E6, OPCODE_MASK_H34B, wdcclearea, special_inst }, + {"mts", INST_TYPE_SPECIAL_R1, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_MTS, 0x9400C000, OPCODE_MASK_H13S, mts, special_inst }, ++ {"mtse", INST_TYPE_SPECIAL_R1, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_MTS, 0x9500C000, OPCODE_MASK_H13S, mtse,special_inst }, + {"mfs", INST_TYPE_RD_SPECIAL, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_MFS, 0x94008000, OPCODE_MASK_H23S, mfs, special_inst }, ++ {"mfse", INST_TYPE_RD_SPECIAL, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_MFS, 0x94088000, OPCODE_MASK_H23S, mfse, special_inst }, + {"br", INST_TYPE_R2, INST_PC_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x98000000, OPCODE_MASK_H124, br, branch_inst }, + {"brd", INST_TYPE_R2, INST_PC_OFFSET, DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x98100000, OPCODE_MASK_H124, brd, branch_inst }, + {"brld", INST_TYPE_RD_R2, INST_PC_OFFSET, DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x98140000, OPCODE_MASK_H24, brld, branch_inst }, +@@ -229,18 +232,24 @@ const struct op_code_struct + {"bgeid", INST_TYPE_R1_IMM, INST_PC_OFFSET, DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xBEA00000, OPCODE_MASK_H1, bgeid, branch_inst }, + {"lbu", INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xC0000000, OPCODE_MASK_H4, lbu, memory_load_inst }, + {"lbur", INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xC0000200, OPCODE_MASK_H4, lbur, memory_load_inst }, ++ {"lbuea", INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xC0000080, OPCODE_MASK_H4, lbuea, memory_load_inst }, + {"lhu", INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xC4000000, OPCODE_MASK_H4, lhu, memory_load_inst }, + {"lhur", INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xC4000200, OPCODE_MASK_H4, lhur, memory_load_inst }, ++ {"lhuea", INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xC4000080, OPCODE_MASK_H4, lhuea, memory_load_inst }, + {"lw", INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xC8000000, OPCODE_MASK_H4, lw, memory_load_inst }, + {"lwr", INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xC8000200, OPCODE_MASK_H4, lwr, memory_load_inst }, + {"lwx", INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xC8000400, OPCODE_MASK_H4, lwx, memory_load_inst }, ++ {"lwea", INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xC8000080, OPCODE_MASK_H4, lwea, memory_load_inst }, + {"sb", INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xD0000000, OPCODE_MASK_H4, sb, memory_store_inst }, + {"sbr", INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xD0000200, OPCODE_MASK_H4, sbr, memory_store_inst }, ++ {"sbea", INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xD0000080, OPCODE_MASK_H4, sbea, memory_store_inst }, + {"sh", INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xD4000000, OPCODE_MASK_H4, sh, memory_store_inst }, + {"shr", INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xD4000200, OPCODE_MASK_H4, shr, memory_store_inst }, ++ {"shea", INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xD4000080, OPCODE_MASK_H4, shea, memory_store_inst }, + {"sw", INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xD8000000, OPCODE_MASK_H4, sw, memory_store_inst }, + {"swr", INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xD8000200, OPCODE_MASK_H4, swr, memory_store_inst }, + {"swx", INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xD8000400, OPCODE_MASK_H4, swx, memory_store_inst }, ++ {"swea", INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xD8000080, OPCODE_MASK_H4, swea, memory_store_inst }, + {"lbui", INST_TYPE_RD_R1_IMM, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xE0000000, OPCODE_MASK_H, lbui, memory_load_inst }, + {"lhui", INST_TYPE_RD_R1_IMM, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xE4000000, OPCODE_MASK_H, lhui, memory_load_inst }, + {"lwi", INST_TYPE_RD_R1_IMM, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xE8000000, OPCODE_MASK_H, lwi, memory_load_inst }, +diff --git a/opcodes/microblaze-opcm.h b/opcodes/microblaze-opcm.h +index 9d1df0814d9..c91b002d951 100644 +--- a/opcodes/microblaze-opcm.h ++++ b/opcodes/microblaze-opcm.h +@@ -33,13 +33,13 @@ enum microblaze_instr + /* 'or/and/xor' are C++ keywords. */ + microblaze_or, microblaze_and, microblaze_xor, + andn, pcmpbf, pcmpbc, pcmpeq, pcmpne, sra, src, srl, sext8, sext16, +- wic, wdc, wdcclear, wdcextclear, wdcflush, wdcextflush, mts, mfs, mbar, br, +- brd, brld, bra, brad, brald, microblaze_brk, beq, beqd, bne, bned, blt, +- bltd, ble, bled, bgt, bgtd, bge, bged, ori, andi, xori, andni, ++ wic, wdc, wdcclear, wdcextclear, wdcflush, wdcextflush, wdcclearea, mts, mtse, ++ mfs, mfse, mbar, br, brd, brld, bra, brad, brald, microblaze_brk, beq, beqd, ++ bne, bned, blt, bltd, ble, bled, bgt, bgtd, bge, bged, ori, andi, xori, andni, + imm, rtsd, rtid, rtbd, rted, bri, brid, brlid, brai, braid, bralid, + brki, beqi, beqid, bnei, bneid, blti, bltid, blei, bleid, bgti, +- bgtid, bgei, bgeid, lbu, lbur, lhu, lhur, lw, lwr, lwx, sb, sbr, sh, +- shr, sw, swr, swx, lbui, lhui, lwi, ++ bgtid, bgei, bgeid, lbu, lbuea, lbur, lhu, lhuea, lhur, lw, lwea, lwr, lwx, ++ sb, sbea, sbr, sh, shea, shr, sw, swea, swr, swx, lbui, lhui, lwi, + sbi, shi, swi, msrset, msrclr, tuqula, mbi_fadd, frsub, mbi_fmul, mbi_fdiv, + fcmp_lt, fcmp_eq, fcmp_le, fcmp_gt, fcmp_ne, fcmp_ge, fcmp_un, flt, + /* 'fsqrt' is a glibc:math.h symbol. */ +-- +2.39.3 diff --git a/package/binutils-bare-metal/2.41/0006-opcodes-microblaze-Add-new-bit-field-instructions.patch b/package/binutils-bare-metal/2.41/0006-opcodes-microblaze-Add-new-bit-field-instructions.patch new file mode 100644 index 0000000000..12168737b0 --- /dev/null +++ b/package/binutils-bare-metal/2.41/0006-opcodes-microblaze-Add-new-bit-field-instructions.patch @@ -0,0 +1,265 @@ +From bb0d05ff74fda6b8f3f83712ebba3ea36bff1426 Mon Sep 17 00:00:00 2001 +From: Neal Frager +Date: Fri, 13 Oct 2023 08:28:55 +0100 +Subject: [PATCH] opcodes: microblaze: Add new bit-field instructions + +This patches adds new bsefi and bsifi instructions. +BSEFI- The instruction shall extract a bit field from a +register and place it right-adjusted in the destination register. +The other bits in the destination register shall be set to zero. +BSIFI- The instruction shall insert a right-adjusted bit field +from a register at another position in the destination register. +The rest of the bits in the destination register shall be unchanged. + +Further documentation of these instructions can be found here: +https://docs.xilinx.com/v/u/en-US/ug984-vivado-microblaze-ref + +With version 6 of the patch, no new relocation types are added as +this was unnecessary for adding the bsefi and bsifi instructions. + +FIXED: Segfault caused by incorrect termination of microblaze_opcodes. + +Signed-off-by: nagaraju +Signed-off-by: Ibai Erkiaga +Signed-off-by: Neal Frager +Signed-off-by: Michael J. Eager +--- + gas/config/tc-microblaze.c | 83 +++++++++++++++++++++++++++++++++++++- + opcodes/microblaze-dis.c | 23 +++++++++++ + opcodes/microblaze-opc.h | 13 +++++- + opcodes/microblaze-opcm.h | 6 ++- + 4 files changed, 121 insertions(+), 4 deletions(-) + +diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c +index d900a9e1d05..b510da95024 100644 +--- a/gas/config/tc-microblaze.c ++++ b/gas/config/tc-microblaze.c +@@ -915,7 +915,7 @@ md_assemble (char * str) + unsigned reg2; + unsigned reg3; + unsigned isize; +- unsigned int immed = 0, temp; ++ unsigned int immed = 0, immed2 = 0, temp; + expressionS exp; + char name[20]; + +@@ -1177,6 +1177,87 @@ md_assemble (char * str) + inst |= (immed << IMM_LOW) & IMM5_MASK; + break; + ++ case INST_TYPE_RD_R1_IMMW_IMMS: ++ if (strcmp (op_end, "")) ++ op_end = parse_reg (op_end + 1, ®1); /* Get rd. */ ++ else ++ { ++ as_fatal (_("Error in statement syntax")); ++ reg1 = 0; ++ } ++ ++ if (strcmp (op_end, "")) ++ op_end = parse_reg (op_end + 1, ®2); /* Get r1. */ ++ else ++ { ++ as_fatal (_("Error in statement syntax")); ++ reg2 = 0; ++ } ++ ++ /* Check for spl registers. */ ++ if (check_spl_reg (®1)) ++ as_fatal (_("Cannot use special register with this instruction")); ++ if (check_spl_reg (®2)) ++ as_fatal (_("Cannot use special register with this instruction")); ++ ++ /* Width immediate value. */ ++ if (strcmp (op_end, "")) ++ op_end = parse_imm (op_end + 1, &exp, MIN_IMM_WIDTH, MAX_IMM_WIDTH); ++ else ++ as_fatal (_("Error in statement syntax")); ++ ++ if (exp.X_op != O_constant) ++ { ++ as_warn (_( ++ "Symbol used as immediate width value for bit field instruction")); ++ immed = 1; ++ } ++ else ++ immed = exp.X_add_number; ++ ++ if (opcode->instr == bsefi && immed > 31) ++ as_fatal (_("Width value must be less than 32")); ++ ++ /* Shift immediate value. */ ++ if (strcmp (op_end, "")) ++ op_end = parse_imm (op_end + 1, &exp, MIN_IMM, MAX_IMM); ++ else ++ as_fatal (_("Error in statement syntax")); ++ ++ if (exp.X_op != O_constant) ++ { ++ as_warn (_( ++ "Symbol used as immediate shift value for bit field instruction")); ++ immed2 = 0; ++ } ++ else ++ { ++ output = frag_more (isize); ++ immed2 = exp.X_add_number; ++ } ++ ++ if (immed2 != (immed2 % 32)) ++ { ++ as_warn (_("Shift value greater than 32. using ")); ++ immed2 = immed2 % 32; ++ } ++ ++ /* Check combined value. */ ++ if (immed + immed2 > 32) ++ as_fatal (_("Width value + shift value must not be greater than 32")); ++ ++ inst |= (reg1 << RD_LOW) & RD_MASK; ++ inst |= (reg2 << RA_LOW) & RA_MASK; ++ ++ if (opcode->instr == bsefi) ++ inst |= (immed & IMM5_MASK) << IMM_WIDTH_LOW; /* bsefi */ ++ else ++ inst |= ((immed + immed2 - 1) & IMM5_MASK) ++ << IMM_WIDTH_LOW; /* bsifi */ ++ ++ inst |= (immed2 << IMM_LOW) & IMM5_MASK; ++ break; ++ + case INST_TYPE_R1_R2: + if (strcmp (op_end, "")) + op_end = parse_reg (op_end + 1, ®1); /* Get r1. */ +diff --git a/opcodes/microblaze-dis.c b/opcodes/microblaze-dis.c +index 12981abfea1..468797befc7 100644 +--- a/opcodes/microblaze-dis.c ++++ b/opcodes/microblaze-dis.c +@@ -90,6 +90,21 @@ get_field_imm5_mbar (struct string_buf *buf, long instr) + return p; + } + ++static char * ++get_field_immw (struct string_buf *buf, long instr) ++{ ++ char *p = strbuf (buf); ++ ++ if (instr & 0x00004000) ++ sprintf (p, "%d", (short)(((instr & IMM5_WIDTH_MASK) ++ >> IMM_WIDTH_LOW))); /* bsefi */ ++ else ++ sprintf (p, "%d", (short)(((instr & IMM5_WIDTH_MASK) >> ++ IMM_WIDTH_LOW) - ((instr & IMM5_MASK) >> ++ IMM_LOW) + 1)); /* bsifi */ ++ return p; ++} ++ + static char * + get_field_rfsl (struct string_buf *buf, long instr) + { +@@ -427,6 +442,14 @@ print_insn_microblaze (bfd_vma memaddr, struct disassemble_info * info) + /* For mbar 16 or sleep insn. */ + case INST_TYPE_NONE: + break; ++ /* For bit field insns. */ ++ case INST_TYPE_RD_R1_IMMW_IMMS: ++ print_func (stream, "\t%s, %s, %s, %s", ++ get_field_rd (&buf, inst), ++ get_field_r1 (&buf, inst), ++ get_field_immw (&buf, inst), ++ get_field_imm5 (&buf, inst)); ++ break; + /* For tuqula instruction */ + case INST_TYPE_RD: + print_func (stream, "\t%s", get_field_rd (&buf, inst)); +diff --git a/opcodes/microblaze-opc.h b/opcodes/microblaze-opc.h +index 7398e9e246a..811b5cbeb0f 100644 +--- a/opcodes/microblaze-opc.h ++++ b/opcodes/microblaze-opc.h +@@ -59,6 +59,9 @@ + /* For mbar. */ + #define INST_TYPE_IMM5 20 + ++/* For bsefi and bsifi */ ++#define INST_TYPE_RD_R1_IMMW_IMMS 21 ++ + #define INST_TYPE_NONE 25 + + +@@ -90,6 +93,7 @@ + #define OPCODE_MASK_H1234 0xFFFFFFFF /* All 32 bits. */ + #define OPCODE_MASK_H3 0xFC000600 /* High 6 bits and bits 21, 22. */ + #define OPCODE_MASK_H32 0xFC00FC00 /* High 6 bits and bit 16-21. */ ++#define OPCODE_MASK_H32B 0xFC00C000 /* High 6 bits and bit 16, 17. */ + #define OPCODE_MASK_H34B 0xFC0000FF /* High 6 bits and low 8 bits. */ + #define OPCODE_MASK_H35B 0xFC0004FF /* High 6 bits and low 9 bits. */ + #define OPCODE_MASK_H34C 0xFC0007E0 /* High 6 bits and bits 21-26. */ +@@ -102,7 +106,7 @@ + #define DELAY_SLOT 1 + #define NO_DELAY_SLOT 0 + +-#define MAX_OPCODES 289 ++#define MAX_OPCODES 291 + + const struct op_code_struct + { +@@ -159,6 +163,8 @@ const struct op_code_struct + {"bslli", INST_TYPE_RD_R1_IMM5, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x64000400, OPCODE_MASK_H3, bslli, barrel_shift_inst }, + {"bsrai", INST_TYPE_RD_R1_IMM5, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x64000200, OPCODE_MASK_H3, bsrai, barrel_shift_inst }, + {"bsrli", INST_TYPE_RD_R1_IMM5, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x64000000, OPCODE_MASK_H3, bsrli, barrel_shift_inst }, ++ {"bsefi", INST_TYPE_RD_R1_IMMW_IMMS, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x64004000, OPCODE_MASK_H32B, bsefi, barrel_shift_inst }, ++ {"bsifi", INST_TYPE_RD_R1_IMMW_IMMS, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x64008000, OPCODE_MASK_H32B, bsifi, barrel_shift_inst }, + {"or", INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x80000000, OPCODE_MASK_H4, microblaze_or, logical_inst }, + {"and", INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x84000000, OPCODE_MASK_H4, microblaze_and, logical_inst }, + {"xor", INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x88000000, OPCODE_MASK_H4, microblaze_xor, logical_inst }, +@@ -418,7 +424,7 @@ const struct op_code_struct + {"suspend", INST_TYPE_NONE, INST_PC_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0xBB020004, OPCODE_MASK_HN, invalid_inst, special_inst }, /* translates to mbar 24. */ + {"swapb", INST_TYPE_RD_R1, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x900001E0, OPCODE_MASK_H4, swapb, arithmetic_inst }, + {"swaph", INST_TYPE_RD_R1, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x900001E2, OPCODE_MASK_H4, swaph, arithmetic_inst }, +- {"", 0, 0, 0, 0, 0, 0, 0, 0}, ++ {NULL, 0, 0, 0, 0, 0, 0, 0, 0}, + }; + + /* Prefix for register names. */ +@@ -438,5 +444,8 @@ char pvr_register_prefix[] = "rpvr"; + #define MIN_IMM5 ((int) 0x00000000) + #define MAX_IMM5 ((int) 0x0000001f) + ++#define MIN_IMM_WIDTH ((int) 0x00000001) ++#define MAX_IMM_WIDTH ((int) 0x00000020) ++ + #endif /* MICROBLAZE_OPC */ + +diff --git a/opcodes/microblaze-opcm.h b/opcodes/microblaze-opcm.h +index c91b002d951..3c4f8948c76 100644 +--- a/opcodes/microblaze-opcm.h ++++ b/opcodes/microblaze-opcm.h +@@ -29,7 +29,7 @@ enum microblaze_instr + addi, rsubi, addic, rsubic, addik, rsubik, addikc, rsubikc, mul, + mulh, mulhu, mulhsu, swapb, swaph, + idiv, idivu, bsll, bsra, bsrl, get, put, nget, nput, cget, cput, +- ncget, ncput, muli, bslli, bsrai, bsrli, mului, ++ ncget, ncput, muli, bslli, bsrai, bsrli, bsefi, bsifi, mului, + /* 'or/and/xor' are C++ keywords. */ + microblaze_or, microblaze_and, microblaze_xor, + andn, pcmpbf, pcmpbc, pcmpeq, pcmpne, sra, src, srl, sext8, sext16, +@@ -130,6 +130,7 @@ enum microblaze_instr_type + #define RB_LOW 11 /* Low bit for RB. */ + #define IMM_LOW 0 /* Low bit for immediate. */ + #define IMM_MBAR 21 /* low bit for mbar instruction. */ ++#define IMM_WIDTH_LOW 6 /* Low bit for immediate width */ + + #define RD_MASK 0x03E00000 + #define RA_MASK 0x001F0000 +@@ -142,6 +143,9 @@ enum microblaze_instr_type + /* Imm mask for mbar. */ + #define IMM5_MBAR_MASK 0x03E00000 + ++/* Imm mask for extract/insert width. */ ++#define IMM5_WIDTH_MASK 0x000007C0 ++ + /* FSL imm mask for get, put instructions. */ + #define RFSL_MASK 0x000000F + +-- +2.39.3 diff --git a/package/binutils-bare-metal/2.41/0007-bfd-microblaze-Add-32_NONE-reloc-type.patch b/package/binutils-bare-metal/2.41/0007-bfd-microblaze-Add-32_NONE-reloc-type.patch new file mode 100644 index 0000000000..48ea4e0794 --- /dev/null +++ b/package/binutils-bare-metal/2.41/0007-bfd-microblaze-Add-32_NONE-reloc-type.patch @@ -0,0 +1,220 @@ +From aea4f3261d558017e9168f85dd200a0fc975e65d Mon Sep 17 00:00:00 2001 +From: Neal Frager +Date: Mon, 16 Oct 2023 18:27:05 +0100 +Subject: [PATCH v1 1/1] bfd: microblaze: Add 32_NONE reloc type + +This patch adds the R_MICROBLAZE_32_NONE relocation type. +This is a 32-bit reloc that stores the 32-bit pc relative +value in two words (with an imm instruction). + +This patch does not cause any regressions. Below are the +testsuite results before and after application of this patch: + +./configure --disable-nls --disable-gdb --disable-gdbserver \ + --disable-gprofng --disable-libbacktrace \ + --disable-libdecnumber --disable-readline \ + --disable-sim --enable-obsolete --enable-plugins \ + --build=powerpc64le-linux --target=microblaze-xilinx-elf + + === binutils Summary === + + # of expected passes 220 + # of expected failures 2 + # of untested testcases 17 + # of unsupported tests 14 + + === gas Summary === + + # of expected passes 272 + # of unexpected failures 1 + # of expected failures 1 + # of unsupported tests 8 + + === ld Summary === + + # of expected passes 379 + # of unexpected failures 4 + # of expected failures 13 + # of untested testcases 26 + # of unsupported tests 217 + + === libctf Summary === + + # of expected passes 5 + # of unsupported tests 3 + + === libsframe Summary === + + # of expected passes 57 + +Signed-off-by: Neal Frager +--- + bfd/bfd-in2.h | 5 +++++ + bfd/elf32-microblaze.c | 25 +++++++++++++++++++++++-- + bfd/libbfd.h | 1 + + bfd/reloc.c | 6 ++++++ + binutils/readelf.c | 4 ++++ + gas/config/tc-microblaze.c | 3 +++ + include/elf/microblaze.h | 1 + + 7 files changed, 43 insertions(+), 2 deletions(-) + +diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h +index c1fe48bb2f1..fb0ead46aba 100644 +--- a/bfd/bfd-in2.h ++++ b/bfd/bfd-in2.h +@@ -6463,6 +6463,11 @@ value relative to the read-write small data area anchor */ + expressions of the form "Symbol Op Symbol" */ + BFD_RELOC_MICROBLAZE_32_SYM_OP_SYM, + ++/* This is a 32 bit reloc that stores the 32 bit pc relative ++value in two words (with an imm instruction).No relocation is ++done here - only used for relaxing */ ++ BFD_RELOC_MICROBLAZE_32_NONE, ++ + /* This is a 64 bit reloc that stores the 32 bit pc relative + value in two words (with an imm instruction). No relocation is + done here - only used for relaxing */ +diff --git a/bfd/elf32-microblaze.c b/bfd/elf32-microblaze.c +index a7e81c70fc8..c10278cde31 100644 +--- a/bfd/elf32-microblaze.c ++++ b/bfd/elf32-microblaze.c +@@ -174,6 +174,21 @@ static reloc_howto_type microblaze_elf_howto_raw[] = + 0x0000ffff, /* Dest Mask. */ + false), /* PC relative offset? */ + ++ /* This reloc does nothing. Used for relaxation. */ ++ HOWTO (R_MICROBLAZE_32_NONE, /* Type. */ ++ 0, /* Rightshift. */ ++ 2, /* Size (0 = byte, 1 = short, 2 = long). */ ++ 32, /* Bitsize. */ ++ true, /* PC_relative. */ ++ 0, /* Bitpos. */ ++ complain_overflow_bitfield, /* Complain on overflow. */ ++ NULL, /* Special Function. */ ++ "R_MICROBLAZE_32_NONE", /* Name. */ ++ false, /* Partial Inplace. */ ++ 0, /* Source Mask. */ ++ 0, /* Dest Mask. */ ++ false), /* PC relative offset? */ ++ + /* This reloc does nothing. Used for relaxation. */ + HOWTO (R_MICROBLAZE_64_NONE, /* Type. */ + 0, /* Rightshift. */ +@@ -560,6 +575,9 @@ microblaze_elf_reloc_type_lookup (bfd * abfd ATTRIBUTE_UNUSED, + case BFD_RELOC_NONE: + microblaze_reloc = R_MICROBLAZE_NONE; + break; ++ case BFD_RELOC_MICROBLAZE_32_NONE: ++ microblaze_reloc = R_MICROBLAZE_32_NONE; ++ break; + case BFD_RELOC_MICROBLAZE_64_NONE: + microblaze_reloc = R_MICROBLAZE_64_NONE; + break; +@@ -1954,6 +1972,7 @@ microblaze_elf_relax_section (bfd *abfd, + } + break; + case R_MICROBLAZE_NONE: ++ case R_MICROBLAZE_32_NONE: + { + /* This was a PC-relative instruction that was + completely resolved. */ +@@ -2009,7 +2028,9 @@ microblaze_elf_relax_section (bfd *abfd, + irelscanend = irelocs + o->reloc_count; + for (irelscan = irelocs; irelscan < irelscanend; irelscan++) + { +- if (ELF32_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_32) ++ if ((ELF32_R_TYPE (irelscan->r_info) == (int) R_MICROBLAZE_32) || ++ (ELF32_R_TYPE (irelscan->r_info) == ++ (int) R_MICROBLAZE_32_NONE)) + { + isym = isymbuf + ELF32_R_SYM (irelscan->r_info); + +@@ -2068,7 +2089,7 @@ microblaze_elf_relax_section (bfd *abfd, + elf_section_data (o)->this_hdr.contents = ocontents; + } + } +- irelscan->r_addend -= calc_fixup (irel->r_addend ++ irelscan->r_addend -= calc_fixup (irelscan->r_addend + + isym->st_value, + 0, + sec); +diff --git a/bfd/libbfd.h b/bfd/libbfd.h +index d5f42f22c08..d729dc48e7c 100644 +--- a/bfd/libbfd.h ++++ b/bfd/libbfd.h +@@ -3010,6 +3010,7 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@", + "BFD_RELOC_MICROBLAZE_32_ROSDA", + "BFD_RELOC_MICROBLAZE_32_RWSDA", + "BFD_RELOC_MICROBLAZE_32_SYM_OP_SYM", ++ "BFD_RELOC_MICROBLAZE_32_NONE", + "BFD_RELOC_MICROBLAZE_64_NONE", + "BFD_RELOC_MICROBLAZE_64_GOTPC", + "BFD_RELOC_MICROBLAZE_64_GOT", +diff --git a/bfd/reloc.c b/bfd/reloc.c +index 2ac883d0eac..3ea2afc0d4e 100644 +--- a/bfd/reloc.c ++++ b/bfd/reloc.c +@@ -6694,6 +6694,12 @@ ENUM + ENUMDOC + This is a 32 bit reloc for the microblaze to handle + expressions of the form "Symbol Op Symbol" ++ENUM ++ BFD_RELOC_MICROBLAZE_32_NONE ++ENUMDOC ++ This is a 32 bit reloc that stores the 32 bit pc relative ++ value in two words (with an imm instruction). No relocation is ++ done here - only used for relaxing + ENUM + BFD_RELOC_MICROBLAZE_64_NONE + ENUMDOC +diff --git a/binutils/readelf.c b/binutils/readelf.c +index c9b6210e229..17fd7066b83 100644 +--- a/binutils/readelf.c ++++ b/binutils/readelf.c +@@ -15279,6 +15279,10 @@ is_8bit_abs_reloc (Filedata * filedata, unsigned int reloc_type) + return reloc_type == 54; /* R_RISCV_SET8. */ + case EM_Z80: + return reloc_type == 1; /* R_Z80_8. */ ++ case EM_MICROBLAZE: ++ return reloc_type == 33 /* R_MICROBLAZE_32_NONE. */ ++ || reloc_type == 0 /* R_MICROBLAZE_NONE. */ ++ || reloc_type == 9; /* R_MICROBLAZE_64_NONE. */ + default: + return false; + } +diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c +index b510da95024..604cc935da9 100644 +--- a/gas/config/tc-microblaze.c ++++ b/gas/config/tc-microblaze.c +@@ -2290,6 +2290,8 @@ md_apply_fix (fixS * fixP, + moves code around due to relaxing. */ + if (fixP->fx_r_type == BFD_RELOC_64_PCREL) + fixP->fx_r_type = BFD_RELOC_MICROBLAZE_64_NONE; ++ else if (fixP->fx_r_type == BFD_RELOC_32) ++ fixP->fx_r_type = BFD_RELOC_MICROBLAZE_32_NONE; + else + fixP->fx_r_type = BFD_RELOC_NONE; + fixP->fx_addsy = section_symbol (absolute_section); +@@ -2513,6 +2515,7 @@ tc_gen_reloc (asection * section ATTRIBUTE_UNUSED, fixS * fixp) + switch (fixp->fx_r_type) + { + case BFD_RELOC_NONE: ++ case BFD_RELOC_MICROBLAZE_32_NONE: + case BFD_RELOC_MICROBLAZE_64_NONE: + case BFD_RELOC_32: + case BFD_RELOC_MICROBLAZE_32_LO: +diff --git a/include/elf/microblaze.h b/include/elf/microblaze.h +index fecdd7e4831..164b36d0978 100644 +--- a/include/elf/microblaze.h ++++ b/include/elf/microblaze.h +@@ -61,6 +61,7 @@ START_RELOC_NUMBERS (elf_microblaze_reloc_type) + RELOC_NUMBER (R_MICROBLAZE_TEXTPCREL_64, 30) /* PC-relative TEXT offset. */ + RELOC_NUMBER (R_MICROBLAZE_TEXTREL_64, 31) /* TEXT Entry offset 64-bit. */ + RELOC_NUMBER (R_MICROBLAZE_TEXTREL_32_LO, 32) /* TEXT Entry offset 32-bit. */ ++ RELOC_NUMBER (R_MICROBLAZE_32_NONE, 33) + END_RELOC_NUMBERS (R_MICROBLAZE_max) + + /* Global base address names. */ +-- +2.25.1 + diff --git a/package/binutils-bare-metal/2.41/0008-opcodes-microblaze-Fix-bit-masking-bug.patch b/package/binutils-bare-metal/2.41/0008-opcodes-microblaze-Fix-bit-masking-bug.patch new file mode 100644 index 0000000000..cf04b712a6 --- /dev/null +++ b/package/binutils-bare-metal/2.41/0008-opcodes-microblaze-Fix-bit-masking-bug.patch @@ -0,0 +1,80 @@ +From b9c6c00c1b399e52a1255a541c30a44d2d11cfd1 Mon Sep 17 00:00:00 2001 +From: Neal Frager +Date: Thu, 19 Oct 2023 12:36:09 +0100 +Subject: [PATCH v1 1/1] opcodes: microblaze: Fix bit masking bug + +There is currently a bug in the bit masking for the barrel shift +instructions because the bit mask is not including all of the +register bits which must be zero. With this patch, the disassembler +can be sure that the 32-bit value is indeed a barrel shift instruction +and not a data value in memory. + +This fix can be verified by assembling and disassembling the following: + + .text + .long 0x65005f5f + +With this patch, the bug is fixed, and the objdump will know that +0x65005f5f is not a barrel shift instruction. + +Signed-off-by: Neal Frager +--- + opcodes/microblaze-dis.c | 4 ++-- + opcodes/microblaze-opc.h | 11 +++++++---- + 3 files changed, 9 insertions(+), 6 deletions(-) + +diff --git a/opcodes/microblaze-dis.c b/opcodes/microblaze-dis.c +index 468797befc7..0b5262255fb 100644 +--- a/opcodes/microblaze-dis.c ++++ b/opcodes/microblaze-dis.c +@@ -35,7 +35,7 @@ + #define get_int_field_imm(instr) ((instr & IMM_MASK) >> IMM_LOW) + #define get_int_field_r1(instr) ((instr & RA_MASK) >> RA_LOW) + +-#define NUM_STRBUFS 3 ++#define NUM_STRBUFS 4 + #define STRBUF_SIZE 25 + + struct string_buf +@@ -279,7 +279,7 @@ print_insn_microblaze (bfd_vma memaddr, struct disassemble_info * info) + prev_insn_vma = curr_insn_vma; + + if (op->name == NULL) +- print_func (stream, ".short 0x%04x", (unsigned int) inst); ++ print_func (stream, ".long 0x%04x", (unsigned int) inst); + else + { + print_func (stream, "%s", op->name); +diff --git a/opcodes/microblaze-opc.h b/opcodes/microblaze-opc.h +index 811b5cbeb0f..b9045f67969 100644 +--- a/opcodes/microblaze-opc.h ++++ b/opcodes/microblaze-opc.h +@@ -92,8 +92,11 @@ + #define OPCODE_MASK_H124 0xFFFF07FF /* High 16, and low 11 bits. */ + #define OPCODE_MASK_H1234 0xFFFFFFFF /* All 32 bits. */ + #define OPCODE_MASK_H3 0xFC000600 /* High 6 bits and bits 21, 22. */ ++#define OPCODE_MASK_H3B 0xFC00F9E0 /* High 6 bits and bits 16:20 and ++ bits 23:26. */ + #define OPCODE_MASK_H32 0xFC00FC00 /* High 6 bits and bit 16-21. */ +-#define OPCODE_MASK_H32B 0xFC00C000 /* High 6 bits and bit 16, 17. */ ++#define OPCODE_MASK_H32B 0xFC00F820 /* High 6 bits and bits 16:20 and ++ bit 26 */ + #define OPCODE_MASK_H34B 0xFC0000FF /* High 6 bits and low 8 bits. */ + #define OPCODE_MASK_H35B 0xFC0004FF /* High 6 bits and low 9 bits. */ + #define OPCODE_MASK_H34C 0xFC0007E0 /* High 6 bits and bits 21-26. */ +@@ -160,9 +163,9 @@ const struct op_code_struct + {"ncget", INST_TYPE_RD_RFSL, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x6C006000, OPCODE_MASK_H32, ncget, anyware_inst }, + {"ncput", INST_TYPE_R1_RFSL, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x6C00E000, OPCODE_MASK_H32, ncput, anyware_inst }, + {"muli", INST_TYPE_RD_R1_IMM, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x60000000, OPCODE_MASK_H, muli, mult_inst }, +- {"bslli", INST_TYPE_RD_R1_IMM5, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x64000400, OPCODE_MASK_H3, bslli, barrel_shift_inst }, +- {"bsrai", INST_TYPE_RD_R1_IMM5, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x64000200, OPCODE_MASK_H3, bsrai, barrel_shift_inst }, +- {"bsrli", INST_TYPE_RD_R1_IMM5, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x64000000, OPCODE_MASK_H3, bsrli, barrel_shift_inst }, ++ {"bslli", INST_TYPE_RD_R1_IMM5, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x64000400, OPCODE_MASK_H3B, bslli, barrel_shift_inst }, ++ {"bsrai", INST_TYPE_RD_R1_IMM5, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x64000200, OPCODE_MASK_H3B, bsrai, barrel_shift_inst }, ++ {"bsrli", INST_TYPE_RD_R1_IMM5, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x64000000, OPCODE_MASK_H3B, bsrli, barrel_shift_inst }, + {"bsefi", INST_TYPE_RD_R1_IMMW_IMMS, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x64004000, OPCODE_MASK_H32B, bsefi, barrel_shift_inst }, + {"bsifi", INST_TYPE_RD_R1_IMMW_IMMS, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x64008000, OPCODE_MASK_H32B, bsifi, barrel_shift_inst }, + {"or", INST_TYPE_RD_R1_R2, INST_NO_OFFSET, NO_DELAY_SLOT, IMMVAL_MASK_NON_SPECIAL, 0x80000000, OPCODE_MASK_H4, microblaze_or, logical_inst }, +-- +2.25.1 + diff --git a/package/binutils-bare-metal/Config.in.host b/package/binutils-bare-metal/Config.in.host new file mode 100644 index 0000000000..e70bee8fa2 --- /dev/null +++ b/package/binutils-bare-metal/Config.in.host @@ -0,0 +1,15 @@ +config BR2_PACKAGE_HOST_BINUTILS_BARE_METAL + bool "host binutils-bare-metal" + help + Build GNU binutils for a bare-metal toolchain + +if BR2_PACKAGE_HOST_BINUTILS_BARE_METAL + +config BR2_PACKAGE_HOST_BINUTILS_BARE_METAL_VERSION + string + default "2.41" + help + Xilinx zynqmp-firmware and versal-firmware + require binutils-bare-metal version >= 2.41 + +endif #BR2_PACKAGE_HOST_BINUTILS_BARE_METAL diff --git a/package/binutils-bare-metal/binutils-bare-metal.hash b/package/binutils-bare-metal/binutils-bare-metal.hash new file mode 100644 index 0000000000..3aab4d433d --- /dev/null +++ b/package/binutils-bare-metal/binutils-bare-metal.hash @@ -0,0 +1,6 @@ +# From https://gcc.gnu.org/pub/binutils/releases/sha512.sum +sha512 5df45d0bd6ddabdce4f35878c041e46a92deef01e7dea5facc97fd65cc06b59abc6fba0eb454b68e571c7e14038dc823fe7f2263843e6e627b7444eaf0fe9374 binutils-2.41.tar.xz + +# locally calculated +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING3 +sha256 56bdea73b6145ef6ac5259b3da390b981d840c24cb03b8e1cbc678de7ecfa18d COPYING.LIB diff --git a/package/binutils-bare-metal/binutils-bare-metal.mk b/package/binutils-bare-metal/binutils-bare-metal.mk new file mode 100644 index 0000000000..c361a5102a --- /dev/null +++ b/package/binutils-bare-metal/binutils-bare-metal.mk @@ -0,0 +1,39 @@ +################################################################################ +# +# binutils-bare-metal +# +################################################################################ + +HOST_BINUTILS_BARE_METAL_VERSION = \ + $(call qstrip,$(BR2_PACKAGE_HOST_BINUTILS_BARE_METAL_VERSION)) +ifeq ($(HOST_BINUTILS_BARE_METAL_VERSION),) +HOST_BINUTILS_BARE_METAL_VERSION = 2.41 +endif # BINUTILS_VERSION + +HOST_BINUTILS_BARE_METAL_SITE = $(BR2_GNU_MIRROR)/binutils +HOST_BINUTILS_BARE_METAL_SOURCE = \ + binutils-$(HOST_BINUTILS_BARE_METAL_VERSION).tar.xz + +HOST_BINUTILS_BARE_METAL_LICENSE = GPL-3.0+, libiberty LGPL-2.1+ +HOST_BINUTILS_BARE_METAL_LICENSE_FILES = COPYING3 COPYING.LIB +HOST_BINUTILS_BARE_METAL_CPE_ID_VENDOR = gnu + +HOST_BINUTILS_BARE_METAL_DEPENDENCIES = host-zlib + +# Don't build documentation. It takes up extra space / build time, +# and sometimes needs specific makeinfo versions to work +HOST_BINUTILS_BARE_METAL_CONF_ENV += MAKEINFO=true +HOST_BINUTILS_BARE_METAL_MAKE_OPTS += MAKEINFO=true +HOST_BINUTILS_BARE_METAL_INSTALL_OPTS += MAKEINFO=true install + +HOST_BINUTILS_BARE_METAL_CONF_OPTS = \ + --target=$(BR2_PACKAGE_HOST_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH)-elf \ + --disable-gprof \ + --disable-shared \ + --enable-lto \ + --enable-static \ + --disable-initfini-array \ + --disable-multilib \ + --disable-werror + +$(eval $(host-autotools-package)) From patchwork Fri Oct 20 11:42:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Neal Frager X-Patchwork-Id: 1852494 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.136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SBjQH4sPCz23jM for ; Fri, 20 Oct 2023 22:43:19 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id A7BAD704DC; Fri, 20 Oct 2023 11:43:15 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org A7BAD704DC X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kB1wINDmR0V7; Fri, 20 Oct 2023 11:43:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 71B077049C; Fri, 20 Oct 2023 11:43:12 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 71B077049C 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 A420F1BF3A9 for ; Fri, 20 Oct 2023 11:43:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 6CF8941467 for ; Fri, 20 Oct 2023 11:43:05 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 6CF8941467 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 imkOv2NdnrDi for ; Fri, 20 Oct 2023 11:43:03 +0000 (UTC) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2060a.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe5b::60a]) by smtp2.osuosl.org (Postfix) with ESMTPS id 8CA00402A7 for ; Fri, 20 Oct 2023 11:43:03 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 8CA00402A7 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eeIlXNNgr0JiJkfPNOpJafN6aCnjqLSUoF/Gb+0eUTXjiikkOebUfIw/BlDGE2PPzhASFctgILpZUMIFHf+hPTO5AJiYBqPUJmDMq6oSqpM0X8PIhS1CyDAB3/HYg+hUWD7oBMkl2gPkcK5gJ9bRAq/13JGBqa/tIUyy7blsev1nAlUt24l9myDAC25wbwCzigbfyvIC6Lz5SMXrlEOO8BmxKSBUenJ9Jjfhf4BTyGF5m+66p/BflTXk7G9fDsNaJu/Zliv7GNSndFv8XtMLVwKSOBsfdcCQmHLZ0ysmctc0P3HeK+J9Ixb4FkJNsLUyQF5b5B9jBYJKTxzdCbhn/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=EEU0dBJY9RbHdboIiNL/syr6T1Opu4Zofi0Igaib3N4=; b=lLuwVCtpC7T7SOH3wucBsHD2j4+W3qNiojzkFkbFBshKTfUBCXiFUOL4r/c+nGWtbDbyDwG9E0EjrRAyMZPdkaGAw/ivEO2/OxtvMZfKFWrTNGh4JJoeTtxrycluPNJ06J3HIwA6zmWB05Y/hWOoJCbthqRF8qNg5tNjpU/HSjpniqedm4fAS+O4LDqVRk3PsIqAEG3VQg5VhzxkqKUnluA9l2k8fyObDnDT4wPjfHuk04GVA+Si8fcX/MvbbQsGBlqvEGx1RoaacH3HSebCSsp6P/DAldsqr03ikS4yTTidaHaLARuktaY08Nfu3jkA7KF8BVlavuBjGBJlfJx8+g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=buildroot.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none Received: from SA9PR11CA0030.namprd11.prod.outlook.com (2603:10b6:806:6e::35) by DM6PR12MB4386.namprd12.prod.outlook.com (2603:10b6:5:28f::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.25; Fri, 20 Oct 2023 11:43:00 +0000 Received: from SN1PEPF0002636E.namprd02.prod.outlook.com (2603:10b6:806:6e:cafe::e) by SA9PR11CA0030.outlook.office365.com (2603:10b6:806:6e::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.26 via Frontend Transport; Fri, 20 Oct 2023 11:43:00 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF0002636E.mail.protection.outlook.com (10.167.241.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6907.20 via Frontend Transport; Fri, 20 Oct 2023 11:42:59 +0000 Received: from SATLEXMB06.amd.com (10.181.40.147) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Fri, 20 Oct 2023 06:42:59 -0500 Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB06.amd.com (10.181.40.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Fri, 20 Oct 2023 06:42:58 -0500 Received: from xirengwts09.xilinx.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.27 via Frontend Transport; Fri, 20 Oct 2023 06:42:57 -0500 To: Date: Fri, 20 Oct 2023 12:42:28 +0100 Message-ID: <20231020114236.4129636-2-neal.frager@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231020114236.4129636-1-neal.frager@amd.com> References: <20231020114236.4129636-1-neal.frager@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF0002636E:EE_|DM6PR12MB4386:EE_ X-MS-Office365-Filtering-Correlation-Id: 4f165870-39e0-4178-6b64-08dbd161b5be X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RaFMF34AEBsya9Fr3CO7QmS2dH977IzRzNqE0LbQNVsSB5e3ARL7tQIlMoEKoGwmEXD65MOsSU8l3CKSSjmFJSq5xC5Gan/+nSNHNuW+34Cp0HWkvVu9MDL1hdKJZIGQwIqhs8eRjRL315Ef9LKXiRoyWysC7c9cZ5J9/gU3M1Q8NJNo5/jiUCUYJ7G9v12KBGbXTqPGVm8BI2tW9zJaw5syS6hSPdp1S9vVKSoY1JXl/CHH8KN08Ufv8AyhLEFA/m8OVLO6MKKcefWXEixGApIZ8/UqCWSVdXjQu8jBxvUGLQBN3/IUUBGHajlQfXb+CTIyKKKREvdwwsLwXkf4881Q/FBv/b8ATRgpGEFWY4nk/c70OrbUazRXqrg7VlqoT1nQ/VNffWVGof3jrqwvWPTjEgyfVwN48klWoywPUDRqbkyMTRG4hOPEwYkQptPzrvfCCJ1UO51Yw5UDTJlvcDdMHtk92sj8mfYhQ4POIxbHtHhg7y/S4uj6b7hmzmpoLvO6KcxlXSto7aIVJ14vVxwA/MNmjWNbiKqSYRriqFbWaGKBnEHl6gtmX2EMgjItC23fcGlROy+BoMzLObHwBzh4oaaT1V+xOMm5r2Nz+OW6KLAlBm9/5odXdb0S0uWQXF7y4ZJ8c3C/5nrd2J8/iAfz92aZs3VLGDl4H/EqXf6GnQV1tctpXHM7WP7cSK0b48lopemCvP+G5LoXGVz70t39v4lv81BBEFpw+FVf6hPy1+bHCwnkuMA20wuIlPFC2DnIPTvjoE92ao9UyrwRtIAARB7tfHrJC4rq2nxBD9w= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230031)(4636009)(346002)(396003)(136003)(376002)(39860400002)(230922051799003)(186009)(82310400011)(1800799009)(64100799003)(451199024)(40470700004)(46966006)(36840700001)(40480700001)(40460700003)(86362001)(47076005)(2906002)(4326008)(5660300002)(41300700001)(81166007)(356005)(82740400003)(336012)(26005)(426003)(8676002)(36860700001)(1076003)(2616005)(36756003)(44832011)(8936002)(478600001)(966005)(316002)(70206006)(70586007)(6666004)(6916009)(54906003)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2023 11:42:59.3620 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4f165870-39e0-4178-6b64-08dbd161b5be X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF0002636E.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4386 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=EEU0dBJY9RbHdboIiNL/syr6T1Opu4Zofi0Igaib3N4=; b=k/WumnVzAPJ38qK4+Nj1ux2yzXz2oPb+0uKJQUckm71llRaz3eBRhFD85SZI0yh4/tjZhclQHrl/F9qKV/GrjNAQlYOBt3Z3YXsDZTLbrmpz5aFPi7YRG7U5ldS0cBGwiYEF23uf+UWsjILuWOwUOmW0EW6rmJQx8Q96Sxhqw0k= X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (1024-bit key, unprotected) header.d=amd.com header.i=@amd.com header.a=rsa-sha256 header.s=selector1 header.b=k/WumnVz Subject: [Buildroot] [PATCH v6 02/10] package/gcc-bare-metal: new package 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: Neal Frager via buildroot From: Neal Frager Reply-To: Neal Frager Cc: ibai.erkiaga-elorza@amd.com, luca.ceresoli@bootlin.com, thomas.petazzoni@bootlin.com, Neal Frager , michal.simek@amd.com Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" This patch adds a new package for building gcc for a bare-metal toolchain. The cpu architecture is defined by a toolchain-bare-metal virtual package. While any cpu architecture could be used, the default configuration will be a Xilinx microblaze little endian architecture, so that buildroot will be able to build the microblaze firmware applications for zynqmp and versal. Signed-off-by: Ibai Erkiaga Signed-off-by: Neal Frager Tested-by: Luca Ceresoli Reviewed-by: Luca Ceresoli --- V1->V2: - removed default enable to be replaced with toolchain select config V2->V3: - no changes V3->V4: - split tar instruction into multiple lines - replaced unnecessary =? with = for assignments - changed xlnx-rel-v2023.1.tar.gz hash to sha256 - improved menuconfig help comment V4->V5: - moved to upstream gcc without any xilinx patches - reduced all lines to <80 chars - added license files V5->V6: - migrated to toolchain-bare-metal-buildroot --- DEVELOPERS | 2 + package/gcc-bare-metal/13.2.0 | 1 + package/gcc-bare-metal/Config.in.host | 12 ++++ package/gcc-bare-metal/gcc-bare-metal.hash | 9 +++ package/gcc-bare-metal/gcc-bare-metal.mk | 68 ++++++++++++++++++++++ 5 files changed, 92 insertions(+) create mode 120000 package/gcc-bare-metal/13.2.0 create mode 100644 package/gcc-bare-metal/Config.in.host create mode 100644 package/gcc-bare-metal/gcc-bare-metal.hash create mode 100644 package/gcc-bare-metal/gcc-bare-metal.mk diff --git a/DEVELOPERS b/DEVELOPERS index 9c2b664426..922a74e426 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1368,6 +1368,7 @@ F: package/python-rpi-gpio/ N: Ibai Erkiaga F: package/binutils-bare-metal/ +F: package/gcc-bare-metal/ N: Ignacy GawÄ™dzki F: package/angularjs/ @@ -2202,6 +2203,7 @@ F: configs/zynqmp_zcu102_defconfig F: configs/zynqmp_zcu106_defconfig F: package/binutils-bare-metal/ F: package/bootgen/ +F: package/gcc-bare-metal/ F: package/versal-firmware/ N: Nicola Di Lieto diff --git a/package/gcc-bare-metal/13.2.0 b/package/gcc-bare-metal/13.2.0 new file mode 120000 index 0000000000..9ae96a8a45 --- /dev/null +++ b/package/gcc-bare-metal/13.2.0 @@ -0,0 +1 @@ +../gcc/13.2.0 \ No newline at end of file diff --git a/package/gcc-bare-metal/Config.in.host b/package/gcc-bare-metal/Config.in.host new file mode 100644 index 0000000000..ca7735340c --- /dev/null +++ b/package/gcc-bare-metal/Config.in.host @@ -0,0 +1,12 @@ +config BR2_PACKAGE_HOST_GCC_BARE_METAL + bool "host gcc-bare-metal" + help + Build GCC for a bare-metal toolchain + +if BR2_PACKAGE_HOST_GCC_BARE_METAL + +config BR2_PACKAGE_HOST_GCC_BARE_METAL_VERSION + string + default "13.2.0" + +endif #BR2_PACKAGE_HOST_GCC_BARE_METAL diff --git a/package/gcc-bare-metal/gcc-bare-metal.hash b/package/gcc-bare-metal/gcc-bare-metal.hash new file mode 100644 index 0000000000..5c5c28fa7e --- /dev/null +++ b/package/gcc-bare-metal/gcc-bare-metal.hash @@ -0,0 +1,9 @@ +# From https://gcc.gnu.org/pub/gcc/releases/gcc-13.2.0/sha512.sum +sha512 d99e4826a70db04504467e349e9fbaedaa5870766cda7c5cab50cdebedc4be755ebca5b789e1232a34a20be1a0b60097de9280efe47bdb71c73251e30b0862a2 gcc-13.2.0.tar.xz + +# Locally calculated +sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING3 +sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING3.LIB +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB +sha256 9d6b43ce4d8de0c878bf16b54d8e7a10d9bd42b75178153e3af6a815bdc90f74 COPYING.RUNTIME diff --git a/package/gcc-bare-metal/gcc-bare-metal.mk b/package/gcc-bare-metal/gcc-bare-metal.mk new file mode 100644 index 0000000000..fe6f931008 --- /dev/null +++ b/package/gcc-bare-metal/gcc-bare-metal.mk @@ -0,0 +1,68 @@ +################################################################################ +# +# gcc-bare-metal +# +################################################################################ + +HOST_GCC_BARE_METAL_VERSION = \ + $(call qstrip,$(BR2_PACKAGE_HOST_GCC_BARE_METAL_VERSION)) +ifeq ($(HOST_GCC_BARE_METAL_VERSION),) +HOST_GCC_BARE_METAL_VERSION = 13.2.0 +endif + +HOST_GCC_BARE_METAL_SITE = \ + https://ftp.gnu.org/gnu/gcc/gcc-$(HOST_GCC_BARE_METAL_VERSION) +HOST_GCC_BARE_METAL_SOURCE = gcc-$(HOST_GCC_BARE_METAL_VERSION).tar.xz + +HOST_GCC_BARE_METAL_LICENSE = GPL-2.0, GPL-3.0, LGPL-2.1, LGPL-3.0 +HOST_GCC_BARE_METAL_LICENSE_FILES = COPYING COPYING3 COPYING.LIB COPYING3.LIB + +HOST_GCC_BARE_METAL_DEPENDENCIES = \ + host-binutils-bare-metal \ + host-gmp \ + host-mpc \ + host-mpfr \ + host-isl + +# gcc doesn't support in-tree build, so we create a 'build' +# subdirectory in the gcc sources, and build from there. +define GCC_BARE_METAL_CONFIGURE_SYMLINK + mkdir -p $(@D)/build + ln -sf ../configure $(@D)/build/configure +endef + +HOST_GCC_BARE_METAL_PRE_CONFIGURE_HOOKS += GCC_BARE_METAL_CONFIGURE_SYMLINK +HOST_GCC_BARE_METAL_SUBDIR = build + +HOST_GCC_BARE_METAL_MAKE_OPTS = \ + $(HOST_GCC_COMMON_MAKE_OPTS) \ + all-gcc \ + all-target-libgcc + +HOST_GCC_BARE_METAL_INSTALL_OPTS = install-gcc install-target-libgcc + +GCC_BARE_METAL_ARCH = \ + $(call qstrip,$(BR2_PACKAGE_HOST_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH)) + +HOST_GCC_BARE_METAL_CONF_OPTS = \ + --target=$(GCC_BARE_METAL_ARCH)-elf \ + --disable-initfini_array \ + --disable-__cxa_atexit \ + --disable-libstdcxx-pch \ + --with-newlib \ + --disable-threads \ + --enable-plugins \ + --with-gnu-as \ + --disable-libitm \ + --without-long-double-128 \ + --without-headers \ + --enable-languages=c \ + --disable-multilib \ + --with-gmp=$(HOST_DIR) \ + --with-mpc=$(HOST_DIR) \ + --with-mpfr=$(HOST_DIR) \ + --with-isl=$(HOST_DIR) \ + AR_FOR_TARGET=$(O)/host/bin/$(GCC_BARE_METAL_ARCH)-elf-ar \ + RANLIB_FOR_TARGET=$(O)/host/bin/$(GCC_BARE_METAL_ARCH)-elf-ranlib + +$(eval $(host-autotools-package)) From patchwork Fri Oct 20 11:42:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Neal Frager X-Patchwork-Id: 1852495 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::136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SBjQV4Y2xz23jM for ; Fri, 20 Oct 2023 22:43:30 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id A7E23704D9; Fri, 20 Oct 2023 11:43:28 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org A7E23704D9 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gHO19mmT9Iws; Fri, 20 Oct 2023 11:43:27 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 7A211704FE; Fri, 20 Oct 2023 11:43:26 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 7A211704FE X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id BC0F51BF3A9 for ; Fri, 20 Oct 2023 11:43:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 84746848F8 for ; Fri, 20 Oct 2023 11:43:06 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 84746848F8 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id O8j6wNGe7C3D for ; Fri, 20 Oct 2023 11:43:05 +0000 (UTC) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on20610.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe5a::610]) by smtp1.osuosl.org (Postfix) with ESMTPS id A180A848F7 for ; Fri, 20 Oct 2023 11:43:05 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org A180A848F7 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mBi3I2H+FbZXttirZBJ2YnRmUJWV6MQPBtY5f9hDfmItANG6sgYetIpkc9mWTbX2/OUkglouVLEUH0rIHX/rLy+eoAUpIbxOm4gwgE5w9ONotQlN8w1kth/kV+JfaefNQwzY6I7oTIoTNJCeJv+sfFzO03DjR2Z6v52c1nsEJp8BpnpiG/7Q3RXd22NJmAsnY0ORdkAAoRpOY+3YIZHbWLwnAI8ERB5X3KIx2VxqU1H42DJZPLbzAz3UvOxb3EradxI9sxCHm4pLMbPDVtwIkvgfmKoionaoGVY1sgdkJFlHDoW8RLKkgqvD6JRkUsnM7ovVesLY2mEDLbVS/yBbJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=/xNky3NxdHepr8tlX8Fp3ahq+A4qVi/vnw6t+OqF7DA=; b=SGcN1DSyZN0+gRz+cEdRI1UQoNENrW+JV8TfZJF5bDTq5bot6r6SUNGATF4MGjr215mSAScrOEFXmiB8KwkC44DCE2uVqihl7I10uaLqdNKkiXkiTP35e8J8jr+vLZ9QgbJAcsWA6lwdoavNwiHU+9omWNdGZGUjia8ujD+W4g2pdvQ3pEpiDr4PuMjItxdyBDzke02Z1bEIwrtHz9dt/bOQE3JtZVoaOT4K16+5IzvTUfRvTZUpBeienqMzj4CXoiuZCIGVD3XXFEUDm1TJI3SFqeVSuce/FgyrhxNezrjBDBVB5vqcAzsgiiBJCyfJE5YV64wflZ8kSgkdmNACwA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=buildroot.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none Received: from DS7PR03CA0281.namprd03.prod.outlook.com (2603:10b6:5:3ad::16) by BN9PR12MB5273.namprd12.prod.outlook.com (2603:10b6:408:11e::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.26; Fri, 20 Oct 2023 11:43:02 +0000 Received: from CY4PEPF0000EE37.namprd05.prod.outlook.com (2603:10b6:5:3ad:cafe::4c) by DS7PR03CA0281.outlook.office365.com (2603:10b6:5:3ad::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.26 via Frontend Transport; Fri, 20 Oct 2023 11:43:02 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB03.amd.com; pr=C Received: from SATLEXMB03.amd.com (165.204.84.17) by CY4PEPF0000EE37.mail.protection.outlook.com (10.167.242.43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6838.22 via Frontend Transport; Fri, 20 Oct 2023 11:43:01 +0000 Received: from SATLEXMB06.amd.com (10.181.40.147) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Fri, 20 Oct 2023 06:43:01 -0500 Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB06.amd.com (10.181.40.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Fri, 20 Oct 2023 06:43:01 -0500 Received: from xirengwts09.xilinx.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.27 via Frontend Transport; Fri, 20 Oct 2023 06:42:59 -0500 To: Date: Fri, 20 Oct 2023 12:42:29 +0100 Message-ID: <20231020114236.4129636-3-neal.frager@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231020114236.4129636-1-neal.frager@amd.com> References: <20231020114236.4129636-1-neal.frager@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EE37:EE_|BN9PR12MB5273:EE_ X-MS-Office365-Filtering-Correlation-Id: 5bb87230-f246-4e72-b547-08dbd161b74a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9TxkkNdo5wJIGFtcMO0l76LEGpkA70Clfxvr75r3UBKSvrX43MCdACrZj40CSvs6oVjiD9LUJB9enB+iU+RVicNotlkiB47J/yEXKI+UM+AqYO48IxkYRWdf20qBTSBoBdevWkTQRdoVT/nB7Zx3MFWyTnWrYzA8D3lHBfOq4m7shTYv+aG/F8zIlTi9N+usiwRU9gFUZ+71/tdhgItXnfmhWw5qDXYN21Cqx9eYoQoc0xgAH/+HySnnStPdVobQKYPckaOfN5plXLEStX+i54Z+NrPvWvMpAjiVo/FCjWL0eLuJ0eNFhgKVMMy+KpIXAJ82ooIT4PBSdDfsXc5ronpbtyeJyy13lsodZXXajZ54CyH6MUzGKOVDwcRiimGhi0oD/HDTC7/ALhaUbWUqVSFfWpZTzp/W4PyGF+BaI2tceS9Up5J6jef7gLnQStjGaI0JqGZAQ31rvbmnb4eb2o4Bn/3jQv5W3K7EkIDBD0Ai82e1MYoIYVpVnXC9eu5oO+qVEDtRVSum2RCdzPl5SKM5aVRCrHGa85n6yDSIeiTDLhh5yBqDup0ouxiPsHU41LoLhDp8MFxLiTF4jrc5KaTqgG8dNevSHpNJsAznzvNya3idzl31reohNx4VgcnGqIk3yDp66cmVhdovZldpTbCn1Kc0EPj76Pkm4Nm0fLVS0jGcGFCHVdd27SR4b9jsueKY8Ux7OlKskfg5bLZeMcTwu9Pf4YCmTTvpD03uhyyB3R2OS2OfpxsOsKvufwbp X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB03.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230031)(4636009)(376002)(346002)(136003)(39860400002)(396003)(230922051799003)(451199024)(82310400011)(64100799003)(1800799009)(186009)(40470700004)(36840700001)(46966006)(2906002)(40480700001)(40460700003)(478600001)(5660300002)(41300700001)(4326008)(44832011)(8936002)(8676002)(316002)(6916009)(70586007)(54906003)(70206006)(36860700001)(47076005)(36756003)(86362001)(356005)(82740400003)(81166007)(2616005)(26005)(426003)(336012)(1076003)(6666004)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2023 11:43:01.9122 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5bb87230-f246-4e72-b547-08dbd161b74a X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000EE37.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR12MB5273 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/xNky3NxdHepr8tlX8Fp3ahq+A4qVi/vnw6t+OqF7DA=; b=EMFOjxda3rTOAGC0sw1NZasbAby5QtFNqPV3L8SbFsriNlz6CkNRqYsZl1h1W0ecRdi7LzyUoXGDmgr7g8YeuPkSfZwHIv2hJ82FhojRykyY5aoiN8mobD9yhmy/I56ELT19SADpBkKHiCb1u1f+3fXdmgQFosApSHavW+ehnU8= X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (1024-bit key, unprotected) header.d=amd.com header.i=@amd.com header.a=rsa-sha256 header.s=selector1 header.b=EMFOjxda Subject: [Buildroot] [PATCH v6 03/10] package/newlib-bare-metal: new package 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: Neal Frager via buildroot From: Neal Frager Reply-To: Neal Frager Cc: ibai.erkiaga-elorza@amd.com, luca.ceresoli@bootlin.com, thomas.petazzoni@bootlin.com, Neal Frager , michal.simek@amd.com Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" This patch adds a new package for building newlib for a bare-metal toolchain. The cpu architecture is defined by a toolchain-bare-metal virtual package. While any cpu architecture could be used, the default configuration will be a Xilinx microblaze little endian architecture, so that buildroot will be able to build the microblaze firmware applications for zynqmp and versal. Signed-off-by: Ibai Erkiaga Signed-off-by: Neal Frager Tested-by: Luca Ceresoli Reviewed-by: Luca Ceresoli --- V1->V2: - removed default enable to be replaced with toolchain select config V2->V3: - no changes V3->V4: - replaced unnecessary =? with = for assignments - improved menuconfig help comment V4->V5: - added license files - reduced all lines to <80 chars V5->V6: - migrated to toolchain-bare-metal-buildroot --- DEVELOPERS | 2 + package/newlib-bare-metal/Config.in.host | 12 ++++++ .../newlib-bare-metal/newlib-bare-metal.hash | 8 ++++ .../newlib-bare-metal/newlib-bare-metal.mk | 37 +++++++++++++++++++ 4 files changed, 59 insertions(+) create mode 100644 package/newlib-bare-metal/Config.in.host create mode 100644 package/newlib-bare-metal/newlib-bare-metal.hash create mode 100644 package/newlib-bare-metal/newlib-bare-metal.mk diff --git a/DEVELOPERS b/DEVELOPERS index 922a74e426..677b8f09bd 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1369,6 +1369,7 @@ F: package/python-rpi-gpio/ N: Ibai Erkiaga F: package/binutils-bare-metal/ F: package/gcc-bare-metal/ +F: package/newlib-bare-metal/ N: Ignacy GawÄ™dzki F: package/angularjs/ @@ -2204,6 +2205,7 @@ F: configs/zynqmp_zcu106_defconfig F: package/binutils-bare-metal/ F: package/bootgen/ F: package/gcc-bare-metal/ +F: package/newlib-bare-metal/ F: package/versal-firmware/ N: Nicola Di Lieto diff --git a/package/newlib-bare-metal/Config.in.host b/package/newlib-bare-metal/Config.in.host new file mode 100644 index 0000000000..be92a1d6a6 --- /dev/null +++ b/package/newlib-bare-metal/Config.in.host @@ -0,0 +1,12 @@ +config BR2_PACKAGE_HOST_NEWLIB_BARE_METAL + bool "host newlib-bare-metal" + help + Build the newlib C library for a bare-metal toolchain + +if BR2_PACKAGE_HOST_NEWLIB_BARE_METAL + +config BR2_PACKAGE_HOST_NEWLIB_BARE_METAL_VERSION + string + default "4.1.0" + +endif #BR2_PACKAGE_HOST_NEWLIB_BARE_METAL diff --git a/package/newlib-bare-metal/newlib-bare-metal.hash b/package/newlib-bare-metal/newlib-bare-metal.hash new file mode 100644 index 0000000000..1a681ecf77 --- /dev/null +++ b/package/newlib-bare-metal/newlib-bare-metal.hash @@ -0,0 +1,8 @@ +# Locally calculated +sha256 f296e372f51324224d387cc116dc37a6bd397198756746f93a2b02e9a5d40154 newlib-4.1.0.tar.gz + +# Hashes for license files locally calculated +sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB +sha256 f3b7f3e4426b1fa6f60198dae7adfedd94b77b28db2d108adc0253575011e0ff COPYING.LIBGLOSS +sha256 422aa40293093fb54fc66e692a0d68fd0b24ed5602e5d1d33ad05ba3909057e9 COPYING.NEWLIB diff --git a/package/newlib-bare-metal/newlib-bare-metal.mk b/package/newlib-bare-metal/newlib-bare-metal.mk new file mode 100644 index 0000000000..a42e04877a --- /dev/null +++ b/package/newlib-bare-metal/newlib-bare-metal.mk @@ -0,0 +1,37 @@ +################################################################################ +# +# newlib-bare-metal +# +################################################################################ + +HOST_NEWLIB_BARE_METAL_VERSION = \ + $(call qstrip,$(BR2_PACKAGE_HOST_NEWLIB_BARE_METAL_VERSION)) +ifeq ($(HOST_NEWLIB_BARE_METAL_VERSION),) +HOST_NEWLIB_BARE_METAL_VERSION = 4.1.0 +endif + +HOST_NEWLIB_BARE_METAL_SITE = ftp://sourceware.org/pub/newlib +HOST_NEWLIB_BARE_METAL_SOURCE = newlib-$(HOST_NEWLIB_BARE_METAL_VERSION).tar.gz +HOST_NEWLIB_BARE_METAL_DEPENDENCIES = host-gcc-bare-metal + +HOST_NEWLIB_BARE_METAL_LICENSE = GPL-2.0, GPL-3.0, LGPL-2.1, LGPL-3.0 +HOST_NEWLIB_BARE_METAL_LICENSE_FILES = COPYING \ + COPYING.LIB \ + COPYING.LIBGLOSS \ + COPYING.NEWLIB + +NEWLIB_ARCH = \ + $(call qstrip,$(BR2_PACKAGE_HOST_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH)) + +HOST_NEWLIB_BARE_METAL_CONF_OPTS = \ + --target=$(NEWLIB_ARCH)-elf \ + CC_FOR_TARGET=$(HOST_DIR)/bin/$(NEWLIB_ARCH)-elf-gcc \ + AR_FOR_TARGET=$(HOST_DIR)/bin/$(NEWLIB_ARCH)-elf-ar \ + RANLIB_FOR_TARGET=$(HOST_DIR)/bin/$(NEWLIB_ARCH)-elf-ranlib \ + --enable-newlib-io-c99-formats \ + --enable-newlib-io-long-long \ + --enable-newlib-io-float \ + --enable-newlib-io-long-double \ + --disable-multilib + +$(eval $(host-autotools-package)) From patchwork Fri Oct 20 11:42:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Neal Frager X-Patchwork-Id: 1852496 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::136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SBjQn3m2Fz23jM for ; Fri, 20 Oct 2023 22:43:44 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id B03FD607DE; Fri, 20 Oct 2023 11:43:41 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org B03FD607DE X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HxFQPCWwk9nr; Fri, 20 Oct 2023 11:43:40 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id A6FB770504; Fri, 20 Oct 2023 11:43:39 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org A6FB770504 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 435041BF3A9 for ; Fri, 20 Oct 2023 11:43:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 1B23141467 for ; Fri, 20 Oct 2023 11:43:12 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 1B23141467 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 X8pZzykHgvQM for ; Fri, 20 Oct 2023 11:43:11 +0000 (UTC) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on20611.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe59::611]) by smtp2.osuosl.org (Postfix) with ESMTPS id 15EA4402A7 for ; Fri, 20 Oct 2023 11:43:10 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 15EA4402A7 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VeUp+dk/9zUTiWZ5koZeExvWgFt9rSPfI5K494za/udw3/9pDKkRbc+8RXkIr2B7Sa0N9SARhCeclgidfYN6nE9gENKUmq3ufep4FZOvAeO8Zaf8Ep6attFcgerfoLQaKGe7r0piZmN/cWS4XNp+mpYDVPfnyJNtOcaHZY0tXnfg1WppxWj6oJjzfOeCrcWFNkwOF7azMRz431Rsd6ny4qD6tkhaCXDZp+iubh+wuuv6J+5odQ1UAEF1Grp6hXMZox6+owUiNliF+VeqLeibTYsDjpl2tfI+JAp//hKy+IBix3WNdm6FR6sQ8chTnFZLSAdppB79QK8nHsUa6v2Zbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=Br5Q5Xyz5U2mQ1mYb3Qsu9HnFbZq/FPXGRcKeMwDY2E=; b=UbIxc+JhdkidPMGrbIKyBHNYbLzOWXBpqNBQ4bDuRbel686zg8+ITPyXlslzic4xGRtuV/MrPjjVzsvtLwa6b4IHlBcKqfznrLtgtaO1ORnl14e4RuNK4H/fSBJvC6PCeet72+zeJP+zTtwmV5MgoWJmUxRgFjNLxnp+qp6Eg8tqVqBRe5BsT1F6iJLjMMFHh72g5hmCwOFZhIVw8/mug/rtjk679m83R/eWWxv+GQGjwSdir4c1u/M42kABOIXkv051+M3AFQs4NXbdJpP/ul5WyW/63ZPh8uRmjw+WOCxpwGNdRM6Q8Q/V/vQC9nFYd9nOg93S1/YGR3xZikC7/g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=buildroot.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none Received: from CY5P221CA0083.NAMP221.PROD.OUTLOOK.COM (2603:10b6:930:9::17) by CH3PR12MB8458.namprd12.prod.outlook.com (2603:10b6:610:155::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.21; Fri, 20 Oct 2023 11:43:05 +0000 Received: from CY4PEPF0000EE36.namprd05.prod.outlook.com (2603:10b6:930:9:cafe::9b) by CY5P221CA0083.outlook.office365.com (2603:10b6:930:9::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.26 via Frontend Transport; Fri, 20 Oct 2023 11:43:05 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB03.amd.com; pr=C Received: from SATLEXMB03.amd.com (165.204.84.17) by CY4PEPF0000EE36.mail.protection.outlook.com (10.167.242.42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6838.22 via Frontend Transport; Fri, 20 Oct 2023 11:43:04 +0000 Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Fri, 20 Oct 2023 06:43:03 -0500 Received: from xirengwts09.xilinx.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.27 via Frontend Transport; Fri, 20 Oct 2023 06:43:02 -0500 To: Date: Fri, 20 Oct 2023 12:42:30 +0100 Message-ID: <20231020114236.4129636-4-neal.frager@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231020114236.4129636-1-neal.frager@amd.com> References: <20231020114236.4129636-1-neal.frager@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EE36:EE_|CH3PR12MB8458:EE_ X-MS-Office365-Filtering-Correlation-Id: 9d5df9de-ac1c-43f9-3082-08dbd161b8ac X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: biTvbAFWKDIzUDMmGVc9uT9ku07WdC8RU/nPcjsnibrzSAnx8ur2E4moBmCmeonZlSu2uU5QSRFyV72fob7kQ+fDjUT3MnyhuspwkePjKqLo+AP3GrtPsBH9BsFEA/1kUTJMf7Mmhsmnv3Zzaz9J+K8111+6TekHXV7wFf8H1d73HU/zGHCVVIHWl/nSdkYUXbFo3BD6Y1NFuRAeJOqItTeZJ1am9Fg++/7K0o/K31irUPDTgBPWuOmVROBtArgLt/ihsvLdtfE/dCSdUOAlQwkgj/Ln2DcztpnLeKcn2MyVA48wf28MKsS9MacqO+Ml+vJ1JWhbDUF+gY7GRp1/KdQn+1KRiqjmxoWTYfnYFLihGU7wAY4JFEJgworhOR7iXsoMzHyEdvSZPInnbn1i7v9c185Gp5C6CCqJjgXJrwI5aOFDbq1V+e8TyVklWGRlh02Gk55W1Aw9+amDpzri8cDZtP+iqELGJMYA4aU1CSW+62iZNI/+1JrgRHmmTjaat5zvULC0ptOUagYV7GwCg2P+NpzwDgYCr6tLiDqqX6lBvNC0NpG6EC5Lmp8tpcG4oaTwts4FEkz0LgjD16W0p8Blhy6A5wGXm/ujS61r8cWLNAjJim6+6d4HhG1//pzgpzCiq25prashTAnIIgTaeNYbMf+3YciNxF941k2m0wqgDTD2xxaNsXIvCImbv08liw/FYRcQn4rwMQXezeUipAr5oLTFHIhLsmpntfqIWdcQmZ5ISONnjJxKipIEEmQ0xIPSIIJp8WYHD12AP/MFIQ== X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB03.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230031)(4636009)(346002)(396003)(39860400002)(136003)(376002)(230922051799003)(1800799009)(451199024)(186009)(64100799003)(82310400011)(36840700001)(46966006)(40470700004)(40460700003)(2906002)(1076003)(26005)(426003)(6666004)(8936002)(70586007)(2616005)(336012)(36860700001)(6916009)(4326008)(41300700001)(44832011)(47076005)(478600001)(5660300002)(8676002)(54906003)(82740400003)(356005)(81166007)(316002)(70206006)(86362001)(40480700001)(36756003)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2023 11:43:04.2288 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9d5df9de-ac1c-43f9-3082-08dbd161b8ac X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000EE36.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB8458 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Br5Q5Xyz5U2mQ1mYb3Qsu9HnFbZq/FPXGRcKeMwDY2E=; b=JkhHb3vyOUcI1pBN2eywSqtNnVZNI55jEnNmUqdy/oQ81V2rjLVj6muykOs+8Z2tmBy8+511dBjBqoCEpPXzsCKPRyyfQooXlRoo0r76aKWFDd0CVIbpRYaUuwD2bwzYkuKawNvkFm1/YKgryEMAtIid4X2Af94Ca6+C5AaGsyE= X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (1024-bit key, unprotected) header.d=amd.com header.i=@amd.com header.a=rsa-sha256 header.s=selector1 header.b=JkhHb3vy Subject: [Buildroot] [PATCH v6 04/10] toolchain/toolchain-bare-metal-buildroot: new toolchain 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: Neal Frager via buildroot From: Neal Frager Reply-To: Neal Frager Cc: ibai.erkiaga-elorza@amd.com, luca.ceresoli@bootlin.com, thomas.petazzoni@bootlin.com, Neal Frager , michal.simek@amd.com Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" This patch adds a new virtual package for adding a bare-metal toolchain to buildroot. By default, this package will configure a bare-metal toolchain for the Xilinx microblaze little endian architecture. When configured for the Xilinx microblaze architecture, this toolchain can be used to build the microblaze firmware applications for zynqmp and versal. Signed-off-by: Ibai Erkiaga Signed-off-by: Neal Frager Tested-by: Luca Ceresoli Reviewed-by: Luca Ceresoli --- V1->V2: - adds select option to bring in all packages needed for toolchain-bare-metal V2->V3: - no changes V3->V4: - moved from package to toolchain directory - improved menuconfig help comment V4->V5: - no changes V5->V6: - migrated to toolchain-bare-metal-buildroot --- DEVELOPERS | 2 ++ toolchain/Config.in | 1 + .../toolchain-bare-metal-buildroot/Config.in | 21 +++++++++++++++++++ .../toolchain-bare-metal-buildroot.mk | 7 +++++++ 4 files changed, 31 insertions(+) create mode 100644 toolchain/toolchain-bare-metal-buildroot/Config.in create mode 100644 toolchain/toolchain-bare-metal-buildroot/toolchain-bare-metal-buildroot.mk diff --git a/DEVELOPERS b/DEVELOPERS index 677b8f09bd..849a5263b5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1370,6 +1370,7 @@ N: Ibai Erkiaga F: package/binutils-bare-metal/ F: package/gcc-bare-metal/ F: package/newlib-bare-metal/ +F: toolchain/toolchain-bare-metal-buildroot/ N: Ignacy GawÄ™dzki F: package/angularjs/ @@ -2207,6 +2208,7 @@ F: package/bootgen/ F: package/gcc-bare-metal/ F: package/newlib-bare-metal/ F: package/versal-firmware/ +F: toolchain/toolchain-bare-metal-buildroot/ N: Nicola Di Lieto F: package/uacme/ diff --git a/toolchain/Config.in b/toolchain/Config.in index d8081f1b9d..b1333f92f0 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -59,6 +59,7 @@ config BR2_TOOLCHAIN_EXTERNAL endchoice +source "toolchain/toolchain-bare-metal-buildroot/Config.in" source "toolchain/toolchain-buildroot/Config.in" source "toolchain/toolchain-external/Config.in" diff --git a/toolchain/toolchain-bare-metal-buildroot/Config.in b/toolchain/toolchain-bare-metal-buildroot/Config.in new file mode 100644 index 0000000000..6ebf2cdf86 --- /dev/null +++ b/toolchain/toolchain-bare-metal-buildroot/Config.in @@ -0,0 +1,21 @@ +config BR2_PACKAGE_HOST_TOOLCHAIN_BARE_METAL_BUILDROOT + bool "host toolchain-bare-metal" + select BR2_PACKAGE_HOST_BINUTILS_BARE_METAL + select BR2_PACKAGE_HOST_GCC_BARE_METAL + select BR2_PACKAGE_HOST_NEWLIB_BARE_METAL + help + Build a bare-metal toolchain in addition to the main Linux toolchain + +if BR2_PACKAGE_HOST_TOOLCHAIN_BARE_METAL_BUILDROOT + +config BR2_PACKAGE_HOST_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH + string + default "microblazeel-xilinx" + help + select architecture for bare-metal toolchain + +source "package/binutils-bare-metal/Config.in.host" +source "package/gcc-bare-metal/Config.in.host" +source "package/newlib-bare-metal/Config.in.host" + +endif #BR2_PACKAGE_HOST_TOOLCHAIN_BARE_METAL_BUILDROOT diff --git a/toolchain/toolchain-bare-metal-buildroot/toolchain-bare-metal-buildroot.mk b/toolchain/toolchain-bare-metal-buildroot/toolchain-bare-metal-buildroot.mk new file mode 100644 index 0000000000..170c73aa31 --- /dev/null +++ b/toolchain/toolchain-bare-metal-buildroot/toolchain-bare-metal-buildroot.mk @@ -0,0 +1,7 @@ +################################################################################ +# +# toolchain-bare-metal-buildroot +# +################################################################################ + +(eval $(host-virtual-package)) From patchwork Fri Oct 20 11:42:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neal Frager X-Patchwork-Id: 1852498 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::136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SBjRV0Gsxz23jM for ; Fri, 20 Oct 2023 22:44:22 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 46ABB704D4; Fri, 20 Oct 2023 11:44:20 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 46ABB704D4 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RJuO5afJbfAH; Fri, 20 Oct 2023 11:44:19 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 1A6FA704DC; Fri, 20 Oct 2023 11:44:18 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 1A6FA704DC X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 930E31BF3A9 for ; Fri, 20 Oct 2023 11:43:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 5E3C04EC90 for ; Fri, 20 Oct 2023 11:43:26 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 5E3C04EC90 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id GtiBT5FYbvfl for ; Fri, 20 Oct 2023 11:43:24 +0000 (UTC) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2062c.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e89::62c]) by smtp4.osuosl.org (Postfix) with ESMTPS id 25FA84EC6B for ; Fri, 20 Oct 2023 11:43:24 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 25FA84EC6B ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Oi+AzBSuIcj/o2TYGCU4bp/lwVJFw+GxUhl7kBe79kNfRdi8T+HFS2iZR0r3AXW9wubXHpc27KAVIi3wg2de/OXVIoSQW0b95qx1uKFlplVOWaYM38kdT+gT+w561C8EDPoOKm2RRxl2BcoKE7ZWU/FQUovN7h/tMdbAfaoHj3zsH7w1e5dxRClE93mGD8o1+Azh5g5dL8LV+UFBMoc192WsUeZTqDX+vFTOT/5tcknl1R/W8vNqHQCXQsQmoYy5JCjslUJgYMU2gTOwkyBcncUdCMm+kDUWMqgD+rySUk51Wmq92YZPCH+RZmJ3NY3oUWFovGtDrBIq8gXUiK7zDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=P56YtZcM3VfY6HKfpFSozuB39wMWzOPdgrGcaGy9nGY=; b=mCrFO1dvwqOoDpD8lrAm0XETxsMDM7h8cb+31/FZHZU9seClTDymC0iQK1ik05wTbilY6m/LOagriLxugb+bHKJvashHKf+pCeHZpFGreJyKx8hn5027X1G5RhGy3GZN8SVO4lSmjsuLqYLJaaFySaQkRVpYIc4hWjnJF0knLHxrJ/rUj2SQBHiRHPs6Hm9GcjLBid0t/laH5p03LkdOhwC0dX//HW1wiCXSODtD3hAHmUFG/siiVPguL65+axwsdIXy7hQuKMbLq2dLx+nmN0EYTAMvj1lKtuxWT6hOheX139gDKVT+VDlNkRI+SGX54jG4atmANjOjftLknLjPww== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=buildroot.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none Received: from SA0PR11CA0001.namprd11.prod.outlook.com (2603:10b6:806:d3::6) by SJ1PR12MB6121.namprd12.prod.outlook.com (2603:10b6:a03:45c::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6886.36; Fri, 20 Oct 2023 11:43:18 +0000 Received: from SN1PEPF0002636A.namprd02.prod.outlook.com (2603:10b6:806:d3:cafe::3) by SA0PR11CA0001.outlook.office365.com (2603:10b6:806:d3::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.24 via Frontend Transport; Fri, 20 Oct 2023 11:43:18 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF0002636A.mail.protection.outlook.com (10.167.241.135) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6907.20 via Frontend Transport; Fri, 20 Oct 2023 11:43:17 +0000 Received: from SATLEXMB08.amd.com (10.181.40.132) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Fri, 20 Oct 2023 06:43:17 -0500 Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB08.amd.com (10.181.40.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Fri, 20 Oct 2023 04:43:06 -0700 Received: from xirengwts09.xilinx.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.27 via Frontend Transport; Fri, 20 Oct 2023 06:43:05 -0500 To: Date: Fri, 20 Oct 2023 12:42:31 +0100 Message-ID: <20231020114236.4129636-5-neal.frager@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231020114236.4129636-1-neal.frager@amd.com> References: <20231020114236.4129636-1-neal.frager@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF0002636A:EE_|SJ1PR12MB6121:EE_ X-MS-Office365-Filtering-Correlation-Id: eafe927e-acf9-4578-e524-08dbd161c0bb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ukTclaIn89pH4e+R0UPhqQTl6yRhaSD2bCLW559ODdQs3tQA/UujxvOIs2Z03naECgKFdZXFE+pFQwqc1JSE7VgbOl+cRdyiPiKYaGeE5UIrX46leSESb4WXfdFTkqqbjEdmLZpDQFqvhGpqqvz54OaDJmmO1PzuCD7rlsEdSNwrK7oh9O6Nc71Y3UeRvAstE7rV0hp0OgFkSJ5WE0uvRviVxen6pCh7CNRRfQ4HmpOKSDr3WO3ZvZ0no1LEOStRGk/odXzOpZ1M7PyIesB4zTJ7hDFmU/pQdloobvlGhn4OX125dcCckddokO9Rcf5vLcVV0qm2/Ja41OwQmAicTEb3WMSKIo71JiajfwOwBtlAhOX2t/GtmK42605PehtjYvRupb1aS4kAiT4HYrELdhqRGHA/zCwWDtIMhDSQNouet5ARJbFXvIcFALrcoJ/t6yqtlhkWKBFF6BdOk6QAo++bxOnAVHubj00SvTimvKLre6BL1zfa+O8YsU7WsfYLu9MAIGPxg1iSMBejQ4AeAJvWM4zgcpPbMcFFutzqZVyCQhdlh4YTFgSBUcP+kiBRySMXUqA7rABYTvHJkN11+O5KoME4A1OTXtUZ5YYi6o63gi+VLHL0n9dFkmA/9JQ8xUtWW7t2srxZ0poEOBEWofszOfqQWV5F2LnKvDwGCZENUWNE8vem8mx5oh8zD3BeNJWrI01sBO15of+Es9U1XC43JL2ow8vSOYQpW6y3cqh1KJQQdQeFSbkjhzVr1EOID0Dey6hrX8Vz/eYmWKLshg== X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230031)(4636009)(346002)(39860400002)(136003)(376002)(396003)(230922051799003)(186009)(64100799003)(451199024)(1800799009)(82310400011)(46966006)(36840700001)(40470700004)(30864003)(40480700001)(2906002)(8936002)(8676002)(478600001)(5660300002)(4326008)(41300700001)(44832011)(70586007)(54906003)(316002)(6916009)(70206006)(40460700003)(26005)(36860700001)(47076005)(83380400001)(356005)(82740400003)(81166007)(36756003)(2616005)(336012)(86362001)(1076003)(426003)(6666004)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2023 11:43:17.7848 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: eafe927e-acf9-4578-e524-08dbd161c0bb X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF0002636A.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ1PR12MB6121 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=P56YtZcM3VfY6HKfpFSozuB39wMWzOPdgrGcaGy9nGY=; b=BF2EEZHns6z8CEjmAK/LKte1ZYM/iF58Nc3OVeX97Q/vz935ZfSM8bAmaCx79h2Fz7yUYtJt1Qt1jESOOiTYxVimTuRgLbr5EmkVslwMojA15XHqP9Cf+Itkp3/i0bS0F5dNtNHZVrh5g4Co8V8GeLppmM0IEMzpVpBy4H7wvv0= X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (1024-bit key, unprotected) header.d=amd.com header.i=@amd.com header.a=rsa-sha256 header.s=selector1 header.b=BF2EEZHn Subject: [Buildroot] [PATCH v6 05/10] boot/zynqmp-firmware: new boot firmware 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: Neal Frager via buildroot From: Neal Frager Reply-To: Neal Frager Cc: ibai.erkiaga-elorza@amd.com, luca.ceresoli@bootlin.com, thomas.petazzoni@bootlin.com, Neal Frager , michal.simek@amd.com Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" This patch adds a new boot firmware to buildroot for building the zynqmp pmufw. It requires the toolchain-bare-metal package that includes a bare-metal binutils, gcc and newlib which can be built for the microblaze architecture. A patch is required to enable parallel building of the pmufw. This patch has been submitted upstream internally at AMD / Xilinx and will be included with the 2023.2 release of the embeddedsw repository. Signed-off-by: Neal Frager Tested-by: Luca Ceresoli Reviewed-by: Luca Ceresoli --- V1->V2: - builds a bare-metal gcc toolchain instead of requiring an external microblaze toolchain V2->V3: - corrected custom cflags option - added support for xilinx_v2022.2 version - added zynqmp-firmware.hash V3->V4: - no changes V4->V5: - reduced all lines to <80 chars V5->V6: - migrated to toolchain-bare-metal-buildroot --- DEVELOPERS | 1 + boot/Config.in | 1 + boot/zynqmp-firmware/Config.in | 22 ++++ ...akefile-specify-sequential-Makefiles.patch | 1 + ...akefile-specify-sequential-Makefiles.patch | 115 ++++++++++++++++++ boot/zynqmp-firmware/zynqmp-firmware.hash | 3 + boot/zynqmp-firmware/zynqmp-firmware.mk | 33 +++++ 7 files changed, 176 insertions(+) create mode 100644 boot/zynqmp-firmware/Config.in create mode 120000 boot/zynqmp-firmware/xilinx_v2022.2/0001-pmufw-misc-Makefile-specify-sequential-Makefiles.patch create mode 100644 boot/zynqmp-firmware/xilinx_v2023.1/0001-pmufw-misc-Makefile-specify-sequential-Makefiles.patch create mode 100644 boot/zynqmp-firmware/zynqmp-firmware.hash create mode 100644 boot/zynqmp-firmware/zynqmp-firmware.mk diff --git a/DEVELOPERS b/DEVELOPERS index 849a5263b5..33d84d4271 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2198,6 +2198,7 @@ N: Neal Frager F: board/versal/ F: board/zynq/ F: board/zynqmp/ +F: boot/zynqmp-firmware/ F: configs/versal_vck190_defconfig F: configs/zynq_zc706_defconfig F: configs/zynqmp_kria_kv260_defconfig diff --git a/boot/Config.in b/boot/Config.in index e5fdf7ad43..c7478fef2e 100644 --- a/boot/Config.in +++ b/boot/Config.in @@ -24,5 +24,6 @@ source "boot/ti-k3-image-gen/Config.in" source "boot/ti-k3-r5-loader/Config.in" source "boot/uboot/Config.in" source "boot/vexpress-firmware/Config.in" +source "boot/zynqmp-firmware/Config.in" endmenu diff --git a/boot/zynqmp-firmware/Config.in b/boot/zynqmp-firmware/Config.in new file mode 100644 index 0000000000..ce666ca264 --- /dev/null +++ b/boot/zynqmp-firmware/Config.in @@ -0,0 +1,22 @@ +config BR2_TARGET_ZYNQMP_FIRMWARE + bool "zynqmp-firmware" + select BR2_PACKAGE_HOST_TOOLCHAIN_BARE_METAL_BUILDROOT + help + This package builds the PMU Firmware application required + to run U-Boot and Linux in the Zynq MPSoC devices. + +if BR2_TARGET_ZYNQMP_FIRMWARE + +config BR2_TARGET_ZYNQMP_FIRMWARE_VERSION + string "firmware version" + default "xilinx_v2023.1" + help + Release version of zynqmp firmware. + Only versions xilinx_v2022.2 and newer are supported. + +config BR2_TARGET_ZYNQMP_FIRMWARE_CUSTOM_CFLAGS + string "custom cflags" + help + Adds additional CFLAGS for building zynqmp firmware. + +endif # BR2_TARGET_ZYNQMP_FIRMWARE diff --git a/boot/zynqmp-firmware/xilinx_v2022.2/0001-pmufw-misc-Makefile-specify-sequential-Makefiles.patch b/boot/zynqmp-firmware/xilinx_v2022.2/0001-pmufw-misc-Makefile-specify-sequential-Makefiles.patch new file mode 120000 index 0000000000..51cb8a6ae0 --- /dev/null +++ b/boot/zynqmp-firmware/xilinx_v2022.2/0001-pmufw-misc-Makefile-specify-sequential-Makefiles.patch @@ -0,0 +1 @@ +../xilinx_v2023.1/0001-pmufw-misc-Makefile-specify-sequential-Makefiles.patch \ No newline at end of file diff --git a/boot/zynqmp-firmware/xilinx_v2023.1/0001-pmufw-misc-Makefile-specify-sequential-Makefiles.patch b/boot/zynqmp-firmware/xilinx_v2023.1/0001-pmufw-misc-Makefile-specify-sequential-Makefiles.patch new file mode 100644 index 0000000000..29c652d6ef --- /dev/null +++ b/boot/zynqmp-firmware/xilinx_v2023.1/0001-pmufw-misc-Makefile-specify-sequential-Makefiles.patch @@ -0,0 +1,115 @@ +From 23002defd462845db376425a7b7d975f3deba83d Mon Sep 17 00:00:00 2001 +From: Neal Frager +Date: Mon, 24 Apr 2023 12:53:25 +0100 +Subject: [PATCH v1 1/1] pmufw: misc/Makefile: specify sequential Makefiles + +The BSP_SEQUENTIAL_MAKEFILES variable is not properly assigned and exported +from copy_bsp.sh. + +Because of this, no library is built sequentially even if it was desired to +build them sequentially by assigning to BSP_SEQUENTIAL_MAKEFILES. All the +libraries are built in parallel. + +This patch resolves this issue, so that libraries that must be built +sequentially are indeed built sequentially. + +Signed-off-by: Neal Frager +--- + lib/sw_apps/zynqmp_pmufw/misc/Makefile | 10 +++++++++- + lib/sw_apps/zynqmp_pmufw/misc/copy_bsp.sh | 7 ------- + lib/sw_apps/zynqmp_pmufw/src/Makefile | 2 ++ + 3 files changed, 11 insertions(+), 8 deletions(-) + +diff --git a/lib/sw_apps/zynqmp_pmufw/misc/Makefile b/lib/sw_apps/zynqmp_pmufw/misc/Makefile +index a773498512..fe2d23c965 100644 +--- a/lib/sw_apps/zynqmp_pmufw/misc/Makefile ++++ b/lib/sw_apps/zynqmp_pmufw/misc/Makefile +@@ -7,6 +7,14 @@ PROCESSOR = psu_pmu_0 + LIBRARIES = ${PROCESSOR}/lib/libxil.a + BSP_MAKEFILES := $(wildcard $(PROCESSOR)/libsrc/*/src/Makefile) + SUBDIRS := $(patsubst %/Makefile, %, $(BSP_MAKEFILES)) ++DRIVERS_LIST=../drivers.txt ++SEQUENTIAL_MAKEFILES := $(shell cat ${DRIVERS_LIST}) ++BSP_SEQUENTIAL_MAKEFILES = $(patsubst %, ${PROCESSOR}/libsrc/%/src/Makefile, $(SEQUENTIAL_MAKEFILES)) ++BSP_SEQUENTIAL_MAKEFILES += ${PROCESSOR}/libsrc/xilskey/src/Makefile ++BSP_SEQUENTIAL_MAKEFILES += ${PROCESSOR}/libsrc/xilfpga/src/Makefile ++BSP_SEQUENTIAL_MAKEFILES += ${PROCESSOR}/libsrc/xilsecure/src/Makefile ++BSP_SEQUENTIAL_MAKEFILES += ${PROCESSOR}/libsrc/dppsu/src/Makefile ++BSP_SEQUENTIAL_MAKEFILES += ${PROCESSOR}/libsrc/dpdma/src/Makefile + BSP_PARALLEL_MAKEFILES := $(filter-out $(BSP_SEQUENTIAL_MAKEFILES),$(BSP_MAKEFILES)) + SEQ_SUBDIRS := $(patsubst %/Makefile, %, $(BSP_SEQUENTIAL_MAKEFILES)) + PAR_SUBDIRS := $(patsubst %/Makefile, %, $(BSP_PARALLEL_MAKEFILES)) +@@ -16,7 +24,7 @@ ifneq (,$(findstring win,$(RDI_PLATFORM))) + endif + + all: +- $(MAKE) --no-print-directory seq_libs ++ $(MAKE) -j1 --no-print-directory seq_libs + $(MAKE) -j --no-print-directory par_libs + $(MAKE) --no-print-directory archive + @echo 'Finished building libraries' +diff --git a/lib/sw_apps/zynqmp_pmufw/misc/copy_bsp.sh b/lib/sw_apps/zynqmp_pmufw/misc/copy_bsp.sh +index 197f7af844..ac8dd8249e 100755 +--- a/lib/sw_apps/zynqmp_pmufw/misc/copy_bsp.sh ++++ b/lib/sw_apps/zynqmp_pmufw/misc/copy_bsp.sh +@@ -29,8 +29,6 @@ STANDALONE_DIR=$EMBEDDED_SW_DIR/lib/bsp/standalone/src + # libraries dir + SERVICES_DIR=$EMBEDDED_SW_DIR/lib/sw_services + +-BSP_SEQUENTIAL_MAKEFILES= +- + # creation of BSP folders required + if [ -d $BSP_DIR ]; then + echo "BSP directory already exists" +@@ -55,14 +53,12 @@ cp -r $SERVICES_DIR/xilfpga/src/interface/zynqmp/xilfpga_pcap.c $BSP_DIR/libsrc/ + cp -r $SERVICES_DIR/xilfpga/src/*.h $BSP_DIR/include/ + cp -r $SERVICES_DIR/xilfpga/src/interface/zynqmp/*.h $BSP_DIR/include/ + rm -r $BSP_DIR/libsrc/xilfpga/src/interface/ +-BSP_SEQUENTIAL_MAKEFILES="$BSP_SEQUENTIAL_MAKEFILES $BSP_DIR/libsrc/xilfpga/src/Makefile" + mkdir -p $BSP_DIR/libsrc/xilsecure/src/ + cp -r $SERVICES_DIR/xilsecure/src/Makefile $BSP_DIR/libsrc/xilsecure/src/ + cp -r $SERVICES_DIR/xilsecure/src/common/all/* $BSP_DIR/libsrc/xilsecure/src/ + cp -r $SERVICES_DIR/xilsecure/src/zynqmp/* $BSP_DIR/libsrc/xilsecure/src/ + cp -r $SERVICES_DIR/xilsecure/src/common/all/*.h $BSP_DIR/include/ + cp -r $SERVICES_DIR/xilsecure/src/zynqmp/*.h $BSP_DIR/include/ +-BSP_SEQUENTIAL_MAKEFILES="$BSP_SEQUENTIAL_MAKEFILES $BSP_DIR/libsrc/xilsecure/src/Makefile" + cp -r $SERVICES_DIR/xilskey/ $BSP_DIR/libsrc/ + + # remove the xilskey library files which are not required for PMU +@@ -84,7 +80,6 @@ rm -r $BSP_DIR/libsrc/xilskey/src/include/xilskey_bbram.h + # copy the xilskey library header files to include directory + cp -r $BSP_DIR/libsrc/xilskey/src/*.h $BSP_DIR/include/ + cp -r $BSP_DIR/libsrc/xilskey/src/include/*.h $BSP_DIR/include/ +-BSP_SEQUENTIAL_MAKEFILES="$BSP_SEQUENTIAL_MAKEFILES $BSP_DIR/libsrc/xilskey/src/Makefile" + + # copy bsp standalone code + cp -r $STANDALONE_DIR/common/* $BSP_DIR/libsrc/standalone/src/ +@@ -113,7 +108,6 @@ do + if [ $line != "avbuf" ] && [ $line != "video_common" ]; then + cp $WORKING_DIR/x"$line"_g.c $BSP_DIR/libsrc/$line/src/ + fi +- BSP_SEQUENTIAL_MAKEFILES="$BSP_SEQUENTIAL_MAKEFILES $BSP_DIR/libsrc/$line/src/Makefile" + + done < $DRIVERS_LIST + +@@ -136,4 +130,3 @@ cp $STANDALONE_DIR/profile/*.h $BSP_DIR/include/ + + # no inbyte and outbyte present in standalone + cp $WORKING_DIR/inbyte.c $WORKING_DIR/outbyte.c $BSP_DIR/libsrc/standalone/src/ +-export BSP_SEQUENTIAL_MAKEFILES +diff --git a/lib/sw_apps/zynqmp_pmufw/src/Makefile b/lib/sw_apps/zynqmp_pmufw/src/Makefile +index 1750c0a329..8747db5cdf 100644 +--- a/lib/sw_apps/zynqmp_pmufw/src/Makefile ++++ b/lib/sw_apps/zynqmp_pmufw/src/Makefile +@@ -27,6 +27,8 @@ all: $(EXEC) + $(EXEC): $(LIBS) $(OBJS) $(INCLUDES) + $(CC) -o $@ $(OBJS) $(CC_FLAGS) $(CFLAGS) $(LN_FLAGS) $(LIBPATH) $(LSCRIPT) + ++$(OBJS): $(LIBS) ++ + $(LIBS): + echo "Copying BSP files" + ../misc/copy_bsp.sh +-- +2.17.1 + diff --git a/boot/zynqmp-firmware/zynqmp-firmware.hash b/boot/zynqmp-firmware/zynqmp-firmware.hash new file mode 100644 index 0000000000..ee2d656110 --- /dev/null +++ b/boot/zynqmp-firmware/zynqmp-firmware.hash @@ -0,0 +1,3 @@ +# locally computed +sha256 fc0e86027bdba53f5df373bcb38a171d61704db4ff1b4671f3886a87ceec7068 zynqmp-firmware-xilinx_v2022.2.tar.gz +sha256 9850f893113936b9959cc76cc3e9152e30f815ff1acaa4b45f7a60fe3e1836f0 zynqmp-firmware-xilinx_v2023.1.tar.gz diff --git a/boot/zynqmp-firmware/zynqmp-firmware.mk b/boot/zynqmp-firmware/zynqmp-firmware.mk new file mode 100644 index 0000000000..be49cb197d --- /dev/null +++ b/boot/zynqmp-firmware/zynqmp-firmware.mk @@ -0,0 +1,33 @@ +################################################################################ +# +# zynqmp-firmware +# +################################################################################ + +ZYNQMP_FIRMWARE_VERSION = $(call qstrip,$(BR2_TARGET_ZYNQMP_FIRMWARE_VERSION)) +ZYNQMP_FIRMWARE_SITE = \ + $(call github,Xilinx,embeddedsw,$(ZYNQMP_FIRMWARE_VERSION)) +ZYNQMP_FIRMWARE_LICENSE = MIT +ZYNQMP_FIRMWARE_LICENSE_FILES = license.txt +ZYNQMP_FIRMWARE_INSTALL_IMAGES = YES +ZYNQMP_FIRMWARE_INSTALL_TARGET = NO +ZYNQMP_FIRMWARE_DEPENDENCIES = host-newlib-bare-metal + +CUSTOM_CFLAGS = $(call qstrip,$(BR2_TARGET_ZYNQMP_FIRMWARE_CUSTOM_CFLAGS)) +ZYNQMP_CFLAGS = "-Os -flto -ffat-lto-objects $(CUSTOM_CFLAGS)" + +define ZYNQMP_FIRMWARE_BUILD_CMDS + $(MAKE) -C $(@D)/lib/sw_apps/zynqmp_pmufw/src \ + COMPILER=$(HOST_DIR)/bin/microblazeel-xilinx-elf-gcc \ + ARCHIVER=$(HOST_DIR)/bin/microblazeel-xilinx-elf-gcc-ar \ + CC=$(HOST_DIR)/bin/microblazeel-xilinx-elf-gcc \ + CFLAGS=$(ZYNQMP_CFLAGS) +endef + +PMUFW_PATH = $(@D)/lib/sw_apps/zynqmp_pmufw/src/executable.elf + +define ZYNQMP_FIRMWARE_INSTALL_IMAGES_CMDS + $(INSTALL) -D -m 0755 $(PMUFW_PATH) $(BINARIES_DIR)/pmufw.elf +endef + +$(eval $(generic-package)) From patchwork Fri Oct 20 11:42:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neal Frager X-Patchwork-Id: 1852501 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::136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SBjSD3dfpz23jM for ; Fri, 20 Oct 2023 22:45:00 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id B717E70497; Fri, 20 Oct 2023 11:44:58 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org B717E70497 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4Yrr5Lg77z7D; Fri, 20 Oct 2023 11:44:57 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id D8264607DE; Fri, 20 Oct 2023 11:44:56 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org D8264607DE 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 5CDC91BF3A9 for ; Fri, 20 Oct 2023 11:43:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 4092D402A7 for ; Fri, 20 Oct 2023 11:43:29 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 4092D402A7 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 DWclP5pOq4tm for ; Fri, 20 Oct 2023 11:43:27 +0000 (UTC) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2060c.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e8c::60c]) by smtp2.osuosl.org (Postfix) with ESMTPS id ACCED41467 for ; Fri, 20 Oct 2023 11:43:27 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org ACCED41467 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VXplFac2JvLvSzuwLI9B3ukzW44kwvS0wPDjvwkUrGg6ZPU/fZ5/B3NRwRAO2AkecTpXCNEL8tC5yilS8J3c4ziOGiUbaDR+gGw+ZfgpaUSjzszepCEaqICYulHx2gtrnPu4YYgwjHMpz1/F2Mh6xOPNJg+RM6R6MfPLht43sgfM1jgQOIM1IErLYelZxI/rWXm7UHyGaiIn3mK0fGsKAmDMKMxX1De9xZ1yg2XjtRlXDtwRAriG5OpcW95vgC0hp1Ronel1LZ+yfKkrGGCo0EOiCBF4Z0vaLXTbPJ0UvCj8ma+VjW2RM2YA8K0/zkOtSKlvw4BiK5hEkKlE66E3rg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=xHZmN9ryUT5Q6vVOmBBTcfYkVS7ZOh6l0CdEYrqAaNU=; b=RZUUjWX77HZyP4kiptiHe1AiurZVRFz2SDFAIfdO9KPKAJobnp10UV+l5p/i+o2hHuNE+b5u5KbkUhsmoUCX4sKh2tZONw9y8wHiyWVRdg9EXNFdam6SB3n2a3hqXpv8yS18S6gvmrH3dL3K/YsY8KMKNKUkuJ4LCbSVz2FSpJmJUv9y+IkEoaY7Pv8zJRq9hnEcbe3tuph9leu5+jRuPpdfXkOQeGFJaWbAvhr2IWJxveQVR/ATu/dUmz+RhulbzHs/8bP3aTwzDGb8udmudEXZwzLfOZkrWK3zUu8p/4lLEOrVaEtNcJ4a9gwxcxAE164rYCejHI6R6B/b9on2VQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=buildroot.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none Received: from SA0PR11CA0030.namprd11.prod.outlook.com (2603:10b6:806:d3::35) by BL1PR12MB5334.namprd12.prod.outlook.com (2603:10b6:208:31d::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.26; Fri, 20 Oct 2023 11:43:22 +0000 Received: from SN1PEPF0002636A.namprd02.prod.outlook.com (2603:10b6:806:d3:cafe::f3) by SA0PR11CA0030.outlook.office365.com (2603:10b6:806:d3::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.26 via Frontend Transport; Fri, 20 Oct 2023 11:43:22 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF0002636A.mail.protection.outlook.com (10.167.241.135) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6907.20 via Frontend Transport; Fri, 20 Oct 2023 11:43:22 +0000 Received: from SATLEXMB06.amd.com (10.181.40.147) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Fri, 20 Oct 2023 06:43:17 -0500 Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB06.amd.com (10.181.40.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Fri, 20 Oct 2023 06:43:09 -0500 Received: from xirengwts09.xilinx.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.27 via Frontend Transport; Fri, 20 Oct 2023 06:43:08 -0500 To: Date: Fri, 20 Oct 2023 12:42:32 +0100 Message-ID: <20231020114236.4129636-6-neal.frager@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231020114236.4129636-1-neal.frager@amd.com> References: <20231020114236.4129636-1-neal.frager@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF0002636A:EE_|BL1PR12MB5334:EE_ X-MS-Office365-Filtering-Correlation-Id: 7c9bbe90-b8f6-40d3-152d-08dbd161c374 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QZyNtMKbGC3SaVqsTKvoERqyycwjpuEJ+PULA7MYTPdbY5Ypz6wGAQIB13k0gkpxcOCXSoNCPBUiiHXEHmIdogdLp05ZntJpWqr8s+c0/R7CqTzJPZvQwMrSBV8acilEHnfj/P4bmQYz+VTHws+v+5FhWFlElLBucN4oFdVEjYEKhIaMW+9lHpFrytCWv396Mh1whzWe7PLYORBXA5Q8qIOX45xFaY6D7lt4HX2c3QMBHvROmeyu+sY8qQ3qal7N0krHi1szIEzl3DBFbcJaizdOaf9BkG0wW4YJZ3FgOCxd5ZBych/tstFXq6u8DMqTX6CSiSWEEIar0luo4scLnulzFDkG5bM3h03LutYb8/uR87pdvVnfdUT9PsZ+CNWIt+3DqdgW+V/VtzoY1bOqg062zlidN3SKXwhkPEUMc2r+5CKaegoyW5TPLD9oVChdSlUHlxCIyOQifmnETCrj2riOKEO7eGhzRHsy/twtmNyqYSjS09GdcoQvOMgU+KRBs+yE9XqIMt2ClgKSaivKROMAN0ZFRyZR/5kUKVqt9Ff1OmR+Sa3T9A2qytZKw9KQaDhmDWediqh54UtPcbzwVhQP5yWoHkmrOPSIyl5Ht3C7kyHGWeZDmNamDeWsPoQG/djoyPMYaM9Z91iPnoxk8N6aXTFZTXk+8v2gA6/xfmTEMk7w2Lly9RSvfiN49Ky99UCLFab3QlEUkUfvUfTIy/6gbLLV90YWrXenwTDEQ6b+ogpFdKId+cHZiBwf/hm3CJZK8URcjmoOV7q9NN+2Ow== X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230031)(4636009)(136003)(346002)(39860400002)(396003)(376002)(230922051799003)(1800799009)(186009)(451199024)(82310400011)(64100799003)(46966006)(36840700001)(40470700004)(4326008)(8936002)(8676002)(44832011)(5660300002)(41300700001)(356005)(36860700001)(81166007)(86362001)(36756003)(82740400003)(83380400001)(40480700001)(40460700003)(47076005)(6916009)(6666004)(478600001)(54906003)(70586007)(70206006)(316002)(2906002)(2616005)(426003)(336012)(26005)(1076003)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2023 11:43:22.3629 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7c9bbe90-b8f6-40d3-152d-08dbd161c374 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF0002636A.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5334 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=xHZmN9ryUT5Q6vVOmBBTcfYkVS7ZOh6l0CdEYrqAaNU=; b=ZWg+jdSnZkRd/zRyFjCXMFBZ2qLj8t0vU5G6RXzZl/9hgJ7fdLiIr5Ao1oQSqznrVMlOCT6cPnvRJxbJTg54dR+FEvldfdG24Kb/tVHmnf10eLAb6zRJakLLAh4C1fkQH8JyDbVgaTyBOhLr4KGQhD5czODb1jjLqVxfwz7r9Q8= X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (1024-bit key, unprotected) header.d=amd.com header.i=@amd.com header.a=rsa-sha256 header.s=selector1 header.b=ZWg+jdSn Subject: [Buildroot] [PATCH v6 06/10] boot/uboot.mk: new zynqmp pmufw build option 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: Neal Frager via buildroot From: Neal Frager Reply-To: Neal Frager Cc: ibai.erkiaga-elorza@amd.com, luca.ceresoli@bootlin.com, thomas.petazzoni@bootlin.com, Neal Frager , michal.simek@amd.com Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" The new BR2_TARGET_UBOOT_ZYNQMP_PMUFW_SOURCE option will enable u-boot to use the zynqmp-firmware package for building a pmufw.elf that gets included in the generated boot.bin. If the BR2_TARGET_UBOOT_ZYNQMP_PMUFW_SOURCE option is enabled, then the BR2_TARGET_UBOOT_ZYNQMP_PMUFW config for downloading a prebuilt pmufw will be ignored. Signed-off-by: Neal Frager Tested-by: Luca Ceresoli Reviewed-by: Luca Ceresoli --- V1->V2: - patch is now backwards compatible for users already using the BR2_TARGET_UBOOT_ZYNQMP_PMUFW config for downloading a prebuilt pmufw V2->V3: - no changes V3->V4: - BR2_TARGET_UBOOT_ZYNQMP_PMUFW removed when BR2_TARGET_UBOOT_ZYNQMP_PMUFW_SOURCE selected V4->V6: - no changes --- boot/uboot/Config.in | 19 +++++++++++++++++-- boot/uboot/uboot.mk | 5 +++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 21f19db890..ef9e811764 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -514,11 +514,26 @@ config BR2_TARGET_UBOOT_ZYNQMP if BR2_TARGET_UBOOT_ZYNQMP +config BR2_TARGET_UBOOT_ZYNQMP_PMUFW_SOURCE + bool "Build zynqmp PMU firmware from source" + select BR2_TARGET_ZYNQMP_FIRMWARE + depends on BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG + help + This option instructs u-boot to build the zynqmp pmufw using + the zynqmp-firmware package. u-boot will then include this + pmufw.elf in the generated boot.bin. + + If this option is selected, the BR2_TARGET_UBOOT_ZYNQMP_PMUFW + prebuilt option will be ignored. + + This feature requires U-Boot >= 2018.07. + config BR2_TARGET_UBOOT_ZYNQMP_PMUFW - string "PMU firmware location" + string "Pre-built zynqmp PMU firmware location" depends on BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG + depends on !BR2_TARGET_UBOOT_ZYNQMP_PMUFW_SOURCE help - Location of a PMU firmware binary. + Location of a pre-built PMU firmware binary. If not empty, instructs the U-Boot build process to generate a boot.bin (to be loaded by the ZynqMP boot ROM) containing diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index dda606a880..c11e3d89f7 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -416,7 +416,12 @@ endef ifeq ($(BR2_TARGET_UBOOT_ZYNQMP),y) +ifeq ($(BR2_TARGET_UBOOT_ZYNQMP_PMUFW_SOURCE),y) +UBOOT_DEPENDENCIES += zynqmp-firmware +UBOOT_ZYNQMP_PMUFW = $(BINARIES_DIR)/pmufw.elf +else UBOOT_ZYNQMP_PMUFW = $(call qstrip,$(BR2_TARGET_UBOOT_ZYNQMP_PMUFW)) +endif #BR2_TARGET_UBOOT_ZYNQMP_PMUFW_SOURCE ifneq ($(findstring ://,$(UBOOT_ZYNQMP_PMUFW)),) UBOOT_EXTRA_DOWNLOADS += $(UBOOT_ZYNQMP_PMUFW) From patchwork Fri Oct 20 11:42:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neal Frager X-Patchwork-Id: 1852499 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::136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SBjRl0bX0z23kS for ; Fri, 20 Oct 2023 22:44:34 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 1789D70529; Fri, 20 Oct 2023 11:44:33 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 1789D70529 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 55TsUD7_EE7N; Fri, 20 Oct 2023 11:44:32 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 0C64C70520; Fri, 20 Oct 2023 11:44:30 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 0C64C70520 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 10EC21BF3A9 for ; Fri, 20 Oct 2023 11:43:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id CF0B070505 for ; Fri, 20 Oct 2023 11:43:26 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org CF0B070505 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id T1I8QkxJe2Zm for ; Fri, 20 Oct 2023 11:43:25 +0000 (UTC) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on20614.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe59::614]) by smtp3.osuosl.org (Postfix) with ESMTPS id 72C1570368 for ; Fri, 20 Oct 2023 11:43:25 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 72C1570368 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iJW5DUR1x00RsKeaguQjLzvY1FTU1w555CBOOUhu0Pzo5lLSXla3/YFy0z6I09TM2JJMN4aYV4m9gX6nWGiEctOhlUhM3+3/tZpKiCgaPF2p6z/16U6aEM7oF3VEnccGmkiU/ZnNINR5cseKG40hHFr/MNuxn7TSR8JZ+GhF/aenpYzk1b6xrWOZfg3xIPrD52SMyISEvSaOOYyGexiZciFzHBa6M3OkURZAYNbVERWLwWG49JMcx99KuxTCf1o7uI0MxWj1pfbBoagOVKLiiL4N1FtlzRVs2IlltPfKJsf8cc1/kFcFVnM78n/Dt6NRgZoqZRvxCTB+jKeEOLJkzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=EDxtn+opHMgUqnAQ1ziTyFyj5zZ4tWjSNPmEWOqO/ik=; b=DkK0YvvZ+cF3wQaAjIZPTeonGPpPwe+ZVUZwjoiDO06LMAnHmdz3CjeAn/y6Uom9YhBTvSZXZdUsFUTPekQ5sNC6U4DZKAJ7CHrtLxYgEloc4GFN4e1EQAOdPMb4llGyaBXtF0hucRh7bzdVGs/ApiOjEBGLptgtNC44rc95oICT2mxmDRmUtQ0KlnFvLzge61bhsxSpMTwinL83/m48C59uZ8hFkYlyHqUO5yRgSQ49TmHRa1T+75M2z+HhdWRJ5GjqofWtps8PGhYC5Rl0zxcsrER/04nru2nQpfKwapyO0mAfIzE5ibeK/WEsXayLpkANBCrkSuCL91fw/YRQ9Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=buildroot.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none Received: from SA0PR11CA0022.namprd11.prod.outlook.com (2603:10b6:806:d3::27) by PH0PR12MB8005.namprd12.prod.outlook.com (2603:10b6:510:26c::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.24; Fri, 20 Oct 2023 11:43:22 +0000 Received: from SN1PEPF0002636A.namprd02.prod.outlook.com (2603:10b6:806:d3:cafe::d5) by SA0PR11CA0022.outlook.office365.com (2603:10b6:806:d3::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.26 via Frontend Transport; Fri, 20 Oct 2023 11:43:22 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF0002636A.mail.protection.outlook.com (10.167.241.135) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6907.20 via Frontend Transport; Fri, 20 Oct 2023 11:43:22 +0000 Received: from SATLEXMB08.amd.com (10.181.40.132) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Fri, 20 Oct 2023 06:43:17 -0500 Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB08.amd.com (10.181.40.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Fri, 20 Oct 2023 04:43:12 -0700 Received: from xirengwts09.xilinx.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.27 via Frontend Transport; Fri, 20 Oct 2023 06:43:11 -0500 To: Date: Fri, 20 Oct 2023 12:42:33 +0100 Message-ID: <20231020114236.4129636-7-neal.frager@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231020114236.4129636-1-neal.frager@amd.com> References: <20231020114236.4129636-1-neal.frager@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF0002636A:EE_|PH0PR12MB8005:EE_ X-MS-Office365-Filtering-Correlation-Id: 1a80496a-096b-4c6c-d72f-08dbd161c3b6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: D6rzi3kTtVtZFilfkiPwdUB6nWJY2nX6iiTnV1K/BdR7tkBhp8FuEDncLQpBywnyKk+aDjMdKYQhTFOZSaZRfowCqdJ7B5hPDVRQbu3KtTS6Nep90krjtCcPvONeIMa52UgRnxTSHub0jZweYnedtAOhXEsffJNERqWqZ3ZhRbsOkzEglr2X+SPeX0jTHNnvdsFz7dEXdAa7FG7Z3PcxNKpfyEVroCH6QQv8p6+9k5I41SVU1ZvaeDpBmoz/emU2h4+Oacc0WCIALiuoSoBVfrWYjUTibtochsuBKnUPN5HO5GdFiZVlpsAAi2tmn8FN4Q29SwdVnE/o6lIGIsdcmQnSLZjxDkYP9ZJqotbdfqywBZu7NEOeKShW5gwLXDQsQJzzwWdU1F8+Dg6XNDj5GMWf/rh8JsSx0rrL+PuIQYuCZwq92Zm1Uz+67tSZ/SjBBAJ4lMzEVuvEyI09/hN4pjbOEMU6VEnKyFaoBiiWnrBK4E7q9paFg+rVEpRd97L0aTIql9NeOgQG7jx7hgr52EK5Ld1N6DGBSKJKz7Wo1AvqHAe1+AQv/gum5+kJL2UkP0b4rYxpkKgycZl9CRFoKb69Crj2vJLYi3RxqHZv1YCsm4J1NSGbWdb93UCPAYJUQa1/jUcMPFCfx0M1wd3u9Cf5k9NR8haOcYAXJ6VKZFaoOzwIZFXQwE8JQTLQfU/8EbPiTk1pJEJkgrBXb5ktYeK8/fN8XPCVvWCo4Krr4gEr6ncOqcxf9avTK/QjKM4WtNy7w4NzdJRjYW0nvnyCDqUetai7LqRsHZx8Ci/akJo= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230031)(4636009)(396003)(376002)(346002)(39860400002)(136003)(230922051799003)(186009)(82310400011)(64100799003)(1800799009)(451199024)(40470700004)(36840700001)(46966006)(36860700001)(356005)(336012)(426003)(26005)(82740400003)(47076005)(40460700003)(5660300002)(83380400001)(316002)(4326008)(44832011)(86362001)(8676002)(54906003)(70206006)(8936002)(1076003)(6916009)(70586007)(41300700001)(478600001)(6666004)(2906002)(40480700001)(81166007)(2616005)(36756003)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2023 11:43:22.7379 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1a80496a-096b-4c6c-d72f-08dbd161c3b6 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF0002636A.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR12MB8005 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=EDxtn+opHMgUqnAQ1ziTyFyj5zZ4tWjSNPmEWOqO/ik=; b=MEcQTSYGfxtncUgZBuPvDgSO5gUsWNGq5v+vAkT0dwIzt0wY2rG4Crd5oG9bfYZ9uRLmr1sovegzaxrZgUlJWignRqSsgyE8kyFi0bw5SfoLnShUmvupOzIZN3HxKjQyVPtGYBCSyVLw18yLxv1fiZg0tc8G4zOE+jz7JiMfx3A= X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (1024-bit key, unprotected) header.d=amd.com header.i=@amd.com header.a=rsa-sha256 header.s=selector1 header.b=MEcQTSYG Subject: [Buildroot] [PATCH v6 07/10] configs/zynqmp*: build pmufw source 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: Neal Frager via buildroot From: Neal Frager Reply-To: Neal Frager Cc: ibai.erkiaga-elorza@amd.com, luca.ceresoli@bootlin.com, thomas.petazzoni@bootlin.com, Neal Frager , michal.simek@amd.com Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" This patch migrates the zynqmp config files to use the new zynqmp-firmware package for building the zynqmp pmufw from source. Signed-off-by: Neal Frager Tested-by: Luca Ceresoli Reviewed-by: Luca Ceresoli --- V4->V6: - no changes --- configs/zynqmp_kria_kv260_defconfig | 4 +++- configs/zynqmp_zcu102_defconfig | 3 ++- configs/zynqmp_zcu106_defconfig | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/configs/zynqmp_kria_kv260_defconfig b/configs/zynqmp_kria_kv260_defconfig index 78b62a9ff8..5e0c820ba7 100644 --- a/configs/zynqmp_kria_kv260_defconfig +++ b/configs/zynqmp_kria_kv260_defconfig @@ -32,7 +32,9 @@ BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2023.1/kv260-kria/pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW_SOURCE=y +BR2_TARGET_ZYNQMP_FIRMWARE_VERSION="xilinx_v2023.1" +BR2_TARGET_ZYNQMP_FIRMWARE_CUSTOM_CFLAGS="-DBOARD_SHUTDOWN_PIN=2 -DBOARD_SHUTDOWN_PIN_STATE=0 -DENABLE_EM -DENABLE_MOD_OVERTEMP -DENABLE_DYNAMIC_MIO_CONFIG -DENABLE_IOCTL -DCONNECT_PMU_GPO_2_VAL=0" BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/kria/kv260/pm_cfg_obj.c" BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig index 18230cf89b..6674fc6dfb 100644 --- a/configs/zynqmp_zcu102_defconfig +++ b/configs/zynqmp_zcu102_defconfig @@ -30,7 +30,8 @@ BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2023.1/zcu102-zynqmp/pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW_SOURCE=y +BR2_TARGET_ZYNQMP_FIRMWARE_VERSION="xilinx_v2023.1" BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu102/pm_cfg_obj.c" BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index 21f41a2d8f..201d3daeda 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -30,7 +30,8 @@ BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2023.1/zcu106-zynqmp/pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW_SOURCE=y +BR2_TARGET_ZYNQMP_FIRMWARE_VERSION="xilinx_v2023.1" BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu106/pm_cfg_obj.c" BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y From patchwork Fri Oct 20 11:42:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neal Frager X-Patchwork-Id: 1852502 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::136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SBjSV1q2nz20cX for ; Fri, 20 Oct 2023 22:45:14 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 5B2C260745; Fri, 20 Oct 2023 11:45:12 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 5B2C260745 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id llruifvkBGwD; Fri, 20 Oct 2023 11:45:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id C452170497; Fri, 20 Oct 2023 11:45:09 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org C452170497 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 337371BF3A9 for ; Fri, 20 Oct 2023 11:43:30 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 18B964ECA7 for ; Fri, 20 Oct 2023 11:43:30 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 18B964ECA7 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id s_0KeF2bYxi3 for ; Fri, 20 Oct 2023 11:43:28 +0000 (UTC) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on20625.outbound.protection.outlook.com [IPv6:2a01:111:f400:7eaa::625]) by smtp4.osuosl.org (Postfix) with ESMTPS id 6C9984EC90 for ; Fri, 20 Oct 2023 11:43:28 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 6C9984EC90 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mcAy79X2jEg+7B2TGTxqK+ccAmTSkDKj8YdO8yqCzFb8sKA6xH5fvxR1TVS+2dxl95bpLiFhzyxpVHp+Duc7TQkmS27ygP17kRcvQwtT6pCSLf8+b+wGA/9QJUtDBiVzoqc9zfUf9kZe8jww5rJADuaMPJ9qWAgfcB1jyml95RZ0xxyb2YmSmh2CJUXV1/9iste2/Zsv2NFqrb9faVqhTuWkJPJ643P+m8KCiaZl6g19kVhkIjI5urpLkVBaMz9jLCchPyas7ztc4s7ZUjrrAJu8yH4lFGSxoiD4DtvCauT21mLNzxWkDv3vg+Ww8eM6zmag29Ivj9/65iehyafERw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=81PGbehGl0iAgFhlif8DsQteOWNJiR07HAS09OhjHyI=; b=aPrRG2Q17698qYBfTgqgzAZwgB3s4obkcsx2zITFdsc5YtkyGIs5d5Ew2/zhjzbUAZbwpn1R0dN+9mynjyKd2T2hbcs0hP6IpwhjlGWHpdXlkH+k8wNhW4WJMjxzwr0QfosmZWOx3uK5oYgKVDp6xmj5pjRcrtErsfGjw7+As/qNm/3XvGSFqzgR0z5j7OO9LSGazV3oUgZpcJBo+sIo/sTohCs4FbgeqErygoPGHl4TnnzM1wdqJZiIXDt62qyhzXcT8iNc6Jp9iok30ZWcFijArIGYKx6NsMJrdZsjJ82g8R9WBZfLs4O5/ldjVRlIYZlLnK3+uDcFHYl5cpXmXw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=buildroot.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none Received: from BN9PR03CA0302.namprd03.prod.outlook.com (2603:10b6:408:112::7) by MN0PR12MB6200.namprd12.prod.outlook.com (2603:10b6:208:3c3::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.21; Fri, 20 Oct 2023 11:43:23 +0000 Received: from SN1PEPF0002636D.namprd02.prod.outlook.com (2603:10b6:408:112:cafe::4a) by BN9PR03CA0302.outlook.office365.com (2603:10b6:408:112::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.26 via Frontend Transport; Fri, 20 Oct 2023 11:43:23 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF0002636D.mail.protection.outlook.com (10.167.241.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6907.20 via Frontend Transport; Fri, 20 Oct 2023 11:43:22 +0000 Received: from SATLEXMB05.amd.com (10.181.40.146) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Fri, 20 Oct 2023 06:43:17 -0500 Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB05.amd.com (10.181.40.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Fri, 20 Oct 2023 06:43:15 -0500 Received: from xirengwts09.xilinx.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.27 via Frontend Transport; Fri, 20 Oct 2023 06:43:14 -0500 To: Date: Fri, 20 Oct 2023 12:42:34 +0100 Message-ID: <20231020114236.4129636-8-neal.frager@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231020114236.4129636-1-neal.frager@amd.com> References: <20231020114236.4129636-1-neal.frager@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF0002636D:EE_|MN0PR12MB6200:EE_ X-MS-Office365-Filtering-Correlation-Id: 7bb03b8b-5fb5-414e-810c-08dbd161c389 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +XdmfV1AZNq442TLP6gMMHxxo4TgrGKP9aC9qcK1dL9IJsjt6Nt8e/Bao1mZW31SgGSeILIfOzMz/7YtIo9K4wUnuKmyLA5bK8K2E2IXbOVI0qjjNKvNMvVd41OG5RxGZzTJMpv6KUuh9XUfGQOT3pj7l7xJ2ds/yH9RFmmlMKlYr0DwFez/CmuU5hsAMsMDKbgfxcUN+ihj4jslo18p1Et4EB727bPThNzJk1KVzg5/oeu6pQoDhRUpescA3JmlopoBGIqWnpT8eT7RlVNF1+LH38yirkfeZXnE8ksq42XZQqeK8+CErWkWLbBYvS77C3vmfCMm/ISccftQOPm8T6S9gaiVqLNV4OAKhTzKoepjnqeKbxEojCbtoMlrxdLEfVOi8fk45IBpnO1dwN6PjxJMZ2nuptJE/jOg60skwvt1E6qgnQKwIbiEgakL8d8DwfQmoggVKzEWx9r3khizCKh7IjW9OvDrS+8RLMO+hI4lKwtl4xsCMX9M1HvzEgGQJTUxnbuYaw/3ucF7ybMCu/qUAk7Zfc+qH0kI5gwXntf70pq0HXHYIKJLbii9nUypmtdNYV4oSuzf12CzEFvkrQM2MJuq5DM54rnvKSczb4K6C8nZ8d43Sj40+5SMO9IcQWwSe+fxsuMPwqyI9W6sdN+eOWcSPprzjO+057UWrwfd+R3d7OiO/k53Sl+b8Big8duSFHWEVWPvTwF1u0a+vGI9BqPGoG7IgATVZtHctSacngMb8iKfgJ4Nt+v2wEdTR/75vzhVTDBeNtT6prnxUQ== X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230031)(4636009)(396003)(39860400002)(136003)(346002)(376002)(230922051799003)(82310400011)(186009)(64100799003)(1800799009)(451199024)(40470700004)(36840700001)(46966006)(36756003)(40480700001)(40460700003)(2616005)(54906003)(6916009)(70586007)(86362001)(81166007)(82740400003)(356005)(426003)(336012)(316002)(83380400001)(6666004)(1076003)(26005)(8936002)(4326008)(478600001)(2906002)(5660300002)(44832011)(8676002)(70206006)(41300700001)(30864003)(36860700001)(47076005)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2023 11:43:22.5189 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7bb03b8b-5fb5-414e-810c-08dbd161c389 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF0002636D.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB6200 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=81PGbehGl0iAgFhlif8DsQteOWNJiR07HAS09OhjHyI=; b=04HV5AC6AEhDts6gFT73LRNIIWt5yaZ9PM8isdCnHsKg9zOWaPZB7AveRD5IYn1e2J/56AH5w+itJi5/EDm+nD2SkSbEUWsqmA91toD8azUffZ+Goq0upvVrbCuj6a+2pnkUa1NZCA4aaLNN10OFmPzTSblgadcHu0cXjHFiL3w= X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (1024-bit key, unprotected) header.d=amd.com header.i=@amd.com header.a=rsa-sha256 header.s=selector1 header.b=04HV5AC6 Subject: [Buildroot] [PATCH v6 08/10] boot/versal-firmware: new boot firmware 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: Neal Frager via buildroot From: Neal Frager Reply-To: Neal Frager Cc: ibai.erkiaga-elorza@amd.com, luca.ceresoli@bootlin.com, thomas.petazzoni@bootlin.com, Neal Frager , michal.simek@amd.com Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" This patch adds a new boot firmware to buildroot for building the versal plm and psmfw. It requires the toolchain-bare-metal package that includes a bare-metal binutils, gcc and newlib which can be built for the microblaze architecture. Patches are required to enable parallel building of the versal plm and psmfw applications. These two patches have been submitted upstream internally at AMD / Xilinx and will be included with the 2023.2 release of the embeddedsw repository. Signed-off-by: Neal Frager Tested-by: Luca Ceresoli Reviewed-by: Luca Ceresoli --- V4->V5: - automatically select bootgen as a needed tool - reduce all lines to <80 chars - add help for PDI file location which could be URL or local V5->V6: - migrated to toolchain-bare-metal-buildroot --- DEVELOPERS | 1 + boot/Config.in | 1 + boot/versal-firmware/Config.in | 38 +++++ boot/versal-firmware/versal-firmware.hash | 2 + boot/versal-firmware/versal-firmware.mk | 52 ++++++ ...al_plm-add-support-of-parallel-build.patch | 157 ++++++++++++++++++ ..._psmfw-add-support-of-parallel-build.patch | 48 ++++++ 7 files changed, 299 insertions(+) create mode 100644 boot/versal-firmware/Config.in create mode 100644 boot/versal-firmware/versal-firmware.hash create mode 100644 boot/versal-firmware/versal-firmware.mk create mode 100644 boot/versal-firmware/xilinx_v2023.1/0001-sw_apps-versal_plm-add-support-of-parallel-build.patch create mode 100644 boot/versal-firmware/xilinx_v2023.1/0002-sw_apps-versal_psmfw-add-support-of-parallel-build.patch diff --git a/DEVELOPERS b/DEVELOPERS index 33d84d4271..087093a59a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2198,6 +2198,7 @@ N: Neal Frager F: board/versal/ F: board/zynq/ F: board/zynqmp/ +F: boot/versal-firmware/ F: boot/zynqmp-firmware/ F: configs/versal_vck190_defconfig F: configs/zynq_zc706_defconfig diff --git a/boot/Config.in b/boot/Config.in index c7478fef2e..da5ccb6b9c 100644 --- a/boot/Config.in +++ b/boot/Config.in @@ -23,6 +23,7 @@ source "boot/ti-k3-boot-firmware/Config.in" source "boot/ti-k3-image-gen/Config.in" source "boot/ti-k3-r5-loader/Config.in" source "boot/uboot/Config.in" +source "boot/versal-firmware/Config.in" source "boot/vexpress-firmware/Config.in" source "boot/zynqmp-firmware/Config.in" diff --git a/boot/versal-firmware/Config.in b/boot/versal-firmware/Config.in new file mode 100644 index 0000000000..b7ca7b866f --- /dev/null +++ b/boot/versal-firmware/Config.in @@ -0,0 +1,38 @@ +config BR2_TARGET_VERSAL_FIRMWARE + bool "versal-firmware" + select BR2_PACKAGE_HOST_TOOLCHAIN_BARE_METAL_BUILDROOT + select BR2_PACKAGE_HOST_BOOTGEN + help + This package builds the boot firmware apps for Xilinx versal + boards, so that they can boot u-boot and Linux. + +if BR2_TARGET_VERSAL_FIRMWARE + +config BR2_TARGET_VERSAL_FIRMWARE_VERSION + string "firmware version" + default "xilinx_v2023.1" + help + Release version of versal firmware. + Only versions xilinx_v2023.1 and newer are supported. + +config BR2_TARGET_VERSAL_FIRMWARE_CUSTOM_CFLAGS + string "custom cflags" + help + Adds additional CFLAGS for building versal firmware. + +config BR2_TARGET_VERSAL_FIRMWARE_PDI + string "pdi file location" + default "https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2023.1/vck190-versal/vpl_gen_fixed.pdi" + help + The PDI file defines everything which is board specific for versal. + It gets parsed by the plm.elf during boot. To boot a custom target + based on versal, this should be configured to point to your Vivado + generated PDI file. + + The location of the PDI can be either a URL for download or a file + in the local repository. + + This config should never be undefined, so default configuration is + for the vck190 evaluation board. + +endif # BR2_TARGET_VERSAL_FIRMWARE diff --git a/boot/versal-firmware/versal-firmware.hash b/boot/versal-firmware/versal-firmware.hash new file mode 100644 index 0000000000..3a03f9c3ff --- /dev/null +++ b/boot/versal-firmware/versal-firmware.hash @@ -0,0 +1,2 @@ +# locally computed +sha256 9850f893113936b9959cc76cc3e9152e30f815ff1acaa4b45f7a60fe3e1836f0 versal-firmware-xilinx_v2023.1.tar.gz diff --git a/boot/versal-firmware/versal-firmware.mk b/boot/versal-firmware/versal-firmware.mk new file mode 100644 index 0000000000..6d49a52d37 --- /dev/null +++ b/boot/versal-firmware/versal-firmware.mk @@ -0,0 +1,52 @@ +################################################################################ +# +# versal-firmware +# +################################################################################ + +VERSAL_FIRMWARE_VERSION = $(call qstrip,$(BR2_TARGET_VERSAL_FIRMWARE_VERSION)) +VERSAL_FIRMWARE_SITE = \ + $(call github,Xilinx,embeddedsw,$(VERSAL_FIRMWARE_VERSION)) +VERSAL_FIRMWARE_LICENSE = MIT +VERSAL_FIRMWARE_LICENSE_FILES = license.txt +VERSAL_FIRMWARE_INSTALL_IMAGES = YES +VERSAL_FIRMWARE_INSTALL_TARGET = NO +VERSAL_FIRMWARE_DEPENDENCIES = host-newlib-bare-metal + +CUSTOM_CFLAGS = $(call qstrip,$(BR2_TARGET_VERSAL_FIRMWARE_CUSTOM_CFLAGS)) +VERSAL_CFLAGS = "-Os -flto -ffat-lto-objects $(CUSTOM_CFLAGS)" + +VERSAL_FIRMWARE_PDI = $(call qstrip,$(BR2_TARGET_VERSAL_FIRMWARE_PDI)) + +ifneq ($(findstring ://,$(VERSAL_FIRMWARE_PDI)),) +VERSAL_FIRMWARE_EXTRA_DOWNLOADS = $(VERSAL_FIRMWARE_PDI) +BR_NO_CHECK_HASH_FOR += $(notdir $(VERSAL_FIRMWARE_PDI)) +PDI_PATH = $(VERSAL_FIRMWARE_DL_DIR)/$(notdir $(VERSAL_FIRMWARE_PDI)) +else ifneq ($(VERSAL_FIRMWARE_PDI),) +PDI_PATH = $(shell readlink -f $(VERSAL_FIRMWARE_PDI)) +endif #VERSAL_FIRMWARE_PDI + +define VERSAL_FIRMWARE_BUILD_CMDS + $(MAKE) -C $(@D)/lib/sw_apps/versal_plm/src/versal \ + COMPILER=$(HOST_DIR)/bin/microblazeel-xilinx-elf-gcc \ + ARCHIVER=$(HOST_DIR)/bin/microblazeel-xilinx-elf-gcc-ar \ + CC=$(HOST_DIR)/bin/microblazeel-xilinx-elf-gcc \ + CFLAGS=$(VERSAL_CFLAGS) + + $(MAKE) -C $(@D)/lib/sw_apps/versal_psmfw/src/versal \ + COMPILER=$(HOST_DIR)/bin/microblazeel-xilinx-elf-gcc \ + ARCHIVER=$(HOST_DIR)/bin/microblazeel-xilinx-elf-gcc-ar \ + CC=$(HOST_DIR)/bin/microblazeel-xilinx-elf-gcc \ + CFLAGS=$(VERSAL_CFLAGS) +endef + +PLM_PATH = $(@D)/lib/sw_apps/versal_plm/src/versal/plm.elf +PSMFW_PATH = $(@D)/lib/sw_apps/versal_psmfw/src/versal/psmfw.elf + +define VERSAL_FIRMWARE_INSTALL_IMAGES_CMDS + $(INSTALL) -D -m 0755 $(PLM_PATH) $(BINARIES_DIR)/plm.elf + $(INSTALL) -D -m 0755 $(PSMFW_PATH) $(BINARIES_DIR)/psmfw.elf + $(INSTALL) -D -m 0755 $(PDI_PATH) $(BINARIES_DIR)/vpl_gen_fixed.pdi +endef + +$(eval $(generic-package)) diff --git a/boot/versal-firmware/xilinx_v2023.1/0001-sw_apps-versal_plm-add-support-of-parallel-build.patch b/boot/versal-firmware/xilinx_v2023.1/0001-sw_apps-versal_plm-add-support-of-parallel-build.patch new file mode 100644 index 0000000000..84fffc1d82 --- /dev/null +++ b/boot/versal-firmware/xilinx_v2023.1/0001-sw_apps-versal_plm-add-support-of-parallel-build.patch @@ -0,0 +1,157 @@ +From 245509f87776c7727973480f08ead6f293a2f3b2 Mon Sep 17 00:00:00 2001 +From: Neal Frager +Date: Mon, 4 Sep 2023 07:08:02 +0100 +Subject: [PATCH 1/2] sw_apps:versal_plm: add support of parallel build + +The build fails when make command is invoked with -j option. +The root cause is, BSP_SEQUENTIAL_MAKEFILES variable is not assigned +and exported properly in copy_bsp.sh file. Also, the 'all' target in +src/Makefile tries to compile the source code before bsp copy was +finished when -j option is enabled during build. + +Added BSP_SEQUENTIAL_MAKEFILES in the misc/Makefile to resolve the +export issue and corrected dependency in the src/Makefile to let the bsp +copy finished before compiling the source. + +Signed-off-by: Duvvi Divya +Acked-by: Sreedhar Kundella +--- + lib/sw_apps/versal_plm/misc/versal/Makefile | 12 +++++++++++- + lib/sw_apps/versal_plm/misc/versal/copy_bsp.sh | 11 ----------- + lib/sw_apps/versal_plm/src/versal/Makefile | 2 ++ + 3 files changed, 13 insertions(+), 12 deletions(-) + +diff --git a/lib/sw_apps/versal_plm/misc/versal/Makefile b/lib/sw_apps/versal_plm/misc/versal/Makefile +index 5c8e719e9c..d735f64530 100644 +--- a/lib/sw_apps/versal_plm/misc/versal/Makefile ++++ b/lib/sw_apps/versal_plm/misc/versal/Makefile +@@ -7,6 +7,16 @@ PROCESSOR = psv_pmc_0 + LIBRARIES = ${PROCESSOR}/lib/libxil.a + BSP_MAKEFILES := $(wildcard $(PROCESSOR)/libsrc/*/src/Makefile) + SUBDIRS := $(patsubst %/Makefile, %, $(BSP_MAKEFILES)) ++DRIVERS_LIST=../drivers.txt ++SEQUENTIAL_MAKEFILES := $(shell cat ${DRIVERS_LIST}) ++BSP_SEQUENTIAL_MAKEFILES = $(patsubst %, ${PROCESSOR}/libsrc/%/src/Makefile, $(SEQUENTIAL_MAKEFILES)) ++BSP_SEQUENTIAL_MAKEFILES += ${PROCESSOR}/libsrc/xilffs/src/Makefile ++BSP_SEQUENTIAL_MAKEFILES += ${PROCESSOR}/libsrc/xilpdi/src/Makefile ++BSP_SEQUENTIAL_MAKEFILES += ${PROCESSOR}/libsrc/xilplmi/src/Makefile ++BSP_SEQUENTIAL_MAKEFILES += ${PROCESSOR}/libsrc/xilpuf/src/Makefile ++BSP_SEQUENTIAL_MAKEFILES += ${PROCESSOR}/libsrc/xilloader/src/Makefile ++BSP_SEQUENTIAL_MAKEFILES += ${PROCESSOR}/libsrc/xilnvm/src/Makefile ++BSP_SEQUENTIAL_MAKEFILES += ${PROCESSOR}/libsrc/xilsecure/src/Makefile + BSP_PARALLEL_MAKEFILES := $(filter-out $(BSP_SEQUENTIAL_MAKEFILES),$(BSP_MAKEFILES)) + SEQ_SUBDIRS := $(patsubst %/Makefile, %, $(BSP_SEQUENTIAL_MAKEFILES)) + PAR_SUBDIRS := $(patsubst %/Makefile, %, $(BSP_PARALLEL_MAKEFILES)) +@@ -16,7 +26,7 @@ ifneq (,$(findstring win,$(RDI_PLATFORM))) + endif + + all: +- $(MAKE) --no-print-directory seq_libs ++ $(MAKE) -j1 --no-print-directory seq_libs + $(MAKE) -j --no-print-directory par_libs + $(MAKE) --no-print-directory archive + @echo 'Finished building libraries' +diff --git a/lib/sw_apps/versal_plm/misc/versal/copy_bsp.sh b/lib/sw_apps/versal_plm/misc/versal/copy_bsp.sh +index 404e588ae2..244d36e2ee 100755 +--- a/lib/sw_apps/versal_plm/misc/versal/copy_bsp.sh ++++ b/lib/sw_apps/versal_plm/misc/versal/copy_bsp.sh +@@ -29,7 +29,6 @@ STANDALONE_DIR=$EMBEDDED_SW_DIR/lib/bsp/standalone/src + + # libraries dir + SERVICES_DIR=$EMBEDDED_SW_DIR/lib/sw_services +-BSP_SEQUENTIAL_MAKEFILES= + + # creation of BSP folders required + if [ -d $BSP_DIR ]; then +@@ -52,7 +51,6 @@ fi + mkdir -p $BSP_DIR/libsrc/xilffs + cp -r $SERVICES_DIR/xilffs/src $BSP_DIR/libsrc/xilffs/ + cp -r $SERVICES_DIR/xilffs/src/include/* $BSP_DIR/include/ +-BSP_SEQUENTIAL_MAKEFILES="$BSP_SEQUENTIAL_MAKEFILES $BSP_DIR/libsrc/xilffs/src/Makefile" + + mkdir -p $BSP_DIR/libsrc/xilpdi/src + cp -r $SERVICES_DIR/xilpdi/src/Makefile $BSP_DIR/libsrc/xilpdi/src +@@ -60,7 +58,6 @@ cp -r $SERVICES_DIR/xilpdi/src/versal/* $BSP_DIR/libsrc/xilpdi/src/ + cp -r $SERVICES_DIR/xilpdi/src/versal/*.h $BSP_DIR/include/ + cp -r $SERVICES_DIR/xilpdi/src/common/* $BSP_DIR/libsrc/xilpdi/src/ + cp -r $SERVICES_DIR/xilpdi/src/common/*.h $BSP_DIR/include/ +-BSP_SEQUENTIAL_MAKEFILES="$BSP_SEQUENTIAL_MAKEFILES $BSP_DIR/libsrc/xilpdi/src/Makefile" + + mkdir -p $BSP_DIR/libsrc/xilplmi/src + cp -r $SERVICES_DIR/xilplmi/src/Makefile $BSP_DIR/libsrc/xilplmi/src +@@ -68,14 +65,12 @@ cp -r $SERVICES_DIR/xilplmi/src/versal/* $BSP_DIR/libsrc/xilplmi/src/ + cp -r $SERVICES_DIR/xilplmi/src/versal/*.h $BSP_DIR/include/ + cp -r $SERVICES_DIR/xilplmi/src/common/* $BSP_DIR/libsrc/xilplmi/src/ + cp -r $SERVICES_DIR/xilplmi/src/common/*.h $BSP_DIR/include/ +-BSP_SEQUENTIAL_MAKEFILES="$BSP_SEQUENTIAL_MAKEFILES $BSP_DIR/libsrc/xilplmi/src/Makefile" + + mkdir -p $BSP_DIR/libsrc/xilpuf/src + cp -r $SERVICES_DIR/xilpuf/src/Makefile $BSP_DIR/libsrc/xilpuf/src + cp -r $SERVICES_DIR/xilpuf/src/common/* $BSP_DIR/libsrc/xilpuf/src + cp -r $SERVICES_DIR/xilpuf/src/server/* $BSP_DIR/libsrc/xilpuf/src + cp -r $BSP_DIR/libsrc/xilpuf/src/*.h $BSP_DIR/include/ +-BSP_SEQUENTIAL_MAKEFILES="$BSP_SEQUENTIAL_MAKEFILES $BSP_DIR/libsrc/xilpuf/src/Makefile" + + mkdir -p $BSP_DIR/libsrc/xilloader/src + cp -r $SERVICES_DIR/xilloader/src/Makefile $BSP_DIR/libsrc/xilloader/src +@@ -83,7 +78,6 @@ cp -r $SERVICES_DIR/xilloader/src/versal/* $BSP_DIR/libsrc/xilloader/src/ + cp -r $SERVICES_DIR/xilloader/src/versal/*.h $BSP_DIR/include/ + cp -r $SERVICES_DIR/xilloader/src/common/* $BSP_DIR/libsrc/xilloader/src/ + cp -r $SERVICES_DIR/xilloader/src/common/*.h $BSP_DIR/include/ +-BSP_SEQUENTIAL_MAKEFILES="$BSP_SEQUENTIAL_MAKEFILES $BSP_DIR/libsrc/xilloader/src/Makefile" + + mkdir -p $BSP_DIR/libsrc/xilpm/src/ + cp -r $SERVICES_DIR/xilpm/src/versal/common/* $BSP_DIR/libsrc/xilpm/src/ +@@ -94,7 +88,6 @@ cp -r $SERVICES_DIR/xilpm/src/versal_common/server/* $BSP_DIR/libsrc/xilpm/src/ + cp -r $SERVICES_DIR/xilpm/src/versal_common/server/*.h $BSP_DIR/include/ + cp -r $SERVICES_DIR/xilpm/src/versal_common/common/*.h $BSP_DIR/include/ + cp -r $SERVICES_DIR/xilpm/src/versal_common/common/* $BSP_DIR/libsrc/xilpm/src/ +-BSP_SEQUENTIAL_MAKEFILES="$BSP_SEQUENTIAL_MAKEFILES $BSP_DIR/libsrc/xilpm/src/versal/common/Makefile" + + mkdir -p $BSP_DIR/libsrc/xilnvm/src + cp -r $SERVICES_DIR/xilnvm/src/Makefile $BSP_DIR/libsrc/xilnvm/src +@@ -103,7 +96,6 @@ cp -r $SERVICES_DIR/xilnvm/src/versal/server/* $BSP_DIR/libsrc/xilnvm/src/ + cp -r $SERVICES_DIR/xilnvm/src/common/server/* $BSP_DIR/libsrc/xilnvm/src/ + cp -r $SERVICES_DIR/xilnvm/src/common/* $BSP_DIR/libsrc/xilnvm/src/ + cp $BSP_DIR/libsrc/xilnvm/src/*.h $BSP_DIR/include/ +-BSP_SEQUENTIAL_MAKEFILES="$BSP_SEQUENTIAL_MAKEFILES $BSP_DIR/libsrc/xilnvm/src/Makefile" + + mkdir -p $BSP_DIR/libsrc/xilsecure/src + cp -r $SERVICES_DIR/xilsecure/src/Makefile $BSP_DIR/libsrc/xilsecure/src +@@ -115,7 +107,6 @@ cp -r $SERVICES_DIR/xilsecure/src/versal/common/* $BSP_DIR/libsrc/xilsecure/src/ + cp $BSP_DIR/libsrc/xilsecure/src/*.h $BSP_DIR/include/ + mv $BSP_DIR/libsrc/xilsecure/src/libxilsecure_pmc.a $BSP_DIR/libsrc/xilsecure/src/libxilsecure.a + rm -f $BSP_DIR/libsrc/xilsecure/src/libxilsecure_*.a +-BSP_SEQUENTIAL_MAKEFILES="$BSP_SEQUENTIAL_MAKEFILES $BSP_DIR/libsrc/xilsecure/src/Makefile" + + # copy bsp standalone code + cp -r $STANDALONE_DIR/common/* $BSP_DIR/libsrc/standalone/src/ +@@ -144,7 +135,6 @@ do + cp -r $DRIVERS_DIR/$line/src/*.h $BSP_DIR/include/ + # copy all the HSM generated driver files DRIVER_g.c + cp $WORKING_DIR/x"$line"_g.c $BSP_DIR/libsrc/$line/src/ +- BSP_SEQUENTIAL_MAKEFILES="$BSP_SEQUENTIAL_MAKEFILES $BSP_DIR/libsrc/$line/src/Makefile" + done < $DRIVERS_LIST + + #copy the processor code. +@@ -176,4 +166,3 @@ cp $STANDALONE_DIR/microblaze/*.h $BSP_DIR/include/ + + # no inbyte and outbyte present in standalone + cp $WORKING_DIR/inbyte.c $WORKING_DIR/outbyte.c $BSP_DIR/libsrc/standalone/src/ +-export BSP_SEQUENTIAL_MAKEFILES +diff --git a/lib/sw_apps/versal_plm/src/versal/Makefile b/lib/sw_apps/versal_plm/src/versal/Makefile +index 15956c8a14..a944225845 100644 +--- a/lib/sw_apps/versal_plm/src/versal/Makefile ++++ b/lib/sw_apps/versal_plm/src/versal/Makefile +@@ -32,6 +32,8 @@ all: $(EXEC) + $(EXEC): $(LIBS) $(OBJS) $(INCLUDES) + $(CC) -o $@ $(OBJS) $(CC_FLAGS) $(CFLAGS) $(LN_FLAGS) $(LIBPATH) $(LSCRIPT) + ++$(OBJS): $(LIBS) ++ + $(LIBS): + echo "Copying BSP files" + ../../misc/versal/copy_bsp.sh +-- +2.25.1 + diff --git a/boot/versal-firmware/xilinx_v2023.1/0002-sw_apps-versal_psmfw-add-support-of-parallel-build.patch b/boot/versal-firmware/xilinx_v2023.1/0002-sw_apps-versal_psmfw-add-support-of-parallel-build.patch new file mode 100644 index 0000000000..7918f20946 --- /dev/null +++ b/boot/versal-firmware/xilinx_v2023.1/0002-sw_apps-versal_psmfw-add-support-of-parallel-build.patch @@ -0,0 +1,48 @@ +From 2ed864ef5965b7466fb145f479ce0747123f2ce0 Mon Sep 17 00:00:00 2001 +From: Neal Frager +Date: Mon, 4 Sep 2023 07:14:38 +0100 +Subject: [PATCH 2/2] sw_apps:versal_psmfw: add support of parallel build + +The PSMFW build fails when make command is invoked with -j option. +The root cause is, the 'all' target in src/Makefile tries to compile +the source code before bsp copy was finished when -j option is +enabled during build. + +Corrected dependency in the src/Makefile to let the bsp copy +finished before compiling the source. + +Signed-off-by: Naman Trivedi Manojbhai +--- + lib/sw_apps/versal_psmfw/misc/Makefile | 2 +- + lib/sw_apps/versal_psmfw/src/versal/Makefile | 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/lib/sw_apps/versal_psmfw/misc/Makefile b/lib/sw_apps/versal_psmfw/misc/Makefile +index 02d85e492e..92d95d0896 100644 +--- a/lib/sw_apps/versal_psmfw/misc/Makefile ++++ b/lib/sw_apps/versal_psmfw/misc/Makefile +@@ -17,7 +17,7 @@ ifneq (,$(findstring win,$(RDI_PLATFORM))) + endif + + all: +- $(MAKE) --no-print-directory seq_libs ++ $(MAKE) -j1 --no-print-directory seq_libs + $(MAKE) -j --no-print-directory par_libs + $(MAKE) --no-print-directory archive + @echo 'Finished building libraries' +diff --git a/lib/sw_apps/versal_psmfw/src/versal/Makefile b/lib/sw_apps/versal_psmfw/src/versal/Makefile +index 1572bbbca9..3f1589283b 100644 +--- a/lib/sw_apps/versal_psmfw/src/versal/Makefile ++++ b/lib/sw_apps/versal_psmfw/src/versal/Makefile +@@ -33,6 +33,8 @@ all: $(EXEC) + $(EXEC): $(LIBS) $(OBJS) $(INCLUDES) + $(CC) -o $@ $(OBJS) $(CC_FLAGS) $(CFLAGS) $(LN_FLAGS) $(LIBPATH) $(LSCRIPT) + ++$(OBJS): $(LIBS) ++ + $(LIBS): + echo "Copying BSP files" + ../../misc/copy_bsp.sh +-- +2.25.1 + From patchwork Fri Oct 20 11:42:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neal Frager X-Patchwork-Id: 1852497 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::136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SBjRD4Lbcz23jM for ; Fri, 20 Oct 2023 22:44:08 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id CA76A7050B; Fri, 20 Oct 2023 11:44:06 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org CA76A7050B X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZuOrp7NKQzJr; Fri, 20 Oct 2023 11:44:06 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id C9EC37049C; Fri, 20 Oct 2023 11:44:04 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org C9EC37049C 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 CB2151BF3A9 for ; Fri, 20 Oct 2023 11:43:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id ADD7041467 for ; Fri, 20 Oct 2023 11:43:24 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org ADD7041467 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 SePOqc-ggDQ3 for ; Fri, 20 Oct 2023 11:43:23 +0000 (UTC) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on20616.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e89::616]) by smtp2.osuosl.org (Postfix) with ESMTPS id 60EFE402A7 for ; Fri, 20 Oct 2023 11:43:23 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 60EFE402A7 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OuhKqDMHvZIyUL7QT9wlak+RVa4tZanOBLVFBAMe5jHl0WXKh6T69+x/C+UGBxjakPWXVodLlnYn5bamk1TP5N7n9k/bR4CnhGJiyolizng+fs1D+UijwLZMPiV/bdemWakRK3MXLHdPvleX8VXF0CEkI4yfpp+sFI6LYVDnaZo0MiptfGgeF0VD1eqBb8jmPAG0iRMw+Iv/nKFNwTWLOs3VCLxDfsPwtyB5IMe292m8SmVKAwvWTqvn+Siza9Kf9soWfPcTPmXTe3vaoUzR2OYlgOGNt6hEC0N1GWo/ZdaW4qpytVJ9VlPm4OFP+xBopTgHMrpvhoOmVlOyhhSrfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=ap+rYjGmDNu+VAHtT17J7IaxWQMLAp3WJsm+qm32RlE=; b=eHG6uWDqQkNmxPsmQjkGwal+X80AQdHCl5Yv974N0ekCV4OTuaBEnRiqqPpePBP7rTxMw0esqDk8Jawas5tgyHpAssKgNduI+V8c0IJM92JLFrZzgTgwg7CO7Ql07xQAUQo/A8ngT3OuYv1D9HNMolGnh7fEP8Tu5UVtgqSPa14FAAd7UTyhGZSbz6um4rRqIdX4GbiPschmHeZMGLL/1kWkna0yJTISy4fHLiznhDNPkcgQdiAYB61st7hnyMTyOC7sp6qBs/my5Fdi4LPClmylo8G/GU+kBCvwX2ocB21jw52SiZk1qVXMkP9UEOh0nV+jHPRRTBiNLLYQg8eeYA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=buildroot.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none Received: from DS7PR05CA0096.namprd05.prod.outlook.com (2603:10b6:8:56::28) by SA0PR12MB4525.namprd12.prod.outlook.com (2603:10b6:806:92::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.24; Fri, 20 Oct 2023 11:43:19 +0000 Received: from CY4PEPF0000EE35.namprd05.prod.outlook.com (2603:10b6:8:56:cafe::7e) by DS7PR05CA0096.outlook.office365.com (2603:10b6:8:56::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.8 via Frontend Transport; Fri, 20 Oct 2023 11:43:19 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB03.amd.com; pr=C Received: from SATLEXMB03.amd.com (165.204.84.17) by CY4PEPF0000EE35.mail.protection.outlook.com (10.167.242.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6838.22 via Frontend Transport; Fri, 20 Oct 2023 11:43:18 +0000 Received: from SATLEXMB08.amd.com (10.181.40.132) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Fri, 20 Oct 2023 06:43:18 -0500 Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB08.amd.com (10.181.40.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Fri, 20 Oct 2023 04:43:18 -0700 Received: from xirengwts09.xilinx.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.27 via Frontend Transport; Fri, 20 Oct 2023 06:43:16 -0500 To: Date: Fri, 20 Oct 2023 12:42:35 +0100 Message-ID: <20231020114236.4129636-9-neal.frager@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231020114236.4129636-1-neal.frager@amd.com> References: <20231020114236.4129636-1-neal.frager@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EE35:EE_|SA0PR12MB4525:EE_ X-MS-Office365-Filtering-Correlation-Id: 0cb5b333-220d-44ee-f294-08dbd161c175 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UIRSd550aKhEToyFzy+M3tmulv8KFnHojpIuRPksYjfZofNw0xplKPC4pcI9fPpADVaaU2DH6jU0QIQDjKCzyE1weXLAESgXC6Nv/7z8oxnOO5edLCHGXQk27A38+9FngIg7B3dpOcuijC1T4gmZlFEAc5aWMGYL5uvlmHO4IqccpETChpnPxleVXoSpuMRnl50ePM3iOsQTLiiY6VX6r6H71Md7D6Vld0sl0tLhMKLugYGRpk+RKn8Lq7YFiSphU6tCuHR79PZpeQHFbD6GFyiKhaD2m54Sd5Gg8jusOkPkJIq9URIrYzYIJetIDw/duZEeIR9qGAKDr5GftID+rDeu/+PPeh2Lx6CzavsOouK9d7KtAybBNtfDFwP+RAM1Ldm6wsHgmrvP/Zcz9cJFj4+j4ATQYCMvDLlAVWlgNz72f5xXEpFzzBkxb8BBpQKjU8qXwK0Z6qF5z1zfy1HtRoO1GK3bQOFB9flmz4Y85GWvY7ncMVQuium53BSjnpsa3S/vdHzBtyE3dpmHHnCm4BTKdbjqCs3Y3+7OKA3hxRRj7Wd3ssBXLHc20Fni2aRhVCx+wMyRovAkzw0WOK0qsGAeY0tbv3Mdf81ltTOXESpIvz3MOTHTQ5PQ+Mn2q4c0xQNr0ACoPiq6AeYcxhYpq2E2LSwo2mQPJCg7gYCc0ZofoOx3T1PDjqp8SMFWipnLa4D3vEBJjCQ3A+THVcADb9M5pMtpGLUPl6dsv0VxWOOuxLqrRIpWxQORHB+B5vel73H5zdhfVGnP4BZ8ete8fQ== X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB03.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230031)(4636009)(39860400002)(376002)(136003)(346002)(396003)(230922051799003)(82310400011)(451199024)(186009)(64100799003)(1800799009)(36840700001)(46966006)(40470700004)(86362001)(40480700001)(40460700003)(316002)(6916009)(70206006)(70586007)(54906003)(8936002)(6666004)(478600001)(41300700001)(8676002)(5660300002)(44832011)(4326008)(47076005)(36756003)(2906002)(83380400001)(2616005)(36860700001)(356005)(1076003)(81166007)(336012)(82740400003)(26005)(426003)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2023 11:43:18.9728 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0cb5b333-220d-44ee-f294-08dbd161c175 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000EE35.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR12MB4525 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ap+rYjGmDNu+VAHtT17J7IaxWQMLAp3WJsm+qm32RlE=; b=NzOEmo2BWtHzdsFUtjwXmOZCMOE0kn5UFZOoKdgdkaZ80Xx8x8geLowH+3IGgVWt8bdZaZbw76QSvcmxU2HGtxzcAtEUUFN/DZzQfeThiybyV1t32HMWawmi+ww7I9llBK7bjsPdtZd9gjEdMCIopT7JmI0TSOAXnpWilwL2ttM= X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (1024-bit key, unprotected) header.d=amd.com header.i=@amd.com header.a=rsa-sha256 header.s=selector1 header.b=NzOEmo2B Subject: [Buildroot] [PATCH v6 09/10] configs/versal_vck190_defconfig: build plm and psmfw source 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: Neal Frager via buildroot From: Neal Frager Reply-To: Neal Frager Cc: ibai.erkiaga-elorza@amd.com, luca.ceresoli@bootlin.com, thomas.petazzoni@bootlin.com, Neal Frager , michal.simek@amd.com Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" This patch migrates the versal_vck190_defconfig to use the new versal-firmware package for building the versal plm and psmfw from source. Signed-off-by: Neal Frager Tested-by: Luca Ceresoli Reviewed-by: Luca Ceresoli --- V4->V5: - bootgen is selected automatically now V5->V6: - no changes --- configs/versal_vck190_defconfig | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/configs/versal_vck190_defconfig b/configs/versal_vck190_defconfig index e30bb35b74..1e2fa6d21f 100644 --- a/configs/versal_vck190_defconfig +++ b/configs/versal_vck190_defconfig @@ -32,11 +32,10 @@ BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_FORMAT_REMAKE_ELF=y BR2_TARGET_UBOOT_FORMAT_DTB=y -BR2_PACKAGE_VERSAL_FIRMWARE=y -BR2_PACKAGE_VERSAL_FIRMWARE_VERSION="xilinx_v2023.1" -BR2_PACKAGE_VERSAL_FIRMWARE_BOARD="vck190" +BR2_TARGET_VERSAL_FIRMWARE=y +BR2_TARGET_VERSAL_FIRMWARE_VERSION="xilinx_v2023.1" +BR2_TARGET_VERSAL_FIRMWARE_PDI="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2023.1/vck190-versal/vpl_gen_fixed.pdi" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_BOOTGEN=y BR2_GLOBAL_PATCH_DIR="board/versal/patches" From patchwork Fri Oct 20 11:42:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neal Frager X-Patchwork-Id: 1852500 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::136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SBjRz3vr2z23jM for ; Fri, 20 Oct 2023 22:44:47 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id BFE9270497; Fri, 20 Oct 2023 11:44:45 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org BFE9270497 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hg1UfCUYmvgL; Fri, 20 Oct 2023 11:44:44 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id DFB49704FC; Fri, 20 Oct 2023 11:44:43 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org DFB49704FC 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 D5EB71BF3A9 for ; Fri, 20 Oct 2023 11:43:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id ACE3D41476 for ; Fri, 20 Oct 2023 11:43:28 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org ACE3D41476 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 blDgYTQl9QWC for ; Fri, 20 Oct 2023 11:43:27 +0000 (UTC) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on20628.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e8b::628]) by smtp2.osuosl.org (Postfix) with ESMTPS id 2DBCE402A7 for ; Fri, 20 Oct 2023 11:43:27 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 2DBCE402A7 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DuH05zYpBd5swvfmJ75YtOY80/Vwg8zv0MI41of1+yzIOhWbBabjxv6O+fOBV3RNHOd4EMsRS7XIQYQ1MC3T7FnnB99CneqwPiYTyGa+XAuFkCisqZCZq44QtLj2fJe4CJKvHxPZKXbF7G+eUio+1k1ULFB3HzpgYyOs0KiDGrhRL/hGeM9KocsFeWETh4FI4bLzZPSWdIyD/SPE7XM47Xlvotfeum6TVHRYU2wuecraBp7K7boBenuBxhABftSVYPtc8wTYILdk1c6S9hPrEcfL3CLhe90tZpBIDrRPwPWgSLp0gVdAqdwRAn7rEJ2LWRqfgapFUNRX4+4STaIUtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=4aBu2LDg+WtrsuyAvLSAAEFFQDK4ou9/ravGm+HLTkc=; b=kizktxxzH10A6zuGoD4aI8v/B/sZgnpq+rJtlZKsUteJ4psT0fvAxFkmC5DAdtV/iq15rFNg/wNHhQHgAssHHq05uQCHW/us/pX5EYW8uwsXRV89IqWX8WnrNMtgDnSKsX+5ZrOglGXtpIW2MxFACoZaqYy8/+9ebjldUOUKtCoPqoqK6iE1Qr+JgkwrcFcqhCrLrLH5pMIFnzr3K4k4gNmyHGvxmzHOP2L001afdPC9joWpQkOnPhmay0+0Py6fX8FHtJlV51pSRu/yFj7v+U/stqwYL98p574eJRpH3HHMqWa+ue7prJXoQWctily/d7VydFWKT5vwpShLMXMRSw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=buildroot.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none Received: from SA0PR11CA0018.namprd11.prod.outlook.com (2603:10b6:806:d3::23) by DM4PR12MB5199.namprd12.prod.outlook.com (2603:10b6:5:396::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.24; Fri, 20 Oct 2023 11:43:23 +0000 Received: from SN1PEPF0002636A.namprd02.prod.outlook.com (2603:10b6:806:d3:cafe::f6) by SA0PR11CA0018.outlook.office365.com (2603:10b6:806:d3::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.26 via Frontend Transport; Fri, 20 Oct 2023 11:43:23 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF0002636A.mail.protection.outlook.com (10.167.241.135) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6907.20 via Frontend Transport; Fri, 20 Oct 2023 11:43:23 +0000 Received: from SATLEXMB06.amd.com (10.181.40.147) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Fri, 20 Oct 2023 06:43:21 -0500 Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB06.amd.com (10.181.40.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Fri, 20 Oct 2023 06:43:21 -0500 Received: from xirengwts09.xilinx.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.27 via Frontend Transport; Fri, 20 Oct 2023 06:43:20 -0500 To: Date: Fri, 20 Oct 2023 12:42:36 +0100 Message-ID: <20231020114236.4129636-10-neal.frager@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231020114236.4129636-1-neal.frager@amd.com> References: <20231020114236.4129636-1-neal.frager@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF0002636A:EE_|DM4PR12MB5199:EE_ X-MS-Office365-Filtering-Correlation-Id: 3d2c893e-89e3-4d58-0f96-08dbd161c3f0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 20DFILXyOPv7K/n135sRHX5pZjKnPLdT1wBYNT611k6mfbXrZg4noRdUeUloQ9YFfHcS8N0EgtmjGyy3Fg8KGjGoqkXgPRWvt3s+WU9doZGweNfNCPeiOgKuuxnuv8pMXTJcecp3esLZ9coSO1hxmUhhhfnsT9mKSdj4MpcI6wEOVeL4TfjGAoUv8xQz1XK/U3oN0FEC/zZXV5PIwsFywTjEkFR5nLQlmMsvWOU+gEbRhL9je3ZZlJKTdoFsqGX1KjnB7AuGGKG3JONwx3KigW0UJ82eLayErgJKxp404NyTMgUnpPpE++RF1eBSRUVk6daiqmNFA1Rc/aAIZxONjN/fa0tYth376AWFhIfxAav4bsSM8DHvzNfiIVdDA8UH4nUbQvHv5qLugStdo2Rh3rQjiJYEkzQtYXc4DSEGkFhxU9OLsLABIPN7z72GJvZzAkoN12ohwVoY3A4GnmEB7yOgeb79ViJhfVYyO6LaTVipVydzhi4+iYNbGJRMoSJGxz5U29E0DOxPggKyEn/znthcps4o3yGKDDzFl9bsRhU6bY2pt3OG3pR2wJ8nRnojmdI0PdHvtmMEqg29OLHWt9wkkr6aRqPeWDXAS9ykUtD4QkAphp5nNMx/OMIMWl6weLOY7zdL5pH8UHwen/lv9uVlx90C2SYxyCKzVlY/Qhf/gPRN2JOoxe3wp0aQZxNZaoA3r0lXR8Of5Yt1HJrujvgSH7Q6jWhOAkZOJAD9oBprD3QILM+ZbYPLq7kGhL572JXW6HfPOZl9wFOcoU3GCQ== X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230031)(4636009)(396003)(346002)(136003)(376002)(39860400002)(230922051799003)(64100799003)(451199024)(82310400011)(1800799009)(186009)(46966006)(40470700004)(36840700001)(40460700003)(40480700001)(356005)(36756003)(2616005)(47076005)(44832011)(86362001)(2906002)(1076003)(83380400001)(26005)(82740400003)(426003)(336012)(81166007)(36860700001)(4326008)(41300700001)(5660300002)(8676002)(478600001)(6916009)(316002)(8936002)(966005)(54906003)(6666004)(70206006)(70586007)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2023 11:43:23.1754 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3d2c893e-89e3-4d58-0f96-08dbd161c3f0 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF0002636A.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5199 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4aBu2LDg+WtrsuyAvLSAAEFFQDK4ou9/ravGm+HLTkc=; b=vhFMHakJo3nTYC/MB1WAtZcSxSuhpKpwfyGUUxuq4QtJgfHcsRP5aTclcplOmsppqKhlNyqszvbT23EqZCZGc/blAarl6Q4yjrnjUBeLWG4fGEwfUSN70ILWAspkZVXqEcBCucpGyrXZPG1CUb2BdND0QOcToaDcYKsj9TJgsCw= X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (1024-bit key, unprotected) header.d=amd.com header.i=@amd.com header.a=rsa-sha256 header.s=selector1 header.b=vhFMHakJ Subject: [Buildroot] [PATCH v6 10/10] package/versal-firmware: remove package 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: Neal Frager via buildroot From: Neal Frager Reply-To: Neal Frager Cc: ibai.erkiaga-elorza@amd.com, luca.ceresoli@bootlin.com, thomas.petazzoni@bootlin.com, Neal Frager , michal.simek@amd.com Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" This patch removes the package/versal-firmware as this package is replaced by the boot/versal-firmware target boot firmware package for versal. Signed-off-by: Neal Frager Tested-by: Luca Ceresoli Reviewed-by: Luca Ceresoli --- V4->V6: - no changes --- DEVELOPERS | 1 - package/Config.in | 1 - package/versal-firmware/Config.in | 24 ---------------------- package/versal-firmware/versal-firmware.mk | 21 ------------------- 4 files changed, 47 deletions(-) delete mode 100644 package/versal-firmware/Config.in delete mode 100644 package/versal-firmware/versal-firmware.mk diff --git a/DEVELOPERS b/DEVELOPERS index 087093a59a..ff58a2b514 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2209,7 +2209,6 @@ F: package/binutils-bare-metal/ F: package/bootgen/ F: package/gcc-bare-metal/ F: package/newlib-bare-metal/ -F: package/versal-firmware/ F: toolchain/toolchain-bare-metal-buildroot/ N: Nicola Di Lieto diff --git a/package/Config.in b/package/Config.in index 4e489c4706..228e9e2416 100644 --- a/package/Config.in +++ b/package/Config.in @@ -454,7 +454,6 @@ menu "Firmware" source "package/sunxi-boards/Config.in" source "package/ts4900-fpga/Config.in" source "package/ux500-firmware/Config.in" - source "package/versal-firmware/Config.in" source "package/wilc-firmware/Config.in" source "package/wilink-bt-firmware/Config.in" source "package/zd1211-firmware/Config.in" diff --git a/package/versal-firmware/Config.in b/package/versal-firmware/Config.in deleted file mode 100644 index 01daefd204..0000000000 --- a/package/versal-firmware/Config.in +++ /dev/null @@ -1,24 +0,0 @@ -config BR2_PACKAGE_VERSAL_FIRMWARE - bool "versal-firmware" - depends on BR2_aarch64 - help - Pre-built firmware files for Xilinx Versal boards. - - https://github.com/Xilinx/soc-prebuilt-firmware - -if BR2_PACKAGE_VERSAL_FIRMWARE - -config BR2_PACKAGE_VERSAL_FIRMWARE_VERSION - string "firmware version" - default "xilinx_v2023.1" - help - Release version of Versal firmware. - -config BR2_PACKAGE_VERSAL_FIRMWARE_BOARD - string "board name" - default "vck190" - help - Name of Versal target board. - Used for installing the appropriate firmware. - -endif # BR2_PACKAGE_VERSAL_FIRMWARE diff --git a/package/versal-firmware/versal-firmware.mk b/package/versal-firmware/versal-firmware.mk deleted file mode 100644 index 1ced259be1..0000000000 --- a/package/versal-firmware/versal-firmware.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# versal-firmware -# -################################################################################ - -VERSAL_FIRMWARE_VERSION = $(call qstrip,$(BR2_PACKAGE_VERSAL_FIRMWARE_VERSION)) -VERSAL_FIRMWARE_SITE = $(call github,Xilinx,soc-prebuilt-firmware,$(VERSAL_FIRMWARE_VERSION)) -VERSAL_FIRMWARE_LICENSE = MIT -VERSAL_FIRMWARE_LICENSE_FILES = LICENSE -VERSAL_FIRMWARE_INSTALL_TARGET = NO -VERSAL_FIRMWARE_INSTALL_IMAGES = YES - -define VERSAL_FIRMWARE_INSTALL_IMAGES_CMDS - $(foreach f,plm.elf psmfw.elf vpl_gen_fixed.pdi,\ - $(INSTALL) -D -m 0755 $(@D)/$(BR2_PACKAGE_VERSAL_FIRMWARE_BOARD)-versal/$(f) \ - $(BINARIES_DIR)/$(f) - ) -endef - -$(eval $(generic-package))