Skip to contentSkip to conversation

configs/raspberrypi: change deprecated pi3-miniuart-bt option to miniuart-bt

PATCH Superseded Arthur Courtel 3 participants 6 messages Dec 3, 2019 – Dec 4, 2019 Broadcom BCM2711/BCM2835 Arm architecture

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 configs/raspberrypi: change deprecated pi3-miniuart-bt option to miniuart-bt

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.

---
 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(-)
board/raspberrypi/post-image.sh +4 -4
index bbeb0bc721..9dbd98ef9b 100755
@@ -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
 		;;
board/raspberrypi/readme.txt +1 -1
index 69c9f9b20a..8b3de6d251 100644
@@ -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.
configs/raspberrypi3_64_defconfig +1 -1
index 27141f364e..b9a070fb82 100644
@@ -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"
configs/raspberrypi3_defconfig +1 -1
index 01aa239805..530eb0ab3f 100644
@@ -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"
configs/raspberrypi3_qt5we_defconfig +1 -1
index 775eb9114e..21c5d1dc4c 100644
@@ -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"
configs/raspberrypi4_defconfig +1 -1
index 6eea0ca816..a216463e28 100644
@@ -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"
Signature · 1 line
2.23.0
#1 lore raw

PATCH v2 2/2 configs: add raspberrypi4 64bits defconfig

This configuration builds a 64bit image for RaspberryPi 4.

---
 .../raspberrypi/genimage-raspberrypi4-64.cfg  | 30 +++++++++++++++
 board/raspberrypi4-64                         |  1 +
 configs/raspberrypi4_64_defconfig             | 37 +++++++++++++++++++
 3 files changed, 68 insertions(+)
 create mode 100644 board/raspberrypi/genimage-raspberrypi4-64.cfg
 create mode 120000 board/raspberrypi4-64
 create mode 100644 configs/raspberrypi4_64_defconfig
board/raspberrypi/genimage-raspberrypi4-64.cfg new file +30 -0
new file mode 100644
index 0000000000..3c480e98f0
@@ -0,0 +1,30 @@
+image boot.vfat {
+  vfat {
+    files = {
+      "bcm2711-rpi-4-b.dtb",
+      "rpi-firmware/cmdline.txt",
+      "rpi-firmware/config.txt",
+      "rpi-firmware/fixup4.dat",
+      "rpi-firmware/start4.elf",
+      "rpi-firmware/overlays",
+      "Image"
+    }
+  }
+  size = 32M
+}
+
+image sdcard.img {
+  hdimage {
+  }
+
+  partition boot {
+    partition-type = 0xC
+    bootable = "true"
+    image = "boot.vfat"
+  }
+
+  partition rootfs {
+    partition-type = 0x83
+    image = "rootfs.ext4"
+  }
+}
board/raspberrypi4-64 new file +1 -0
new file mode 120000
index 0000000000..fcdafc81ed
@@ -0,0 +1 @@
+raspberrypi
\ No newline at end of file
configs/raspberrypi4_64_defconfig new file +37 -0
new file mode 100644
index 0000000000..c88923d507
@@ -0,0 +1,37 @@
+BR2_aarch64=y
+BR2_cortex_a72=y
+
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
+
+BR2_SYSTEM_DHCP="eth0"
+
+# Linux headers same as kernel, a 4.19 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
+
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,raspberrypi-kernel_1.20190819-1)/linux-raspberrypi-kernel_1.20190819-1.tar.gz"
+BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
+
+# Build the DTB from the kernel sources
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b"
+
+BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
+
+BR2_PACKAGE_RPI_FIRMWARE=y
+BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y
+
+# Required tools to create the SD image
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
+
+# Filesystem / image
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
+# BR2_TARGET_ROOTFS_TAR is not set
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi4-64/post-build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi4-64/post-image.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="--add-miniuart-bt-overlay --aarch64"
Signature · 1 line
2.23.0
#2 lore raw

PATCH v2 2/2 configs: add raspberrypi4 64bits defconfig

Hello Arthur,

Quoted 70 lines · Arthur Courtel

This configuration builds a 64bit image for RaspberryPi 4.

---
 .../raspberrypi/genimage-raspberrypi4-64.cfg  | 30 +++++++++++++++
 board/raspberrypi4-64                         |  1 +
 configs/raspberrypi4_64_defconfig             | 37 +++++++++++++++++++
 3 files changed, 68 insertions(+)
 create mode 100644 board/raspberrypi/genimage-raspberrypi4-64.cfg
 create mode 120000 board/raspberrypi4-64
 create mode 100644 configs/raspberrypi4_64_defconfig
board/raspberrypi/genimage-raspberrypi4-64.cfg new file +30 -0
new file mode 100644
index 0000000000..3c480e98f0
@@ -0,0 +1,30 @@
+image boot.vfat {
+  vfat {
+    files = {
+      "bcm2711-rpi-4-b.dtb",
+      "rpi-firmware/cmdline.txt",
+      "rpi-firmware/config.txt",
+      "rpi-firmware/fixup4.dat",
+      "rpi-firmware/start4.elf",
+      "rpi-firmware/overlays",
+      "Image"
+    }
+  }
+  size = 32M
+}
+
+image sdcard.img {
+  hdimage {
+  }
+
+  partition boot {
+    partition-type = 0xC
+    bootable = "true"
+    image = "boot.vfat"
+  }
+
+  partition rootfs {
+    partition-type = 0x83
+    image = "rootfs.ext4"
+  }
+}
board/raspberrypi4-64 new file +1 -0
new file mode 120000
index 0000000000..fcdafc81ed
@@ -0,0 +1 @@
+raspberrypi
\ No newline at end of file
configs/raspberrypi4_64_defconfig new file +8 -0
new file mode 100644
index 0000000000..c88923d507
@@ -0,0 +1,37 @@
+BR2_aarch64=y
+BR2_cortex_a72=y
+
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
+
+BR2_SYSTEM_DHCP="eth0"
+
+# Linux headers same as kernel, a 4.19 series

configs/raspberrypi4_64_defconfig line 18

Quoted 10 lines
configs/raspberrypi4_64_defconfig new file +10 -0
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
+
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,raspberrypi-kernel_1.20190819-1)/linux-raspberrypi-kernel_1.20190819-1.tar.gz"
+BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
+
+# Build the DTB from the kernel sources
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b"

No chance to test myself for pi4 (because of lack of hardware yet), but I believe BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y is needed for an 64-bit kernel, see
[1] and [2] for pi3...

Regards,
Peter

[1] https://git.buildroot.net/buildroot/commit/?id=2aa92335cdc5f71c2d09391dc49fcf3c7627d6f0
[2] https://git.buildroot.net/buildroot/commit/?id=e747d33bd9d319481a67a376c97e5100dd93f62a

Quoted 19 lines
configs/raspberrypi4_64_defconfig new file +19 -0
+
+BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
+
+BR2_PACKAGE_RPI_FIRMWARE=y
+BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y
+
+# Required tools to create the SD image
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
+
+# Filesystem / image
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
+# BR2_TARGET_ROOTFS_TAR is not set
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi4-64/post-build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi4-64/post-image.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="--add-miniuart-bt-overlay --aarch64"
#3 lore raw

PATCH v2 2/2 configs: add raspberrypi4 64bits defconfig

Hello Peter,

Indeed it is needed.
I don't know how i got a working serial on rpi4 without it... Thanks for the feedback, I will propose a V3 to fix that.

Regards,
Arthur

Quoted 123 lines · Peter Seiderer

Hello Arthur,

Quoted 12 lines · Arthur Courtel

This configuration builds a 64bit image for RaspberryPi 4.

---
 .../raspberrypi/genimage-raspberrypi4-64.cfg  | 30 +++++++++++++++
 board/raspberrypi4-64                         |  1 +
 configs/raspberrypi4_64_defconfig             | 37 +++++++++++++++++++
 3 files changed, 68 insertions(+)
 create mode 100644 board/raspberrypi/genimage-raspberrypi4-64.cfg
 create mode 120000 board/raspberrypi4-64
 create mode 100644 configs/raspberrypi4_64_defconfig

Review

Quoted 1 line
(quoted diff) +0 -0

b/board/raspberrypi/genimage-raspberrypi4-64.cfg

Review

Quoted 44 lines

new file mode 100644
index 0000000000..3c480e98f0

board/raspberrypi/genimage-raspberrypi4-64.cfg new file +30 -0
@@ -0,0 +1,30 @@
+image boot.vfat {
+  vfat {
+    files = {
+      "bcm2711-rpi-4-b.dtb",
+      "rpi-firmware/cmdline.txt",
+      "rpi-firmware/config.txt",
+      "rpi-firmware/fixup4.dat",
+      "rpi-firmware/start4.elf",
+      "rpi-firmware/overlays",
+      "Image"
+    }
+  }
+  size = 32M
+}
+
+image sdcard.img {
+  hdimage {
+  }
+
+  partition boot {
+    partition-type = 0xC
+    bootable = "true"
+    image = "boot.vfat"
+  }
+
+  partition rootfs {
+    partition-type = 0x83
+    image = "rootfs.ext4"
+  }
+}
board/raspberrypi4-64 new file +1 -0
new file mode 120000
index 0000000000..fcdafc81ed
@@ -0,0 +1 @@
+raspberrypi
\ No newline at end of file
(quoted diff) +0 -0

b/configs/raspberrypi4_64_defconfig

Quoted 8 lines

new file mode 100644
index 0000000000..c88923d507

configs/raspberrypi4_64_defconfig new file +3 -0
@@ -0,0 +1,37 @@
+BR2_aarch64=y
+BR2_cortex_a72=y
+

configs/raspberrypi4_64_defconfig line 13

Quoted 10 lines
configs/raspberrypi4_64_defconfig new file +10 -0
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
+
+BR2_SYSTEM_DHCP="eth0"
+
+# Linux headers same as kernel, a 4.19 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
+
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call

github,raspberrypi,linux,raspberrypi-kernel_1.20190819-1)/linux-raspberrypi-kernel_1.20190819-1.tar.gz"

configs/raspberrypi4_64_defconfig line 18

Quoted 5 lines
configs/raspberrypi4_64_defconfig new file +5 -0
+BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
+
+# Build the DTB from the kernel sources
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b"

No chance to test myself for pi4 (because of lack of hardware yet), but I believe
BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y is needed for an 64-bit kernel, see
[1] and [2] for pi3...

Regards,
Peter

[1]
https://git.buildroot.net/buildroot/commit/?id=2aa92335cdc5f71c2d09391dc49fcf3c7627d6f0
[2]
https://git.buildroot.net/buildroot/commit/?id=e747d33bd9d319481a67a376c97e5100dd93f62a

Quoted 19 lines
configs/raspberrypi4_64_defconfig new file +19 -0
+
+BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
+
+BR2_PACKAGE_RPI_FIRMWARE=y
+BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y
+
+# Required tools to create the SD image
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
+
+# Filesystem / image
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
+# BR2_TARGET_ROOTFS_TAR is not set
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi4-64/post-build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi4-64/post-image.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="--add-miniuart-bt-overlay --aarch64"
Signature · 10 lines
<http://www.smile.eu/>
*Arthur COURTEL*
Ing?nieur Etude et D?veloppement

[image: email] arthur.courtel at smile.fr

[image: eco] Pour la plan?te, n'imprimez ce mail que si c'est n?cessaire
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20191204/1d902fdf/attachment.html>
#4 lore raw

PATCH v2 1/2 configs/raspberrypi: change deprecated pi3-miniuart-bt option to miniuart-bt

In reply to Arthur Courtel

Hello Arthur,

thanks for the patch, one nitpick below...

Quoted 18 lines · Arthur Courtel

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.

---
 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(-)
board/raspberrypi/post-image.sh +0 -0
index bbeb0bc721..9dbd98ef9b 100755

board/raspberrypi/post-image.sh GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" · line 13

Quoted 5 lines
board/raspberrypi/post-image.sh +1 -1
@@ -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)

Maybe keep additional the legacy '--add-pi3-miniuart-bt-overlay' option for people using old custom config files?

Will do a short (pi3 only) test the next days...

Regards,
Peter

Quoted 65 lines
board/raspberrypi/post-image.sh +3 -3
 		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
 		;;
board/raspberrypi/readme.txt +1 -1
index 69c9f9b20a..8b3de6d251 100644
@@ -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.
configs/raspberrypi3_64_defconfig +1 -1
index 27141f364e..b9a070fb82 100644
@@ -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"
configs/raspberrypi3_defconfig +1 -1
index 01aa239805..530eb0ab3f 100644
@@ -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"
configs/raspberrypi3_qt5we_defconfig +1 -1
index 775eb9114e..21c5d1dc4c 100644
@@ -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"
configs/raspberrypi4_defconfig +1 -1
index 6eea0ca816..a216463e28 100644
@@ -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"
#5 lore raw

PATCH v2 1/2 configs/raspberrypi: change deprecated pi3-miniuart-bt option to miniuart-bt

Quoted 19 lines · Peter Seiderer

Hello Arthur,

thanks for the patch, one nitpick below...

Quoted 13 lines · Arthur Courtel

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.

---
 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(-)
Quoted 12 lines

board/raspberrypi/post-image.sh GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" · line 13

Quoted 10 lines
board/raspberrypi/post-image.sh +1 -1
index bbeb0bc721..9dbd98ef9b 100755
@@ -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)

Maybe keep additional the legacy '--add-pi3-miniuart-bt-overlay' option for people using old custom config files?

I don't think we need to do that. Everything in board/ is supposed to be
internal. If you use one of our defconfigs as inspiration for your own custom config, you should copy all the support stuff as well.

Regards,
Arnout