From patchwork Tue Feb 9 20:13:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giulio Benetti X-Patchwork-Id: 1438667 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=aruba.it header.i=@aruba.it header.a=rsa-sha256 header.s=a1 header.b=l7AWUP8N; dkim-atps=neutral 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 RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DZvQh064Zz9s1l for ; Wed, 10 Feb 2021 07:20:28 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 4DF3A6F6DC for ; Tue, 9 Feb 2021 20:20:26 +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 OeL9i8Ewtz30 for ; Tue, 9 Feb 2021 20:20:25 +0000 (UTC) Received: by smtp3.osuosl.org (Postfix, from userid 1001) id 976156F6A6; Tue, 9 Feb 2021 20:20:25 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 55BAF6F4A4; Tue, 9 Feb 2021 20:20:12 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 224431BF3A6 for ; Tue, 9 Feb 2021 20:20:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1ED3986274 for ; Tue, 9 Feb 2021 20:20:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5IEgGPHg9eV6 for ; Tue, 9 Feb 2021 20:20:09 +0000 (UTC) X-Greylist: delayed 00:07:03 by SQLgrey-1.7.6 Received: from smtpcmd0641.aruba.it (smtpcmd0641.aruba.it [62.149.156.41]) by fraxinus.osuosl.org (Postfix) with ESMTP id 58C968626C for ; Tue, 9 Feb 2021 20:20:09 +0000 (UTC) Received: from ubuntu.localdomain ([146.241.168.111]) by Aruba Outgoing Smtp with ESMTPSA id 9ZNflg0Thl6ts9ZNglQW4h; Tue, 09 Feb 2021 21:13:05 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=aruba.it; s=a1; t=1612901585; bh=eT3toHrHgz3otrI//21LfcD4p3Z0H/eLn+MdZBpdXJM=; h=From:To:Subject:Date:MIME-Version; b=l7AWUP8NkSYRTgmEpTN94Zjj3fL5DLcGEAZo82sNgoPC07YyUiY4FcG7t0LjsF1lL MbAPVYanem1BUKZ/S9wy8kBFufn4TgOjgxSJOOhKaMkGK2s+QBbd5Q4Fw/Bvig3KXV rma7e17UOg+Z/KjAm8WV2F00F6Ml4cIBOCQ1ogyi1feD5JFnn772DJdabGQ2pb/n1q XlcRrHw99V/cGDvPk3quC+v4OHbbDIID3WviaQvp65GzyEuIyp5/y+Y1Sw6+h6+fDj 5AuQPSVP0e/u13dMoBBbtcY7V9Y9pmAW1ROVACHnNjJEG8kiQPUOd7ED9wMG42u3zn 42Mu96p54u7sA== From: Giulio Benetti To: buildroot@buildroot.org Date: Tue, 9 Feb 2021 21:13:03 +0100 Message-Id: <20210209201303.195093-1-giulio.benetti@benettiengineering.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CMAE-Envelope: MS4wfA/GBgepln1rmHhiZTyVo9KA2SKJRg2CFAducpLLOp9+YG+dajVvh8HcdXrkhe67M96b3g/6wNAGfXe/0iYsOBv2qkVeRjehrdAGRULptLH8Dq2oMCba RkP8oS4UcQajHILiOcKo/NrEPRh2qJFeQkPgr4NCpf5JVY0j3Kz/+5kulmGTHtv7e+iykeZIKOM+8MQsxqEXZwP8iECQJOG8lZACkhVdUj58+EXQUqSoBofk tl6YXFfjQD3kWmCfSHHrbXpTpR5S7IK3toGc01pKJzyb16Vlamh2XEbWkvjLwUcvZjwLrpkgCZ6bAVef8dpDsQ== Subject: [Buildroot] [PATCH] boot/uboot: fix uboot build failure with UBOOT_CUSTOM_DTS_PATH on uboot version >= 2020.x X-BeenThere: buildroot@busybox.net 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: , Cc: Giulio Benetti , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Starting from version 2020.x uboot can't build .dts files not listed in dts/Makefile leading to a build failure when trying to pass a .dts file to UBOOT_CUSTOM_DTS_PATH. So let's prepend that file(s) to dts/Makefile if UBOOT_CUSTOM_DTS_PATH is used. Signed-off-by: Giulio Benetti --- boot/uboot/uboot.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 2478a2a1e9..a5ad101d68 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -303,6 +303,11 @@ endif # BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY UBOOT_CUSTOM_DTS_PATH = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_DTS_PATH)) define UBOOT_BUILD_CMDS + $(if $(UBOOT_CUSTOM_DTS_PATH), + $(Q)$(SED) \ + '1s;^;dtb-y += $(subst .dts,.dtb,$(call notdir,$(UBOOT_CUSTOM_DTS_PATH)))\n;' \ + $(@D)/arch/$(UBOOT_ARCH)/dts/Makefile + ) $(if $(UBOOT_CUSTOM_DTS_PATH), cp -f $(UBOOT_CUSTOM_DTS_PATH) $(@D)/arch/$(UBOOT_ARCH)/dts/ )