core/linux-raspberrypi4 to 5.4.83-3

Move dtbs out of /boot/broadcom/ to /boot/ for aarch64 to allow auto detection
on boot rather than hard-coding into /boot/config.txt.  Increase flexibility
and matches what RPiOS does with their arm64 image currently.
This commit is contained in:
graysky 2020-12-23 13:21:46 -05:00
parent 562fa440ad
commit 5eb9ffe179
2 changed files with 9 additions and 3 deletions

View file

@ -11,7 +11,7 @@ _srcname=linux-${_commit}
_kernelname=${pkgbase#linux} _kernelname=${pkgbase#linux}
_desc="Raspberry Pi 4" _desc="Raspberry Pi 4"
pkgver=5.4.83 pkgver=5.4.83
pkgrel=2 pkgrel=3
arch=('armv7h' 'aarch64') arch=('armv7h' 'aarch64')
url="http://www.kernel.org/" url="http://www.kernel.org/"
license=('GPL2') license=('GPL2')
@ -36,7 +36,7 @@ md5sums=('6c8790707ffc9440e1bcae20b697e9ec'
md5sums_armv7h=('0fc39bc5d19ba8503011ab5e033de67d' md5sums_armv7h=('0fc39bc5d19ba8503011ab5e033de67d'
'7c6b37a1353caccf6d3786bb4161c218') '7c6b37a1353caccf6d3786bb4161c218')
md5sums_aarch64=('80fb4289dfeca2f541416e5cf0dd3a81' md5sums_aarch64=('80fb4289dfeca2f541416e5cf0dd3a81'
'1cac5b1e040fd4bd6535cb6d0ffe487c') '84a781813024e320245be08b9e260902')
# setup vars # setup vars
[[ $CARCH == "armv7h" ]] && _kernel=kernel7.img KARCH=arm _image=zImage _config=config _bconfig=config.txt [[ $CARCH == "armv7h" ]] && _kernel=kernel7.img KARCH=arm _image=zImage _config=config _bconfig=config.txt
@ -111,6 +111,13 @@ _package() {
make INSTALL_MOD_PATH="${pkgdir}/usr" modules_install make INSTALL_MOD_PATH="${pkgdir}/usr" modules_install
make INSTALL_DTBS_PATH="${pkgdir}/boot" dtbs_install make INSTALL_DTBS_PATH="${pkgdir}/boot" dtbs_install
if [[ $CARCH == "aarch64" ]]; then
# drop hard-coded devicetree=foo.dtb in /boot/config.txt for
# autodetected load of supported of models at boot
find "${pkgdir}/boot/broadcom" -type f -print0 | xargs -0 mv -t "${pkgdir}/boot"
rmdir "${pkgdir}/boot/broadcom"
fi
cp arch/$KARCH/boot/$_image "${pkgdir}/boot/$_kernel" cp arch/$KARCH/boot/$_image "${pkgdir}/boot/$_kernel"
cp arch/$KARCH/boot/dts/overlays/README "${pkgdir}/boot/overlays" cp arch/$KARCH/boot/dts/overlays/README "${pkgdir}/boot/overlays"

View file

@ -4,5 +4,4 @@ gpu_mem=64
initramfs initramfs-linux.img followkernel initramfs initramfs-linux.img followkernel
kernel=kernel8.img kernel=kernel8.img
arm_64bit=1 arm_64bit=1
device_tree=broadcom/bcm2711-rpi-4-b.dtb
enable_gic=1 enable_gic=1