From patchwork Mon Mar 4 07:41:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neal Frager X-Patchwork-Id: 1907407 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.137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (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 4Tp9d85Vnbz23hX for ; Mon, 4 Mar 2024 18:42:04 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id B8CD040674; Mon, 4 Mar 2024 07:42:01 +0000 (UTC) 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 nZnrHjQn3BDZ; Mon, 4 Mar 2024 07:42:00 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 9022D402FD Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 9022D402FD; Mon, 4 Mar 2024 07:42:00 +0000 (UTC) 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 59A421BF280 for ; Mon, 4 Mar 2024 07:41:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 470F881F8D for ; Mon, 4 Mar 2024 07:41:59 +0000 (UTC) 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 eJq_RAsbywGj for ; Mon, 4 Mar 2024 07:41:57 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a01:111:f403:2409::600; helo=nam04-dm6-obe.outbound.protection.outlook.com; envelope-from=neal.frager@amd.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org A4E1181F8C DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org A4E1181F8C Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on20600.outbound.protection.outlook.com [IPv6:2a01:111:f403:2409::600]) by smtp1.osuosl.org (Postfix) with ESMTPS id A4E1181F8C for ; Mon, 4 Mar 2024 07:41:56 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UVUS/qgdyIz+odcnr9OZP2pZHC3Qbjt+ishGrCzQHsGa0FkRRwt7m8E/yEFzGIx5fFXG1MlLofkaiMMgPjcYyli2XDQfWgcEnE3IPHy4kM6ToCqX53d5AkKw30A66uFILd9kBCX88LHmipI+iwcW/DKCD+JDKjLampADRuUeMxV60NzWfwtFLCUzuqoAaTsK+dRr4KZy5Ty5vq/1pVcK6bvsJlSvWmgRw4dOMBpt0QYPjhrbnAA6Dqx+TbP43oFyiG9M/o89Y06WTdp3ZXO5hcMIXoBsYw/gJu2ZIg5aaftthneOmHPL49gWqzT8CaEqw8UJsBNJReIa4byRkdUDDQ== 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=wC1YZzc0muvIFYxsrXknmNr19PKE16uP3koSGE1MU54=; b=exEICJkx9KsWoviEEaIiObblxP7J1WCyCJoSwFike0J483dEJFkimgSyT0xPh5TiUBvD0ZA5Im61PLMd3RYQeuAXo4KTpDT2l9BBjaiA69hzXhvc+MHT/goyAtzKOMtQWzsoZRHMZ/Hyq5qtjt0KT6m7Pe/r+C0elbzYpJ0q3KRnKlsA35d72z3obDQ256JBUpA4e5jGNhcL8eexiCBN3KK51NMxjOLe9Tznm4yxGENqQDI/jjg5Gd6dgejMUgu+iyZDi70uKc2vfAd5MuOFhu0tnNKjpwONbnW4MRc9R/kS+1pk9/M3MHGsh0uxgUbMc74vdpPQOUldUIp0vopU5g== 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 (0) Received: from CYXPR02CA0014.namprd02.prod.outlook.com (2603:10b6:930:cf::20) by BY5PR12MB4067.namprd12.prod.outlook.com (2603:10b6:a03:212::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.39; Mon, 4 Mar 2024 07:41:51 +0000 Received: from CY4PEPF0000EE31.namprd05.prod.outlook.com (2603:10b6:930:cf:cafe::7e) by CYXPR02CA0014.outlook.office365.com (2603:10b6:930:cf::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.39 via Frontend Transport; Mon, 4 Mar 2024 07:41:51 +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 CY4PEPF0000EE31.mail.protection.outlook.com (10.167.242.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7362.11 via Frontend Transport; Mon, 4 Mar 2024 07:41:49 +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.35; Mon, 4 Mar 2024 01:41:49 -0600 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.35; Sun, 3 Mar 2024 23:41:48 -0800 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.35 via Frontend Transport; Mon, 4 Mar 2024 01:41:47 -0600 To: Date: Mon, 4 Mar 2024 07:41:35 +0000 Message-ID: <20240304074140.1537910-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: CY4PEPF0000EE31:EE_|BY5PR12MB4067:EE_ X-MS-Office365-Filtering-Correlation-Id: 3b47afea-c156-4eee-6e21-08dc3c1e8d64 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3bGHvqeasW2JibJYzgrCMekArG71wbnhJ5tDuAkSk8DS0dKUmCcvJwmM1fuK7SCEecDCYNmttOgiok1Ic4MJI+3Tefg0JvqJ/4begOuDcaf0N0BEGdC8CsOFhdATcuIOIz4qo+UOX0OMboWyrQxAyQ+HMvgDmCzfDa11618XV/o6UOrxkZFV3GAXVWJ/BveHy552GZFcckOKQ+g8uHXJTTgIZHOxr8qVXCOmvT6CejpJM0sH0HlmyrX+LjlCluCQTS68vH/gGsRg7QBNiPc78+PRPAZf2W5golBt2g2CjoO89G9QrJk+hPkScwCloCItcVBN2FWCFPxzh+7i+8yvn45nOzwN/lRWcK+K4/8xVgxPINajP+BpUYcENO4gID/voNNyqaw3uy5X+VnvzCud2xrLAyar8FB4UA7OBT2JWPI9eDylR0gDa+jWXn/+1Y5sgA/Ie+mhPWhgz2+NS3dHNIBMbncXO2f5fRr+eZF+g4QBYyvX/5eEGOzx54F6rcu3FEl/ILlZw5v3KGzJjTGlY7eSR13MVcQbujEBzs2xSz0m84081UJdiuuECZUIEqnZMnhMFTFRKyA40RMFNtZyv5yB2IxJd1aA/eCY6t0O+SqbgR1lEbjYVT1QzdeHcuEvJjwQ8kSsHeuBTi9a3nSY+kns42LtwBZR4hluc9pQs10BmvSFkAvtrioi2A2ZdJvEOl1U8CbrqKm5k1PU7oP1OZjOF6bSL4gWSwlTmGx+xHdxq8Gj1YE9WW2XLeVFYTBJ 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)(82310400014)(376005)(36860700004); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2024 07:41:49.7685 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3b47afea-c156-4eee-6e21-08dc3c1e8d64 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: CY4PEPF0000EE31.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4067 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=wC1YZzc0muvIFYxsrXknmNr19PKE16uP3koSGE1MU54=; b=xfvCGG5PYYaVTv/kjuQEw7HZyYcfaxNllcxhG1WvfE/vMxjUCglRAaFkMv/J1nYpaU3Q0ukkn6mVgMBcJ9McADIo2D2/UGMbICXJk4T/kcFkAwfqQxu2+o03n4pQOJyqxOqKjkitjO9iBRUvLeHlWngKJopIyI+3H+Il473VqRk= X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com 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=xfvCGG5P Subject: [Buildroot] [PATCH v11 1/6] 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. 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 V6->V7: - removed patch numbers - changed dependency to toolchain-bare-metal-buildroot - removed hash since version is configurable V7->V9: - no changes V9->V10: - removed patches for supporting versions older than xilinx_v2023.2 V10-V11: - set default BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH to "microblazeel-xilinx-elf" to avoid stand-alone build failure --- DEVELOPERS | 1 + boot/Config.in | 1 + boot/zynqmp-firmware/Config.in | 22 +++++++++++++ boot/zynqmp-firmware/zynqmp-firmware.mk | 33 +++++++++++++++++++ .../toolchain-bare-metal-buildroot/Config.in | 1 + 5 files changed, 58 insertions(+) create mode 100644 boot/zynqmp-firmware/Config.in create mode 100644 boot/zynqmp-firmware/zynqmp-firmware.mk diff --git a/DEVELOPERS b/DEVELOPERS index 0bfe91f064..b677d9cd5b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2283,6 +2283,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_zc702_defconfig F: configs/zynq_zc706_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..d68ec2cf6a --- /dev/null +++ b/boot/zynqmp-firmware/Config.in @@ -0,0 +1,22 @@ +config BR2_TARGET_ZYNQMP_FIRMWARE + bool "zynqmp-firmware" + select BR2_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.2" + help + Release version of zynqmp firmware. + Only versions xilinx_v2023.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/zynqmp-firmware.mk b/boot/zynqmp-firmware/zynqmp-firmware.mk new file mode 100644 index 0000000000..383d888fba --- /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 = toolchain-bare-metal-buildroot + +CUSTOM_CFLAGS = $(call qstrip,$(BR2_TARGET_ZYNQMP_FIRMWARE_CUSTOM_CFLAGS)) +ZYNQMP_FIRMWARE_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_FIRMWARE_CFLAGS) +endef + +ZYNQMP_PMUFW = $(@D)/lib/sw_apps/zynqmp_pmufw/src/executable.elf + +define ZYNQMP_FIRMWARE_INSTALL_IMAGES_CMDS + $(INSTALL) -D -m 0755 $(ZYNQMP_PMUFW) $(BINARIES_DIR)/pmufw.elf +endef + +$(eval $(generic-package)) diff --git a/toolchain/toolchain-bare-metal-buildroot/Config.in b/toolchain/toolchain-bare-metal-buildroot/Config.in index 6fe969357f..7d33a68c5c 100644 --- a/toolchain/toolchain-bare-metal-buildroot/Config.in +++ b/toolchain/toolchain-bare-metal-buildroot/Config.in @@ -2,6 +2,7 @@ if BR2_TOOLCHAIN_BARE_METAL_BUILDROOT config BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH string "architecture tuple" + default "microblazeel-xilinx-elf" if BR2_TARGET_ZYNQMP_FIRMWARE help This option allows to define the architecture tuple for the bare-metal toolchain. From patchwork Mon Mar 4 07:41:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neal Frager X-Patchwork-Id: 1907408 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::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (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 4Tp9dF4g7Cz23hX for ; Mon, 4 Mar 2024 18:42:09 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 626A74081D; Mon, 4 Mar 2024 07:42:05 +0000 (UTC) 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 tfaMtrqNRDCQ; Mon, 4 Mar 2024 07:42:04 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 39E63402FD Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 39E63402FD; Mon, 4 Mar 2024 07:42:04 +0000 (UTC) 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 5728B1BF280 for ; Mon, 4 Mar 2024 07:42:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 44AB160B5E for ; Mon, 4 Mar 2024 07:42:00 +0000 (UTC) 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 ZODOdAjpjUwm for ; Mon, 4 Mar 2024 07:41:59 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a01:111:f403:2405::600; helo=nam02-dm3-obe.outbound.protection.outlook.com; envelope-from=neal.frager@amd.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org 70A2160B5C DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 70A2160B5C Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on20600.outbound.protection.outlook.com [IPv6:2a01:111:f403:2405::600]) by smtp3.osuosl.org (Postfix) with ESMTPS id 70A2160B5C for ; Mon, 4 Mar 2024 07:41:59 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=n2DwOVwj6z76FOA/cG5I1r9/pf9pKNUzhhQ9pedrB6693R5GQrhcQSSagRT6L68rGE6TMqoV2kv6WemQEktsRi0+qHKFWjbXOqg0ZT71+JFGJclkyOMRD60EIoUw8s7JNicJRG7IEsRk8ZYvEKJrFQHe2Lsx+YCCdQBSy+3g8/gZWxALgPSRCRk2LGauRuiPOUj3wCf8X4yHFS35wSn5MFGXeQaCSBoqSsj14IsCoMsFWW/J6yrAQX+qTo8xSLFkb52VR7pZBmjsLx0wwlXJmFaY6Vyw5pH8Q0uGGf1Zi7L8SQP+0sIReK4ieeVAdAhI8DPPGrAON7fQUy4erPvQIw== 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=QjK259Zq147zLPcRHhpAU1b3bC0JbAAE8AhICt/ytyg=; b=Kj788sBdjDx2qYTslYKBPF9n9gkZCjPwB0JGyqhscflZ4dESzkjU15dgPeuUyg/oWwUDoO2oQo8lXbfJHVZRAJYj+UbWdzS3ZFzmJUrpwZqORFJya7sgY0fQdVyZ3yq+EGnwikmqtuD8xlPYCSAZ+QFCKwlDbIN2l/ZvmKHW2X4NGkBLtfYlvzn3y9VzdCMLkX3KUo0BHo1vZVUroCwsvOHV9y+jVcupgcloP5jd5NWylyVhXBsCiAW8bpca5mqWkcPvTsQkVVB0Q+8XT+Te7aQxcTdc966tohzAYwM0pAScysT4k6NTDfmAo4OVKXNoH5fe9kzlBci4ssjSp9zkSw== 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 (0) Received: from BN9PR03CA0841.namprd03.prod.outlook.com (2603:10b6:408:13d::6) by DS0PR12MB7745.namprd12.prod.outlook.com (2603:10b6:8:13c::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.38; Mon, 4 Mar 2024 07:41:56 +0000 Received: from BN1PEPF0000468A.namprd05.prod.outlook.com (2603:10b6:408:13d:cafe::ec) by BN9PR03CA0841.outlook.office365.com (2603:10b6:408:13d::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.38 via Frontend Transport; Mon, 4 Mar 2024 07:41:56 +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 BN1PEPF0000468A.mail.protection.outlook.com (10.167.243.135) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7362.11 via Frontend Transport; Mon, 4 Mar 2024 07:41:55 +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.35; Mon, 4 Mar 2024 01:41:55 -0600 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.35; Sun, 3 Mar 2024 23:41:55 -0800 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.35 via Frontend Transport; Mon, 4 Mar 2024 01:41:54 -0600 To: Date: Mon, 4 Mar 2024 07:41:36 +0000 Message-ID: <20240304074140.1537910-2-neal.frager@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240304074140.1537910-1-neal.frager@amd.com> References: <20240304074140.1537910-1-neal.frager@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN1PEPF0000468A:EE_|DS0PR12MB7745:EE_ X-MS-Office365-Filtering-Correlation-Id: 79baa29a-9047-490a-ba43-08dc3c1e9104 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sglrSN4LVUJdCjBGX7FYaH9YkmJnv1g4lKUN/GuQ9bs3kZM4hLo2B1Jh37YPU65n0e0Lt6iwVmmD8ndN3us5J6iNJs97OwX6o/briB8pJwjPXc4GVS8xirMwG0DXMC15gZyn6A2CEMDyG7zhaZ2miJJkjZFZkKZhqQLoImSqZWlqQ8oeEWPW8o8civz6qLGr4JKRJcA/CVdfBLzzFzhXF4msefDdYDUAD20sa0zKpLTgEMZUZ+nLe9mHgd/hUsGZi2BqE7Vg9N0TugGcZddgwu+c5wNsuzHC0Yorn3igs0R+MhbsGKjP5agbhnlXI6k9Rz7LQH2vnJyMETGEGc9+OnCmnXjw6mhtGy1SHuq1NPe/SQzl9mfIKMbxcb+VufJVbYepzNvrejLaCXQU8ZYtOzoDfDT9zhwUXTot/a9+6EY9OITyxV7G7so8G9vpUxFTAv5JmSjQGsocx5QX95A4BV6OCdVHtEbV6ZzlpU0a82pvDmqrqlW46Ua2K66sH8MpJIydrAjK+D7pzaX1viNRhruIwT4FH+ARICkEaYbwJ9C8NP5+m88/r6Ijpp4m6hfSgTHRpCXsRrK831S67i1NdFTfjkzzka3ChdSeSVaBqBITfFrzGqtKV82+mUBenfNfUf6JkYsjThqQXor2D6oWsJ44Hzf/zmU9RuJmv4IhnHtM2yxpqE8KUFZG7A55Y+AEwsORnl8I8pApm/escEoxd4pohAhi0aybBdqGLwd+booQTkxpk+r2WnAC7SU2L/Ln 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)(36860700004)(376005)(82310400014); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2024 07:41:55.8990 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 79baa29a-9047-490a-ba43-08dc3c1e9104 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: BN1PEPF0000468A.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB7745 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=QjK259Zq147zLPcRHhpAU1b3bC0JbAAE8AhICt/ytyg=; b=jAdzOSctF1xZAliUSjedICMW4/3rpont/weWTvh23bskcxUcjoWhgdhy7jZcICS8yjDCdNTU5x1pNqLHepprdBhnyfr1Nn/oKYay5/r52k+ygQhV3CLbCKjHk+JTFf2ppV6GVUT5l2rP4GNVowG/1S7NezreXTudNLaraskMc6A= X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com 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=jAdzOSct Subject: [Buildroot] [PATCH v11 2/6] 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->V11: - 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 beafb38930..c5e33944d5 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 Mon Mar 4 07:41:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neal Frager X-Patchwork-Id: 1907409 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.137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (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 4Tp9dL3pd8z23hX for ; Mon, 4 Mar 2024 18:42:14 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id B8427402FD; Mon, 4 Mar 2024 07:42:12 +0000 (UTC) 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 4eTTYOa_6gHd; Mon, 4 Mar 2024 07:42:11 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org A032840674 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id A032840674; Mon, 4 Mar 2024 07:42:11 +0000 (UTC) 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 255121BF280 for ; Mon, 4 Mar 2024 07:42:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 4E4DD81FB5 for ; Mon, 4 Mar 2024 07:42:09 +0000 (UTC) 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 0HXBdYoh5bCv for ; Mon, 4 Mar 2024 07:42:07 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a01:111:f403:2412::601; helo=nam10-mw2-obe.outbound.protection.outlook.com; envelope-from=neal.frager@amd.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org F38CD81EF6 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org F38CD81EF6 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on20601.outbound.protection.outlook.com [IPv6:2a01:111:f403:2412::601]) by smtp1.osuosl.org (Postfix) with ESMTPS id F38CD81EF6 for ; Mon, 4 Mar 2024 07:42:06 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RJ9okrXvIKk7PAQvJ7OJE8MosuhPYmZJ1mYg7abTYli6pToqpf9JxDdXmVhcfpNK0nWlBFWqzw8jxHrViuNDypDGVqpD/Vyb/cULOoyOcnsLDwr+46oYY/HZZ5LPWOo3oPYI3gn5hrxlTnXGTkAY7Btdnz5IU8aonFy2bJNL5QEzF034Q6hY/oQrsJFgMOJlWcr4UFHNyP6jclSu2KAdRso8kEnaVkzOesmUH2G2rsTZ8fdkiPPgFEmJCjfjAa0Fl2Ye4VuR+wsPj7yVw+2s7PbkUJgAgdSBVaKyHFu1DOKQSX6MJC9nWvpk+pCw0889EX/4B9ToLKeEvzGB+xgDLQ== 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=fVueuvzzF0X3LsAM1GgykUJLW0oNk2QMbtBR1ASV9SY=; b=VT+BLch6f9KztbNjOV1ZirOXI2Jv3auyb++ZBsSGuhwtDeQVpKU/3AKEDiW/0eeLhRqOAjURS7UeqNzx6NvTcEJ904ORfqqPUyS/k3a2/96CQUziFWYVCSjOjYQi5HcKT/+syIHLZywEX0sF2EPaufcsEkjLgNWD41VsJDyOIW8LbNgl7oR0GksArNELOfn4gWSHCyBeSAct56MoRdXDSpjBwskyh95EiFFyt0cTQN/Rb9AqkFpJly9au3GKB5fmxi6DALS1SqbZQcK3P++4ZB3VdFBPT5KGmsuqigvXCy4HYITaFvIu9WnegNUMBE3dOODdfJCPNq28jQPBarYwiQ== 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 (0) Received: from CH5PR02CA0013.namprd02.prod.outlook.com (2603:10b6:610:1ed::27) by MN2PR12MB4320.namprd12.prod.outlook.com (2603:10b6:208:15f::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.38; Mon, 4 Mar 2024 07:42:02 +0000 Received: from CH1PEPF0000A346.namprd04.prod.outlook.com (2603:10b6:610:1ed:cafe::b0) by CH5PR02CA0013.outlook.office365.com (2603:10b6:610:1ed::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.38 via Frontend Transport; Mon, 4 Mar 2024 07:42: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 CH1PEPF0000A346.mail.protection.outlook.com (10.167.244.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7362.11 via Frontend Transport; Mon, 4 Mar 2024 07:42:02 +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.35; Mon, 4 Mar 2024 01:42:01 -0600 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.35 via Frontend Transport; Mon, 4 Mar 2024 01:42:00 -0600 To: Date: Mon, 4 Mar 2024 07:41:37 +0000 Message-ID: <20240304074140.1537910-3-neal.frager@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240304074140.1537910-1-neal.frager@amd.com> References: <20240304074140.1537910-1-neal.frager@amd.com> MIME-Version: 1.0 Received-SPF: None (SATLEXMB03.amd.com: neal.frager@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH1PEPF0000A346:EE_|MN2PR12MB4320:EE_ X-MS-Office365-Filtering-Correlation-Id: 01fbb401-5445-483e-2531-08dc3c1e94b5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6Fi9iQP7/bsd8p3A3MK96VJ2uwlJvL4Y+UXf3amQzMSEzGqM1WzEqCCBfna3wwDeKVKDLe7Ed2LF1/6N78Wpt2390Sdy8LNQIeO490P97F7O1JxvPlHD1/XmPzLBlCXVQ//i1NqpG7pnEC3Q4yNwdY3RpdWRsi+EPcrFDGRHqH5YdL8h+v5pDs6z1WoMgXekJ6CBsBYNzo2nwHVtwR3f8SmTwPiCLnCHi33wBFjtoO+rzuuGiCAzBe/VF7jnw61O1bHl8Rq9K3tYcEH0cfZqUhFX5Ofpq+VSljc0e7B8W9uDtiFdI8ViTHt/xpXMy7ygT+3hNpHRhan3PLcM+VGVGzmLSUCMFGZy16fMcLf4JY6IbXC6QeNs4mISFRVyf8S/GQmN68+Zs/AIFi5U9DFvEtwneOvXXBqhgOBkmg+khdT4hCL9yhVzRg9Fq2zIRz9P9QZY0lQrWVCfp9M3/9/wCeO53RK5e7HEjp1aSjiquHZll/jQWiWrQimJukEZePnKUkWuqzyNc2sZcxudkhIPNQCA+kJ0wXaOP39avE+MislZHbzluk/ZKLHLg9WNGtgIN0QRwMzAeRM3eZHwvaaRAP9HUW39ZmeRv5JamWgtkvAmL8tvBRuiTheGcDWJE2NfB1OrnxYtRw4r5u/Wgfg1sX/j8RW2O/wQfMT5JvKmapJHirDLQ0ELmIDapqDDWWzrb11aUZEtBSfgqPW3oQZGBQ== 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)(36860700004)(82310400014)(376005); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2024 07:42:02.0727 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 01fbb401-5445-483e-2531-08dc3c1e94b5 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: CH1PEPF0000A346.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4320 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=fVueuvzzF0X3LsAM1GgykUJLW0oNk2QMbtBR1ASV9SY=; b=WrZeR+U/KJNKM7VZIyUo0MPqdL8UtJe06JWeco1YLBlrWQS3rlpz1vKhQgjHFgfm6qXJ2t09UyexywNg3CAoVhvWAzpi2XNqD/kyMYfFXTZJ1RFyTXnyhtoIYSRcMV+SnKYOoDhA9mnr/9rJWAWxawe2QTuTydQZN47DxGi53Ns= X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com 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=WrZeR+U/ Subject: [Buildroot] [PATCH v11 3/6] 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->V7: - no changes V7->V8: - bump to xilinx_v2023.2 V8->V9: - add the new zynqmp defconfigs - add BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH definition V9->V10: - no changes V10->V11: - BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH is set by zynqmp-firmware --- configs/zynqmp_kria_kd240_defconfig | 4 +++- configs/zynqmp_kria_kr260_defconfig | 4 +++- configs/zynqmp_kria_kv260_defconfig | 4 +++- configs/zynqmp_zcu102_defconfig | 3 ++- configs/zynqmp_zcu104_defconfig | 3 ++- configs/zynqmp_zcu106_defconfig | 3 ++- 6 files changed, 15 insertions(+), 6 deletions(-) diff --git a/configs/zynqmp_kria_kd240_defconfig b/configs/zynqmp_kria_kd240_defconfig index 78302a48c0..908ded1d97 100644 --- a/configs/zynqmp_kria_kd240_defconfig +++ b/configs/zynqmp_kria_kd240_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.2/kd240-kria/pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW_SOURCE=y +BR2_TARGET_ZYNQMP_FIRMWARE_VERSION="xilinx_v2023.2" +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/kd240/pm_cfg_obj.c" BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y diff --git a/configs/zynqmp_kria_kr260_defconfig b/configs/zynqmp_kria_kr260_defconfig index 2089c3f355..73b0a641e0 100644 --- a/configs/zynqmp_kria_kr260_defconfig +++ b/configs/zynqmp_kria_kr260_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.2/kr260-kria/pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW_SOURCE=y +BR2_TARGET_ZYNQMP_FIRMWARE_VERSION="xilinx_v2023.2" +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/kr260/pm_cfg_obj.c" BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y diff --git a/configs/zynqmp_kria_kv260_defconfig b/configs/zynqmp_kria_kv260_defconfig index a3a157267c..0151b364d6 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.2/kv260-kria/pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW_SOURCE=y +BR2_TARGET_ZYNQMP_FIRMWARE_VERSION="xilinx_v2023.2" +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 c920093d8d..bdd85ab7d3 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.2/zcu102-zynqmp/pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW_SOURCE=y +BR2_TARGET_ZYNQMP_FIRMWARE_VERSION="xilinx_v2023.2" 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_zcu104_defconfig b/configs/zynqmp_zcu104_defconfig index 452f2343c8..7e341c571b 100644 --- a/configs/zynqmp_zcu104_defconfig +++ b/configs/zynqmp_zcu104_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.2/zcu104-zynqmp/pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW_SOURCE=y +BR2_TARGET_ZYNQMP_FIRMWARE_VERSION="xilinx_v2023.2" BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu104/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 011c7f0fae..554e62fb05 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.2/zcu106-zynqmp/pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW_SOURCE=y +BR2_TARGET_ZYNQMP_FIRMWARE_VERSION="xilinx_v2023.2" 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 Mon Mar 4 07:41:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neal Frager X-Patchwork-Id: 1907410 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::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (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 4Tp9dR3Nxgz23hX for ; Mon, 4 Mar 2024 18:42:19 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 7A5F140687; Mon, 4 Mar 2024 07:42:17 +0000 (UTC) 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 V5Dc6gwitWiZ; Mon, 4 Mar 2024 07:42:16 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 30FBA407EF Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 30FBA407EF; Mon, 4 Mar 2024 07:42:16 +0000 (UTC) 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 E5FBA1BF280 for ; Mon, 4 Mar 2024 07:42:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id E091681EE5 for ; Mon, 4 Mar 2024 07:42:14 +0000 (UTC) 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 rh8KxKwcW58W for ; Mon, 4 Mar 2024 07:42:13 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a01:111:f403:2414::600; helo=nam11-bn8-obe.outbound.protection.outlook.com; envelope-from=neal.frager@amd.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org 9EB6B81EE0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 9EB6B81EE0 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on20600.outbound.protection.outlook.com [IPv6:2a01:111:f403:2414::600]) by smtp1.osuosl.org (Postfix) with ESMTPS id 9EB6B81EE0 for ; Mon, 4 Mar 2024 07:42:13 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gk+acAzzaISV11XZ1nWcjA93YUPUe/goLJnygvRqIyGL4q2d4qXK69knujcp6NoD2XJXGzqolX2bdbqMBlc4GrYr5r//4JdBOxSBejZKc6vAolpgOGiVLqNgwE/LPmc8iKmqghxLPZ2gYpugDh5W8kY7iYGlun1jarGdrojC7He3/BoEYsS2DszxI6bvHmpTvdpDpj2zGTPEdWQt3k/zV4dMHHDq2H8+X1wr0Clk4YtKAvVOSBAl/9OJa0N5AQ3QOfCZUiS7gLJJwoqx74IFck1VOJj7WxyVVur4PTKfRtiauUW+fH7Dk93/IZmlwqOorkQqhSX1MIm45PvKgqLY/Q== 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=JNnnPg701TdBve4UJeTbJsHoD2AFDUrJbPGcsjzTBJ0=; b=Cz7L0vniYWcNrhefb4cQVr2geUHCyQPdThru5OHHenBpwbesCoobSueSf009v/o64qde0t1BidKZIAxcRcMZbV7rdLGDWWBdESQkWlQlOeeWfAbrimuM9lfG3Sy3+S440ESygdvrNpDd7n02kXDsGii7A7l9ttG9TfCgBxbE85rsAUPLWr0ZIxB15TNadrPOjTXaalQokBvTkGGvGvIRolp9fc/oQBkcD9MEZQDX9Sm+A+LQg0Gum1lwvHsWUcIKlKMGxPZ39R1ucXlquql8jeWD+sjAUtm5p/ES8Fc3T6obP3BTasmunhpuiZbmY3/XaM3qOrDDc1PHqcx2G6cJaA== 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 (0) Received: from DM6PR07CA0075.namprd07.prod.outlook.com (2603:10b6:5:337::8) by DM4PR12MB7550.namprd12.prod.outlook.com (2603:10b6:8:10e::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.38; Mon, 4 Mar 2024 07:42:10 +0000 Received: from CY4PEPF0000EE36.namprd05.prod.outlook.com (2603:10b6:5:337:cafe::29) by DM6PR07CA0075.outlook.office365.com (2603:10b6:5:337::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.39 via Frontend Transport; Mon, 4 Mar 2024 07:42:10 +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 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.7362.11 via Frontend Transport; Mon, 4 Mar 2024 07:42:09 +0000 Received: from SATLEXMB03.amd.com (10.181.40.144) 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.35; Mon, 4 Mar 2024 01:42:05 -0600 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.35 via Frontend Transport; Mon, 4 Mar 2024 01:42:04 -0600 To: Date: Mon, 4 Mar 2024 07:41:38 +0000 Message-ID: <20240304074140.1537910-4-neal.frager@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240304074140.1537910-1-neal.frager@amd.com> References: <20240304074140.1537910-1-neal.frager@amd.com> MIME-Version: 1.0 Received-SPF: None (SATLEXMB04.amd.com: neal.frager@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EE36:EE_|DM4PR12MB7550:EE_ X-MS-Office365-Filtering-Correlation-Id: 2ea94dc6-d08a-4e98-645e-08dc3c1e990a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oCVtHiGeh4gDyI0FyFR6O7AE7mfzVMo7GQDRDgyOVkxngpaq9Cr4tC6c5hK7k2Gjdhty/iea6zYCRvhJC6nhggLvkEztGWGnX4cu9d2VBSpBwzm/42gG7rWLag8M4xaGdSxvmutn03TucNKIJWuU4ep7tW7/lf43drr8cKs+og5uDNtC1xsC+ldW34XbdIHDFpbFpa23+p6C0FBGfSHaHAKD/1LEx+lrmRwFikSEfnAAQSIVyhD2qlsSgV/ckoFg9RqX+C9AizuQ4DHTXd8QohqewNipAjXx7VmXqhLIU5It/mgo4S3EPXZgs9LNQjA74+XVfs/rHB/ioaWzjcRwTw30Rja2ievdablRgPU78rsJsQtl5w+f+mfaUq4nnyryvNurtKACeObtEQPllD8ajgHDLzgnGEX4Xdc/OP9EdySjFt8mH+AEVpnWza7T4sNhCJRTJmFuNTb4VLSTn7DjlpvWuV18MKbZLsgKJCSlHc7mRPdxeKuHCOr4R027OcprI+tVOGixZpi2Ia8VljnJjftMjUNQiuW4QC4aLyWvMumA0rYuqiwOVdFus41VjW1Fqz/P5A2PTbf7FwVwxwGeVhT9Mg8GwdjHnPl7ptKBzXae3pHgsrnma7HOqqLNfOyo33igpl33BRHyq413lzTmlZHJHMRF5YHS1S2xT/Q0EgesCQN2jEmVdtRDiNzIsxhcnCW5GXD26f2gE3q6Vg8/xA== 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)(36860700004)(376005)(82310400014); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2024 07:42:09.3110 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2ea94dc6-d08a-4e98-645e-08dc3c1e990a 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: CY4PEPF0000EE36.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB7550 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=JNnnPg701TdBve4UJeTbJsHoD2AFDUrJbPGcsjzTBJ0=; b=BMkd35CKpcLDW43mKve6bF/4GFIvRzHDsaefZaWGmSwS4yF3nXJnQDmr3edemDJHavw4fUM17/aGhyc84WZAxLCyC9+oqeDlzJ7F+r+S02G/G6obo8KT4939EZb/+GPd++Y6CVzn+Sux9LchqSFFzOyPlIaCNHOLbslh5v4Y7Gw= X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com 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=BMkd35CK Subject: [Buildroot] [PATCH v11 4/6] 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. 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 V6->V7: - removed patch numbers - changed dependency to toolchain-bare-metal-buildroot - removed hash since version is configurable V7->V9: - no changes V9->V10: - removed patches for supporting versions older than xilinx_v2023.2 V10-V11: - set default BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH to "microblazeel-xilinx-elf" to avoid stand-alone build failure --- DEVELOPERS | 1 + boot/Config.in | 1 + boot/versal-firmware/Config.in | 38 ++++++++++++++ boot/versal-firmware/versal-firmware.mk | 52 +++++++++++++++++++ .../toolchain-bare-metal-buildroot/Config.in | 1 + 5 files changed, 93 insertions(+) create mode 100644 boot/versal-firmware/Config.in create mode 100644 boot/versal-firmware/versal-firmware.mk diff --git a/DEVELOPERS b/DEVELOPERS index b677d9cd5b..fa3424074e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2283,6 +2283,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_zc702_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..cda72c7704 --- /dev/null +++ b/boot/versal-firmware/Config.in @@ -0,0 +1,38 @@ +config BR2_TARGET_VERSAL_FIRMWARE + bool "versal-firmware" + select BR2_PACKAGE_HOST_BOOTGEN + select BR2_TOOLCHAIN_BARE_METAL_BUILDROOT + 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.2" + help + Release version of versal firmware. + Only versions xilinx_v2023.2 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.2/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.mk b/boot/versal-firmware/versal-firmware.mk new file mode 100644 index 0000000000..fa932510a1 --- /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 = toolchain-bare-metal-buildroot + +CUSTOM_CFLAGS = $(call qstrip,$(BR2_TARGET_VERSAL_FIRMWARE_CUSTOM_CFLAGS)) +VERSAL_FIRMWARE_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)) +VERSAL_PDI = $(VERSAL_FIRMWARE_DL_DIR)/$(notdir $(VERSAL_FIRMWARE_PDI)) +else ifneq ($(VERSAL_FIRMWARE_PDI),) +VERSAL_PDI = $(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_FIRMWARE_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_FIRMWARE_CFLAGS) +endef + +VERSAL_PLM = $(@D)/lib/sw_apps/versal_plm/src/versal/plm.elf +VERSAL_PSMFW = $(@D)/lib/sw_apps/versal_psmfw/src/versal/psmfw.elf + +define VERSAL_FIRMWARE_INSTALL_IMAGES_CMDS + $(INSTALL) -D -m 0755 $(VERSAL_PLM) $(BINARIES_DIR)/plm.elf + $(INSTALL) -D -m 0755 $(VERSAL_PSMFW) $(BINARIES_DIR)/psmfw.elf + $(INSTALL) -D -m 0755 $(VERSAL_PDI) $(BINARIES_DIR)/vpl_gen_fixed.pdi +endef + +$(eval $(generic-package)) diff --git a/toolchain/toolchain-bare-metal-buildroot/Config.in b/toolchain/toolchain-bare-metal-buildroot/Config.in index 7d33a68c5c..1a15558371 100644 --- a/toolchain/toolchain-bare-metal-buildroot/Config.in +++ b/toolchain/toolchain-bare-metal-buildroot/Config.in @@ -2,6 +2,7 @@ if BR2_TOOLCHAIN_BARE_METAL_BUILDROOT config BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH string "architecture tuple" + default "microblazeel-xilinx-elf" if BR2_TARGET_VERSAL_FIRMWARE default "microblazeel-xilinx-elf" if BR2_TARGET_ZYNQMP_FIRMWARE help This option allows to define the architecture tuple for the From patchwork Mon Mar 4 07:41:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neal Frager X-Patchwork-Id: 1907411 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.137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (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 4Tp9dY0Hz1z23hX for ; Mon, 4 Mar 2024 18:42:25 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 5438F406B1; Mon, 4 Mar 2024 07:42:23 +0000 (UTC) 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 Hl9ITrSTr6Vl; Mon, 4 Mar 2024 07:42:22 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 686FC40818 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 686FC40818; Mon, 4 Mar 2024 07:42:22 +0000 (UTC) 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 2CF301BF280 for ; Mon, 4 Mar 2024 07:42:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 130F940167 for ; Mon, 4 Mar 2024 07:42:20 +0000 (UTC) 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 MNb7SUR7ijQe for ; Mon, 4 Mar 2024 07:42:18 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a01:111:f403:2416::600; helo=nam11-co1-obe.outbound.protection.outlook.com; envelope-from=neal.frager@amd.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org BD97C400C6 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org BD97C400C6 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on20600.outbound.protection.outlook.com [IPv6:2a01:111:f403:2416::600]) by smtp2.osuosl.org (Postfix) with ESMTPS id BD97C400C6 for ; Mon, 4 Mar 2024 07:42:18 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OJ9DQRqogjrVsJ1aZ9Ww9/6C20/RO5RzONRWGuCGXW++eHqTf/opj4wUgQbVRmzcjUd4GPrphRnpkHQnJ4Eiht+SbQYXEFrVwh4tpXB5rn5DOR3MIqrg8by+aSqBQjrdd43F4ge9yrvwQVqtEw4BAipJDcJU3tI7AqDlpQfcCpF2PHBYIaDhOJIfiFK0IfnqjLunmkeinRjyTk3RzQTIN4bZXpdwPPrMINEbxpHWbJFDiXAlApOMnz2ekAXiWPpIais8vB1aq3fVMeAoWkb2EtxLLjpPDHMbhdYBBHMA6fWZQumDTqjT/OGbBTN4hMnPCwLINFnyrAoCYyO9tAommw== 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=hFhqssYgw4h7WQ+SKfhNYH8efAjJtk3vXtgWkgK6YJE=; b=bmZXOzC0gOWxO9alUkPondsMOWD//vEI0ZhUR/quCTvR+qlQ0ncgUX4o9ptJjEvjpii7jSvG4JfmQ0+Qfh5x1oPS5+fDj3bX1FbwPaYvDv0/xp0IldtqkPJc+TFKtSE275nzUR0olOJe9vM1G3i+Ng59fIPaOEUHue2WQrPXuPHFM9tV4UvOzKevbuB74MULVdp/yVUVmGR/XwCr7ss852YOCfbrnO/GycO9ZOXuOUs6NeZW/Kuhc/AlSJejXsCxURPcRduVychGbNrdCNkgKkYq7X1/fr/a4SLa60XY7COjkvZ+YibqaMTJhdYriUqvFtkzCy/aP3K+/B5XhvXv2A== 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 (0) Received: from DM6PR07CA0073.namprd07.prod.outlook.com (2603:10b6:5:337::6) by IA1PR12MB6115.namprd12.prod.outlook.com (2603:10b6:208:3e9::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.38; Mon, 4 Mar 2024 07:42:15 +0000 Received: from CY4PEPF0000EE36.namprd05.prod.outlook.com (2603:10b6:5:337:cafe::3d) by DM6PR07CA0073.outlook.office365.com (2603:10b6:5:337::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.39 via Frontend Transport; Mon, 4 Mar 2024 07:42:15 +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 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.7362.11 via Frontend Transport; Mon, 4 Mar 2024 07:42:15 +0000 Received: from SATLEXMB03.amd.com (10.181.40.144) 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.35; Mon, 4 Mar 2024 01:42:12 -0600 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.35 via Frontend Transport; Mon, 4 Mar 2024 01:42:10 -0600 To: Date: Mon, 4 Mar 2024 07:41:39 +0000 Message-ID: <20240304074140.1537910-5-neal.frager@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240304074140.1537910-1-neal.frager@amd.com> References: <20240304074140.1537910-1-neal.frager@amd.com> MIME-Version: 1.0 Received-SPF: None (SATLEXMB04.amd.com: neal.frager@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EE36:EE_|IA1PR12MB6115:EE_ X-MS-Office365-Filtering-Correlation-Id: bc98b9d7-6f72-4fcd-64d8-08dc3c1e9c75 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bBCAFhR9PPiY1kG9rSsAvgj/uoygDuAMNhDnsPJEFqH0piKIUsrlShc8C/ZSXv1gBruMyGu5M0UPCk7mhJv0HN8kjXm6AM6dNlaDPI4qgyHMDz3D5BohjaRV+2ATxny6qMhGH/g9OVUdwcYweDC562goLXuYvFz7ycUfncs5ja5Io5uT60TTwa2LOIcPKPfL+TEaSbJH4kZvNRXZZuo4aNHmUitBY5SXoUUF4rZG7+QNn6BqLkFT8ZfbYqUOxtzzP4axRnnBZDbpMU4S/HEbm/0Hf/iCQ3N1A7USVVJQy8gKYSPKs2S3vXxl9ohHGo2bm3k+jTztovoSUGE6+sIPfuZHIM46Bk88hU6vVrrGVESp2xW/qsWsQ4LUMwAyJt80trGGJVBWMTCRnwzD5U2Bx34jeZBBA60TfB5ZKt8nCOfELvu4xJvD9TFMy5yC8BPOn8CJptBbRiel80lvEzBhlcvM4U1Y3JnVRrWYSsyQUpQxLz3ktcYOXe57sqDyHkyGvHA+nOHfg2vQBvayybsAgTTNl63aD8JS8EU7677VShYc4S1DchpArLpgCyXqwnRSwbtY0v8Q27Z3HFLjZTGxS1ZdZhbb5/pwCpzecWjrgpaGRQPLBBy7aoO7SiyZdLDsR98+5NIWFlvA6K5IF8UtXWa9c0u4wDNNKUT42DUy0FYDm1PB/r3IChg1pGHc4oZKMXFF5vrhAsR59u+lctgRHg== 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)(376005)(82310400014)(36860700004); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2024 07:42:15.0454 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bc98b9d7-6f72-4fcd-64d8-08dc3c1e9c75 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: CY4PEPF0000EE36.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6115 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=hFhqssYgw4h7WQ+SKfhNYH8efAjJtk3vXtgWkgK6YJE=; b=CV8QggYjNUODcYcpwBwEuwKlkWfjSG2wXMDn8JF/rlVL3emLpM3eLQk9H2d8Y1ZORVJSVEYNuCUQxVVbnezN1vuYIRCOhNGS8g/du9t+qUW9vVeqiyhxRkzb9l5G7+OCWJDmtaIzXLTXx2fRTGfSbPJxCYAxR4Dg6vWACv+szr4= X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com 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=CV8QggYj Subject: [Buildroot] [PATCH v11 5/6] 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->V7: - no changes V7->V8: - bump to xilinx_v2023.2 V8->V9: - add BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH definition V9->V10: - no changes V10->V11: - BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH is set by versal-firmware --- 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 8561b6641a..d59e23792c 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.2" -BR2_PACKAGE_VERSAL_FIRMWARE_BOARD="vck190" +BR2_TARGET_VERSAL_FIRMWARE=y +BR2_TARGET_VERSAL_FIRMWARE_VERSION="xilinx_v2023.2" +BR2_TARGET_VERSAL_FIRMWARE_PDI="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2023.2/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 Mon Mar 4 07:41:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neal Frager X-Patchwork-Id: 1907412 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::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (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 4Tp9dc4r5wz23hX for ; Mon, 4 Mar 2024 18:42:28 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id DE180407D4; Mon, 4 Mar 2024 07:42:26 +0000 (UTC) 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 l8WpT3MtqVFg; Mon, 4 Mar 2024 07:42:26 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org A280D4085A Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id A280D4085A; Mon, 4 Mar 2024 07:42:25 +0000 (UTC) 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 211F21BF280 for ; Mon, 4 Mar 2024 07:42:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 0F51340818 for ; Mon, 4 Mar 2024 07:42:22 +0000 (UTC) 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 gxavLzO9BPzT for ; Mon, 4 Mar 2024 07:42:21 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a01:111:f400:7e88::631; helo=nam10-dm6-obe.outbound.protection.outlook.com; envelope-from=neal.frager@amd.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org 0979E406B1 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 0979E406B1 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on20631.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e88::631]) by smtp4.osuosl.org (Postfix) with ESMTPS id 0979E406B1 for ; Mon, 4 Mar 2024 07:42:20 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Jo0T+H06CKMftcneB5XOw+N+ze0Jzph0yp3BhnLj33VE6/ecnlBNR6Y4VJRcjuo9jAytsZm0b/q5pb9vZP6Vl9FgaL/eJZCp2R7/ISgM6rHRY4PhM6zDudi/3M7PmcVrXyelLYK5WE46NM/3JmRFOp5Y4CFCZcL61envFKM+hfkKhgabIOmKOGopzhS19is5WK4IJ5NXUL+aUs9eCw7bDCS8S4QOwroORaeqMLkjntEJotfdcKt0FUvrBgocU/2deYnmlh9uLmxgmnXe2LJVnXY4Riq1qoOn5EaFDnmWv/PsYpfZtGnARYA877y7VH4DHYQzYCaUECWeSpJjnDPDDQ== 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=JyPJ9QbVnGni0HMmQpnRPlcQUfBoZg2Bd1bj3VWi4ok=; b=R5N9s2BBUEh9LTioLC9mp1qru77uVmrnLlB5l1cfbISHdJp87YqZUEGpG70BaoNE5yeiKQt+VXmJOL6A3naID8CrJ9W74z3Wp17EXapBV3NpW7MjE7uoHjCx4oEnNGo5XCITolpWNtiHt+euSvOMpUY7HFaC0yR6xi8spjc3wix8SvxieMyD2MloL22Ayx5j/5INmfqXN7zLkS2KB3upd2du+5/5YixWtkAVo3abJoO8Lw4J73koli4IjYJTkc3/EZ20tJCHPi6imhOD8eGbH8cqFDi5G7q4mvue2OkMT2hzqtvL893AqPE++X20Z8HfMGnTMmWFV88O1/JJBEzoKA== 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 (0) Received: from DM6PR07CA0090.namprd07.prod.outlook.com (2603:10b6:5:337::23) by CH3PR12MB9394.namprd12.prod.outlook.com (2603:10b6:610:1cf::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.39; Mon, 4 Mar 2024 07:42:18 +0000 Received: from CY4PEPF0000EE36.namprd05.prod.outlook.com (2603:10b6:5:337:cafe::c0) by DM6PR07CA0090.outlook.office365.com (2603:10b6:5:337::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.38 via Frontend Transport; Mon, 4 Mar 2024 07:42: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 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.7362.11 via Frontend Transport; Mon, 4 Mar 2024 07:42:17 +0000 Received: from SATLEXMB03.amd.com (10.181.40.144) 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.35; Mon, 4 Mar 2024 01:42:16 -0600 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.35 via Frontend Transport; Mon, 4 Mar 2024 01:42:15 -0600 To: Date: Mon, 4 Mar 2024 07:41:40 +0000 Message-ID: <20240304074140.1537910-6-neal.frager@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240304074140.1537910-1-neal.frager@amd.com> References: <20240304074140.1537910-1-neal.frager@amd.com> MIME-Version: 1.0 Received-SPF: None (SATLEXMB04.amd.com: neal.frager@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EE36:EE_|CH3PR12MB9394:EE_ X-MS-Office365-Filtering-Correlation-Id: 8c65a783-ebf5-485a-9fb8-08dc3c1e9e35 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TpKAGYV1oxuDc6c1GfIUSEPLYCFSOM1yv30P9nNc4ZH9ZVTI+jWYYIJzXSoolHRUv7mnHKgepvEiBI7dhTtFQ/gbDsu8wbD89yaeMqmT5p/9DZp8hUIqDDLpb+JnEPMeFKcP45+hCWtYa0DllGYhwAqN5Xv3HwmTKSd6fnVHHV5Gxb7cmEgUBERRE1kuhvb86HlKSDhyLHJqkyKzs/45Y3M1HsiSSiP3YvAfugnUoKqQabiYu512icXTOmFQY3tNly3qgKyHMVYPNWbRokSM8g1Fx/+DSCIyf8aiO81p3diW1UX3b3Fq3HkH89krAW6UwnleJ/j2mSZ2yEuB3u9Q3v+exHQAUvYU7xr61Fw3UvvvAmyFNyisB27K6MMtl0VpldO4T+jwoOhUdj1nRWfbLh9csS0aQ+zFbKTJQ0H/U2tJapd9T/P4lvtlT+dTnzZSOyWs74hUfWgQRMjXyY7pItAXZS88vxJFT6YLL9GyyZUoIwXCMlOZY1DmTiyDI50UUjZ2LxocC3wHD25UJh9xRW+IfrWfLuXh+mcTAMdTSK+GXBB//wJP9V0vwYJfWqKCF1EtJ8t6Gcn9cEm30UzNgw9BiSmgJqzDEX8cbRnhKFrgRZ0pVrCjaelUYCGWrSTluhLyW9TP+uq7uCMKppUg+n2Ac/JjTt3URwMuDa+zwtXAOghbC2u45mSjfC1eUh6UowcF94cav4aE3u49h7i7kw== 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)(82310400014)(376005)(36860700004); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2024 07:42:17.9673 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8c65a783-ebf5-485a-9fb8-08dc3c1e9e35 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: CY4PEPF0000EE36.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB9394 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=JyPJ9QbVnGni0HMmQpnRPlcQUfBoZg2Bd1bj3VWi4ok=; b=KbepcnwnVAqpyw4rrfHwtKgp69DrAwl+3EHQ9kr1aUNXunmdsAKVJpNlI4X9BIJ2Nf9Gby6wnLKuZjrbCkuIu7qK+OkIZoWxHgTylPdtMF8HNtxjmfBk3KMpFE3fpkQqR8FeI4J9zs16yYqdKbz43+xS8LYDCUJANKaf2NnReJo= X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com 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=Kbepcnwn Subject: [Buildroot] [PATCH v11 6/6] 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->V11: - 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 fa3424074e..5fb3b1f5ef 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2298,7 +2298,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 bf0fe078b9..f3bcf13bb9 100644 --- a/package/Config.in +++ b/package/Config.in @@ -457,7 +457,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))