diff --git a/alarm/uboot-raspberrypi/0002-fix-serial-console.patch b/alarm/uboot-raspberrypi/0002-fix-serial-console.patch index 42709d16b..c6a7e485a 100644 --- a/alarm/uboot-raspberrypi/0002-fix-serial-console.patch +++ b/alarm/uboot-raspberrypi/0002-fix-serial-console.patch @@ -21,14 +21,14 @@ index 30228285ed..44a427512c 100644 /* Environment */ stdin=serial,usbkbd -diff --git a/configs/rpi_4_defconfig b/configs/rpi_4_defconfig -index 2541b83a3d..a5dc879d6a 100644 + diff --git a/configs/rpi_4_defconfig b/configs/rpi_4_defconfig +index 993b797..014b7c5 100644 --- a/configs/rpi_4_defconfig +++ b/configs/rpi_4_defconfig -@@ -65,3 +65,8 @@ CONFIG_SYS_WHITE_ON_BLACK=y - CONFIG_VIDEO_BCM2835=y +@@ -70,3 +70,8 @@ CONFIG_VIDEO_BCM2835=y CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_PHYS_TO_BUS=y + # CONFIG_HEXDUMP is not set +CONFIG_BOOTDELAY=-2 +CONFIG_SILENT_CONSOLE=y +CONFIG_SYS_DEVICE_NULLDEV=y diff --git a/alarm/uboot-raspberrypi/PKGBUILD b/alarm/uboot-raspberrypi/PKGBUILD index 950f086d6..8a8c99360 100644 --- a/alarm/uboot-raspberrypi/PKGBUILD +++ b/alarm/uboot-raspberrypi/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: graysky <therealgraysky@proton.me> pkgname=uboot-raspberrypi -pkgver=2024.10 +pkgver=2025.01 pkgrel=1 pkgdesc="U-Boot for Raspberry Pi" arch=('armv7h' 'aarch64') @@ -12,7 +12,7 @@ license=('GPL') backup=('boot/boot.txt' 'boot/boot.scr' 'boot/config.txt') makedepends=('bc' 'dtc' 'git' 'util-linux') conflicts_armv7h=('linux-rpi' 'linux-rpi-16k') -_commit=c0307606abef9e6070d50047e7fa62d8354d8c29 +_commit=f2a25fcbdfac418c22a2083791cbc99fe32a93d8 source=( # these work for aarch64 but not for armv7h "https://github.com/u-boot/u-boot/archive/refs/tags/v${pkgver/rc/-rc}.tar.gz" @@ -28,61 +28,64 @@ source=( "https://github.com/raspberrypi/firmware/raw/${_commit}/boot/bcm2711-rpi-cm4.dtb" "https://github.com/raspberrypi/firmware/raw/${_commit}/boot/bcm2711-rpi-cm4s.dtb" "https://github.com/raspberrypi/firmware/raw/${_commit}/boot/bcm2712-rpi-5-b.dtb" + "https://github.com/raspberrypi/firmware/raw/${_commit}/boot/bcm2712-rpi-500.dtb" "https://github.com/raspberrypi/firmware/raw/${_commit}/boot/bcm2712d0-rpi-5-b.dtb" "https://github.com/raspberrypi/firmware/raw/${_commit}/boot/bcm2712-rpi-cm5-cm4io.dtb" "https://github.com/raspberrypi/firmware/raw/${_commit}/boot/bcm2712-rpi-cm5-cm5io.dtb" # these are from linux-armv7-6.9.8-1 - bcm2712-rpi-5-b.v7 bcm2710-rpi-3-b-plus.v7 - bcm2711-rpi-cm4-io.v7 - bcm2712-rpi-cm5-cm4io.v7 bcm2710-rpi-3-b.v7 - bcm2711-rpi-cm4.v7 - bcm2711-rpi-cm4s.v7 - bcm2711-rpi-400.v7 - bcm2712d0-rpi-5-b.v7 bcm2710-rpi-zero-2.v7 - bcm2712-rpi-cm5-cm5io.v7 bcm2710-rpi-zero-2-w.v7 bcm2710-rpi-cm3.v7 + bcm2711-rpi-cm4.v7 + bcm2711-rpi-cm4s.v7 + bcm2712-rpi-5-b.v7 + bcm2712-rpi-cm5-cm4io.v7 + bcm2712d0-rpi-5-b.v7 + bcm2712-rpi-cm5-cm5io.v7 + # these are from linux-armv7-6.13-1 bcm2711-rpi-4-b.v7 + bcm2711-rpi-400.v7 + bcm2711-rpi-cm4-io.v7 '0001-rpi-increase-space-for-kernel.patch' '0002-fix-serial-console.patch' 'boot.txt.v2' 'boot.txt.v3' 'mkscr') -md5sums=('f1ef24a7d9907c0aeedde50938726598' - '11c5a49b7b4951a571fe1a8537c329c6' +md5sums=('eae6d6ed62c30dd516e6f46b272553e8' + 'f3798c944c390b54e2bec37d9aac9500' + '1fbf8530914a7f9e5e6a1398db4b1811' + 'd97efea18b9e18bae318f5bcea3c2878' + '53c5c4f80b89dcbf549c4c7c37439a3e' + '51e2af158a8e7ef3dd792f2c594bf5cd' + '51e2af158a8e7ef3dd792f2c594bf5cd' + '6a8f893c7738bdd2a7109af0b5562e86' + '2c67aeae94f2aa479d95d7a45064eaae' + 'c45d2fbcea6f0af038c81860205d93d1' + '31575d1152ac6568f835b32a3e1c602a' + '813ebc37a6d80e11651309159cc82e6d' + '152d0e4276d52d02237714c3d8fcfa2e' + 'bea1f42977bb004d50f35af111ca01ce' + '043d1ca11201baa5cf61f667774a0414' + 'b7ffc8a6ca698e8dbfad4948b5beb663' + '240d211c9e9588a3bcfd439ef4f3ab24' '0190cba24f7a637cdf6019d6750c59ff' 'c291d947389308411e3779782522f7c3' + '7e9846deb2c8f81283ccae35240258e1' + '7e9846deb2c8f81283ccae35240258e1' '8dea82ecb9ec769246767836c74fb8f7' - '7e9846deb2c8f81283ccae35240258e1' - '7e9846deb2c8f81283ccae35240258e1' - 'ce1dc48eb08210929e48eac31d5ec031' - 'e7edf95cfa70211a6db053615c8c45c3' - '3efd77582f05e5ca6f55ec14f00810e1' '687902e98a5e4367a2b0f3914752a0c9' 'fbfe64dc18614d75d22955eeb3a8cae1' '94abb358fd4af83907dc16e19b65d4f3' - 'd8619315e6c8896df1727008b7e9359f' '9fb99782610680f2c5457afb65a60826' - '8d16fd383d663662ca60f750a69ed732' - '94abb358fd4af83907dc16e19b65d4f3' - '0190cba24f7a637cdf6019d6750c59ff' - '3efd77582f05e5ca6f55ec14f00810e1' - '9fb99782610680f2c5457afb65a60826' - 'c291d947389308411e3779782522f7c3' - '687902e98a5e4367a2b0f3914752a0c9' - 'fbfe64dc18614d75d22955eeb3a8cae1' - 'e7edf95cfa70211a6db053615c8c45c3' 'd8619315e6c8896df1727008b7e9359f' - '7e9846deb2c8f81283ccae35240258e1' '8d16fd383d663662ca60f750a69ed732' - '7e9846deb2c8f81283ccae35240258e1' - '8dea82ecb9ec769246767836c74fb8f7' - '35074bb767e8b259c5825b0c1f17fd60' + '8036ecf8bdc3e174ed6dcc6d1711716f' + '051a6d4fa0c903c7d39ad530c1796f3e' + 'eff27a37a8e4a96fe660970b07a37b2c' '636c8ac2098ebf0acdc2ff15430edf0d' - 'daa8314d29129e1b1ae0b316604bf8be' + 'a63d6cde8e45c00075e0df23ff71a0f4' 'f8ad4508b9734e9e13aedb9f7419d7a3' 'be8abe44b86d63428d7ac3acc64ee3bf' '021623a04afd29ac3f368977140cfbfd') diff --git a/alarm/uboot-raspberrypi/bcm2711-rpi-4-b.v7 b/alarm/uboot-raspberrypi/bcm2711-rpi-4-b.v7 index 46685f67e..710df5cfc 100755 Binary files a/alarm/uboot-raspberrypi/bcm2711-rpi-4-b.v7 and b/alarm/uboot-raspberrypi/bcm2711-rpi-4-b.v7 differ diff --git a/alarm/uboot-raspberrypi/bcm2711-rpi-400.v7 b/alarm/uboot-raspberrypi/bcm2711-rpi-400.v7 index 298f2ae0b..b2a4f2b24 100755 Binary files a/alarm/uboot-raspberrypi/bcm2711-rpi-400.v7 and b/alarm/uboot-raspberrypi/bcm2711-rpi-400.v7 differ diff --git a/alarm/uboot-raspberrypi/bcm2711-rpi-cm4-io.v7 b/alarm/uboot-raspberrypi/bcm2711-rpi-cm4-io.v7 index 1f2bc7973..4bcd4d597 100755 Binary files a/alarm/uboot-raspberrypi/bcm2711-rpi-cm4-io.v7 and b/alarm/uboot-raspberrypi/bcm2711-rpi-cm4-io.v7 differ