From patchwork Mon Jan 25 14:57:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Weber X-Patchwork-Id: 1431255 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.137; helo=fraxinus.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=rockwellcollins.com header.i=@rockwellcollins.com header.a=rsa-sha256 header.s=hrcrc2020 header.b=DcUvT72i; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DPY7f0hHmz9sS8 for ; Tue, 26 Jan 2021 02:04:58 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 91D898608D; Mon, 25 Jan 2021 15:04:55 +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 TuUy35sdbNE9; Mon, 25 Jan 2021 15:04:53 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 91F3A85E8D; Mon, 25 Jan 2021 15:04:53 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id F3C021BF390 for ; Mon, 25 Jan 2021 15:04:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id F0855872A9 for ; Mon, 25 Jan 2021 15:04:51 +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 CIQLvHv0xtiW for ; Mon, 25 Jan 2021 15:04:51 +0000 (UTC) X-Greylist: delayed 00:07:06 by SQLgrey-1.7.6 Received: from ch3vs03.rockwellcollins.com (ch3vs03.rockwellcollins.com [205.175.226.47]) by whitealder.osuosl.org (Postfix) with ESMTPS id C504C87308 for ; Mon, 25 Jan 2021 15:04:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rockwellcollins.com; s=hrcrc2020; h=from:to:cc:subject:date:message-id; bh=RU+1YC3Cjr9YolPh5z8j2V5HciM4q55GBQkw4rYXljw=; b=DcUvT72iFSYvdV4j/ei1ZyJaeLmW7shMjxG1FvIKgHugxiqDna7Wmt1y +0Zy+o5OUk6grF1+Fde4PMymykI/3hb/ml1dQtUiee2/y9yhLUFviNGL/ oa+fkrIvPqxAx4BoR76ub+LOovyFwaj8ZpdDsGo+TAMvcnxDrrNxfy3LA W6C0yh6ReN4ur8YzdKSN2B6pJzOlTULTHTwA5S5K5cR3eIY67Obuxbl0Z aoeFAyb60KhWWwqq+m9Uo3kyM5Ls9THWzKrCjrrncojrw/3YzYbsY4cp5 GVV1vRZqKg8CCgv28Eho7eA7t8zDPXHZJ7oCKdnjIuqBvhOxW1S61cVK5 A==; IronPort-SDR: KbxR7WIO9A+NJQSlkzGhf38H3ehIt+VwW0P7vQt4sT/QbRD3fDGgKSCjb414a8JpIxypzHdlM7 M2VbnOxZcKSpYRD4UU5+hL4flOYwj3ZrPW84FHUIoyKnNQkBnSxoMuGJXdGm/xDweuLVFN79g9 nst2SBDuYOrx08OLV1W29G5/ioKRYRJPGn4pvnXSpLtwIzIPvGTaprPtusdmKG10/SPWJsis26 WD+SYJEFfy4tYlbGnZlOHqWtlAGP7xU7LknnUcAVvu8F8MSAMRKi3gD8TZItLbGaApjqfyLnaZ dog= Received: from ofwch3n02.rockwellcollins.com (HELO dtulimr02.rockwellcollins.com) ([205.175.226.14]) by ch3vs03.rockwellcollins.com with ESMTP; 25 Jan 2021 08:57:44 -0600 X-Received: from biscuits.rockwellcollins.com (biscuits.rockwellcollins.lab [10.148.119.137]) by dtulimr02.rockwellcollins.com (Postfix) with ESMTP id 7923720076; Mon, 25 Jan 2021 08:57:43 -0600 (CST) From: Matt Weber To: buildroot@buildroot.org Date: Mon, 25 Jan 2021 08:57:41 -0600 Message-Id: <20210125145742.42460-1-matthew.weber@rockwellcollins.com> X-Mailer: git-send-email 2.17.1 Subject: [Buildroot] [PATCH 1/2] package/uboot-tools: resolve uboot env source file error 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: Matt Weber , Kalpesh Panchal MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Kalpesh Panchal If Target u-boot is not available, the host build of uboot-tools requires user to provide u-boot environment source file. This change resolves a missing parentheses and updates the comment for the same. Signed-off-by: Kalpesh Panchal Signed-off-by: Matt Weber --- package/uboot-tools/uboot-tools.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk index 1313107e0e..10cbd1cdd9 100644 --- a/package/uboot-tools/uboot-tools.mk +++ b/package/uboot-tools/uboot-tools.mk @@ -139,11 +139,11 @@ ifeq ($(BR_BUILDING),y) ifeq ($(call qstrip,$(BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SIZE)),) $(error Please provide U-Boot environment size (BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SIZE setting)) endif -# If U-Boot is available, ENVIMAGE_SOURCE is optional because the default can -# be taken from U-Boot. +# If U-Boot is not available, ENVIMAGE_SOURCE must be provided by user, +# otherwise it is optional because the default can be taken from U-Boot ifeq ($(BR2_TARGET_UBOOT),) -ifeq ($(call qstrip,$(BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE),) -$(error Please provide U-Boot environment file BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE setting)) +ifeq ($(call qstrip,$(BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE)),) +$(error Please provide U-Boot environment file (BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE setting)) endif endif #BR2_TARGET_UBOOT endif #BR_BUILDING From patchwork Mon Jan 25 14:57:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Weber X-Patchwork-Id: 1431254 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=rockwellcollins.com header.i=@rockwellcollins.com header.a=rsa-sha256 header.s=hrcrc2020 header.b=ml+RdCtP; 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 4DPY7d03S9z9sVm for ; Tue, 26 Jan 2021 02:05:00 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 248D4872A9; Mon, 25 Jan 2021 15:04:59 +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 LbgDvK+9bX9P; Mon, 25 Jan 2021 15:04:58 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 7B1C687308; Mon, 25 Jan 2021 15:04:58 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 6B0B61BF390 for ; Mon, 25 Jan 2021 15:04:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 67FDB87308 for ; Mon, 25 Jan 2021 15:04:56 +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 d5QiTWa9dkXO for ; Mon, 25 Jan 2021 15:04:55 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from ch3vs02.rockwellcollins.com (ch3vs02.rockwellcollins.com [205.175.226.29]) by whitealder.osuosl.org (Postfix) with ESMTPS id A0514872A9 for ; Mon, 25 Jan 2021 15:04:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rockwellcollins.com; s=hrcrc2020; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=NDVkbvhbWF3wKG+9RQ3OXDhU41RxQW3+N0Y0kguhM+I=; b=ml+RdCtPa65aV8Qq8BAIIwE3aaB555QQpqy4N27fzAeLD5JeF3D/kzFc oZ1kGWTAJIMK2tO22YNiQOFws8T2+hJkW1gsMmDWazJ+4TQk4FiRY5TeQ E7+feWemN1/7MK7P8i+b0Q+fO7MjZFjOyOmhMmY/K3EIpoBv6G4E2D57n /LaZTNTJnGKjgamy5AnHTi0QUzhivPPhmuemq/ai+XaU0O4iU0WZUOSL3 tMR5uGNmfL0sfB59jEb55KlaG8hIu8k9LlSMKT+iA7BFypeXa/28tAAZR 4LIVYU7YY2qvyvrK5ol+fIJBx6oPQx1BaufIglAWWUiQY7xiCNugDu5B4 Q==; IronPort-SDR: 7jCItgeXgOKMtk56UCVrHXtGVxkW1EWabYgBjjwke1Y8aGxMgIwnUDz6fXAPe+KpKLqqGqtd73 Sf3V9qjvuF1X39bkFiVH8RMrn1AoYz8mkHBs3UJ8Unri2hqYhRRMW5rzrG11mmfty3GYRV7MsC 0hviTFRvF0dvrAOqYLJ325Fsf9Niz62/RRgvgm452nHcU4WdLwOeVxHWFAUkd7Wz2kfLdnnDzl tf2gyLaSs7cw7PVnXXmVisPDcVmevQq44TBznSucPj9iWKK0SJ10vrwC+LvZ2k7THHJPoxdmfD Nxc= Received: from ofwch3n02.rockwellcollins.com (HELO dtulimr02.rockwellcollins.com) ([205.175.226.14]) by ch3vs02.rockwellcollins.com with ESMTP; 25 Jan 2021 08:57:45 -0600 X-Received: from biscuits.rockwellcollins.com (biscuits.rockwellcollins.lab [10.148.119.137]) by dtulimr02.rockwellcollins.com (Postfix) with ESMTP id 5775420086; Mon, 25 Jan 2021 08:57:44 -0600 (CST) From: Matt Weber To: buildroot@buildroot.org Date: Mon, 25 Jan 2021 08:57:42 -0600 Message-Id: <20210125145742.42460-2-matthew.weber@rockwellcollins.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210125145742.42460-1-matthew.weber@rockwellcollins.com> References: <20210125145742.42460-1-matthew.weber@rockwellcollins.com> Subject: [Buildroot] [PATCH 2/2] package/uboot-tools: env/script generation need BINARIES_DIR 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: Matt Weber , Kalpesh Panchal MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Kalpesh Panchal The host build of uboot-tools can occur early in the build process and may require the creation of BINARIES_DIR before generation of an enabled envimage and/or boot script binary. Signed-off-by: Kalpesh Panchal Signed-off-by: Matt Weber --- package/uboot-tools/uboot-tools.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk index 10cbd1cdd9..f9ff170266 100644 --- a/package/uboot-tools/uboot-tools.mk +++ b/package/uboot-tools/uboot-tools.mk @@ -128,6 +128,7 @@ endif define HOST_UBOOT_TOOLS_GENERATE_ENV_IMAGE $(HOST_UBOOT_TOOLS_GENERATE_ENV_DEFAULTS) + mkdir -p $(BINARIES_DIR) $(HOST_DIR)/bin/mkenvimage -s $(BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SIZE) \ $(if $(BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_REDUNDANT),-r) \ $(if $(filter "BIG",$(BR2_ENDIAN)),-b) \ @@ -164,6 +165,7 @@ define HOST_UBOOT_TOOLS_INSTALL_CMDS $(INSTALL) -m 0755 -D $(@D)/tools/dumpimage $(HOST_DIR)/bin/dumpimage $(HOST_UBOOT_TOOLS_GENERATE_ENV_IMAGE) $(if $(BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT), + mkdir -p $(BINARIES_DIR); \ $(MKIMAGE) -C none -A $(MKIMAGE_ARCH) -T script \ -d $(call qstrip,$(BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE)) \ $(BINARIES_DIR)/boot.scr)