Initial Raspberry Pi 5 support

Documentation/boards/README.md

@@ -5,6 +5,7 @@
 The following boards/devices are supported:
 
 - Raspberry Pi
+  - Pi 5 ([4 GB](https://www.raspberrypi.com/products/raspberry-pi-5/?variant=raspberry-pi-5-4gb) and [8 GB](https://www.raspberrypi.com/products/raspberry-pi-5/?variant=raspberry-pi-5-8gb) model) 64-bit
   - Pi 4 Model B ([1 GB](https://www.raspberrypi.com/products/raspberry-pi-4-model-b/?variant=raspberry-pi-4-model-b-1gb), [2 GB](https://www.raspberrypi.com/products/raspberry-pi-4-model-b/?variant=raspberry-pi-4-model-b-2gb), [4 GB](https://www.raspberrypi.com/products/raspberry-pi-4-model-b/?variant=raspberry-pi-4-model-b-4gb) and [8 GB](https://www.raspberrypi.com/products/raspberry-pi-4-model-b/?variant=raspberry-pi-4-model-b-8gb) model) 32-bit or 64-bit (recommended)
   - [Pi 3 Model B](https://www.raspberrypi.com/products/raspberry-pi-3-model-b/) and [B+](https://www.raspberrypi.com/products/raspberry-pi-3-model-b-plus/) 32-bit or 64-bit (recommended)
   - [Pi 2](https://www.raspberrypi.com/products/raspberry-pi-2-model-b/) (not recommended)
@@ -39,6 +40,7 @@ Notes:
 
 |Board|Build|Config|Docs|
 |-----|----|------|----|
+|Pi5 64-bit    |`make rpi5_64`       |[rpi5_64](../../buildroot-external/configs/rpi5_64_defconfig)|[raspberrypi](./raspberrypi/)|
 |Pi4B 64-bit   |`make rpi4_64`       |[rpi4_64](../../buildroot-external/configs/rpi4_64_defconfig)|[raspberrypi](./raspberrypi/)|
 |Pi4B 32-bit   |`make rpi4`          |[rpi4](../../buildroot-external/configs/rpi4_defconfig)|[raspberrypi](./raspberrypi/)|
 |Pi3B 64-bit   |`make rpi3_64`       |[rpi3_64](../../buildroot-external/configs/rpi3_64_defconfig)|[raspberrypi](./raspberrypi/)|

Documentation/boards/raspberrypi/README.md

@@ -8,6 +8,7 @@
 | Raspberry Pi 2 B    |2015           | not recommended | [rpi2](../../../buildroot-external/configs/rpi2_defconfig)             |
 | Raspberry Pi 3 B/B+ |2016/2018      | yes             | [rpi3](../../../buildroot-external/configs/rpi3_defconfig) / [rpi3_64](../../../buildroot-external/configs/rpi3_64_defconfig) |
 | Raspberry Pi 4 B    |2019           | yes             | [rpi4](../../../buildroot-external/configs/rpi4_defconfig) / [rpi4_64](../../../buildroot-external/configs/rpi4_64_defconfig) |
+| Raspberry Pi 5      |2023           | yes (beta)      | [rpi5_64](../../../buildroot-external/configs/rpi5_64_defconfig) |
 
 ## Serial console
 

Documentation/kernel.md

@@ -11,6 +11,7 @@ Default Kernel tree: 6.1
 | Raspberry Pi 2 | 6.1.63 |
 | Raspberry Pi 3 | 6.1.63 |
 | Raspberry Pi 4 | 6.1.63 |
+| Raspberry Pi 5 | 6.1.63 |
 | Home Assistant Yellow | 6.1.63 |
 | Home Assistant Green | 6.1.66 |
 | Tinker Board | 6.1.66 |

buildroot-external/board/raspberrypi/rpi5-64/cmdline.txt

@@ -0,0 +1 @@
+zram.enabled=1 zram.num_devices=3 rootwait cgroup_enable=memory fsck.repair=yes console=tty1 root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd rootfstype=squashfs ro rauc.slot=A

buildroot-external/board/raspberrypi/rpi5-64/config.txt

@@ -0,0 +1,53 @@
+# For more options and information see
+# http://rptl.io/configtxt
+# Some settings may impact device functionality. See link above for details
+
+# Uncomment some or all of these to enable the optional hardware interfaces
+#dtparam=i2c_arm=on
+#dtparam=i2s=on
+#dtparam=spi=on
+
+# Enable audio (loads snd_bcm2835)
+dtparam=audio=on
+
+# Additional overlays and parameters are documented
+# /boot/firmware/overlays/README
+
+# Automatically load overlays for detected cameras
+camera_auto_detect=1
+
+# Automatically load overlays for detected DSI displays
+display_auto_detect=1
+
+# Automatically load initramfs files, if found
+auto_initramfs=1
+
+# Enable DRM VC4 V3D driver
+dtoverlay=vc4-kms-v3d
+max_framebuffers=2
+
+# Don't have the firmware create an initial video= setting in cmdline.txt.
+# Use the kernel's default instead.
+disable_fw_kms_setup=1
+
+# Run in 64-bit mode
+arm_64bit=1
+
+# Disable compensation for displays with overscan
+disable_overscan=1
+
+# Run as fast as firmware / board allows
+arm_boost=1
+
+# Use OS prefix for A/B slot (RAUC)
+os_prefix=slot-A/
+cmdline=/cmdline.txt
+
+[cm4]
+# Enable host mode on the 2711 built-in XHCI USB controller.
+# This line should be removed if the legacy DWC2 controller is required
+# (e.g. for USB device mode) or if USB support is not required.
+otg_mode=1
+
+[all]
+

buildroot-external/board/raspberrypi/rpi5-64/hassos-hook.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+# shellcheck disable=SC2155
+
+function hassos_pre_image() {
+    local BOOT_DATA="$(path_boot_dir)"
+
+    mkdir -p "${BOOT_DATA}/slot-A/"
+    cp "${BINARIES_DIR}"/*.dtb "${BOOT_DATA}/slot-A/"
+    gzip --stdout "${BINARIES_DIR}"/Image > "${BOOT_DATA}/slot-A/kernel_2712.img"
+    cp -r "${BINARIES_DIR}/overlays/" "${BOOT_DATA}/slot-A/"
+    cp "${BINARIES_DIR}"/*.dtbo "${BOOT_DATA}/slot-A/overlays/" 2>/dev/null || true
+    cp "${BOARD_DIR}/config.txt" "${BOOT_DATA}/config.txt"
+    cp "${BOARD_DIR}/cmdline.txt" "${BOOT_DATA}/cmdline.txt"
+}
+
+
+function hassos_post_image() {
+    convert_disk_image_xz
+}
+

buildroot-external/board/raspberrypi/rpi5-64/meta

@@ -0,0 +1,11 @@
+BOARD_ID=rpi5-64
+BOARD_NAME="RaspberryPi 5 64bit"
+CHASSIS=embedded
+BOOTLOADER=tryboot
+KERNEL_FILE=Image
+BOOT_SYS=gpt
+BOOT_SIZE=64M
+BOOT_SPL=false
+BOOT_ENV_SIZE=0x4000
+SUPERVISOR_MACHINE=raspberrypi5-64
+SUPERVISOR_ARCH=aarch64

buildroot-external/board/raspberrypi/rpi5-64/rootfs-overlay/usr/lib/rauc/cmdline.sh

@@ -0,0 +1,25 @@
+# shellcheck shell=sh
+# Shell script functions to manipulate kernel cmdline
+
+# Function to get the value of a key from a command line string
+get_value() {
+    key="$1"
+    cmdline_string="$2"
+
+    # Split the command line string by whitespace and then by '=' using xargs
+    echo "$cmdline_string" | xargs -n1 | grep "^$key=" | cut -d= -f2-
+}
+
+# Function to set or update the value of a key in a command line string
+set_value() {
+    key="$1"
+    new_value="$2"
+    cmdline_string="$3"
+
+    # Use sed to replace the value of the key if it exists, or add a new key-value pair
+    if echo "$cmdline_string" | grep -q "$key="; then
+        echo "$cmdline_string" | sed "s/$key=[^ ]*/$key=$new_value/"
+    else
+        echo "$cmdline_string $key=$new_value"
+    fi
+}

buildroot-external/board/raspberrypi/rpi5-64/rootfs-overlay/usr/lib/rauc/rpi-tryboot.sh

@@ -0,0 +1,101 @@
+#!/bin/sh
+
+# shellcheck source=/dev/null # Our GitHub Actions tests this separately
+. /usr/lib/rauc/cmdline.sh
+
+# RAUC hook script for Raspberry Pi firmwaree tryboot
+# Meant to be usesd as a RAUC bootloader-custom-backend script.
+
+boot_dir="/mnt/boot"
+root_slot_a="PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd"
+root_slot_b="PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20"
+
+case "$1" in
+    get-primary)
+        # Actions to be performed when getting the primary bootloader
+        # Example: Output the path to the current primary bootloader
+        echo "tryboot get-primary" >&2
+        cmdline=$(head -n1 "${boot_dir}/cmdline.txt")
+        get_value rauc.slot "${cmdline}"
+        ;;
+
+    set-primary)
+        # Actions to be performed when setting the primary bootloader
+        # Example: Set the specified bootloader as the primary one
+        slot_bootname="$2"
+        echo "tryboot set-primary $slot_bootname" >&2
+        cmdline=$(head -n1 "${boot_dir}/cmdline.txt")
+        if [ "${slot_bootname}" = "A" ]; then
+            cmdline=$(set_value root "${root_slot_a}" "${cmdline}")
+        elif [ "${slot_bootname}" = "B" ]; then
+            cmdline=$(set_value root "${root_slot_b}" "${cmdline}")
+        else
+            exit 1
+        fi
+        cmdline=$(set_value rauc.slot "${slot_bootname}" "${cmdline}")
+        echo "${cmdline}" > "${boot_dir}/cmdline-tryboot.txt"
+        sed -e "s/^\(os_prefix=\)slot-[A-Z]\/$/\1slot-${slot_bootname}\//" \
+            -e "s/^\(cmdline=\).*$/\1\/cmdline-tryboot.txt/" \
+            "${boot_dir}/config.txt" > "${boot_dir}/tryboot.txt"
+        # Use tryboot to try booting the new primary on reboot
+        echo "0 tryboot" > /run/systemd/reboot-param
+        ;;
+
+    get-state)
+        # Actions to be performed when getting the bootloader state
+        # Example: Output the current state of the bootloader
+        # You need to implement logic to determine the state (good or bad) based on the slot.bootname
+        slot_bootname="$2"
+        echo "tryboot get-state $slot_bootname" >&2
+        if [ -f "${boot_dir}/slot-${slot_bootname}/.good" ]; then
+            echo "returning good" >&2
+            echo "good"
+        else
+            echo "returning bad" >&2
+            echo "bad"
+        fi
+        ;;
+
+    set-state)
+        # Actions to be performed when setting the bootloader state
+        # Example: Set the specified state for the bootloader
+        slot_bootname="$2"
+        new_state="$3"
+        echo "tryboot set-state $slot_bootname $new_state" >&2
+        if [ "${new_state}" = "good" ]; then
+            touch "${boot_dir}/slot-${slot_bootname}/.good"
+        else
+            rm -f "${boot_dir}/slot-${slot_bootname}/.good"
+            exit 0
+	fi
+
+        # It seems we call set-state in any case. Use this to "commit" tryboot
+        # state...
+
+        # Check if tryboot is active
+        if ! cmp -s -n 4 /proc/device-tree/chosen/bootloader/tryboot /dev/zero; then
+            cmdline_tryboot=$(head -n1 "${boot_dir}/cmdline-tryboot.txt")
+            tryboot_slot=$(get_value rauc.slot "${cmdline_tryboot}")
+	    if [ "${tryboot_slot}" != "${slot_bootname}" ]; then
+                echo "tryboot doesn't reflect the expected boot slot, not committing." >&2
+                exit 1
+            fi
+            echo "Committing tryboot state to primary boot" >&2
+            mv "${boot_dir}/tryboot.txt" "${boot_dir}/config.txt"
+            mv "${boot_dir}/cmdline-tryboot.txt" "${boot_dir}/cmdline.txt"
+        fi
+        ;;
+
+    get-current)
+        # We don't have a better detection then /proc/cmdline...
+        echo "Cannot reliably determine current slot with tryboot" >&2
+        exit 1
+        ;;
+
+    *)
+        echo "Unknown operation: $1"
+        exit 1
+        ;;
+esac
+
+exit 0

buildroot-external/busybox.config

@@ -480,7 +480,7 @@ CONFIG_GREP=y
 # CONFIG_EGREP is not set
 # CONFIG_FGREP is not set
 # CONFIG_FEATURE_GREP_CONTEXT is not set
-# CONFIG_XARGS is not set
+CONFIG_XARGS=y
 # CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
 # CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set
 # CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set