From patchwork Wed Dec 4 10:54:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arthur Courtel X-Patchwork-Id: 1204115 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=smile.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=smile-fr.20150623.gappssmtp.com header.i=@smile-fr.20150623.gappssmtp.com header.b="1Yi+ntqt"; 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 47SbNJ3lhJz9sPV for ; Wed, 4 Dec 2019 21:55:12 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 81EC120394; Wed, 4 Dec 2019 10:55:09 +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 MgAJz1DpUqsh; Wed, 4 Dec 2019 10:55:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 41D2122264; Wed, 4 Dec 2019 10:55:07 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id EF9081BF312 for ; Wed, 4 Dec 2019 10:55:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id E1C9187E5C for ; Wed, 4 Dec 2019 10:55:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id GLVk+IcQEFuk for ; Wed, 4 Dec 2019 10:55:03 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by hemlock.osuosl.org (Postfix) with ESMTPS id CE69187D73 for ; Wed, 4 Dec 2019 10:55:02 +0000 (UTC) Received: by mail-wr1-f46.google.com with SMTP id c9so1566334wrw.8 for ; Wed, 04 Dec 2019 02:55:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile-fr.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=2/SuNdVAHDQTEzvFsY8ELJtpY24hlX+h//krC42f7R0=; b=1Yi+ntqt+5vF6t6Tp+cxa3sH3LxvL6Oiv3txXPrFCtlsuZWEDIZUmKv/49JbV1aSoD 58iYB5T9I6nIkEUWjPmg9IvkUS/gRLQKJoU+9EFBM6zrMlgVclmsGFVu14jvKWSfugZb T8JoeDWHSnorXI0P8cji+SJWKbcwPxISaUaD5Sj439xq9dLqSi9toSRQf0wQaM62QJDo INJZW0L/SBKPHQ4GFpX6zsnf70mjisCORMkQqwWO2XWB6M03rvAJpkUDOxM/YwQrJy2d yo1r206aO4cm4vo8fxuL0qVuSPnmGbtlUAVKvwNeB3oluH6j6WGHQJLr4yipaIin5J4R q2qA== 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=2/SuNdVAHDQTEzvFsY8ELJtpY24hlX+h//krC42f7R0=; b=ucrOZC8SFVwF7+iTIk5RvvwWt3z5gp5u5iYODoE41fC31wn0x7Ewyg9y6n9cgqJzQj n1RSErKPACfcJiTz8amz6UHBEaNJSAdpD0fksKsFaL+rL5TEsFDnKf2gae3JG2ogsMT6 hwBIQtLAM07rQWIJnT4mdxOfM4zvJdbY1Uya0M6LlIYYVifdjOqlyD9OF8iEL3kz7aMk gFNDHvBdsBYgbHFF6qeQBpcOdZegQcBjDRmp9lUeeEvG+JxAM97zgRGvKneU7ubXOY0b qHLt3YEKs7/F5b/PPBPOQc57Qk9tIvbIj7T0KmI4xv04jUXVDKFmYMikPwvPM5Gu4/Kd FoJg== X-Gm-Message-State: APjAAAWpmFQWZCXHY9GamokgGAvn9BpVcgBNw6iBiPhtO/exCBls5y0q 5q3xf/CRi9VL20cWN5l6oD7BKuCLHtAnig== X-Google-Smtp-Source: APXvYqwUdzLrFVnBe052mgbQObubaQO6pkIcmQ7Xq+2Z2Sm3/NZ1rRiKmf4nD+xPbsawxKfbkUxe7g== X-Received: by 2002:adf:f80b:: with SMTP id s11mr3134284wrp.12.1575456901044; Wed, 04 Dec 2019 02:55:01 -0800 (PST) Received: from DESKTOP-PT8V883.dhcp.nantes.intranet (static-css-ccs-204145.business.bouyguestelecom.com. [176.157.204.145]) by smtp.gmail.com with ESMTPSA id t12sm7785690wrs.96.2019.12.04.02.55.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Dec 2019 02:55:00 -0800 (PST) From: Arthur Courtel To: buildroot@buildroot.org Date: Wed, 4 Dec 2019 11:54:29 +0100 Message-Id: <20191204105430.943303-1-arthur.courtel@smile.fr> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCHv3 1/2] configs/raspberrypi: change deprecated pi3-miniuart-bt option to miniuart-bt 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: daggs@gmx.com, Romain Naour , Peter Seiderer , Martin Bark , Arthur Courtel Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This option will be used in RPI4 config in order to have a working serial port on gpios. This change makes this option not only RPI3 specific. Signed-off-by: Arthur Courtel --- board/raspberrypi/post-image.sh | 8 ++++---- board/raspberrypi/readme.txt | 2 +- configs/raspberrypi3_64_defconfig | 2 +- configs/raspberrypi3_defconfig | 2 +- configs/raspberrypi3_qt5we_defconfig | 2 +- configs/raspberrypi4_defconfig | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/board/raspberrypi/post-image.sh b/board/raspberrypi/post-image.sh index bbeb0bc721..9dbd98ef9b 100755 --- a/board/raspberrypi/post-image.sh +++ b/board/raspberrypi/post-image.sh @@ -10,13 +10,13 @@ GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" for arg in "$@" do case "${arg}" in - --add-pi3-miniuart-bt-overlay) + --add-miniuart-bt-overlay) if ! grep -qE '^dtoverlay=' "${BINARIES_DIR}/rpi-firmware/config.txt"; then - echo "Adding 'dtoverlay=pi3-miniuart-bt' to config.txt (fixes ttyAMA0 serial console)." + echo "Adding 'dtoverlay=miniuart-bt' to config.txt (fixes ttyAMA0 serial console)." cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt" -# fixes rpi3 ttyAMA0 serial console -dtoverlay=pi3-miniuart-bt +# fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console +dtoverlay=miniuart-bt __EOF__ fi ;; diff --git a/board/raspberrypi/readme.txt b/board/raspberrypi/readme.txt index 69c9f9b20a..8b3de6d251 100644 --- a/board/raspberrypi/readme.txt +++ b/board/raspberrypi/readme.txt @@ -78,7 +78,7 @@ After building, you should obtain this tree: [1] Not all of them will be present, depending on the RaspberryPi model you are using. -[2] Only for the Raspberry Pi 3/4 Models (overlay pi3-miniuart-bt is needed +[2] Only for the Raspberry Pi 3/4 Models (overlay miniuart-bt is needed to enable the RPi3 serial console otherwise occupied by the bluetooth chip). Alternative would be to disable the serial console in cmdline.txt and /etc/inittab. diff --git a/configs/raspberrypi3_64_defconfig b/configs/raspberrypi3_64_defconfig index 27141f364e..b9a070fb82 100644 --- a/configs/raspberrypi3_64_defconfig +++ b/configs/raspberrypi3_64_defconfig @@ -35,4 +35,4 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3-64/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3-64/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="--aarch64 --add-pi3-miniuart-bt-overlay" +BR2_ROOTFS_POST_SCRIPT_ARGS="--aarch64 --add-miniuart-bt-overlay" diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig index 01aa239805..530eb0ab3f 100644 --- a/configs/raspberrypi3_defconfig +++ b/configs/raspberrypi3_defconfig @@ -34,4 +34,4 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="--add-pi3-miniuart-bt-overlay" +BR2_ROOTFS_POST_SCRIPT_ARGS="--add-miniuart-bt-overlay" diff --git a/configs/raspberrypi3_qt5we_defconfig b/configs/raspberrypi3_qt5we_defconfig index 775eb9114e..21c5d1dc4c 100644 --- a/configs/raspberrypi3_qt5we_defconfig +++ b/configs/raspberrypi3_qt5we_defconfig @@ -48,4 +48,4 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="360M" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="--add-pi3-miniuart-bt-overlay --gpu_mem_1024=200" +BR2_ROOTFS_POST_SCRIPT_ARGS="--add-miniuart-bt-overlay --gpu_mem_1024=200" diff --git a/configs/raspberrypi4_defconfig b/configs/raspberrypi4_defconfig index 6eea0ca816..a216463e28 100644 --- a/configs/raspberrypi4_defconfig +++ b/configs/raspberrypi4_defconfig @@ -35,4 +35,4 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi4/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi4/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="--add-pi3-miniuart-bt-overlay" +BR2_ROOTFS_POST_SCRIPT_ARGS="--add-miniuart-bt-overlay"