From patchwork Thu Dec 24 12:27:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giulio Benetti X-Patchwork-Id: 1420520 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.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=benettiengineering.com 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=oIrdpiRl; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4D1qJc40X5z9sTc for ; Thu, 24 Dec 2020 23:34:21 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 545878674F; Thu, 24 Dec 2020 12:34:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id GgEPoVp+zwl8; Thu, 24 Dec 2020 12:34:19 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 06781866D1; Thu, 24 Dec 2020 12:34:19 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 464741BF42C for ; Thu, 24 Dec 2020 12:34:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 42690871AC for ; Thu, 24 Dec 2020 12:34:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BfN8kh9ZUO4M for ; Thu, 24 Dec 2020 12:34:15 +0000 (UTC) X-Greylist: delayed 00:07:03 by SQLgrey-1.7.6 Received: from smtpcmd03117.aruba.it (smtpcmd03117.aruba.it [62.149.158.117]) by hemlock.osuosl.org (Postfix) with ESMTP id 367418717A for ; Thu, 24 Dec 2020 12:34:15 +0000 (UTC) Received: from ubuntu.localdomain ([146.241.198.163]) by Aruba Outgoing Smtp with ESMTPSA id sPi1k6TpAgwoSsPi1kTtkE; Thu, 24 Dec 2020 13:27:10 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=aruba.it; s=a1; t=1608812830; bh=yvqYlcCMv00rB8RiJLTIyyd4N6K++nRruaWfr1Hvtbc=; h=From:To:Subject:Date:MIME-Version; b=oIrdpiRlKHUnVEyJJnsZNhOCzD9seATkuRLFBtwDHBTqvKrTCYOolMsN0Ct1HuN43 PBuCl+JH0mnvqX1+R6lCfXLMAdgvqmPWvlE6ZlYZz3Z/p2IgxWJgHeffu7HdPAyO2Y iejrHF4fmcSt8NneRs85MlAggcoObIL53t31FmsSyO7whV4xOJr3R3J4J2mavyCee6 txxsqpFrqCUJBnK+hfpuwjVavJFUod50m6BQjUGd8XYB8sxXdS43CyUgLosDFAN5Jz bln1mE3oV4q5KaPwTxqJOU6BhKxKFV8ZLelee2pkccXIodr4zguHn0stSQam+qn/lg w1Gg1s+GwfUjw== From: Giulio Benetti To: buildroot@buildroot.org Date: Thu, 24 Dec 2020 13:27:08 +0100 Message-Id: <20201224122708.588130-1-giulio.benetti@benettiengineering.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CMAE-Envelope: MS4wfA07NRkHo8RL3pHTN7QMwrTMpJB43eKbND4spdQegmOEAKDmYGHOYkH9bgnrUjH7gG/cPpQaZgnI9r1lcw/WOT3LlR7sdyL4g+DO8FosAK8nke+UHmaS UdQPQMJXXvvivkEJugFX3bX5zkPGlxO+KX/KEwJ1+pxUoHWTg02UMS75vHzBg+ynehvePSlRn7SolbOM0Z6xzzf0Lmr9Tcgzqk0ru0HhZ+vafwpLPiFgx3Wt AmM+BmSZ4rguam5BnJdht43dyHdu0Z+h8wYC/meVmIU= Subject: [Buildroot] [RFC 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 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 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index d2b4e8dc60..1f5ef4b9d2 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -296,6 +296,9 @@ 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/ )