diff --git a/embedded/build.sh b/embedded/build.sh index f32b0d2..ad28fe2 100755 --- a/embedded/build.sh +++ b/embedded/build.sh @@ -2,8 +2,8 @@ set -e -BUILDROOT=buildroot-2024.02.2 -BUILDROOT_TAR=buildroot-2024.02.2.tar.gz +BUILDROOT=buildroot-2024.02.3 +BUILDROOT_TAR=buildroot-2024.02.3.tar.gz if [ ! -e "${BUILDROOT}" ]; then tar xvf "${BUILDROOT_TAR}" @@ -32,9 +32,13 @@ cp "${BUILDROOT}/output/images/rpi-firmware/fixup4.dat" output # Not used by Pi 4, but need to be present to make usbboot think it is a valid directory touch output/bootcode.bin +cp ${BUILDROOT}/output/images/bcm2711*.dtb output/ +cp ${BUILDROOT}/output/images/bcm2712*.dtb output/ + mkdir -p output/overlays cp ${BUILDROOT}/output/images/dwc2-overlay.dtb output/overlays/dwc2.dtbo +cp ${BUILDROOT}/output/images/bcm2712d0-overlay.dtb output/overlays/bcm2712d0.dtbo cp ${BUILDROOT}/output/images/vc4-kms-v3d-pi5-overlay.dtb output/overlays/vc4-kms-v3d-pi5.dtbo cp ${BUILDROOT}/output/images/vc4-kms-v3d-pi4-overlay.dtb output/overlays/vc4-kms-v3d-pi4.dtbo cp ${BUILDROOT}/output/images/disable-bt-overlay.dtb output/overlays/disable-bt.dtbo diff --git a/embedded/imager/configs/rpi-imager_defconfig b/embedded/imager/configs/rpi-imager_defconfig index b465206..8addbd7 100644 --- a/embedded/imager/configs/rpi-imager_defconfig +++ b/embedded/imager/configs/rpi-imager_defconfig @@ -253,7 +253,7 @@ BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="" # BR2_GCC_VERSION_11_X is not set # BR2_GCC_VERSION_12_X is not set BR2_GCC_VERSION_13_X=y -BR2_GCC_VERSION="13.2.0" +BR2_GCC_VERSION="13.3.0" BR2_EXTRA_GCC_CONFIG_OPTIONS="" BR2_TOOLCHAIN_BUILDROOT_CXX=y # BR2_TOOLCHAIN_BUILDROOT_FORTRAN is not set @@ -541,7 +541,7 @@ BR2_LINUX_KERNEL_CUSTOM_TARBALL=y # BR2_LINUX_KERNEL_CUSTOM_GIT is not set # BR2_LINUX_KERNEL_CUSTOM_HG is not set # BR2_LINUX_KERNEL_CUSTOM_SVN is not set -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,573f8fd)/linux-573f8fd.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,c1432b4)/linux-c1432b4.tar.gz" BR2_LINUX_KERNEL_VERSION="custom" BR2_LINUX_KERNEL_PATCH="" # BR2_LINUX_KERNEL_USE_DEFCONFIG is not set @@ -562,7 +562,7 @@ BR2_LINUX_KERNEL_IMAGEGZ=y BR2_LINUX_KERNEL_ZSTD=y BR2_LINUX_KERNEL_DTS_SUPPORT=y # BR2_LINUX_KERNEL_DTB_IS_SELF_BUILT is not set -BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b broadcom/bcm2711-rpi-400 broadcom/bcm2711-rpi-cm4 broadcom/bcm2712-rpi-5-b overlays/overlay_map overlays/dwc2-overlay overlays/vc4-kms-v3d-pi4-overlay overlays/vc4-kms-v3d-pi5-overlay overlays/disable-bt-overlay overlays/disable-wifi-overlay overlays/disable-bt-pi5-overlay overlays/disable-wifi-pi5-overlay" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b broadcom/bcm2711-rpi-400 broadcom/bcm2711-rpi-cm4 broadcom/bcm2712-rpi-5-b broadcom/bcm2712d0-rpi-5-b broadcom/bcm2712-rpi-cm5-cm5io broadcom/bcm2712-rpi-cm5-cm4io overlays/overlay_map overlays/dwc2-overlay overlays/vc4-kms-v3d-pi4-overlay overlays/vc4-kms-v3d-pi5-overlay overlays/disable-bt-overlay overlays/disable-wifi-overlay overlays/disable-bt-pi5-overlay overlays/disable-wifi-pi5-overlay overlays/bcm2712d0-overlay" BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="" # BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME is not set # BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT is not set diff --git a/embedded/imager/package/rpi-firmware-custom/rpi-firmware-custom.mk b/embedded/imager/package/rpi-firmware-custom/rpi-firmware-custom.mk index f1502a0..24509d4 100644 --- a/embedded/imager/package/rpi-firmware-custom/rpi-firmware-custom.mk +++ b/embedded/imager/package/rpi-firmware-custom/rpi-firmware-custom.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_FIRMWARE_CUSTOM_VERSION = 7e9c2063fc15274fbc4dab1ca614f9228834d881 +RPI_FIRMWARE_CUSTOM_VERSION = 40eb78a3876379d78d7d3188940f86a39111f73c RPI_FIRMWARE_CUSTOM_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_CUSTOM_VERSION)) RPI_FIRMWARE_CUSTOM_LICENSE = BSD-3c RPI_FIRMWARE_CUSTOM_LICENSE_FILES = boot/LICENCE.broadcom