From patchwork Fri Jan 3 00:37:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher McCrory X-Patchwork-Id: 1217171 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; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ap2LtrlK"; 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 47pmGj43syz9sPK for ; Fri, 3 Jan 2020 11:38:18 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id E039C8545B; Fri, 3 Jan 2020 00:38:15 +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 WdVjjYX5xAg1; Fri, 3 Jan 2020 00:38:15 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6DC0E85BE4; Fri, 3 Jan 2020 00:38:15 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 6E3C91BF9B9 for ; Fri, 3 Jan 2020 00:38:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 6A4D02044E for ; Fri, 3 Jan 2020 00:38:14 +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 hUX74PhhgNhm for ; Fri, 3 Jan 2020 00:38:13 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pj1-f66.google.com (mail-pj1-f66.google.com [209.85.216.66]) by silver.osuosl.org (Postfix) with ESMTPS id C1A4F203AD for ; Fri, 3 Jan 2020 00:38:13 +0000 (UTC) Received: by mail-pj1-f66.google.com with SMTP id n59so4050191pjb.1 for ; Thu, 02 Jan 2020 16:38:13 -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; bh=+ioxOP2zXlhqfcZctHDra89tL0q+L8RBd9lOjiaynJ8=; b=ap2LtrlKHovGojNf6bpInj9QHjL1MoBThnYhvYqGdDfo2g+WvNI7xp9b2w2SO90Dcz 3sK+1PpNGwNR7chYe5zgsNuMC6qDJkuJAz396eddchJ+9l3e4iqrkJxx1nfdO4pCWMjg 36Cpk712cKYHFYBpB2j7VU5KLMHtlEDg7WvVXMjHkQHjeWiUCfcxvPJLucpkvjLKWOFD p0qQpQRw448kyEGPc6onvybsUNtKW9+I8AaAZ0Ahj2HKVvaIu4UpljzCoojwq8yO4Uvn hGEi5tva6BZtztqqEzFWP8qYvPuPVKqYqASpNQ7TNexRm8+IhBgalpzUhcSN8L2nA1vV NypA== 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; bh=+ioxOP2zXlhqfcZctHDra89tL0q+L8RBd9lOjiaynJ8=; b=DxIFqe7j9kvySFYBmMFMHSLc6eJPYw1sLzqiaOthFxf/RKTFqejKKRUeGIRaV2HJpK fOrA3/7tO2e7rdCWDIImWvDiRtq69+n82cH6bkJ4yXX98IJ3D6Euud5G/9DNLtfNBvWn tT1FHERMEMcaL0TgQwIrLlGop8pccTCpaTRmcyUHmZq6m0SLqOySR1kpr1ElcNwFnuUc lpCPUSvydLQcm34vQ4dalImlN80/A7D/pc3TeFqI76h6C9ZeAnXxVFsLFOQMPqeHd8xp 6crRl9nvRYQ1LTwOLW6qqIRpFDU4OulqX2m5PlQellf/ZD5rfqzteLN7pprKtV9mu++B h76g== X-Gm-Message-State: APjAAAXI5bDaNz5V+cK3rH0zQW/jUUBC53UV4bBjMLmjSi+Xp9qixiB3 wiJf9EVNb1cXQX+ObtBQcP9fMfpw X-Google-Smtp-Source: APXvYqxLBrHtbWitFaU4KScXOkLzqhIbNwn9tgWRM8mA6zPERrbamoDRO6ZQU0YhCGcT2xB1DZyQNg== X-Received: by 2002:a17:90a:d34c:: with SMTP id i12mr23189790pjx.18.1578011893000; Thu, 02 Jan 2020 16:38:13 -0800 (PST) Received: from localhost.localdomain (150.sub-174-193-143.myvzw.com. [174.193.143.150]) by smtp.gmail.com with ESMTPSA id p24sm65317746pff.69.2020.01.02.16.38.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jan 2020 16:38:12 -0800 (PST) From: Christopher McCrory To: buildroot@buildroot.org Date: Fri, 3 Jan 2020 00:37:51 +0000 Message-Id: <20200103003752.140-1-chrismcc@gmail.com> X-Mailer: git-send-email 2.18.1 Subject: [Buildroot] [PATCH 1/2] board/raspberrypi/post-image.sh: support older defconfigs 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: Christopher McCrory , Peter Seiderer , Martin Bark MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Commit ada40afb324 fixed pi3-minuart-bt being changed to miniuart-bt. Older defconfig files based on raspberrypi*_defconfigs might have to old call, BR2_ROOTFS_POST_SCRIPT_ARGS="--add-pi3-miniuart-bt-overlay" Allow either argument to add the correct miniuart-bt overlay. Signed-off-by: Christopher McCrory --- board/raspberrypi/post-image.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/raspberrypi/post-image.sh b/board/raspberrypi/post-image.sh index 9dbd98ef9b..e9246fa113 100755 --- a/board/raspberrypi/post-image.sh +++ b/board/raspberrypi/post-image.sh @@ -10,7 +10,7 @@ GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" for arg in "$@" do case "${arg}" in - --add-miniuart-bt-overlay) + --add-miniuart-bt-overlay|--add-pi3-miniuart-bt-overlay) if ! grep -qE '^dtoverlay=' "${BINARIES_DIR}/rpi-firmware/config.txt"; then echo "Adding 'dtoverlay=miniuart-bt' to config.txt (fixes ttyAMA0 serial console)." cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt" From patchwork Fri Jan 3 00:37:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher McCrory X-Patchwork-Id: 1217172 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=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="dI12yGab"; 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 47pmGn0qS7z9sRR for ; Fri, 3 Jan 2020 11:38:24 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 68AFB86272; Fri, 3 Jan 2020 00:38:19 +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 F9ZT1PW5q+ao; Fri, 3 Jan 2020 00:38:17 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 6F1AB857C2; Fri, 3 Jan 2020 00:38:17 +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 A24E71BF9B9 for ; Fri, 3 Jan 2020 00:38:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9555B85C7A for ; Fri, 3 Jan 2020 00:38:16 +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 aoYfzKSRToHU for ; Fri, 3 Jan 2020 00:38:16 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pj1-f67.google.com (mail-pj1-f67.google.com [209.85.216.67]) by fraxinus.osuosl.org (Postfix) with ESMTPS id EE46E85BE4 for ; Fri, 3 Jan 2020 00:38:15 +0000 (UTC) Received: by mail-pj1-f67.google.com with SMTP id d5so3923773pjz.5 for ; Thu, 02 Jan 2020 16:38:15 -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:in-reply-to:references; bh=R9u2s5H79uKXkQVSyLO+BUfSZ/9MGUi4WJs5r65K+H4=; b=dI12yGabjGVWsN2U4V23y7P98ICaTLkPAX3hzfIozUdVg9SxGfzjI9SZzt4BXEPUPv tp4ZZYxVkwc5yRbfLCM1/nkpp4ICEaSCIE30kWvFgshnwpaA3jHdqhYvVMYBEeoiHUbg 5r2HoZhMnW9riE0f0LXMGRdrUTjE9q8IHuL9YE6HRRy8Oy+sdcOAcLEfa6FbHs1xZGsm /vX7jRvV2gpp/YXUPrhZBJgkNupCz+otxMJIrDFjUE7j6dYwyu+7CG8vUA6qNHEutUJ4 0sh318eHSJiZ/Bq4B7kPU3tl3l0YsclgZDUN7wuiqf5cASfMQ8QFYRC5oQH6jHe4GyOL YLbQ== 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:in-reply-to :references; bh=R9u2s5H79uKXkQVSyLO+BUfSZ/9MGUi4WJs5r65K+H4=; b=m3KUYt3xq9qJZNUseWM2aec7hnRqikwvsk0CuBRnAtfyRc7zDL2I9T2HTQ9Rugwoas t/XMAzO01b8dGIa/mUJqo1p2cpDWaNLgO1wP8coWFjWEZtZC3/8+caVEbectB67EpHvX k0hiScPfkzYeJPUiie0JN24G+hIgW6fjQePJXe5qc0V4oLxuWKNzqhx34E5foyPzCa7Z Oq+ymEgjY21R7SXscRTMxYfVjxjZ6d1tusq5HX1nkOgWmb3KtqLK1tkHkkghqXf78YBO R4rILaJX6PbL0FyWfyWoR1CP1UQWszqVqmc1zU8NRt5RCXP30M24MnOKT6jwhDBe+t9h LFcg== X-Gm-Message-State: APjAAAUJ08+c2DV6qsHYI3Y3yicUyg0YmpATE0MzV6omuRDpdi0k9k9I 2nedKNSJk680BXTXF9m6Qr/zxCvL X-Google-Smtp-Source: APXvYqx8uuEu+yeIcr7y5J8Q2OEbk1gufDnjHXj5KLPbPLSnSFJ9HOs7wS443ZvHl9TNjiUqR3swtQ== X-Received: by 2002:a17:902:6bc3:: with SMTP id m3mr85596597plt.185.1578011895296; Thu, 02 Jan 2020 16:38:15 -0800 (PST) Received: from localhost.localdomain (150.sub-174-193-143.myvzw.com. [174.193.143.150]) by smtp.gmail.com with ESMTPSA id p24sm65317746pff.69.2020.01.02.16.38.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jan 2020 16:38:14 -0800 (PST) From: Christopher McCrory To: buildroot@buildroot.org Date: Fri, 3 Jan 2020 00:37:52 +0000 Message-Id: <20200103003752.140-2-chrismcc@gmail.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20200103003752.140-1-chrismcc@gmail.com> References: <20200103003752.140-1-chrismcc@gmail.com> Subject: [Buildroot] [PATCH 2/2] configs/raspberrypi0w_defconfig: fix post script args 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: Christopher McCrory , Peter Seiderer , Martin Bark MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Commit ada40afb324 updated the raspberrypi*defconfigs to use -add-miniuart-bt-overlay instead of -add-pi3-miniuart-bt-overlay. Update raspberrypi0w_defconfig also. Signed-off-by: Christopher McCrory Reviewed-by: Peter Seiderer --- configs/raspberrypi0w_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/raspberrypi0w_defconfig b/configs/raspberrypi0w_defconfig index ea5856e8c0..e3c747ff6f 100644 --- a/configs/raspberrypi0w_defconfig +++ b/configs/raspberrypi0w_defconfig @@ -29,4 +29,4 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi0w/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi0w/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="--add-pi3-miniuart-bt-overlay" +BR2_ROOTFS_POST_SCRIPT_ARGS="--add-miniuart-bt-overlay"