From patchwork Fri Feb 2 13:05:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Garg X-Patchwork-Id: 769195 Delivered-To: patch@linaro.org Received: by 2002:adf:9bca:0:b0:33a:e5bd:fedd with SMTP id e10csp898637wrc; Fri, 2 Feb 2024 05:07:13 -0800 (PST) X-Google-Smtp-Source: AGHT+IHaLchEjfKKnRo/khFHw7LSi8fCEIQBdURt0PreaF2KVXpv2Li2zA3HSEi3UoQCm8KT1aoq X-Received: by 2002:a5d:4f0c:0:b0:33b:274e:af5 with SMTP id c12-20020a5d4f0c000000b0033b274e0af5mr350861wru.60.1706879233302; Fri, 02 Feb 2024 05:07:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706879233; cv=none; d=google.com; s=arc-20160816; b=CMW7Zk50Oq8jx0358W/0mc2iI89jJ0IVbh1LYdd9PSxZeNcrl0OC01KBhkjNrzHMQB ItpPvfEls7lOy+fmBjgTqfkEIwMPRQxptLe6b0zFw1ShObUlipKx12J6GGpK9OqSw5LF wXvAeOdfMAf5vw3vH110Kvy6cdRWk9IUJBeebWDmY2leyX6fgVH6fz6JEgUByJw4rrCB hoHEKbgSXyGdhIhO+3DMQ4EprbvUNpPzMAihj5JIMAFzi1NkuHbXv65ATP0YMZObWsJw sSuh5hJJAb+CyXujgxxNOWHAHE95T3/7Q9znS8KoXy2G17rwL7zdWe0/tQXalKqF5fcy g9nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=pIWKFZ/4450JPhylLYbfBEMghCwNKQs4YCs3cXu+m2M=; fh=QL/pc0yRuwqf6h1obGA3r0++C6iEGOFulM8mkviq7EI=; b=QxIXH24sdxcn5sfiENDbKcDQFY2tChE1iSMFFGZ9AWUXLObR80cdEBN0B2zVck7gOl uwR6zPfZ7aCil7VFxqXT3BfMmZf3lMUIm369eENLwUmfH0tOTWI10pJZnO/eBNa1+aUc n1sTVucBsXPuxdME1SMetJD40AammeQ+mwCt7I3V5LDWjFP/iVqZB21y4zuFjRJ85RXz A0/qjCBeAfc0QcQfbkNd2WFHrftNZKkUp2PWkflNdNYyTB9u5dwSRpDG5t/atXZ2dMS+ dFjeN2WyTdtVWm/dpJSCtrH9P9SCrmwVOwFhvvO19JCwcfoB+mmvD4hYmiLDhcsCJjmJ f9SA==; darn=linaro.org ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=IJuXdyrD; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org X-Forwarded-Encrypted: i=0; AJvYcCXwX1AJQfulFDsk4wq9EafH3WnfjCi027yLaYVRVnV9spq48mc7aChl67fcET3pIY3Vllk/f7mQc6EQz+gA0IDGjdDCtkeM0RBoaUAfNGmECxbpBOHJd0BNm/mwTzVVB6QFv+ULKFMAN9NgooiM9haFmDYoa2OrxLHzQcES5+sQMl15/Qtcqyv5W6v8Hrf4IN8lZP+LF4SICUsZl38RVF0IZ7L/VtKJ3v7Ssa2gknkiN4P5TN7cVwEkewtYl9hzKV0YgPtXLWvw+5zfITxyqZk8wY2iA5OFn67aUR7gu61YvqHQObt40kVTZ7ncZSBOK9scWCv0PpaxeJ1KejiwR6psVlpz9ewFH7sdNzxHln1c5xi/S524k4Evg1u03lJLTNpP2S3RBXhMpaGI3vKkd7ePwBMK7gonZa2KUrnXXxfaibrqWAhELC9AGQnuJMmqlD/Ce1A0nIfLF7EuGAkK2swxOItx4u75EgL5IeVSgCIwPqX5vYVYncC1pN3YGZBpZmRI/NIVe3ICHchXTDMHyEEExr2eYSQlYOnw7DI16shN0sAzeUoS/uvJNnuJN4/lTD8PZAuvRcRMAu5FJ1uXlBthBx/m4EF1Aoo1XKeTBfN4U5VxrIvqpjXmnENd6OGUP7m7gc7ISnZzqdqW3SxNEBGOX2D6CefSbiJQtUnFndk9vWj0KiYc5vHYMytKlXnsZBdxTA+dqTAulMJOxEFRCZZStqSZOvOCFkAVo/wQr30lcyTtIg57z7Kup9IiYAWN3LktyPUYncYr+bmmXzzVuI9KPhp6gYjN12ScehqHBjgH9q1Ej0cTnaMlCHDvDCshMxohXGO3TB1c6Q== Return-Path: Received: from phobos.denx.de (phobos.denx.de. [2a01:238:438b:c500:173d:9f52:ddab:ee01]) by mx.google.com with ESMTPS id q4-20020adfb184000000b0033ae78fe185si972751wra.1004.2024.02.02.05.07.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Feb 2024 05:07:13 -0800 (PST) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=IJuXdyrD; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1CC9C87CCF; Fri, 2 Feb 2024 14:06:59 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="IJuXdyrD"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4D00787CA7; Fri, 2 Feb 2024 14:06:57 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: * X-Spam-Status: No, score=1.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_SBL_CSS,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.2 Received: from mail-pl1-x631.google.com (mail-pl1-x631.google.com [IPv6:2607:f8b0:4864:20::631]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 4F90987CC2 for ; Fri, 2 Feb 2024 14:06:53 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sumit.garg@linaro.org Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-1d94323d547so17171765ad.3 for ; Fri, 02 Feb 2024 05:06:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1706879211; x=1707484011; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=pIWKFZ/4450JPhylLYbfBEMghCwNKQs4YCs3cXu+m2M=; b=IJuXdyrDCG8W97IsSkPQf/Wat0r6+lQrHtCOej2wRw+4LxadOfotqc71aGCVu1yzZh +6UsZmy6K0DpGeal5vQmvtFEPF9bCegxIXD70NlM6MYhWXv+Xs9ZKvZqPr2FBNiB6czG nX8nZngmaKML4F/S//hhOXGI2+KCEdWtnt1uDP2sKHzrif2Jzl+YELHhGpQG30PRsGw8 6GALDaIF0Ai49S8cQWSKAy+x3nRLAU/d7r3ryrQzkB5qpYOLlBFtL7sF/AooNrwSib6l MDzKx49T+sS1nyecTaKfkKdIEIuHpx7+HzZUeE3S7hJAFqEmfKu/4zvCHL95FGUXlUYt Cf5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706879211; x=1707484011; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pIWKFZ/4450JPhylLYbfBEMghCwNKQs4YCs3cXu+m2M=; b=Kol7131eb4+eLwzMXfpfEbZMzHbCCIK7sKCY2iRwi0MjuMe0hu40EdyP/NdxrL5m5O OgSli5KzK5oaCLke/O/1h8ddbZiaZuegvV/4Yz8WRqvxPumduXxMm0kxxXdizqgWe00J FTxJDpGedS8Zgw5o86CX22e0Jjr0Wa2rU2Sy09xHoOHillr9K4AjP6V7nShVodYhW42M Lxsy1mA5NquLW5/7U9Xto0F79i2tUihe7fCtU7cYkDEiq5L/O1BKDskolWCXePg/h1Z5 raeiqtvxZfwplVnqJd+64fdRRVgNaiKWdG8yOKkbjIikIU0dz4Hh+xlzj/YbID/XpdOC xNEw== X-Gm-Message-State: AOJu0YzE31lPjPURSpT/F9I9oEGDsi5m0bVlRY5WI8E7cykkMg9AOaTY an72ErLglsVeSigiSzGwCz56AmkTNS2XjIJZGkCe0moJdlzx29lCRtmDDhtx03P+OH/heRf6uvL 1s0s= X-Received: by 2002:a17:902:f545:b0:1d9:232d:4c1c with SMTP id h5-20020a170902f54500b001d9232d4c1cmr2418373plf.52.1706879211266; Fri, 02 Feb 2024 05:06:51 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCX2EqLG43e+RV1Y5OIBc35XBwDkabQurHUKrnQjDF1MN7G9Y6RgjBzZDm6LaNc9+ZGSTaLI4iF4jM7DYbP/2jzmD1bAeTvqT664ApSxqcx/Ddt6GT22+RlNMHv0IWcDPq4/C2ycLlf6Q1Qh30TEOdBo5bHpy6RolRGzBtphFsVPXZBtzBov1+96SWV/hXQUIKusU8TQxtDLcNj98jRykOyPfrkYeYxrjUy9XZKC4dTss3NtbEr/IcouomhI99Z2M+tBvQbzpG/KnC49m64pKaz3mhe8eVLCJUa1b4iAssgSHEWItl22xSRszT1loac0p+TIksiyN4M0LY0NtjMJ1KQ4pBp5vQlwW0p7ILiG76nHuo9uFXrz3F2dvEjThAMHGdz1JCS95Hv5Z1ouLhX2XDnam5QD0IhGMnEcZIUp8zkm4PvcK1Rz3W1nMjwxrlyzNHgYjsTGjw2Ckc6T7E+4+CA1NNqAP+B24FJA5LvW7m1/YpKAyMJkPJb0zBM6nqQWfX3ZUdXYfrciyPyGFo8qAf9xeuIJ7PGPmSTtjQnEh40pxvNN5+RRatd4sIFIAgAAMVIrx8ZMr2D2LHMeCkWT5QK1ZJlF9+phbbnfW8F7mqk0ncmdh+jo+pRTPuWb/k4GiPMAgjAVbgw8u5gq9wgZw4/kbigPJvBGDGYq+AnWd8TaX3dYEiCFJFX43Z13iOnTD1bs60p43UzZ3TecGzMSaLrHvWpZRQkbVFk23OCWg+9f+taFzKbb92wRzvHMqPlqRZjdM39nIWmlzSbhno5TIRT576tint9FwpTb5cGWvwz/0hhDeVHb18P/XLPTo5X+nGbM1R8qtWUBFrwuWyrZHDYqltW/dzY3hr9xfpsvfBtpaSCRaL9X2mfaIFqsJBqAeSI7nLs8WhW5QrKMr5i//3V5QcuYXzDHsphn Received: from sumit-X1.. ([223.178.213.44]) by smtp.gmail.com with ESMTPSA id q23-20020a170902edd700b001d923684323sm1542407plk.195.2024.02.02.05.06.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Feb 2024 05:06:50 -0800 (PST) From: Sumit Garg To: u-boot@lists.denx.de, u-boot-amlogic@groups.io, u-boot-custodians@lists.denx.de Cc: trini@konsulko.com, sjg@chromium.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor@kernel.org, neil.armstrong@linaro.org, caleb.connolly@linaro.org, ff@shokubai.tech, daniel.thompson@linaro.org, dgilmore@fedoraproject.org, pbrobinson@gmail.com, ilias.apalodimas@linaro.org, b.galvani@gmail.com, xypron.glpk@gmx.de, michal.simek@amd.com, seanga2@gmail.com, rasmus.villemoes@prevas.dk, peng.fan@nxp.com, jh80.chung@samsung.com, rfried.dev@gmail.com, marex@denx.de, mibodhi@gmail.com, bb@ti.com, mark.kettenis@xs4all.nl, festevam@gmail.com, nm@ti.com, andre.przywara@arm.com, Sumit Garg Subject: [PATCH v5 06/11] dts: Add script to uprev dts/upstream subtree Date: Fri, 2 Feb 2024 18:35:29 +0530 Message-Id: <20240202130534.1051438-7-sumit.garg@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240202130534.1051438-1-sumit.garg@linaro.org> References: <20240202130534.1051438-1-sumit.garg@linaro.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean dts/update-dts-subtree.sh is just a wrapper around git subtree commands. Usage from the top level U-Boot source tree, run: $ ./dts/update-dts-subtree.sh pull $ ./dts/update-dts-subtree.sh pick Signed-off-by: Sumit Garg --- Changes in v5: - Added support to cherry-pick fixes in subtree update script. Also, used https:// instead of git://. Changes in v4: - New patch to add script dts/update-dts-subtree.sh as per Rob's comments. dts/update-dts-subtree.sh | 45 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100755 dts/update-dts-subtree.sh diff --git a/dts/update-dts-subtree.sh b/dts/update-dts-subtree.sh new file mode 100755 index 000000000000..b781bf710025 --- /dev/null +++ b/dts/update-dts-subtree.sh @@ -0,0 +1,45 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0+ +# +# Copyright 2024 Linaro Ltd. +# +# Usage: from the top level U-Boot source tree, run: +# $ ./dts/update-dts-subtree.sh pull +# $ ./dts/update-dts-subtree.sh pick +# +# The script will pull changes from devicetree-rebasing repo into U-Boot +# as a subtree located as /dts/upstream sub-directory. It will +# automatically create a squash/merge commit listing the commits imported. + +set -e + +merge_commit_msg=$(cat << EOF +Subtree merge tag '$2' of devicetree-rebasing repo [1] into dts/upstream + +[1] https://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetree-rebasing.git/ +EOF +) + +remote_add() { + if ! git remote | grep -w devicetree-rebasing + then + git remote add devicetree-rebasing \ + https://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetree-rebasing.git + fi + git fetch devicetree-rebasing master +} + +if [ ! -z $1 ] && [ $1 = "pull" ] +then + remote_add + git subtree pull --prefix dts/upstream devicetree-rebasing \ + $2 --squash -m "${merge_commit_msg}" +elif [ ! -z $1 ] && [ $1 = "pick" ] +then + remote_add + git cherry-pick -x --strategy=subtree -Xsubtree=dts/upstream/ $2 +else + echo "usage: $0 param1 param2" + echo " param1 pull or pick" + echo " param2 release tag [pull] or commit id [pick]" +fi