From patchwork Sun Jan 24 09:43:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Titouan Christophe X-Patchwork-Id: 1430888 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=tfN4ASKd; 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 4DNp3g2rnrz9sVS for ; Sun, 24 Jan 2021 20:43:59 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 20E0686993; Sun, 24 Jan 2021 09:43:57 +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 hlvcbZoHaRlc; Sun, 24 Jan 2021 09:43:55 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 825BA867B9; Sun, 24 Jan 2021 09:43:55 +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 7D0C41BF2F1 for ; Sun, 24 Jan 2021 09:43:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 79FBD85F83 for ; Sun, 24 Jan 2021 09:43:54 +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 9Z42vB78k8nX for ; Sun, 24 Jan 2021 09:43:53 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 5766F85F81 for ; Sun, 24 Jan 2021 09:43:53 +0000 (UTC) Received: by mail-ej1-f50.google.com with SMTP id g3so13716342ejb.6 for ; Sun, 24 Jan 2021 01:43:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=NKYZNB12jORbpwMaEbUKHbiEXb1h99UPFE98oKMMnBk=; b=tfN4ASKdSG1gT4POCIKJjmqZSnn+26cSjuTNe7trzmDMipJhET0K2CEuwX+1VpcRat XpJVeeP7bxMQGVEIdMIdGlIql1/nPeee6JDiM/3yH92JD6H3Cs8Ssghl2ipgyNYzheL7 TDjeslg9Stpko0fNo5ZRcVLbZcKeiwNipk+rQ+G8PAMEEm/BYb+n/GvX+2S5aRP3AGs8 ub2FCpm2ymtoQ1Yo9Vu8IplwNiqeIqzweOsPQlnDZkrADKMgKf7UfOGK7THNg4tMGFWC e0FBK+FORbepADRNtAJzKdQYv55hDrCO8PCQ50XxLWWl9OLb9y4HPTAQHRv/+pPdTcU0 Xk4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=NKYZNB12jORbpwMaEbUKHbiEXb1h99UPFE98oKMMnBk=; b=N1fAswM00wf5nt9uz3bSqITSseDfVUvjAYRNtE+Bq6NnlWsq9q5zRpyHQmrO7poQYO n3Q1f3S2z97dXEnOiZ/QyRkZcWeIteFd/DeAOcu5FEv0RDMF2GDrO8NNaAPMRC6EiQ19 3++XkmL0cIsba5yqwswcblwYuHgPtp+ACxzNd4sp7RKDsjb5ILXtX+Jkvpt2ZU+Vblxq JZ33BBdFtceTMKXAErfJxDU0GCUbD1StCMZGmL/DZsV9RND+wH7LTXioYtFVn+mSgR3+ ZHbGvSIOjthh9thwHvPTxr19JtsPLV0zX+cRlDWfZ76+8bpyUu8+dSmNoyb4uv81GKST cENg== X-Gm-Message-State: AOAM531Gn/bDHf79JMy0qr5EzBrEl6T16sxtjbiJ9Me1SAI/6HAakZrJ cWkzpxU/RsRoe9nrgG6sMTfn1eBvfSt21A== X-Google-Smtp-Source: ABdhPJxHAStf/dflfdIRgO1R8+QdiPUHpgJ+sLbT/E8+AJNdNRefdiro0uwtQE79HsrT5UDVW3WbCA== X-Received: by 2002:a17:906:5fc6:: with SMTP id k6mr202529ejv.252.1611481431810; Sun, 24 Jan 2021 01:43:51 -0800 (PST) Received: from localhost.localdomain ([2a02:a03f:63d3:7700:5fb9:2a66:a7a8:378f]) by smtp.gmail.com with ESMTPSA id h16sm8579048edw.34.2021.01.24.01.43.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Jan 2021 01:43:51 -0800 (PST) From: Titouan Christophe To: buildroot@buildroot.org Date: Sun, 24 Jan 2021 10:43:22 +0100 Message-Id: <20210124094322.153407-1-titouanchristophe@gmail.com> X-Mailer: git-send-email 2.25.3 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] boot/uboot: introduce BR2_TARGET_UBOOT_NEEDS_XXD 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: Titouan Christophe , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" When compiling uboot with a default environment built from a text file [1], the build pipeline uses the xxd command [2]. xxd is distributed with vim [3], which might no be installed on the host, so we provide this "uboot needs xxd" option to install host-vim for such a case. [1] https://gitlab.denx.de/u-boot/u-boot/-/blob/v2021.01/env/Kconfig#L612-628 [2] https://gitlab.denx.de/u-boot/u-boot/-/blob/v2021.01/Makefile#L1887-1893 [3] https://github.com/vim/vim/tree/v8.2.0000/src/xxd Signed-off-by: Titouan Christophe --- boot/uboot/Config.in | 8 ++++++++ boot/uboot/uboot.mk | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index d43c85cce7..5b91d23a81 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -239,6 +239,14 @@ config BR2_TARGET_UBOOT_NEEDS_OPENSBI and that the OpenSBI variable pointing to OpenSBI binary, is passed during the Buildroot build. +config BR2_TARGET_UBOOT_NEEDS_XXD + bool "U-Boot needs xxd" + help + Select this option if your U-Boot board configuration + requires xxd to be available on the host. This is typically + the case when the board configuration has USE_DEFAULT_ENV_FILE + enabled. + menu "U-Boot binary format" config BR2_TARGET_UBOOT_FORMAT_AIS diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 2478a2a1e9..3afed94dbe 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -198,6 +198,10 @@ ifeq ($(BR2_TARGET_UBOOT_NEEDS_LZOP),y) UBOOT_DEPENDENCIES += host-lzop endif +ifeq ($(BR2_TARGET_UBOOT_NEEDS_XXD),y) +UBOOT_DEPENDENCIES += host-vim +endif + # prior to u-boot 2013.10 the license info was in COPYING. Copy it so # legal-info finds it define UBOOT_COPY_OLD_LICENSE_FILE