core/linux-rpi to 6.1.66-2

armv7h and aarch64 share a unified /boot/config.txt

core/linux-rpi/PKGBUILD

@@ -10,7 +10,7 @@ _srcname=linux-${_commit}
 _kernelname=${pkgbase#linux}
 _regen=
 pkgver=6.1.66
-pkgrel=1
+pkgrel=2
 pkgdesc='Linux'
 url="http://www.kernel.org/"
 arch=(armv7h aarch64)
@@ -21,10 +21,11 @@ makedepends=(
   inetutils
 )
 options=('!strip')
-source_armv7h=('config' 'config.txt')
-source_aarch64=('config8' 'config8.txt')
+source_armv7h=('config')
+source_aarch64=('config8')
 source=("linux-$pkgver-${_commit:0:10}.tar.gz::https://github.com/raspberrypi/linux/archive/${_commit}.tar.gz"
         cmdline.txt
+        config.txt
         0001-Make-proc-cpuinfo-consistent-on-arm64-and-arm.patch
         linux.preset
         60-linux.hook
@@ -33,21 +34,20 @@ source=("linux-$pkgver-${_commit:0:10}.tar.gz::https://github.com/raspberrypi/li
 )
 md5sums=('aba147ee07635a0834cd54fbbe8d0a24'
          '3bab7426d8c8818dda8353da3892a41f'
+         '16c484af9f72b9275afcf83a6b8eab36'
          'f66a7ea3feb708d398ef57e4da4815e9'
          '86d4a35722b5410e3b29fc92dae15d4b'
          '0a5f16bfec6ad982a2f6782724cca8ba'
          '441ec084c47cddc53e592fb0cbce4edf'
          'c8f84694321e249492c80149833671d7')
-md5sums_armv7h=('eaee7ec6f027d2da926b69c3380ecaf7'
-                '16c484af9f72b9275afcf83a6b8eab36')
-md5sums_aarch64=('9ef704822fe5323cf9ac18757354e074'
-                 '7e4403dea857e40005bf76beda9927ff')
+md5sums_armv7h=('eaee7ec6f027d2da926b69c3380ecaf7')
+md5sums_aarch64=('9ef704822fe5323cf9ac18757354e074')
 
 # setup vars
 if [[ $CARCH == "armv7h" ]]; then
-  _kernel=kernel7.img KARCH=arm _image=zImage _config=config _bconfig=config.txt
+  _kernel=kernel7.img KARCH=arm _image=zImage _config=config
 elif [[ $CARCH == "aarch64" ]]; then
-  _kernel=kernel8.img KARCH=arm64 _image=Image _config=config8 _bconfig=config8.txt
+  _kernel=kernel8.img KARCH=arm64 _image=Image _config=config8
 fi
 
 prepare() {
@@ -151,7 +151,7 @@ _package() {
 
   cp arch/$KARCH/boot/$_image "${pkgdir}/boot/$_kernel"
   cp arch/$KARCH/boot/dts/overlays/README "${pkgdir}/boot/overlays"
-  install -m644 ../$_bconfig "${pkgdir}/boot/config.txt"
+  install -m644 ../config.txt "${pkgdir}/boot/config.txt"
   install -m644 ../cmdline.txt "${pkgdir}/boot"
 
   # sed expression for following substitutions

core/linux-rpi/config8.txt

@@ -1,13 +0,0 @@
-# See /boot/overlays/README for all available options
-
-dtoverlay=vc4-kms-v3d
-initramfs initramfs-linux.img followkernel
-
-display_auto_detect=1
-
-# Uncomment to enable bluetooth
-#dtparam=krnbt=on
-
-[pi4]
-# Run as fast as firmware / board allows
-arm_boost=1