[CI] Align with 6.1 branches

Signed-off-by: MichaIng <[email protected]>

.github/workflows/build.yml

@@ -24,7 +24,7 @@ jobs:
  sudo DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends -qq dist-upgrade
  sudo DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends -qq install make gcc libc6-dev flex bison gcc-riscv64-linux-gnu bc libssl-dev
  rm -Rf linux-image-visionfive2
- mkdir -p linux-image-visionfive2/DEBIAN linux-image-visionfive2/boot/extlinux linux-image-visionfive2/lib/firmware
+ mkdir -p linux-image-visionfive2/DEBIAN linux-image-visionfive2/boot/extlinux
  - name: Build Linux
  run: |
  > .scmversion # Avoid Git commit version suffix
@@ -36,17 +36,21 @@ jobs:
  find linux-image-visionfive2/usr/lib/linux-image-visionfive2 -mindepth 1 -regextype egrep \( ! -regex '.*/(starfive|vf2-overlay.*|jh7110-visionfive-v2.*\.dtb)' -o -regex '.*/jh7110-visionfive-v2-A1[01].dtb' \) -exec rm -Rf {} +
  make modules_install INSTALL_MOD_PATH='linux-image-visionfive2'
  rm linux-image-visionfive2/lib/modules/*/build linux-image-visionfive2/lib/modules/*/source
- # https://github.com/starfive-tech/buildroot/blob/JH7110_VisionFive2_devel/package/starfive/starfive-firmware/starfive-firmware.mk
- cd linux-image-visionfive2/lib/firmware
- curl -sSfO 'https://raw.githubusercontent.com/starfive-tech/buildroot/JH7110_VisionFive2_devel/package/starfive/starfive-firmware/ap6256-bluetooth/BCM4345C5.hcd'
- curl -sSfO 'https://raw.githubusercontent.com/starfive-tech/buildroot/JH7110_VisionFive2_devel/package/starfive/starfive-firmware/ap6256-sdio-wifi/fw_bcm43456c5_ag.bin'
- curl -sSfO 'https://raw.githubusercontent.com/starfive-tech/buildroot/JH7110_VisionFive2_devel/package/starfive/starfive-firmware/ap6256-sdio-wifi/nvram_ap6256.txt'
- curl -sSfO 'https://raw.githubusercontent.com/starfive-tech/buildroot/JH7110_VisionFive2_devel/package/starfive/starfive-firmware/rtl8852bu-bluetooth/rtl8852bu_config'
- curl -sSfO 'https://raw.githubusercontent.com/starfive-tech/buildroot/JH7110_VisionFive2_devel/package/starfive/starfive-firmware/rtl8852bu-bluetooth/rtl8852bu_fw'
- curl -sSfO 'https://raw.githubusercontent.com/starfive-tech/buildroot/JH7110_VisionFive2_devel/package/starfive/starfive-firmware/ECR6600U-usb-wifi/ECR6600U_transport.bin'
- svn export 'https://github.com/starfive-tech/buildroot/branches/JH7110_VisionFive2_devel/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800'
- svn export 'https://github.com/starfive-tech/buildroot/branches/JH7110_VisionFive2_devel/package/starfive/starfive-firmware/aic8800-usb-wifi/aic8800DC'
- cd ../../..
+ # WiFi/BT firmware: https://github.com/starfive-tech/buildroot/blob/JH7110_VisionFive2_devel/package/starfive/starfive-firmware/starfive-firmware.mk
+ mkdir -p linux-image-visionfive2/lib/firmware
+ curl -fLO https://github.com/starfive-tech/buildroot/archive/JH7110_VisionFive2_devel.tar.gz
+ tar xf JH7110_VisionFive2_devel.tar.gz
+ rm JH7110_VisionFive2_devel.tar.gz
+ cp -Rv buildroot-JH7110_VisionFive2_devel/package/starfive/starfive-firmware/*/* linux-image-visionfive2/lib/firmware/
+ rm -R buildroot-JH7110_VisionFive2_devel
+ # StarFive DRI library
+ curl -sSfO 'https://raw.githubusercontent.com/starfive-tech/Debian/20221225T084846Z/gpu/DDK1.19-binary-xorg/IMG_GPU-xorg.tar.gz'
+ tar xf IMG_GPU-xorg.tar.gz
+ rm IMG_GPU-xorg.tar.gz
+ mkdir -p linux-image-visionfive2/usr/lib/riscv64-linux-gnu/dri
+ cp IMG_GPU-xorg/usr/local/lib/dri/starfive_dri.so linux-image-visionfive2/usr/lib/riscv64-linux-gnu/dri/
+ rm -R IMG_GPU-xorg
+ # Permissions
  find linux-image-visionfive2 -type f -exec chmod 0644 {} +
  find linux-image-visionfive2 -type d -exec chmod 0755 {} +
  - name: Build package