Move to bpir-rolling-stable branch

3 files changed, 20 insertions, 16 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 74a3d907a798..a8bf870c1417 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,15 +11,18 @@
 # Optional settings:
 #_lto="true"      # Uncomment this line to enable CLANG-LTO
 
-_gitbranch="linux-rolling-stable"
+_gitroot="https://github.com/ericwoud/linux.git"
+_gitbranch="bpir-rolling-stable"
+#_gitroot="https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux"
+#_gitbranch="linux-rolling-stable"
 #_gitbranch="linux-rolling-lts"
+#_gitroot="https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next"
 #_gitbranch="main"
+#_gitroot="https://github.com/frank-w/BPI-Router-Linux.git"
+#_gitbranch="6.6-r3mini"
 
 pkgbase=linux-bpir64-git
 _srcname=linux
-_gitroot="https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux"
-#_gitroot="https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next"
-#_gitroot="https://github.com/frank-w/BPI-Router-Linux.git"
 _kernelname=${pkgbase#linux}
 _desc="AArch64 kernel for BPI-R64 and BPI-R3"
 pkgver=6.3.9.bpi
@@ -38,9 +41,8 @@ source=('defconfig'
         'mkinitcpio.hook'
         'mkinitcpio.build'
         'bpir-flash2emmc'
-        "src/configfs.c::https://github.com/Xilinx/linux-xlnx/raw/master/drivers/of/configfs.c"
 )
-md5sums=(SKIP SKIP SKIP SKIP SKIP SKIP SKIP SKIP SKIP)
+md5sums=(SKIP SKIP SKIP SKIP SKIP SKIP SKIP SKIP)
 
 export CARCH=aarch64
 export LOCALVERSION=""
@@ -53,7 +55,7 @@ fi
 prepare() {
   if [[ -d "${srcdir}/${_srcname}/" ]]; then
     cd "${srcdir}/${_srcname}/"
-    git fetch --all
+    git fetch --all --depth=1
     echo "LOCAL  HEAD: $(git rev-parse HEAD)"
     echo "REMOTE HEAD: $(git rev-parse @{u})"
     if [ "$(git rev-parse HEAD)" != "$(git rev-parse @{u})" ]; then
@@ -81,18 +83,16 @@ prepare() {
   )
 
   cp -vf ${startdir}/defconfig ./arch/arm64/configs/bpir_defconfig
+  if (( _ver > 6005 )); then
+    sed -i 's/CONFIG_MT7986_WMAC/CONFIG_MT798X_WMAC/g' ./arch/arm64/configs/bpir_defconfig
+  else
+    sed -i 's/CONFIG_MT798X_WMAC/CONFIG_MT7986_WMAC/g' ./arch/arm64/configs/bpir_defconfig
+  fi
   make ${MAKEFLAGS} $_llvm bpir_defconfig
   rm -vf ./arch/arm64/configs/bpir_defconfig
 
-  if [ ! -z "$(cat .config | grep CONFIG_OF_OVERLAY=y)" ]; then
-    cp -vf "${srcdir}/configfs.c" "./drivers/of/"
-    if [ -z "$(cat ./drivers/of/Makefile | grep configfs.o)" ]; then
-      echo -e "\nobj-y	+= configfs.o\n" >>./drivers/of/Makefile
-    fi
-    if (( _ver > 6005 )); then
-      sed -i '/of_overlay_fdt_apply/s/id);/id, NULL);/g' ./drivers/of/configfs.c
-    fi
-  fi
+  # Need to patch this in repo when kernel goes v6.6
+  #sed -i '/of_overlay_fdt_apply/s/id);/id, NULL);/g' ./drivers/of/configfs.c
 
   # get kernel version
   make ${MAKEFLAGS} $_llvm prepare
diff --git a/bpir-flash2emmc b/bpir-flash2emmc
index ce9637155e35..84e3fbe5d866 100755
--- a/bpir-flash2emmc
+++ b/bpir-flash2emmc
@@ -66,6 +66,7 @@ if [[ "$compatible" == *"bananapi"*"mediatek,mt7622"* ]]; then # BPI-R64
   dd if="/tmp/mnt$1" of=/dev/${mmcblk} bs=1M conv=fsync,notrunc
   umount /tmp/mnt
 elif [[ "$compatible" == *"bananapi"*"mediatek,mt7986"* ]]; then # BPI-R3
+  [ ! -e "/sys/kernel/config/device-tree/overlays" ] && exit
   addr="11230000"
   mount -t configfs none /sys/kernel/config
   mmcblk=$(get_mmcblk)
diff --git a/defconfig b/defconfig
index 50b76876aff8..6c21acff256f 100644
--- a/defconfig
+++ b/defconfig
@@ -508,6 +508,8 @@ CONFIG_SFP=y
 #
 CONFIG_ICPLUS_PHY=y
 CONFIG_MAXLINEAR_GPHY=y
+CONFIG_AIR_EN8811H_PHY=y
+
 CONFIG_PPP=m
 CONFIG_PPP_DEFLATE=m
 CONFIG_PPP_FILTER=y
@@ -863,6 +865,7 @@ CONFIG_F2FS_FS_COMPRESSION=y
 CONFIG_AUTOFS_FS=y
 CONFIG_OVERLAY_FS=y
 CONFIG_OVERLAY_FS_XINO_AUTO=y
+CONFIG_OF_CONFIGFS=y
 
 #
 # DOS/FAT/EXFAT/NT Filesystems