From patchwork Mon Dec 14 17:20:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 1416097 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=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=walle.cc Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=walle.cc header.i=@walle.cc header.a=rsa-sha256 header.s=mail2016061301 header.b=E2HxgoHW; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Cvp8D0HVKz9sSf for ; Tue, 15 Dec 2020 04:21:15 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id BD12A204DF; Mon, 14 Dec 2020 17:21:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id x96OOnQCB-tJ; Mon, 14 Dec 2020 17:21:06 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id F3499204ED; Mon, 14 Dec 2020 17:21:05 +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 453541BF313 for ; Mon, 14 Dec 2020 17:21:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 41C5D86DD0 for ; Mon, 14 Dec 2020 17:21:04 +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 IHkFey89Y25r for ; Mon, 14 Dec 2020 17:21:03 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from ssl.serverraum.org (ssl.serverraum.org [176.9.125.105]) by whitealder.osuosl.org (Postfix) with ESMTPS id EFB3386B14 for ; Mon, 14 Dec 2020 17:21:02 +0000 (UTC) Received: from mwalle01.fritz.box (unknown [IPv6:2a02:810c:c200:2e91:fa59:71ff:fe9b:b851]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by ssl.serverraum.org (Postfix) with ESMTPSA id C722622EE3; Mon, 14 Dec 2020 18:21:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walle.cc; s=mail2016061301; t=1607966461; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=CNLR7naEazKE1XXINfyOESct2pxm28oQ1HsrjJUsaH8=; b=E2HxgoHWD8/0khkHmAMrZoulEWby6P+YosHhYGW23TjJ7bfH8oc2UOFLhlWZtBMDvXy0ZX lYEi7x+QOMJwrcsy6vOJvIrdPY5shBJ3GsbQDV6kTjtpiyvBiUXal1p2vNeuD5iO5Xw0D0 clLoQT+ZPCC082psm/MlB8KCxgqpKIU= From: Michael Walle To: buildroot@busybox.net Date: Mon, 14 Dec 2020 18:20:51 +0100 Message-Id: <20201214172051.9492-1-michael@walle.cc> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] package/rcw: rename to qoriq-rcw 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 , Michael Walle Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This is really only for QoriQ SoCs. Also the upstream package - despite its base name of the git repository - is "qoriq-components/rcw". Thus rename it to a more specify package name. Please note that this will also rename the installed rcw files from $(HOST_DIR)/share/rcw to $(HOST_DIR)/share/qoriq-rcw. There are no configs or dependencies which uses this package. Signed-off-by: Michael Walle Cc: Matt Weber --- Config.in.legacy | 8 +++ DEVELOPERS | 2 +- package/Config.in.host | 2 +- package/{rcw => qoriq-rcw}/Config.in.host | 8 +-- .../rcw.hash => qoriq-rcw/qoriq-rcw.hash} | 2 +- package/qoriq-rcw/qoriq-rcw.mk | 67 +++++++++++++++++++ package/rcw/rcw.mk | 67 ------------------- 7 files changed, 82 insertions(+), 74 deletions(-) rename package/{rcw => qoriq-rcw}/Config.in.host (86%) rename package/{rcw/rcw.hash => qoriq-rcw/qoriq-rcw.hash} (50%) create mode 100644 package/qoriq-rcw/qoriq-rcw.mk delete mode 100644 package/rcw/rcw.mk diff --git a/Config.in.legacy b/Config.in.legacy index 6d8acadf9c..9a15140c02 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -3962,6 +3962,14 @@ config BR2_TARGET_UBOOT_NETWORK help U-Boot's custom network settings options have been removed. +config BR2_PACKAGE_HOST_RCW + bool "BR2_PACKAGE_HOST_RCW was renamed" + select BR2_LEGACY + select BR2_PACKAGE_HOST_QORIQ_RCW + help + QoriQ RCW package has been renamed to BR2_PACKAGE_HOST_QORIQ_RCW + to match the upstream package name. + endmenu endif # !SKIP_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index a2c7f7f34a..882e8cd825 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1747,8 +1747,8 @@ F: package/python-pyrex/ F: package/python-pysftp/ F: package/python-tinyrpc/ F: package/python-txdbus/ +F: package/qoriq-rcw/ F: package/raptor/ -F: package/rcw/ F: package/rng-tools/ F: package/rsyslog/ F: package/setools/ diff --git a/package/Config.in.host b/package/Config.in.host index 4f69785810..ba6a68c728 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -70,9 +70,9 @@ menu "Host utilities" source "package/python-xlrd/Config.in.host" source "package/python3/Config.in.host" source "package/qemu/Config.in.host" + source "package/qoriq-rcw/Config.in.host" source "package/raspberrypi-usbboot/Config.in.host" source "package/rauc/Config.in.host" - source "package/rcw/Config.in.host" source "package/rustc/Config.in.host" source "package/s6-rc/Config.in.host" source "package/sam-ba/Config.in.host" diff --git a/package/rcw/Config.in.host b/package/qoriq-rcw/Config.in.host similarity index 86% rename from package/rcw/Config.in.host rename to package/qoriq-rcw/Config.in.host index a9253958d9..1f69c0389c 100644 --- a/package/rcw/Config.in.host +++ b/package/qoriq-rcw/Config.in.host @@ -1,5 +1,5 @@ -config BR2_PACKAGE_HOST_RCW - bool "host rcw" +config BR2_PACKAGE_HOST_QORIQ_RCW + bool "host qoriq-rcw" help This package provides an reset configuration word(RCW) compiler to build NXP QoriQ/LS PBL/RCW binary(s). @@ -11,9 +11,9 @@ config BR2_PACKAGE_HOST_RCW https://source.codeaurora.org/external/qoriq/qoriq-components/rcw/ -if BR2_PACKAGE_HOST_RCW +if BR2_PACKAGE_HOST_QORIQ_RCW -config BR2_PACKAGE_HOST_RCW_CUSTOM_PATH +config BR2_PACKAGE_HOST_QORIQ_RCW_CUSTOM_PATH string "RCW Source file paths" help Space-separated list of .rcw and .rcwi files, that will be diff --git a/package/rcw/rcw.hash b/package/qoriq-rcw/qoriq-rcw.hash similarity index 50% rename from package/rcw/rcw.hash rename to package/qoriq-rcw/qoriq-rcw.hash index 76b6373942..88460716f9 100644 --- a/package/rcw/rcw.hash +++ b/package/qoriq-rcw/qoriq-rcw.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b69a6a8b187ba794e0af716a509ced2bbac83da0f6e94b5c7331a34619db21b1 rcw-LSDK-19.09.tar.gz +sha256 4a9ce5bb1733239bf1b740b705df20f90802b16114e24f3fd56c08a7ba4b56c2 qoriq-rcw-LSDK-19.09.tar.gz sha256 a531b3146425e592db17a51ff39c4801cb01fb4055ffdaada0572decc0655bcd LICENSE diff --git a/package/qoriq-rcw/qoriq-rcw.mk b/package/qoriq-rcw/qoriq-rcw.mk new file mode 100644 index 0000000000..8026f60fbf --- /dev/null +++ b/package/qoriq-rcw/qoriq-rcw.mk @@ -0,0 +1,67 @@ +################################################################################ +# +# qoriq-rcw +# +################################################################################ + +QORIQ_RCW_VERSION = LSDK-19.09 +QORIQ_RCW_SITE = https://source.codeaurora.org/external/qoriq/qoriq-components/rcw +QORIQ_RCW_SITE_METHOD = git +QORIQ_RCW_LICENSE = BSD-3-Clause +QORIQ_RCW_LICENSE_FILES = LICENSE + +HOST_QORIQ_RCW_DEPENDENCIES = $(BR2_PYTHON3_HOST_DEPENDENCY) + +QORIQ_RCW_FILES = $(call qstrip,$(BR2_PACKAGE_HOST_QORIQ_RCW_CUSTOM_PATH)) + +ifneq ($(QORIQ_RCW_FILES),) +QORIQ_RCW_INCLUDES = $(filter-out %.rcw,$(QORIQ_RCW_FILES)) +# Get the name of the custom rcw file from the custom list +QORIQ_RCW_PROJECT = $(notdir $(filter %.rcw,$(QORIQ_RCW_FILES))) + +# Error if there are no or more than one .rcw file +ifeq ($(BR_BUILDING),y) +ifneq ($(words $(QORIQ_RCW_PROJECT)),1) +$(error BR2_PACKAGE_HOST_QORIQ_RCW_CUSTOM_PATH must have exactly one .rcw file) +endif +endif + +ifneq ($(QORIQ_RCW_INCLUDES),) +define HOST_QORIQ_RCW_ADD_CUSTOM_RCW_INCLUDES + mkdir -p $(@D)/custom_board + cp -f $(QORIQ_RCW_INCLUDES) $(@D)/custom_board +endef +HOST_QORIQ_RCW_POST_PATCH_HOOKS += HOST_QORIQ_RCW_ADD_CUSTOM_RCW_INCLUDES +endif + +define HOST_QORIQ_RCW_ADD_CUSTOM_RCW_FILES + mkdir -p $(@D)/custom_board/rcw + cp -f $(filter %.rcw,$(QORIQ_RCW_FILES)) $(@D)/custom_board/rcw +endef +HOST_QORIQ_RCW_POST_PATCH_HOOKS += HOST_QORIQ_RCW_ADD_CUSTOM_RCW_FILES + +# rcw.py is a python3-only script, and we can be using either the +# system-provided python3, or our own built with host-python3. +# Fortunately, rcw.py uses #!/usr/bin/env python3, so it will +# easily find it from PATH. +define HOST_QORIQ_RCW_BUILD_CMDS + PATH=$(BR_PATH) \ + $(@D)/rcw.py \ + -i $(@D)/custom_board/rcw/$(QORIQ_RCW_PROJECT) \ + -I $(@D)/custom_board -o $(@D)/PBL.bin +endef + +define HOST_QORIQ_RCW_INSTALL_DELIVERY_FILE + $(INSTALL) -D -m 0644 $(@D)/PBL.bin $(BINARIES_DIR)/PBL.bin +endef +endif + +# Copy source files and script into $(HOST_DIR)/share/qoriq-rcw/ so a developer +# could use a post image or SDK to build/install PBL files. +define HOST_QORIQ_RCW_INSTALL_CMDS + mkdir -p $(HOST_DIR)/share/qoriq-rcw + cp -a $(@D)/* $(HOST_DIR)/share/qoriq-rcw + $(HOST_QORIQ_RCW_INSTALL_DELIVERY_FILE) +endef + +$(eval $(host-generic-package)) diff --git a/package/rcw/rcw.mk b/package/rcw/rcw.mk deleted file mode 100644 index 22e3be4f13..0000000000 --- a/package/rcw/rcw.mk +++ /dev/null @@ -1,67 +0,0 @@ -################################################################################ -# -# rcw -# -################################################################################ - -RCW_VERSION = LSDK-19.09 -RCW_SITE = https://source.codeaurora.org/external/qoriq/qoriq-components/rcw -RCW_SITE_METHOD = git -RCW_LICENSE = BSD-3-Clause -RCW_LICENSE_FILES = LICENSE - -HOST_RCW_DEPENDENCIES = $(BR2_PYTHON3_HOST_DEPENDENCY) - -RCW_FILES = $(call qstrip,$(BR2_PACKAGE_HOST_RCW_CUSTOM_PATH)) - -ifneq ($(RCW_FILES),) -RCW_INCLUDES = $(filter-out %.rcw,$(RCW_FILES)) -# Get the name of the custom rcw file from the custom list -RCW_PROJECT = $(notdir $(filter %.rcw,$(RCW_FILES))) - -# Error if there are no or more than one .rcw file -ifeq ($(BR_BUILDING),y) -ifneq ($(words $(RCW_PROJECT)),1) -$(error BR2_PACKAGE_HOST_RCW_CUSTOM_PATH must have exactly one .rcw file) -endif -endif - -ifneq ($(RCW_INCLUDES),) -define HOST_RCW_ADD_CUSTOM_RCW_INCLUDES - mkdir -p $(@D)/custom_board - cp -f $(RCW_INCLUDES) $(@D)/custom_board -endef -HOST_RCW_POST_PATCH_HOOKS += HOST_RCW_ADD_CUSTOM_RCW_INCLUDES -endif - -define HOST_RCW_ADD_CUSTOM_RCW_FILES - mkdir -p $(@D)/custom_board/rcw - cp -f $(filter %.rcw,$(RCW_FILES)) $(@D)/custom_board/rcw -endef -HOST_RCW_POST_PATCH_HOOKS += HOST_RCW_ADD_CUSTOM_RCW_FILES - -# rcw.py is a python3-only script, and we can be using either the -# system-provided python3, or our own built with host-python3. -# Fortunately, rcw.py uses #!/usr/bin/env python3, so it will -# easily find it from PATH. -define HOST_RCW_BUILD_CMDS - PATH=$(BR_PATH) \ - $(@D)/rcw.py \ - -i $(@D)/custom_board/rcw/$(RCW_PROJECT) \ - -I $(@D)/custom_board -o $(@D)/PBL.bin -endef - -define HOST_RCW_INSTALL_DELIVERY_FILE - $(INSTALL) -D -m 0644 $(@D)/PBL.bin $(BINARIES_DIR)/PBL.bin -endef -endif - -# Copy source files and script into $(HOST_DIR)/share/rcw/ so a developer -# could use a post image or SDK to build/install PBL files. -define HOST_RCW_INSTALL_CMDS - mkdir -p $(HOST_DIR)/share/rcw - cp -a $(@D)/* $(HOST_DIR)/share/rcw - $(HOST_RCW_INSTALL_DELIVERY_FILE) -endef - -$(eval $(host-generic-package))