From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 53DE4C4332F for ; Tue, 22 Nov 2022 20:17:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 8F6EA40B78; Tue, 22 Nov 2022 20:17:27 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 8F6EA40B78 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 MzUb0sxKX03J; Tue, 22 Nov 2022 20:17:26 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 9B160403F8; Tue, 22 Nov 2022 20:17:25 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 9B160403F8 Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id A88C51BF285 for ; Tue, 22 Nov 2022 20:17:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 8418981FB4 for ; Tue, 22 Nov 2022 20:17:24 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 8418981FB4 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 o9xaJ4vQrR2V for ; Tue, 22 Nov 2022 20:17:23 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org C2AFA81FB1 Received: from mx0a-00105401.pphosted.com (mx0a-00105401.pphosted.com [67.231.144.184]) by smtp1.osuosl.org (Postfix) with ESMTPS id C2AFA81FB1 for ; Tue, 22 Nov 2022 20:17:23 +0000 (UTC) Received: from pps.filterd (m0075556.ppops.net [127.0.0.1]) by mx0a-00105401.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 2AMKChHu045343; Tue, 22 Nov 2022 20:17:19 GMT Received: from xnwpv37.utc.com ([167.17.239.17]) by mx0a-00105401.pphosted.com with ESMTP id 3m13me12jd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 22 Nov 2022 20:17:18 +0000 Received: from qusnwaff.utcapp.com (qusnwaff.utcapp.com [10.161.48.102]) by xnwpv37.utc.com (8.16.1.2/8.16.1.2) with ESMTPS id 2AMKHHnb119859 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 22 Nov 2022 20:17:17 GMT Received: from crulimr01.rockwellcollins.com ([10.172.224.19]) by qusnwaff.utcapp.com (8.16.1.2/8.16.1.2) with ESMTPS id 2AMKHGQG000390 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 22 Nov 2022 20:17:17 GMT X-Received: from kirk.rockwellcollins.lab (kirk.rockwellcollins.lab [10.148.204.208]) by crulimr01.rockwellcollins.com (Postfix) with ESMTP id AF44C60689; Tue, 22 Nov 2022 14:17:16 -0600 (CST) To: buildroot@buildroot.org Date: Tue, 22 Nov 2022 14:17:01 -0600 Message-Id: <20221122201701.65681-1-brandon.maier@collins.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: 3bZR3WkizeLyjp4tqDbC9Aok4K_Pp0kH X-Proofpoint-GUID: 3bZR3WkizeLyjp4tqDbC9Aok4K_Pp0kH X-Proofpoint-Spam-Details: rule=outbound_default_notspam policy=outbound_default score=0 suspectscore=0 priorityscore=1501 malwarescore=0 impostorscore=0 bulkscore=0 adultscore=0 spamscore=0 mlxscore=0 clxscore=1015 lowpriorityscore=0 mlxlogscore=999 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2211220157 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=collins.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding; s=POD051818; bh=298md210chVzFj04BwhCIzUtc1BMIzD9z4rXE90ngjY=; b=bgyYjeoTeOH0/IIEkmqAsITe1E/1sXiuLda/A7FmKISo0Po6CXPwyKikX1ndNWvFYIyU 5kKKcdSdcrB+3thIdx6pX9/4JfeaBzvHaXaXOKIakgqcugFYcpvod8mIytVH2fCcDOc1 pHuJU32b2OXJwdeH616YmH0DZ9NlbIeqGWboiw5GSLQFdut227hYWNygLKz/RcV6DvRF HQMZYmlgw8NtRuOyodajjIn40pRnGPpoqTIcH8Y2YD6EK1Tg0z9SIntjGYINK0sau1Oc mOiLcedvzfReVxWIiVY44nuAsYR6gwkIB/mMcdnSKRPKpl2w7SPQ7PgfiB44lb5WhgvX TA== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=collins.com header.i=@collins.com header.a=rsa-sha256 header.s=POD051818 header.b=bgyYjeoT Subject: [Buildroot] [PATCH v2 1/1] boot/uboot/uboot.mk: fix zynqmp without pmufw 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: , From: Brandon Maier via buildroot Reply-To: Brandon Maier Cc: Luca Ceresoli , Brandon Maier , Neal Frager Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Commit d07e6b70 (boot/uboot/uboot.mk: add pmufw.elf support) broke configurations where the UBOOT_ZYNQMP_PMUFW was blank. Previously it would set the U-Boot CONFIG_PMUFW_INIT_FILE to the blank string, but now it will set it to ".bin" which causes U-Boot to fail to build. Signed-off-by: Brandon Maier --- v2: - support pmufw with any extension --- boot/uboot/uboot.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 19e4183927..d037ae9c12 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -394,8 +394,9 @@ UBOOT_ZYNQMP_PMUFW_BASENAME = $(basename $(UBOOT_ZYNQMP_PMUFW_PATH)) define UBOOT_ZYNQMP_KCONFIG_PMUFW $(if $(filter %.elf,$(UBOOT_ZYNQMP_PMUFW_PATH)), - objcopy -O binary -I elf32-little $(UBOOT_ZYNQMP_PMUFW_BASENAME).elf $(UBOOT_ZYNQMP_PMUFW_BASENAME).bin) - $(call KCONFIG_SET_OPT,CONFIG_PMUFW_INIT_FILE,"$(UBOOT_ZYNQMP_PMUFW_BASENAME).bin") + objcopy -O binary -I elf32-little $(UBOOT_ZYNQMP_PMUFW_BASENAME).elf $(UBOOT_ZYNQMP_PMUFW_BASENAME).bin + $(call KCONFIG_SET_OPT,CONFIG_PMUFW_INIT_FILE,"$(UBOOT_ZYNQMP_PMUFW_BASENAME).bin"), + $(call KCONFIG_SET_OPT,CONFIG_PMUFW_INIT_FILE,"$(UBOOT_ZYNQMP_PMUFW_PATH)")) endef UBOOT_ZYNQMP_PM_CFG = $(call qstrip,$(BR2_TARGET_UBOOT_ZYNQMP_PM_CFG)) -- 2.38.1 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot