Skip to contentSkip to conversation

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

PATCH New Arthur Courtel 2 participants 4 messages Dec 4, 2019 – Dec 8, 2019 Broadcom BCM2711/BCM2835 Arm architecture

lore
Share & tools
lore
#0 lore raw

PATCH v3 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 v3 2/2 configs: add raspberrypi4 64bits defconfig

This configuration builds a 64bit image for RaspberryPi 4.

---
V2->V3:
Add DTB overlay support for RPI4 and FPU_VFPV4 (suggested by Peter)

V1->V2:
Divide patch to replace deprecated overlay option in rpi3 defconfigs

---
 .../raspberrypi/genimage-raspberrypi4-64.cfg  | 30 ++++++++++++++
 board/raspberrypi4-64                         |  1 +
 configs/raspberrypi4_64_defconfig             | 39 +++++++++++++++++++
 3 files changed, 70 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 +39 -0
new file mode 100644
index 0000000000..f013c4382c
@@ -0,0 +1,39 @@
+BR2_aarch64=y
+BR2_cortex_a72=y
+BR2_ARM_FPU_VFPV4=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_DTB_OVERLAY_SUPPORT=y
+
+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 v3 2/2 configs: add raspberrypi4 64bits defconfig

Hello Arthur,

Quoted 3 lines · On Wed, 4 Dec 2019 11:54:30 +0100 Arthur Courtel <[email protected]>…

This configuration builds a 64bit image for RaspberryPi 4.

Thanks for your contribution. I've applied after fixing the commit title, adding an entry to the DEVELOPERS file and re-generating the .gitlab-ci.yml file.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw

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

In reply to Arthur Courtel
Quoted 4 lines · On Wed, 4 Dec 2019 11:54:29 +0100 Arthur Courtel <[email protected]>…

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.

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

I've slightly improved the commit log, and applied. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com