update

.github/workflows/Openwrt-AutoBuild.yml

@@ -65,15 +65,15 @@ jobs:
         if [ ${{matrix.target}} == "x86_64" ]; then
             echo "ARCH=linux/amd64" >> $GITHUB_ENV
             echo "MTARGET=x86_64" >> $GITHUB_ENV
-        elif [[ ${{matrix.target}} =~ (Rpi-4B|nanopi-r2s|nanopi-r2c|nanopi-r4s) ]]; then
-            echo "ARCH=linux/arm64" >> $GITHUB_ENV
-        fi
-        if [ ${{matrix.target}} == "Rpi-4B" ]; then
-            echo "MTARGET=aarch64_cortex-a72" >> $GITHUB_ENV
-        elif [ ${{matrix.target}} == "nanopi-r2s" ]; then
-            echo "MTARGET=aarch64_generic" >> $GITHUB_ENV
         elif [ ${{matrix.target}} == "phicomm-N1" ]; then
             echo "MTARGET=aarch64_cortex-a53" >> $GITHUB_ENV
+        else
+          echo "ARCH=linux/arm64" >> $GITHUB_ENV
+          if [[ ${{matrix.target}} == "Rpi-4B" ]]; then
+            echo "MTARGET=aarch64_cortex-a72" >> $GITHUB_ENV
+          else
+            echo "MTARGET=aarch64_generic" >> $GITHUB_ENV
+          fi
         fi
 
     - name: Trigger Packages Update
@@ -110,7 +110,7 @@ jobs:
 
     - name: Clone source code
       run: |
-        [ "$REPO_BRANCH" ] ||
+        [ "${{ env.REPO_BRANCH }}" ] ||
             REPO_BRANCH="$((curl -gs -H 'Content-Type: application/json' \
                -H "Authorization: Bearer ${{ secrets.REPO_TOKEN }}" \
                -X POST -d '{ "query": "query {repository(owner: \"openwrt\", name: \"openwrt\") {refs(refPrefix: \"refs/tags/\", last: 4, orderBy: {field: TAG_COMMIT_DATE, direction: ASC}) {edges {node {name}}}}}"}' https://api.github.com/graphql) | jq -r '.data.repository.refs.edges[].node.name' | grep v21 | tail -n 1 | sed -e 's/v//')"
@@ -128,6 +128,7 @@ jobs:
         fi
         fi
         echo "REPO_BRANCH=$REPO_BRANCH" >> $GITHUB_ENV
+        echo "$REPO_BRANCH"
         
     - name: Free up disk space
       if: env.FREE_UP_DISK == 'true'
@@ -165,9 +166,9 @@ jobs:
     - name: Apply patches
       run: |
         cd openwrt
-        find "devices/common/patches" -type f ! -path 'devices/common/patches/china_mirrors.patch' -name '*.patch' -print0 | sort -z | xargs -I % -t -0 -n 1 sh -c "cat '%'  | patch -d './' -p1 -E --forward --no-backup-if-mismatch"
+        find "devices/common/patches" -type f ! -name 'china_mirrors.patch' -name '*.patch' -print0 | sort -z | xargs -I % -t -0 -n 1 sh -c "cat '%'  | patch -d './' -p1 -E --forward"
         if [ -n "$(ls -A "devices/${{matrix.target}}/patches" 2>/dev/null)" ]; then
-          find "devices/${{matrix.target}}/patches" -type f -name '*.patch' ! -name '*.revert.patch' -print0 | sort -z | xargs -I % -t -0 -n 1 sh -c "cat '%'  | patch -d './' -p1 -E --forward --no-backup-if-mismatch"
+          find "devices/${{matrix.target}}/patches" -type f -name '*.patch' -print0 | sort -z | xargs -I % -t -0 -n 1 sh -c "cat '%'  | patch -d './' -p1 -E --forward"
         fi
         
     - name: Default PPPOE Setting
@@ -176,7 +177,13 @@ jobs:
         sed -i '$i uci set network.wan.username=${{ env.PPPOE_USERNAME }}' openwrt/package/*/*/my-default-settings/files/etc/uci-defaults/95-default-settings
         sed -i '$i uci set network.wan.password=${{ env.PPPOE_PASSWD }}' openwrt/package/*/*/my-default-settings/files/etc/uci-defaults/95-default-settings
         sed -i '$i uci commit network' openwrt/package/*/*/my-default-settings/files/etc/uci-defaults/95-default-settings
-              
+
+    - name: Defconfig
+      run: |
+        cd openwrt
+        make defconfig
+        cat .config
+
     - name: SSH connection to Actions
       uses: kiddin9/debugger-action@master
       if: contains(github.event.action, 'ssh')
@@ -185,11 +192,6 @@ jobs:
       id: package
       run: |
         cd openwrt
-        make defconfig
-        for i in $(make --file=preset_pkg.mk presetpkg); do
-          sed -i "\$a CONFIG_PACKAGE_$i=y" .config
-        done
-        make defconfig
         make download -j$(($(nproc)+1)) &
 
     - name: Cache
@@ -207,28 +209,6 @@ jobs:
         make -j$(($(nproc)+1)) || make -j1 V=s
         echo "::set-output name=status::success"
         mv -f .config ${{matrix.target}}.config
-        if [ "${{matrix.target}}" == "nanopi-r2s" ]; then
-            echo "开始编译R2C"
-            cp -f devices/common/$CONFIG_FILE .config
-            echo >> .config
-            cat devices/nanopi-r2c/$CONFIG_FILE >> .config
-            make defconfig
-            make -j$(($(nproc)+1)) || make -j1 V=s || {
-            echo "R2C编译失败";
-            exit 1;
-            }
-            mv -f .config nanopi-r2c.config
-            echo "开始编译R4S"
-            cp -f devices/common/$CONFIG_FILE .config
-            echo >> .config
-            cat devices/nanopi-r4s/$CONFIG_FILE >> .config
-            make defconfig
-            make -j$(($(nproc)+1)) || make -j1 V=s || {
-            echo "R4S编译失败";
-            exit 1;
-            }
-            mv -f .config nanopi-r4s.config
-        fi
    
     - name: Check space usage
       run: df -hT
@@ -238,37 +218,14 @@ jobs:
       run: |
         shopt -s extglob
         mkdir -p firmware/${{matrix.target}} kmods
-        if [[ ${{matrix.target}} == "nanopi-r4s" || ${{matrix.target}} == "nanopi-r2c" ]]; then
-          rm -rf openwrt/bin/targets/*/*/!(*.gz)
-        fi
-        if [ -f openwrt/bin/targets/*/*/*r2s*sysupgrade* ]; then
-          mkdir firmware/nanopi-r4s
-          mv -f  openwrt/nanopi-r4s.config firmware/nanopi-r4s/ || true
-          cp -rf openwrt/bin/targets/*/*/*r4s*sysupgrade* ./firmware/nanopi-r4s/ || true
-          mkdir firmware/nanopi-r2c
-          mv -f  openwrt/nanopi-r2c.config firmware/nanopi-r2c/ || true
-          cp -rf openwrt/bin/targets/*/*/*r2c*sysupgrade* ./firmware/nanopi-r2c/ || true
-          cp -rf openwrt/bin/targets/*/*/*{combined,r2s*sysupgrade,rpi-4*sysupgrade}* ./firmware/${{matrix.target}}/ || true
-        else
-          cp -rf openwrt/bin/targets/*/*/*{combined,sysupgrade}* ./firmware/${{matrix.target}}/ || true
-        fi
+        cp -rf openwrt/bin/targets/*/*/*{combined,sysupgrade}* ./firmware/${{matrix.target}}/ || true
         cp openwrt/${{matrix.target}}.config  ./firmware/${{matrix.target}}/${{matrix.target}}.config || true
         cp openwrt/build_dir/target-*/linux-*/linux-*/.config ./firmware/${{matrix.target}}/${{matrix.target}}_kernel.config
-        kernel_v="$(cat openwrt/include/kernel-5.15 | grep LINUX_KERNEL_HASH-* | cut -f 2 -d - | cut -f 1 -d ' ')"
-        echo "KERNEL=${kernel_v}" >> $GITHUB_ENV
-        cp -rf openwrt/bin/targets/*/*/packages ./kmods/$kernel_v || true
-        cp -rf openwrt/bin/packages/*/base/*-firmware* ./kmods/$kernel_v || true
+        cp -rf openwrt/bin/targets/*/*/packages ./kmods/${{ env.KERNEL }} || true
         rm -rf openwrt/bin/targets/*/*/packages/*.ipk
-        cp -rf openwrt/bin/targets/*/*/*{combined,r2s*sysupgrade,rpi-4*sysupgrade}* ./firmware/${{matrix.target}}/ || true
         rename -v "s/openwrt-/${{ env.VERSION }}-openwrt-/" ./firmware/*/* || true
         rename -v "s/friendlyarm_//" ./firmware/*/*gz || true
-        for i in $(ls -d firmware/*/); do
-          echo "${{ env.VERSION }}.$(date +'%Y')" > $i/version.txt
-          md5=$((md5sum $i/*squashfs-sysupgrade* || md5sum $i/*squashfs-combined-efi*) | awk '{print $1}') 2>/dev/null
-          echo $md5 >> $i/version.txt
-          echo v$REPO_BRANCH >> $i/version.txt
-        done
-        rm -rf openwrt/bin/targets/*/*/!(*.tar.*|*buildinfo|packages)
+        rename -v "s/embedfire_//" ./firmware/*/*gz || true
         mkdir ${{ env.REPO_BRANCH }}
         cp -rf openwrt/bin/targets ${{ env.REPO_BRANCH }}/
         Emoji=("🎉" "🤞" "✨" "🎁" "🎈" "🎄" "🎨" "💋" "🍓" "🍕" "🍉" "💐" "🌴" "🚀" "🛸" "🗽" "⛅" "🌈" "🔥" "⛄" "🐶" "🏅" "🦄" "🐤")
@@ -309,7 +266,18 @@ jobs:
         SOURCE: ${{ env.REPO_BRANCH }}
         REMOTE_HOST: op.supes.top
         REMOTE_USER: root
-        TARGET: "/www/wwwroot/op.supes.top/releases/"
+        TARGET: "/www/wwwroot/op.supes.top/releases/tmp/"
+        
+    - name: Deploy some packages to server
+      uses: easingthemes/ssh-deploy@main
+      if: env.SSH_PRIVATE_KEY && ! contains(github.event.action, 'noser')
+      with:
+        SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
+        ARGS: "-avzr"
+        SOURCE: openwrt/bin/packages/*/base/*-firmware*
+        REMOTE_HOST: op.supes.top
+        REMOTE_USER: root
+        TARGET: "/www/wwwroot/op.supes.top/packages/${{ env.MTARGET }}/"
 
     - name: remote ssh command
       uses: appleboy/ssh-action@master
@@ -319,7 +287,7 @@ jobs:
         username: root
         key: ${{ env.SSH_PRIVATE_KEY }}
         script: |
-          cd /www/wwwroot/op.supes.top/packages/${{ env.MTARGET }}/kmods/${{ env.KERNEL }}
+          cd /www/wwwroot/op.supes.top/packages/${{ env.MTARGET }}/
           opkg &
 
     - name: Upload firmware for artifact
@@ -331,6 +299,7 @@ jobs:
         path: |
           ./firmware/
           ${{ env.REPO_BRANCH }}
+          openwrt/bin/packages/*/base/*-firmware*
 
     - name: Upload firmware to cowtransfer
       if: env.UPLOAD_FIRMWARE_TO_COWTRANSFER == 'true'
@@ -409,7 +378,7 @@ jobs:
       if: env.TELEGRAM_TOKEN && ! contains(github.event.action, 'notg')
       continue-on-error: true
       run: |
-        [ steps.compile.outputs.status == 'success' ] && curl -k --data chat_id="${{ secrets.TELEGRAM_CHAT_ID }}" --data "text=🎉 OpenWrt ${{ env.VERSION }} ${{matrix.target}} 编译成功 😋  https://op.supes.top/firmware/${{matrix.target}}/  ${{ env.COWURL }}   ${{ env.WETRANS }} 🚀" "https://api.telegram.org/bot${{ secrets.TELEGRAM_TOKEN }}/sendMessage" || curl -k --data chat_id="${{ secrets.TELEGRAM_TO }}" --data "text=❌ OpenWrt ${{ env.VERSION }} ${{matrix.target}} 编译失败 😂" "https://api.telegram.org/bot${{ secrets.TELEGRAM_TOKEN }}/sendMessage"
+        [ steps.compile.outputs.status == 'success' ] && curl -k --data chat_id="${{ env.TELEGRAM_CHAT_ID }}" --data "text=🎉 OpenWrt ${{ env.VERSION }} ${{matrix.target}} 编译成功 😋  https://op.supes.top/firmware/${{matrix.target}}/  ${{ env.COWURL }}   ${{ env.WETRANS }} 🚀" "https://api.telegram.org/bot${{ env.TELEGRAM_TOKEN }}/sendMessage" || curl -k --data chat_id="${{ env.TELEGRAM_CHAT_ID }}" --data "text=❌ OpenWrt ${{ env.VERSION }} ${{matrix.target}} 编译失败 😂" "https://api.telegram.org/bot${{ env.TELEGRAM_TOKEN }}/sendMessage"
 
     - name: Delete workflow runs
       uses: GitRML/delete-workflow-runs@main

.github/workflows/repo-dispatcher.yml

@@ -65,4 +65,9 @@ jobs:
           -H "Accept: application/vnd.github.everest-preview+json" \
           -H "Authorization: token ${{ secrets.REPO_TOKEN }}" \
           -d '{"event_type": "Rpi-4B ${{ github.event.inputs.version }}", "client_payload": {"target": "Rpi-4B"}}'
+          curl \
+          -X POST https://api.github.com/repos/${{ github.repository }}/dispatches \
+          -H "Accept: application/vnd.github.everest-preview+json" \
+          -H "Authorization: token ${{ secrets.REPO_TOKEN }}" \
+          -d '{"event_type": "phicomm-N1 ${{ github.event.inputs.version }}", "client_payload": {"target": "phicomm-N1"}}'
 

Dockerfile

@@ -4,4 +4,3 @@ MAINTAINER Kiddin9 "https://github.com/kiddin9/OpenWrt_x86-r2s-r4s"
 
 ADD openwrt/bin/targets/*/*/*rootfs*.tar.gz /
 
-RUN if [[ -f /*r2s* && -f /*r4s* ]] ; then rm -rf /*{r2c,r4s}* ; fi

README.md

@@ -125,8 +125,8 @@ Build OpenWrt using GitHub Actions
 ### Acknowledgments
 - [OpenWrt](https://github.com/openwrt/openwrt)
 - [Lean's OpenWrt](https://github.com/coolsnowwolf/lede)
-- [FriendlyWrt](https://github.com/friendlyarm/friendlywrt)
 - [P3TERX](https://github.com/P3TERX/OpenWrt_x86-r2s-r4s/blob/master/LICENSE)
+- [aparcar](https://github.com/openwrt/asu)
 - [GitHub](https://github.com)
 - [GitHub Actions](https://github.com/features/actions)
 

devices/Rpi-4B/.config

@@ -3,6 +3,9 @@ CONFIG_TARGET_bcm27xx=y
 CONFIG_TARGET_bcm27xx_bcm2711=y
 CONFIG_TARGET_bcm27xx_bcm2711_DEVICE_rpi-4=y
 
+CONFIG_PACKAGE_kmod-drm-vc4=n
+CONFIG_PACKAGE_kmod-usb-net-lan78xx=n
+
 # Applications
 CONFIG_PACKAGE_luci-app-cpufreq=y
 

devices/Rpi-4B/diy.sh

@@ -1,7 +1,11 @@
 #!/bin/bash
 
-sed -i 's,ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305,ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256,g' package/feeds/kiddin9/luci-app-bypass/root/usr/share/ssrplus/gentrojanconfig
-sed -i 's,TLS_AES_128_GCM_SHA256:TLS_CHACHA20_POLY1305_SHA256,TLS_CHACHA20_POLY1305_SHA256:TLS_AES_128_GCM_SHA256,g' package/feeds/kiddin9/luci-app-bypass/root/usr/share/ssrplus/gentrojanconfig
+kernel_v="$(cat include/kernel-5.10 | grep LINUX_KERNEL_HASH-* | cut -f 2 -d - | cut -f 1 -d ' ')"
+echo "KERNEL=${kernel_v}" >> $GITHUB_ENV || true
+sed -i "s?packages/%A/kmods/.*'?packages/%A/kmods/$kernel_v'?" include/feeds.mk
+
+svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/generic/hack-5.10 target/linux/generic/hack-5.10
+rm -rf target/linux/generic/hack-5.10/{220-gc_sections*,781-dsa-register*,780-drivers-net*}
 
 sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += my-autocore-arm luci-app-cpufreq kmod-usb-net-asix-ax88179 kmod-usb-net-rtl8152/' target/linux/bcm27xx/Makefile
 

devices/common/.config

@@ -9,15 +9,12 @@ CONFIG_GRUB_CONSOLE=n
 CONFIG_SIGNED_PACKAGES=n
 CONFIG_SIGNATURE_CHECK=n
 
-CONFIG_TESTING_KERNEL=y
-
 # 设置固件大小:
 CONFIG_TARGET_ROOTFS_PARTSIZE=1004
 
-CONFIG_ALL_KMODS=y
+CONFIG_ALL_KMODS=n
 CONFIG_PACKAGE_kmod-ipt-coova=n
 CONFIG_PACKAGE_kmod-usb-serial-xr_usb_serial_common=n
-CONFIG_PACKAGE_kmod-batman-adv=n
 
 CONFIG_IB=y
 CONFIG_IB_STANDALONE=y
@@ -30,9 +27,6 @@ CONFIG_IPV6=y
 
 # Applications
 
-CONFIG_PACKAGE_luci-app-bypass=y
-CONFIG_PACKAGE_luci-app-samba4=y
-
 # Themes
 
 CONFIG_PACKAGE_luci-theme-bootstrap=y
@@ -76,7 +70,10 @@ CONFIG_PACKAGE_kmod-lib-lz4=y
 CONFIG_PACKAGE_kmod-lib-zstd=y
 CONFIG_NODEJS_14=y
 
-CONFIG_OPENSSL_PREFER_CHACHA_OVER_GCM=y
+CONFIG_OPENSSL_OPTIMIZE_SPEED=y
+CONFIG_OPENSSL_ENGINE_BUILTIN=y
+CONFIG_OPENSSL_ENGINE_BUILTIN_AFALG=y
+CONFIG_OPENSSL_ENGINE_BUILTIN_DEVCRYPTO=y
 
 CONFIG_PACKAGE_kmod-ipt-offload=y
 CONFIG_PACKAGE_kmod-tcp-bbr=y

devices/common/diy.sh

@@ -2,20 +2,24 @@
 #=================================================
 shopt -s extglob
 
-commitid="$(curl -sfL https://github.com/openwrt/openwrt/tree/master/include | grep -o 'href=".*>kernel: bump 5.15' | head -1 | cut -d / -f 5 | cut -d '"' -f 1)"
-version="$(git rev-parse HEAD)"
-git checkout master
-#[ "$(echo $(git log -1 --pretty=short) | grep "kernel: bump 5.15")" ] && git checkout $commitid
-mv -f target/linux package/kernel package/firmware/linux-firmware include/{kernel-*,netfilter.mk} .github/
-git checkout $version
-rm -rf target/linux package/kernel package/firmware/linux-firmware include/kernel-version.mk include/kernel-5.15 include/kernel-defaults.mk
+#latest="$(curl -sfL https://github.com/openwrt/openwrt/tree/master/include | grep -o 'href=".*>kernel: bump 5.15' | head -1 | cut -d / -f 5 | cut -d '"' -f 1)"
+latest="master"
+current="$(git rev-parse HEAD)"
+[ "$latest" ] && git checkout $latest || git checkout master
+#git checkout HEAD^
+[ "$(echo $(git log -1 --pretty=short) | grep "kernel: bump 5.15")" ] && git checkout $latest
+mv -f target/linux package/kernel package/boot package/firmware/linux-firmware include/{kernel-*,netfilter.mk} .github/
+git checkout $current
+rm -rf target/linux package/kernel package/boot package/firmware/linux-firmware include/kernel-version.mk include/kernel-5.15 include/kernel-defaults.mk
 mv -f .github/linux target/
 mv -f .github/kernel package/
+mv -f .github/boot package/
 mv -f .github/linux-firmware package/firmware/
 mv -f  .github/{kernel-*,netfilter.mk} include/
 sed -i 's/ libelf//' tools/Makefile
 
 kernel_v="$(cat include/kernel-5.15 | grep LINUX_KERNEL_HASH-* | cut -f 2 -d - | cut -f 1 -d ' ')"
+echo "KERNEL=${kernel_v}" >> $GITHUB_ENV || true
 sed -i "s?targets/%S/packages?packages/%A/kmods/$kernel_v?" include/feeds.mk
 echo "$(date +"%s")" >version.date
 sed -i '/$(curdir)\/compile:/c\$(curdir)/compile: package/opkg/host/compile' package/Makefile
@@ -25,8 +29,6 @@ coremark wget-ssl curl htop nano zram-swap kmod-lib-zstd kmod-tcp-bbr bash \
 kmod-usb2 kmod-usb3 automount /" include/target.mk
 sed -i "/dnsmasq \\\/d" include/target.mk
 
-sh -c "curl -sfL https://github.com/coolsnowwolf/lede/commit/af9ddeb7c95186854733262554c944d29513a58a.patch | patch -d './' -p1 --forward"
-sh -c "curl -sfL https://github.com/coolsnowwolf/lede/commit/b4a6d7f974f7b17052ade15a3cf63086bd52736d.patch | patch -d './' -p1 --forward"
 sh -c "curl -sfL https://github.com/coolsnowwolf/lede/commit/06fcdca1bb9c6de6ccd0450a042349892b372220.patch | patch -d './' -p1 --forward"
 
 sed -i '/	refresh_config();/d' scripts/feeds

devices/common/diy/target/linux/rockchip/patches-5.10/991-arm64-dts-rockchip-add-more-cpu-operating-points-for.patch

@@ -1,44 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Leonidas P. Papadakos <[email protected]>
-Date: Fri, 1 Mar 2019 21:55:53 +0200
-Subject: [PATCH v2] arm64: dts: rockchip: add more cpu operating points for
- RK3328
-
-This allows for greater max frequency on rk3328 boards,
-increasing performance.
-
-It has been included in Armbian (a linux distibution for ARM boards)
-for a while now without any reported issues
-
-https://github.com/armbian/build/blob/master/patch/kernel/rockchip64-default/enable-1392mhz-opp.patch
-https://github.com/armbian/build/blob/master/patch/kernel/rockchip64-default/enable-1512mhz-opp.patch
-
-Signed-off-by: Leonidas P. Papadakos <[email protected]>
----
- arch/arm64/boot/dts/rockchip/rk3328.dtsi | 15 +++++++++++++++
- 1 files changed, 15 insertions(+)
-
---- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-@@ -140,6 +140,21 @@
- 			opp-microvolt = <1300000>;
- 			clock-latency-ns = <40000>;
- 		};
-+		opp-1392000000 {
-+			opp-hz = /bits/ 64 <1392000000>;
-+			opp-microvolt = <1350000>;
-+			clock-latency-ns = <40000>;
-+		};
-+		opp-1512000000 {
-+			opp-hz = /bits/ 64 <1512000000>;
-+			opp-microvolt = <1400000>;
-+			clock-latency-ns = <40000>;
-+		};
-+		opp-1608000000 {
-+			opp-hz = /bits/ 64 <1608000000>;
-+			opp-microvolt = <1450000>;
-+			clock-latency-ns = <40000>;
-+		};
- 	};
- 
- 	amba: bus {

devices/common/diy/target/linux/rockchip/patches-5.10/992-rockchip-rk3399-overclock-to-2.2-1.8-GHz.patch

@@ -1,46 +0,0 @@
-From 04202df5cb497b1934c95211cf43784ef62245a4 Mon Sep 17 00:00:00 2001
-From: Tianling Shen <[email protected]>
-Date: Mon, 18 Oct 2021 12:47:30 +0800
-Subject: [PATCH] rockchip: rk3399: overclock to 2.2/1.8 GHz
-
-It's stable enough to overclock cpu frequency to 2.2/1.8 GHz,
-and for better performance.
-
-Co-development-by: gzelvis <[email protected]>
-Signed-off-by: Tianling Shen <[email protected]>
----
- arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
---- a/arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi
-@@ -33,6 +33,14 @@
- 			opp-hz = /bits/ 64 <1416000000>;
- 			opp-microvolt = <1125000>;
- 		};
-+		opp06 {
-+			opp-hz = /bits/ 64 <1608000000>;
-+			opp-microvolt = <1225000>;
-+		};
-+		opp07 {
-+			opp-hz = /bits/ 64 <1800000000>;
-+			opp-microvolt = <1275000>;
-+		};
- 	};
- 
- 	cluster1_opp: opp-table1 {
-@@ -72,6 +80,14 @@
- 			opp-hz = /bits/ 64 <1800000000>;
- 			opp-microvolt = <1200000>;
- 		};
-+		opp08 {
-+			opp-hz = /bits/ 64 <2016000000>;
-+			opp-microvolt = <1250000>;
-+		};
-+		opp09 {
-+			opp-hz = /bits/ 64 <2208000000>;
-+			opp-microvolt = <1325000>;
-+		};
- 	};
- 
- 	gpu_opp_table: opp-table2 {

devices/common/patches/imagebuilder.patch

@@ -1,6 +1,6 @@
 --- a/target/imagebuilder/Makefile
 +++ b/target/imagebuilder/Makefile
-@@ -38,13 +38,13 @@ $(BIN_DIR)/$(IB_NAME).tar.xz: clean
+@@ -38,13 +38,14 @@ $(BIN_DIR)/$(IB_NAME).tar.xz: clean
  		./files/repositories.conf \
  		$(TMP_DIR)/.targetinfo \
  		$(TMP_DIR)/.packageinfo \
@@ -12,7 +12,8 @@
  	$(call FeedSourcesAppend,$(PKG_BUILD_DIR)/repositories.conf)
  	$(VERSION_SED_SCRIPT) $(PKG_BUILD_DIR)/repositories.conf
 -endif
-+	$(SED) 's/^src\/gz openwrt_core/# src\/gz openwrt_core/' $(PKG_BUILD_DIR)/repositories.conf
++	$(SED) 's/^src\/gz \(.*\) https.*top\/\(packages.*\)/src \1 file:\/\/www\/wwwroot\/op.supes.top\/\2/' $(PKG_BUILD_DIR)/repositories.conf
++	$(SED) 's/\/kiddin9//' $(PKG_BUILD_DIR)/repositories.conf
  
  	$(INSTALL_DIR) $(PKG_BUILD_DIR)/packages
  	# create an empty package index so `opkg` doesn't report an error

devices/common/patches/kernel-defaults.patch

@@ -0,0 +1,10 @@
+--- a/include/kernel-defaults.mk
++++ b/include/kernel-defaults.mk
+@@ -127,6 +127,7 @@ endef
+ 
+ define Kernel/CompileModules/Default
+ 	rm -f $(LINUX_DIR)/vmlinux $(LINUX_DIR)/System.map
++	+$(KERNEL_MAKE) olddefconfig
+ 	+$(KERNEL_MAKE) $(if $(KERNELNAME),$(KERNELNAME),all) modules
+ 	# If .config did not change, use the previous timestamp to avoid package rebuilds
+ 	cmp -s $(LINUX_DIR)/.config $(LINUX_DIR)/.config.modules.save && \

devices/common/patches/video.patch

@@ -0,0 +1,100 @@
+From 03a1613c1e95b042dd99a6f69c45b61d786e41d4 Mon Sep 17 00:00:00 2001
+From: kiddin9 <[email protected]>
+Date: Sat, 23 Apr 2022 18:52:48 +0800
+Subject: [PATCH] Update video.mk
+
+---
+ package/kernel/linux/modules/video.mk | 63 +++++++++++++++++++++++++--
+ 1 file changed, 59 insertions(+), 4 deletions(-)
+
+diff --git a/package/kernel/linux/modules/video.mk b/package/kernel/linux/modules/video.mk
+index 258414df4509..3056d1d4d947 100644
+--- a/package/kernel/linux/modules/video.mk
++++ b/package/kernel/linux/modules/video.mk
+@@ -220,14 +220,36 @@ endef
+ 
+ $(eval $(call KernelPackage,fb-tft-ili9486))
+ 
++define KernelPackage/multimedia-input
++  SUBMENU:=$(VIDEO_MENU)
++  TITLE:=Multimedia input support
++  DEPENDS:=+kmod-input-core
++  KCONFIG:=CONFIG_RC_CORE \
++	CONFIG_LIRC=y \
++	CONFIG_RC_DECODERS=y \
++	CONFIG_RC_DEVICES=y
++  FILES:=$(LINUX_DIR)/drivers/media/rc/rc-core.ko
++  AUTOLOAD:=$(call AutoProbe,rc-core)
++endef
++
++define KernelPackage/multimedia-input/description
++  Enable multimedia input.
++endef
++
++$(eval $(call KernelPackage,multimedia-input))
+ 
+ define KernelPackage/drm
+   SUBMENU:=$(VIDEO_MENU)
+   TITLE:=Direct Rendering Manager (DRM) support
+   HIDDEN:=1
+-  DEPENDS:=+kmod-dma-buf +kmod-i2c-core +PACKAGE_kmod-backlight:kmod-backlight \
++  DEPENDS:=+kmod-dma-buf +kmod-i2c-core +kmod-i2c-algo-bit +!TARGET_x86&&PACKAGE_kmod-backlight:kmod-backlight \
+ 	+(LINUX_5_15):kmod-fb
+-  KCONFIG:=CONFIG_DRM
++  KCONFIG:=	\
++	CONFIG_DRM	\
++	CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y	\
++	CONFIG_DRM_FBDEV_EMULATION=y \
++	CONFIG_DRM_FBDEV_OVERALLOC=100 \
++	CONFIG_HDMI
+   FILES:= \
+ 	$(LINUX_DIR)/drivers/gpu/drm/drm.ko \
+ 	$(LINUX_DIR)/drivers/gpu/drm/drm_panel_orientation_quirks.ko
+@@ -301,8 +323,6 @@ define KernelPackage/drm-imx
+   TITLE:=Freescale i.MX DRM support
+   DEPENDS:=@TARGET_imx +kmod-drm-kms-helper
+   KCONFIG:=CONFIG_DRM_IMX \
+-	CONFIG_DRM_FBDEV_EMULATION=y \
+-	CONFIG_DRM_FBDEV_OVERALLOC=100 \
+ 	CONFIG_IMX_IPUV3_CORE \
+ 	CONFIG_RESET_CONTROLLER=y \
+ 	CONFIG_DRM_IMX_IPUV3 \
+@@ -1030,3 +1050,38 @@ define KernelPackage/video-gspca-konica/description
+ endef
+ 
+ $(eval $(call KernelPackage,video-gspca-konica))
++
++define KernelPackage/drm-i915
++  SUBMENU:=$(VIDEO_MENU)
++  TITLE:=Intel GPU drm support
++  DEPENDS:=@TARGET_x86 +kmod-drm-ttm +kmod-drm-kms-helper +i915-firmware
++  KCONFIG:=	\
++          CONFIG_INTEL_GTT=y			\
++          CONFIG_DRM_I915=m			\
++          CONFIG_DRM_I915_CAPTURE_ERROR=y	\
++          CONFIG_DRM_I915_COMPRESS_ERROR=y	\
++          CONFIG_DRM_I915_USERPTR=y		\
++          CONFIG_DRM_I915_GVT=y			\
++          CONFIG_DRM_I915_WERROR=n		\
++          CONFIG_DRM_I915_DEBUG=n		\
++          CONFIG_DRM_I915_DEBUG_MMIO=n		\
++          CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS=n	\
++          CONFIG_DRM_I915_SW_FENCE_CHECK_DAG=n	\
++          CONFIG_DRM_I915_DEBUG_GUC=n		\
++          CONFIG_DRM_I915_SELFTEST=n		\
++          CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS=n	\
++          CONFIG_DRM_I915_DEBUG_VBLANK_EVADE=n	\
++          CONFIG_DRM_I915_DEBUG_RUNTIME_PM=n
++  FILES:=$(LINUX_DIR)/drivers/gpu/drm/i915/i915.ko
++  AUTOLOAD:=$(call AutoProbe,i915)
++endef
++
++define KernelPackage/drm-i915/description
++  Direct Rendering Manager (DRM) support for "Intel Graphics
++  Media Accelerator" or "HD Graphics" integrated graphics,
++  including 830M, 845G, 852GM, 855GM, 865G, 915G, 945G, 965G,
++  G35, G41, G43, G45 chipsets and Celeron, Pentium, Core i3,
++  Core i5, Core i7 as well as Atom CPUs with integrated graphics.
++endef
++
++$(eval $(call KernelPackage,drm-i915))

devices/common/preset_pkg.mk

@@ -1,21 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-#
-# Copyright (C) 2007 OpenWrt.org
-
-TOPDIR:=${CURDIR}
-export OPENWRT_VERBOSE=s
-
-include rules.mk
-include $(INCLUDE_DIR)/target.mk
--include .profiles.mk
-
-.profiles.mk: $(TMP_DIR)/.targetinfo
-	@$(SCRIPT_DIR)/target-metadata.pl profile_mk $< '$(BOARD)$(if $(SUBTARGET),/$(SUBTARGET))' > $@
-
-USER_PROFILE ?= $(firstword $(PROFILE_NAMES))
-BUILD_PACKAGES:=$(sort $(DEFAULT_PACKAGES) $($(USER_PROFILE)_PACKAGES) kernel)
-# "-pkgname" in the package list means remove "pkgname" from the package list
-BUILD_PACKAGES:=$(filter-out $(filter -%,$(BUILD_PACKAGES)) $(patsubst -%,%,$(filter -%,$(BUILD_PACKAGES))),$(BUILD_PACKAGES))
-
-presetpkg: FORCE
-	@echo "$(BUILD_PACKAGES)"

devices/doornet1/.config

@@ -0,0 +1,12 @@
+
+CONFIG_TARGET_rockchip=y
+CONFIG_TARGET_rockchip_armv8=y
+CONFIG_TARGET_rockchip_armv8_DEVICE_embedfire_doornet1=y
+CONFIG_TARGET_ROOTFS_EXT4FS=n
+
+# Applications
+CONFIG_PACKAGE_luci-app-cpufreq=y
+
+# 其他需要安装的软件包:
+CONFIG_PACKAGE_my-autocore-arm=y
+CONFIG_PACKAGE_kmod-hwmon-pwmfan=y

devices/doornet1/diy.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+SHELL_FOLDER=$(dirname $(readlink -f "$0"))
+bash $SHELL_FOLDER/../nanopi-r2s/diy.sh
+
+find "$SHELL_FOLDER/../nanopi-r2s/patches" -type f -name '*.patch' -print0 | sort -z | xargs -I % -t -0 -n 1 sh -c "cat '%'  | patch -d './' -p1 -E --forward"

devices/doornet2/.config

@@ -0,0 +1,12 @@
+
+CONFIG_TARGET_rockchip=y
+CONFIG_TARGET_rockchip_armv8=y
+CONFIG_TARGET_rockchip_armv8_DEVICE_embedfire_doornet2=y
+CONFIG_TARGET_ROOTFS_EXT4FS=n
+
+# Applications
+CONFIG_PACKAGE_luci-app-cpufreq=y
+
+# 其他需要安装的软件包:
+CONFIG_PACKAGE_my-autocore-arm=y
+CONFIG_PACKAGE_kmod-hwmon-pwmfan=y

devices/doornet2/diy.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+SHELL_FOLDER=$(dirname $(readlink -f "$0"))
+bash $SHELL_FOLDER/../nanopi-r2s/diy.sh
+
+find "$SHELL_FOLDER/../nanopi-r2s/patches" -type f -name '*.patch' -print0 | sort -z | xargs -I % -t -0 -n 1 sh -c "cat '%'  | patch -d './' -p1 -E --forward"

devices/nanopi-r2c/diy.sh

@@ -1,3 +1,5 @@
 #!/bin/bash
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
-bash $SHELL_FOLDER/../nanopi-r2s/diy.sh
+bash $SHELL_FOLDER/../nanopi-r2s/diy.sh
+
+find "$SHELL_FOLDER/../nanopi-r2s/patches" -type f -name '*.patch' -print0 | sort -z | xargs -I % -t -0 -n 1 sh -c "cat '%'  | patch -d './' -p1 -E --forward"

devices/nanopi-r2s/.config

@@ -4,9 +4,28 @@ CONFIG_TARGET_rockchip_armv8=y
 CONFIG_TARGET_rockchip_armv8_DEVICE_friendlyarm_nanopi-r2s=y
 CONFIG_TARGET_ROOTFS_EXT4FS=n
 
+CONFIG_PACKAGE_arm-trusted-firmware-rk3399=y
+CONFIG_PACKAGE_kmod-ptp=n
+CONFIG_PACKAGE_kmod-bnx2x=n
+CONFIG_PACKAGE_kmod-mlx4-core=n
+CONFIG_PACKAGE_kmod-mlx5-core=n
+CONFIG_PACKAGE_kmod-igc=n
+CONFIG_PACKAGE_kmod-sfc=n
+CONFIG_PACKAGE_kmod-e1000e=n
+CONFIG_PACKAGE_kmod-igb=n
+CONFIG_PACKAGE_kmod-igbvf=n
+CONFIG_PACKAGE_kmod-ixgbe=n
+CONFIG_PACKAGE_kmod-ixgbevf=n
+CONFIG_PACKAGE_kmod-i40e=n
+CONFIG_PACKAGE_kmod-tg3=n
+
+
+
 # Applications
 CONFIG_PACKAGE_luci-app-cpufreq=y
 
+CONFIG_OPENSSL_PREFER_CHACHA_OVER_GCM=y
+
 # 其他需要安装的软件包:
 CONFIG_PACKAGE_my-autocore-arm=y
 

devices/nanopi-r2s/diy.sh

@@ -1,15 +1,22 @@
 #!/bin/bash
 
 shopt -s extglob
-svn export --force https://github.com/friendlyarm/friendlywrt/trunk/target/linux/rockchip/armv8/base-files/usr target/linux/rockchip/armv8/base-files/usr
 
 sed -i 's,-mcpu=generic,-march=armv8-a+crypto+crc -mabi=lp64,g' include/target.mk
 
-sh -c "curl -sfL https://github.com/openwrt/openwrt/commit/a686b71d0143a59a5c8932468dd2a425dccf536b.patch | patch -d './' -p1 --forward"
-sh -c "curl -sfL https://github.com/openwrt/openwrt/commit/c27993f039452f14182282d0ac40c5e9810c0803.patch | patch -d './' -p1 --forward"
-sh -c "curl -sfL https://github.com/openwrt/openwrt/commit/6c391373850335f7f3a0a3fc6dc39bfebdfb70d1.patch | patch -d './' -p1 --forward"
-sh -c "curl -sfL https://github.com/openwrt/openwrt/commit/53c85f2afe9e497599f56bf1bbecca1f734595dc.patch | patch -d './' -p1 --forward"
-# sh -c "curl -sfL https://github.com/openwrt/openwrt/commit/9ba39aa45f06e5c935a9816e771682c5533b1e24.patch | patch -d './' -p1 --forward"
+rm -rf package/boot/uboot-rockchip
+svn export --force https://github.com/coolsnowwolf/lede/trunk/package/boot/uboot-rockchip package/boot/uboot-rockchip
+svn export --force https://github.com/coolsnowwolf/lede/trunk/package/boot/arm-trusted-firmware-rockchip-vendor package/boot/arm-trusted-firmware-rockchip-vendor
+rm -rf target/linux/rockchip/!(Makefile|patches-5.15)
+svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/rockchip target/linux/rockchip
+rm -rf target/linux/rockchip/{.svn,patches-5.15/.svn}
+svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/rockchip/patches-5.15 target/linux/rockchip/patches-5.15
+
+sed -i "s/KERNEL_PATCHVER=5.10/KERNEL_PATCHVER=5.15/" target/linux/rockchip/Makefile
+
+sed -i -e 's,kmod-r8168,kmod-r8169,g' target/linux/rockchip/image/armv8.mk
+
+sed -i "s/BUILD_DEVICES:=/BUILD_DEVICES:=friendlyarm_nanopi-r2s/" package/boot/uboot-rockchip/Makefile
 
 sed -i '/;;/i\ethtool -K eth1 rx off tx off && logger -t disable-offloading "disabed rk3328 ethernet tcp/udp offloading tx/rx"' target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity
 
@@ -22,6 +29,7 @@ CONFIG_CRYPTO_AES_ARM64_BS=y
 CONFIG_CRYPTO_AES_ARM64_CE=y
 CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
 CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
+CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=y
 CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
 CONFIG_CRYPTO_CRYPTD=y
 CONFIG_CRYPTO_GF128MUL=y
@@ -38,4 +46,4 @@ CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 CONFIG_MOTORCOMM_PHY=y
 CONFIG_SENSORS_PWM_FAN=y
-' >> ./target/linux/rockchip/armv8/config-5.10
+' >> ./target/linux/rockchip/armv8/config-5.15

devices/nanopi-r2s/patches/drm-rockchip-fix.patch

@@ -0,0 +1,23 @@
+From fe7d7074c4dc75eaf868addc4d4c602e4233e31f Mon Sep 17 00:00:00 2001
+From: kiddin9 <[email protected]>
+Date: Sat, 23 Apr 2022 22:14:29 +0800
+Subject: [PATCH] Update modules.mk
+
+---
+ target/linux/rockchip/modules.mk | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/target/linux/rockchip/modules.mk b/target/linux/rockchip/modules.mk
+index 4ad49b57e82..46f3e715624 100644
+--- a/target/linux/rockchip/modules.mk
++++ b/target/linux/rockchip/modules.mk
+@@ -35,7 +35,8 @@ define KernelPackage/drm-rockchip
+ 	$(LINUX_DIR)/drivers/media/cec/core/[email protected] \
+ 	$(LINUX_DIR)/drivers/phy/rockchip/phy-rockchip-inno-hdmi.ko \
+ 	$(LINUX_DIR)/drivers/gpu/drm/panel/panel-simple.ko \
+-	$(LINUX_DIR)/drivers/gpu/drm/rockchip/rockchipdrm.ko
++	$(LINUX_DIR)/drivers/gpu/drm/rockchip/rockchipdrm.ko \
++	$(LINUX_DIR)/drivers/gpu/drm/[email protected]
+   AUTOLOAD:=$(call AutoProbe,rockchipdrm phy-rockchip-inno-hdmi dw-hdmi-cec)
+ endef
+ 

devices/nanopi-r2s/patches/r2s_exchange_lan_wan.patch

@@ -1,16 +1,19 @@
 --- a/target/linux/rockchip/armv8/base-files/etc/board.d/02_network
 +++ b/target/linux/rockchip/armv8/base-files/etc/board.d/02_network
-@@ -8,10 +8,12 @@ rockchip_setup_interfaces()
- 
- 	case "$board" in
+@@ -11,13 +11,15 @@ rockchip_setup_interfaces()
+ 	embedfire,doornet1|\
+ 	embedfire,doornet2|\
  	friendlyarm,nanopi-r2c|\
 -	friendlyarm,nanopi-r2s|\
- 	friendlyarm,nanopi-r4s)
+ 	friendlyarm,nanopi-r4s|\
+ 	sharevdi,guangmiao-g4c|\
+ 	xunlong,orangepi-r1-plus|\
+ 	xunlong,orangepi-r1-plus-lts)
  		ucidef_set_interfaces_lan_wan 'eth1' 'eth0'
  		;;
 +	friendlyarm,nanopi-r2s)
 +		ucidef_set_interfaces_lan_wan 'eth0' 'eth1'
 + 		;;
- 	friendlyelec,nanopi-r2 | \
- 	friendlyelec,nanopi-r4s)
- 		ucidef_set_interface_wan 'eth0'
+ 	*)
+ 		ucidef_set_interface_lan 'eth0'
+ 		;;

devices/nanopi-r2s/patches/uboot-rockchip-fix.patch

@@ -1,401 +0,0 @@
-From 9ba39aa45f06e5c935a9816e771682c5533b1e24 Mon Sep 17 00:00:00 2001
-From: jensen <[email protected]>
-Date: Thu, 13 Jan 2022 17:02:02 +0800
-Subject: [PATCH] uboot-rockchip: fixes several issues for r2c/r4s
-
-Patches formated from
-  https://github.com/friendlyarm/uboot-rockchip/tree/nanopi4-v2021.07
-
-Signed-off-by: jensen <[email protected]>
----
- ...k3328-Fix-spl-mmc-boot-device-ofpath.patch | 28 ++++++
- ...c-support-to-disable-HS-mode-for-SPL.patch | 31 +++++++
- ...399-nanopi4-Add-u-boot-spl-broken-hs.patch | 24 +++++
- ...k3328-add-mmc-aliases-for-nanopi-r2s.patch | 29 +++++++
- ...mc-Fixes-timeout-issue-for-FIFO-mode.patch | 36 ++++++++
- ...-Add-arch_addr_aligned-hook-for-rk33.patch | 87 +++++++++++++++++++
- ...3399-r4s-disable-nodes-for-vopb-vopl.patch | 41 +++++++++
- ...FIG_SYS_MMC_ENV_DEV-1-for-nanopi-r4s.patch | 25 ++++++
- ...328-Implement-arch_addr_aligned-hook.patch | 59 +++++++++++++
- 9 files changed, 360 insertions(+)
- create mode 100644 package/boot/uboot-rockchip/patches/300-rockchip-rk3328-Fix-spl-mmc-boot-device-ofpath.patch
- create mode 100644 package/boot/uboot-rockchip/patches/301-rockchip-dw_mmc-support-to-disable-HS-mode-for-SPL.patch
- create mode 100644 package/boot/uboot-rockchip/patches/302-arm64-dts-rk3399-nanopi4-Add-u-boot-spl-broken-hs.patch
- create mode 100644 package/boot/uboot-rockchip/patches/303-rockchip-rk3328-add-mmc-aliases-for-nanopi-r2s.patch
- create mode 100644 package/boot/uboot-rockchip/patches/305-common-bouncebuf-Add-arch_addr_aligned-hook-for-rk33.patch
- create mode 100644 package/boot/uboot-rockchip/patches/306-arm64-rk3399-r4s-disable-nodes-for-vopb-vopl.patch
- create mode 100644 package/boot/uboot-rockchip/patches/307-configs-Add-CONFIG_SYS_MMC_ENV_DEV-1-for-nanopi-r4s.patch
- create mode 100644 package/boot/uboot-rockchip/patches/308-rockchip-rk3328-Implement-arch_addr_aligned-hook.patch
-
-diff --git a/package/boot/uboot-rockchip/patches/300-rockchip-rk3328-Fix-spl-mmc-boot-device-ofpath.patch b/package/boot/uboot-rockchip/patches/300-rockchip-rk3328-Fix-spl-mmc-boot-device-ofpath.patch
-new file mode 100644
-index 000000000000..94c69878a856
---- /dev/null
-+++ b/package/boot/uboot-rockchip/patches/300-rockchip-rk3328-Fix-spl-mmc-boot-device-ofpath.patch
-@@ -0,0 +1,28 @@
-+From e14e93922a39e5950c8b042aefd0c9869ee3a259 Mon Sep 17 00:00:00 2001
-+From: hmz007 <[email protected]>
-+Date: Sat, 1 Jan 2022 18:41:34 +0800
-+Subject: [PATCH 300/308] rockchip: rk3328: Fix spl mmc boot device ofpath
-+
-+Signed-off-by: hmz007 <[email protected]>
-+---
-+ arch/arm/mach-rockchip/rk3328/rk3328.c | 4 ++--
-+ 1 file changed, 2 insertions(+), 2 deletions(-)
-+
-+diff --git a/arch/arm/mach-rockchip/rk3328/rk3328.c b/arch/arm/mach-rockchip/rk3328/rk3328.c
-+index ec3336cb49..de17b88682 100644
-+--- a/arch/arm/mach-rockchip/rk3328/rk3328.c
-++++ b/arch/arm/mach-rockchip/rk3328/rk3328.c
-+@@ -21,8 +21,8 @@ DECLARE_GLOBAL_DATA_PTR;
-+ #define FW_DDR_CON_REG		0xFF7C0040
-+ 
-+ const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
-+-	[BROM_BOOTSOURCE_EMMC] = "/rksdmmc@ff520000",
-+-	[BROM_BOOTSOURCE_SD] = "/rksdmmc@ff500000",
-++	[BROM_BOOTSOURCE_EMMC] = "/mmc@ff520000",
-++	[BROM_BOOTSOURCE_SD] = "/mmc@ff500000",
-+ };
-+ 
-+ static struct mm_region rk3328_mem_map[] = {
-+-- 
-+2.34.1
-+
-diff --git a/package/boot/uboot-rockchip/patches/301-rockchip-dw_mmc-support-to-disable-HS-mode-for-SPL.patch b/package/boot/uboot-rockchip/patches/301-rockchip-dw_mmc-support-to-disable-HS-mode-for-SPL.patch
-new file mode 100644
-index 000000000000..ccc5df5a5c70
---- /dev/null
-+++ b/package/boot/uboot-rockchip/patches/301-rockchip-dw_mmc-support-to-disable-HS-mode-for-SPL.patch
-@@ -0,0 +1,31 @@
-+From baecb10c4b34be29ca0aac97158d4cdbc84d76a0 Mon Sep 17 00:00:00 2001
-+From: hmz007 <[email protected]>
-+Date: Wed, 1 Dec 2021 16:45:27 +0800
-+Subject: [PATCH 301/308] rockchip: dw_mmc: support to disable HS mode for SPL
-+
-+For rk3399, the highspeed mode doesn't work because of
-+the signal voltage remains at 1.8V after reboot.
-+
-+Signed-off-by: hmz007 <[email protected]>
-+---
-+ drivers/mmc/rockchip_dw_mmc.c | 4 ++++
-+ 1 file changed, 4 insertions(+)
-+
-+diff --git a/drivers/mmc/rockchip_dw_mmc.c b/drivers/mmc/rockchip_dw_mmc.c
-+index d7d5361fd5..49ad73fdff 100644
-+--- a/drivers/mmc/rockchip_dw_mmc.c
-++++ b/drivers/mmc/rockchip_dw_mmc.c
-+@@ -145,6 +145,10 @@ static int rockchip_dwmmc_probe(struct udevice *dev)
-+ 	}
-+ #endif
-+ 	dwmci_setup_cfg(&plat->cfg, host, priv->minmax[1], priv->minmax[0]);
-++#ifdef CONFIG_SPL_BUILD
-++	if (dev_read_bool(dev, "u-boot,spl-broken-hs"))
-++		plat->cfg.host_caps &= ~MMC_MODE_HS;
-++#endif
-+ 	host->mmc = &plat->mmc;
-+ 	host->mmc->priv = &priv->host;
-+ 	host->mmc->dev = dev;
-+-- 
-+2.34.1
-+
-diff --git a/package/boot/uboot-rockchip/patches/302-arm64-dts-rk3399-nanopi4-Add-u-boot-spl-broken-hs.patch b/package/boot/uboot-rockchip/patches/302-arm64-dts-rk3399-nanopi4-Add-u-boot-spl-broken-hs.patch
-new file mode 100644
-index 000000000000..925cc8414cee
---- /dev/null
-+++ b/package/boot/uboot-rockchip/patches/302-arm64-dts-rk3399-nanopi4-Add-u-boot-spl-broken-hs.patch
-@@ -0,0 +1,24 @@
-+From c608d2fd04cb4973f75082807e5df0653fc6e819 Mon Sep 17 00:00:00 2001
-+From: hmz007 <[email protected]>
-+Date: Wed, 1 Dec 2021 18:20:37 +0800
-+Subject: [PATCH 302/308] arm64: dts: rk3399-nanopi4: Add u-boot,spl-broken-hs
-+
-+Signed-off-by: hmz007 <[email protected]>
-+---
-+ arch/arm/dts/rk3399-nanopi4-u-boot.dtsi | 2 ++
-+ 1 file changed, 2 insertions(+)
-+
-+diff --git a/arch/arm/dts/rk3399-nanopi4-u-boot.dtsi b/arch/arm/dts/rk3399-nanopi4-u-boot.dtsi
-+index a9d10592d5..53c4f17ac8 100644
-+--- a/arch/arm/dts/rk3399-nanopi4-u-boot.dtsi
-++++ b/arch/arm/dts/rk3399-nanopi4-u-boot.dtsi
-+@@ -13,4 +13,6 @@
-+ 
-+ &sdmmc {
-+ 	pinctrl-0 = <&sdmmc_bus4 &sdmmc_clk &sdmmc_cmd &sdmmc_cd>;
-++
-++	u-boot,spl-broken-hs;
-+ };
-+-- 
-+2.34.1
-+
-diff --git a/package/boot/uboot-rockchip/patches/303-rockchip-rk3328-add-mmc-aliases-for-nanopi-r2s.patch b/package/boot/uboot-rockchip/patches/303-rockchip-rk3328-add-mmc-aliases-for-nanopi-r2s.patch
-new file mode 100644
-index 000000000000..1c4ab53bd39c
---- /dev/null
-+++ b/package/boot/uboot-rockchip/patches/303-rockchip-rk3328-add-mmc-aliases-for-nanopi-r2s.patch
-@@ -0,0 +1,29 @@
-+From b8d642fadf95508f3a728a995b6892467deb1097 Mon Sep 17 00:00:00 2001
-+From: hmz007 <[email protected]>
-+Date: Tue, 4 Jan 2022 14:54:20 +0800
-+Subject: [PATCH 303/308] rockchip: rk3328: add mmc aliases for nanopi-r2s
-+
-+Signed-off-by: hmz007 <[email protected]>
-+---
-+ arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi | 5 +++++
-+ 1 file changed, 5 insertions(+)
-+
-+diff --git a/arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi b/arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi
-+index 9e2ced1541..df692ec30a 100644
-+--- a/arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi
-++++ b/arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi
-+@@ -7,6 +7,11 @@
-+ #include "rk3328-u-boot.dtsi"
-+ #include "rk3328-sdram-ddr4-666.dtsi"
-+ / {
-++	aliases {
-++		mmc0 = &sdmmc;
-++		mmc1 = &emmc;
-++	};
-++
-+ 	chosen {
-+ 		u-boot,spl-boot-order = "same-as-spl", &sdmmc, &emmc;
-+ 	};
-+-- 
-+2.34.1
-+
-diff --git a/package/boot/uboot-rockchip/patches/305-common-bouncebuf-Add-arch_addr_aligned-hook-for-rk33.patch b/package/boot/uboot-rockchip/patches/305-common-bouncebuf-Add-arch_addr_aligned-hook-for-rk33.patch
-new file mode 100644
-index 000000000000..ca83565e1603
---- /dev/null
-+++ b/package/boot/uboot-rockchip/patches/305-common-bouncebuf-Add-arch_addr_aligned-hook-for-rk33.patch
-@@ -0,0 +1,87 @@
-+From 7b108ebc5f9ac82487ad17dea0ae7163285d906f Mon Sep 17 00:00:00 2001
-+From: hmz007 <[email protected]>
-+Date: Wed, 12 Jan 2022 10:59:31 +0800
-+Subject: [PATCH 305/308] common: bouncebuf: Add arch_addr_aligned() hook for
-+ rk3399
-+
-+As described in rk3399-u-boot.dtsi ("mmc to sram can't do dma"),
-+this restrict can be sorted out by adding a hook and returning
-+the non-DRAM area as Unaligned (0) in rk3399's implementation.
-+
-+Then we can enable DMA mode and save about 200ms of SPL boot.
-+
-+Signed-off-by: hmz007 <[email protected]>
-+---
-+ arch/arm/dts/rk3399-u-boot.dtsi        |  3 ---
-+ arch/arm/mach-rockchip/rk3399/rk3399.c | 13 +++++++++++++
-+ common/bouncebuf.c                     |  9 +++++++--
-+ 3 files changed, 20 insertions(+), 5 deletions(-)
-+
-+diff --git a/arch/arm/dts/rk3399-u-boot.dtsi b/arch/arm/dts/rk3399-u-boot.dtsi
-+index 73922c328a..57e1a7feab 100644
-+--- a/arch/arm/dts/rk3399-u-boot.dtsi
-++++ b/arch/arm/dts/rk3399-u-boot.dtsi
-+@@ -119,9 +119,6 @@
-+ 
-+ &sdmmc {
-+ 	u-boot,dm-pre-reloc;
-+-
-+-	/* mmc to sram can't do dma, prevent aborts transferring TF-A parts */
-+-	u-boot,spl-fifo-mode;
-+ };
-+ 
-+ &spi1 {
-+diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c
-+index 869d2159be..fc0292e6be 100644
-+--- a/arch/arm/mach-rockchip/rk3399/rk3399.c
-++++ b/arch/arm/mach-rockchip/rk3399/rk3399.c
-+@@ -111,6 +111,19 @@ int arch_cpu_init(void)
-+ 	return 0;
-+ }
-+ 
-++int arch_addr_aligned(void *ubuf)
-++{
-++#define DRAM_END	0xf8000000
-++
-++	if ((uintptr_t)ubuf < DRAM_END) {
-++		/* Aligned for DRAM area */
-++		return 1;
-++	}
-++
-++	debug("Unsupported buffer for DMA transfer\n");
-++	return 0;
-++}
-++
-+ #ifdef CONFIG_DEBUG_UART_BOARD_INIT
-+ void board_debug_uart_init(void)
-+ {
-+diff --git a/common/bouncebuf.c b/common/bouncebuf.c
-+index 6d98920de6..5f510a04ec 100644
-+--- a/common/bouncebuf.c
-++++ b/common/bouncebuf.c
-+@@ -13,6 +13,12 @@
-+ #include <bouncebuf.h>
-+ #include <asm/cache.h>
-+ 
-++__weak int arch_addr_aligned(void *ubuf)
-++{
-++	/* Aligned */
-++	return 1;
-++}
-++
-+ static int addr_aligned(struct bounce_buffer *state)
-+ {
-+ 	const ulong align_mask = ARCH_DMA_MINALIGN - 1;
-+@@ -29,8 +35,7 @@ static int addr_aligned(struct bounce_buffer *state)
-+ 		return 0;
-+ 	}
-+ 
-+-	/* Aligned */
-+-	return 1;
-++	return arch_addr_aligned(state->user_buffer);
-+ }
-+ 
-+ int bounce_buffer_start_extalign(struct bounce_buffer *state, void *data,
-+-- 
-+2.34.1
-+
-diff --git a/package/boot/uboot-rockchip/patches/306-arm64-rk3399-r4s-disable-nodes-for-vopb-vopl.patch b/package/boot/uboot-rockchip/patches/306-arm64-rk3399-r4s-disable-nodes-for-vopb-vopl.patch
-new file mode 100644
-index 000000000000..21e3c763dac9
---- /dev/null
-+++ b/package/boot/uboot-rockchip/patches/306-arm64-rk3399-r4s-disable-nodes-for-vopb-vopl.patch
-@@ -0,0 +1,41 @@
-+From 8a8b3ef12c68ad662223aefb4a46b1ca43e23482 Mon Sep 17 00:00:00 2001
-+From: hmz007 <[email protected]>
-+Date: Wed, 12 Jan 2022 11:00:08 +0800
-+Subject: [PATCH 306/308] arm64: rk3399: r4s: disable nodes for vopb/vopl
-+
-+Disable vopb and vopl to fix:
-+  rk3399_vop vop@ff8f0000: failed to get ahb reset (ret=-524)
-+  rk3399_vop vop@ff8f0000: failed to get ahb reset (ret=-524)
-+
-+Signed-off-by: hmz007 <[email protected]>
-+---
-+ arch/arm/dts/rk3399-nanopi-r4s.dts | 16 ++++++++++++++++
-+ 1 file changed, 16 insertions(+)
-+
-+diff --git a/arch/arm/dts/rk3399-nanopi-r4s.dts b/arch/arm/dts/rk3399-nanopi-r4s.dts
-+index 6f2cf17bf1..e7c6daddd5 100644
-+--- a/arch/arm/dts/rk3399-nanopi-r4s.dts
-++++ b/arch/arm/dts/rk3399-nanopi-r4s.dts
-+@@ -136,3 +136,19 @@
-+ &vcc3v3_sys {
-+ 	vin-supply = <&vcc5v0_sys>;
-+ };
-++
-++&vopb {
-++	status = "disabled";
-++};
-++
-++&vopb_mmu {
-++	status = "disabled";
-++};
-++
-++&vopl {
-++	status = "disabled";
-++};
-++
-++&vopl_mmu {
-++	status = "disabled";
-++};
-+-- 
-+2.34.1
-+
-diff --git a/package/boot/uboot-rockchip/patches/307-configs-Add-CONFIG_SYS_MMC_ENV_DEV-1-for-nanopi-r4s.patch b/package/boot/uboot-rockchip/patches/307-configs-Add-CONFIG_SYS_MMC_ENV_DEV-1-for-nanopi-r4s.patch
-new file mode 100644
-index 000000000000..d84651eb5347
---- /dev/null
-+++ b/package/boot/uboot-rockchip/patches/307-configs-Add-CONFIG_SYS_MMC_ENV_DEV-1-for-nanopi-r4s.patch
-@@ -0,0 +1,25 @@
-+From 92c1bcf0983464f7bcc9e38bc2a6edccc239bd93 Mon Sep 17 00:00:00 2001
-+From: hmz007 <[email protected]>
-+Date: Wed, 12 Jan 2022 11:00:21 +0800
-+Subject: [PATCH 307/308] configs: Add CONFIG_SYS_MMC_ENV_DEV=1 for nanopi-r4s
-+
-+Signed-off-by: hmz007 <[email protected]>
-+---
-+ configs/nanopi-r4s-rk3399_defconfig | 1 +
-+ 1 file changed, 1 insertion(+)
-+
-+diff --git a/configs/nanopi-r4s-rk3399_defconfig b/configs/nanopi-r4s-rk3399_defconfig
-+index 351d2eb553..0f22737d54 100644
-+--- a/configs/nanopi-r4s-rk3399_defconfig
-++++ b/configs/nanopi-r4s-rk3399_defconfig
-+@@ -25,6 +25,7 @@ CONFIG_SPL_OF_CONTROL=y
-+ CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
-+ CONFIG_ENV_IS_IN_MMC=y
-+ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-++CONFIG_SYS_MMC_ENV_DEV=1
-+ CONFIG_ROCKCHIP_GPIO=y
-+ CONFIG_SYS_I2C_ROCKCHIP=y
-+ CONFIG_MMC_DW=y
-+-- 
-+2.34.1
-+
-diff --git a/package/boot/uboot-rockchip/patches/308-rockchip-rk3328-Implement-arch_addr_aligned-hook.patch b/package/boot/uboot-rockchip/patches/308-rockchip-rk3328-Implement-arch_addr_aligned-hook.patch
-new file mode 100644
-index 000000000000..2a8e9d21c246
---- /dev/null
-+++ b/package/boot/uboot-rockchip/patches/308-rockchip-rk3328-Implement-arch_addr_aligned-hook.patch
-@@ -0,0 +1,59 @@
-+From 886a84ea1a0e501fd168ad779ca54aecc70f8f4d Mon Sep 17 00:00:00 2001
-+From: hmz007 <[email protected]>
-+Date: Wed, 12 Jan 2022 11:21:37 +0800
-+Subject: [PATCH 308/308] rockchip: rk3328: Implement arch_addr_aligned() hook
-+
-+Signed-off-by: hmz007 <[email protected]>
-+---
-+ arch/arm/dts/rk3328-u-boot.dtsi        |  6 ------
-+ arch/arm/mach-rockchip/rk3328/rk3328.c | 13 +++++++++++++
-+ 2 files changed, 13 insertions(+), 6 deletions(-)
-+
-+diff --git a/arch/arm/dts/rk3328-u-boot.dtsi b/arch/arm/dts/rk3328-u-boot.dtsi
-+index 1633558264..d6b7f3e30a 100644
-+--- a/arch/arm/dts/rk3328-u-boot.dtsi
-++++ b/arch/arm/dts/rk3328-u-boot.dtsi
-+@@ -52,16 +52,10 @@
-+ 
-+ &emmc {
-+ 	u-boot,dm-pre-reloc;
-+-
-+-	/* mmc to sram can't do dma, prevent aborts transfering TF-A parts */
-+-	u-boot,spl-fifo-mode;
-+ };
-+ 
-+ &sdmmc {
-+ 	u-boot,dm-pre-reloc;
-+-
-+-	/* mmc to sram can't do dma, prevent aborts transfering TF-A parts */
-+-	u-boot,spl-fifo-mode;
-+ };
-+ 
-+ &usb20_otg {
-+diff --git a/arch/arm/mach-rockchip/rk3328/rk3328.c b/arch/arm/mach-rockchip/rk3328/rk3328.c
-+index de17b88682..60e0b6134f 100644
-+--- a/arch/arm/mach-rockchip/rk3328/rk3328.c
-++++ b/arch/arm/mach-rockchip/rk3328/rk3328.c
-+@@ -58,6 +58,19 @@ int arch_cpu_init(void)
-+ 	return 0;
-+ }
-+ 
-++int arch_addr_aligned(void *ubuf)
-++{
-++#define DRAM_END	0xff000000
-++
-++	if ((uintptr_t)ubuf < DRAM_END) {
-++		/* Aligned for DRAM area */
-++		return 1;
-++	}
-++
-++	debug("Unsupported buffer for DMA transfer\n");
-++	return 0;
-++}
-++
-+ void board_debug_uart_init(void)
-+ {
-+ 	struct rk3328_grf_regs * const grf = (void *)GRF_BASE;
-+-- 
-+2.34.1
-+

devices/nanopi-r4s/diy.sh

@@ -1,3 +1,5 @@
 #!/bin/bash
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
-bash $SHELL_FOLDER/../nanopi-r2s/diy.sh
+bash $SHELL_FOLDER/../nanopi-r2s/diy.sh
+
+find "$SHELL_FOLDER/../nanopi-r2s/patches" -type f -name '*.patch' -print0 | sort -z | xargs -I % -t -0 -n 1 sh -c "cat '%'  | patch -d './' -p1 -E --forward"

devices/phicomm-N1/.config

@@ -5,3 +5,5 @@ CONFIG_TARGET_ROOTFS_EXT4FS=y
 CONFIG_TARGET_ROOTFS_SQUASHFS=n
 CONFIG_PACKAGE_kmod-brcmfmac=y
 CONFIG_BRCMFMAC_SDIO=y
+
+CONFIG_TESTING_KERNEL=y

devices/phicomm-N1/diy/target/linux/armvirt/image/Makefile

@@ -99,6 +99,7 @@ TARGET_DEVICES += odroid-n2
 define Image/Build
 	export IMG_PREFIX="$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED))"; \
 	export BIN_DIR=$(BIN_DIR); \
+	export PARTSIZE=$(CONFIG_TARGET_ROOTFS_PARTSIZE); \
 	cd $(TOPDIR)/../openwrt_packit; \
 	if [ $(PROFILE_SANITIZED) == "n1" ]; then \
 		./mk_s905d_n1.sh; \

devices/x86_64/.config

@@ -2,6 +2,8 @@
 CONFIG_TARGET_x86=y
 CONFIG_TARGET_x86_64=y
 
+CONFIG_TESTING_KERNEL=y
+
 # EFI支持:
 CONFIG_GRUB_IMAGES=y
 CONFIG_GRUB_EFI_IMAGES=y
@@ -16,4 +18,3 @@ CONFIG_PACKAGE_kmod-r8125=y
 CONFIG_PACKAGE_kmod-igc=y
 
 CONFIG_PACKAGE_kmod-r8169=n
-

devices/x86_64/patches/Intel_gpu.patch

@@ -1,13 +1,3 @@
---- a/include/kernel-defaults.mk
-+++ b/include/kernel-defaults.mk
-@@ -127,6 +127,7 @@ endef
- 
- define Kernel/CompileModules/Default
- 	rm -f $(LINUX_DIR)/vmlinux $(LINUX_DIR)/System.map
-+	+$(KERNEL_MAKE) olddefconfig
- 	+$(KERNEL_MAKE) $(if $(KERNELNAME),$(KERNELNAME),all) modules
- endef
- 
 diff --git a/package/firmware/linux-firmware/intel.mk b/package/firmware/linux-firmware/intel.mk
 index 923701c703d..7f60014ea6c 100644
 --- a/package/firmware/linux-firmware/intel.mk

devices/x86_64/patches/exsi.patch

@@ -1,52 +0,0 @@
---- a/include/image-commands.mk
-+++ b/include/image-commands.mk
-@@ -329,6 +329,17 @@ endef
- 
- # Convert a raw image into a $1 type image.
- # E.g. | qemu-image vdi
-+define Build/qemu-exsi
-+	if command -v qemu-img; then \
-+		name="$(subst .vmdk.zip,,$@)"; \
-+		qemu-img convert -f raw -O $1 $@ $$name.vmdk; \
-+		rm -f $@; \
-+		zip -jm $@ $$name*.vmdk; \
-+	else \
-+		echo "WARNING: Install qemu-img to create VDI/VMDK images" >&2; exit 1; \
-+	fi
-+endef
-+
- define Build/qemu-image
- 	if command -v qemu-img; then \
- 		qemu-img convert -f raw -O $1 $@ [email protected]; \
-
---- a/target/linux/x86/image/Makefile
-+++ b/target/linux/x86/image/Makefile
-@@ -108,7 +108,7 @@ define Device/Default
-   IMAGE/combined.img := grub-config pc | combined | grub-install | append-metadata
-   IMAGE/combined.img.gz := grub-config pc | combined | grub-install | gzip | append-metadata
-   IMAGE/combined.vdi := grub-config pc | combined | grub-install | qemu-image vdi
--  IMAGE/combined.vmdk := grub-config pc | combined | grub-install | qemu-image vmdk
-+  IMAGE/combined.vmdk.zip := grub-config pc | combined | grub-install | qemu-exsi vmdk -o adapter_type=lsilogic -o subformat=monolithicFlat
-   IMAGE/combined.vhdx := grub-config pc | combined | grub-install | qemu-image vhdx -o subformat=dynamic
-   IMAGE/rootfs.img := append-rootfs | pad-to $(ROOTFS_PARTSIZE)
-   IMAGE/rootfs.img.gz := append-rootfs | pad-to $(ROOTFS_PARTSIZE) | gzip
-@@ -116,7 +116,7 @@ define Device/Default
-   IMAGE/combined-efi.img := grub-config efi | combined efi | grub-install efi | append-metadata
-   IMAGE/combined-efi.img.gz := grub-config efi | combined efi | grub-install efi | gzip | append-metadata
-   IMAGE/combined-efi.vdi := grub-config efi | combined efi | grub-install efi | qemu-image vdi
--  IMAGE/combined-efi.vmdk := grub-config efi | combined efi | grub-install efi | qemu-image vmdk
-+  IMAGE/combined-efi.vmdk.zip := grub-config efi | combined efi | grub-install efi | qemu-exsi vmdk -o adapter_type=lsilogic -o subformat=monolithicFlat
-   IMAGE/combined-efi.vhdx := grub-config efi | combined efi | grub-install efi | qemu-image vhdx -o subformat=dynamic
-   ifeq ($(CONFIG_TARGET_IMAGES_GZIP),y)
-     IMAGES-y := rootfs.img.gz
-@@ -139,8 +139,8 @@ define Device/Default
-     IMAGES-$$(CONFIG_GRUB_EFI_IMAGES) += combined-efi.vdi
-   endif
-   ifeq ($(CONFIG_VMDK_IMAGES),y)
--    IMAGES-$$(CONFIG_GRUB_IMAGES) += combined.vmdk
--    IMAGES-$$(CONFIG_GRUB_EFI_IMAGES) += combined-efi.vmdk
-+    IMAGES-$$(CONFIG_GRUB_IMAGES) += combined.vmdk.zip
-+    IMAGES-$$(CONFIG_GRUB_EFI_IMAGES) += combined-efi.vmdk.zip
-   endif
-   ifeq ($(CONFIG_VHDX_IMAGES),y)
-     IMAGES-$$(CONFIG_GRUB_IMAGES) += combined.vhdx

devices/x86_64/patches/image.patch

@@ -1,3 +1,14 @@
+From c7bc056650227ba6003414356f57b33cdb2603b7 Mon Sep 17 00:00:00 2001
+From: kiddin9 <[email protected]>
+Date: Sat, 23 Apr 2022 18:38:12 +0800
+Subject: [PATCH] Update Makefile
+
+---
+ target/linux/x86/image/Makefile | 12 ++++--------
+ 1 file changed, 4 insertions(+), 8 deletions(-)
+
+diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile
+index 322131c2a488..0b4ed1d272eb 100644
 --- a/target/linux/x86/image/Makefile
 +++ b/target/linux/x86/image/Makefile
 @@ -108,22 +108,18 @@ define Device/Default