diff --git a/.github/workflows/build-armbian.yml b/.github/workflows/build-armbian.yml index 829de27e4f..5863956a6d 100644 --- a/.github/workflows/build-armbian.yml +++ b/.github/workflows/build-armbian.yml @@ -26,6 +26,7 @@ on: type: choice options: - all + - swan1-w28 - s905w_s905x_s905mb_s905l3a_s905l3b_s905x2_s905x3_s912_s922x_s922x-ct2000_s922x-reva - s905x3-x88-pro-x3_s912-m8s-pro_s905x-t95_s912-t95z-plus_s905l3-unt400g1_s905lb-r3300l - seewo-sv21_smart-am40_station-m1_sw799_tn3399_zysj_tvi3315a_xiaobao_zcube1-max @@ -181,10 +182,12 @@ on: kernel_repo: description: "Set the kernel repository." required: false - default: "ophub/kernel" + default: "dy008/kernel" type: choice options: - ophub/kernel + - dy008/kernel + - dy008/amlogic-s9xxx-armbian kernel_usage: description: "Set the tags of the stable kernel." required: false @@ -219,7 +222,7 @@ on: options: - ophub - angel - - yourname + - dy008 env: TZ: America/New_York @@ -282,7 +285,7 @@ jobs: df -hT ${PWD} git clone -q --single-branch --depth=1 --branch=main https://github.com/armbian/build.git build ln -sf /builder/build ${GITHUB_WORKSPACE}/build - ln -sf /builder/build /home/runner/work/_actions/ophub/amlogic-s9xxx-armbian/main/build + ln -sf /builder/build /home/runner/work/_actions/dy008/amlogic-s9xxx-armbian/main/build echo "status=success" >> ${GITHUB_OUTPUT} - name: Compile Armbian [ ${{ inputs.set_release }} ] @@ -320,7 +323,7 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} - name: Rebuild Armbian - uses: ophub/amlogic-s9xxx-armbian@main + uses: dy008/amlogic-s9xxx-armbian@main if: ${{ steps.clean.outputs.status }} == 'success' && !cancelled() with: build_target: armbian diff --git a/.github/workflows/build-homeassistant.yml b/.github/workflows/build-homeassistant.yml new file mode 100644 index 0000000000..66684003be --- /dev/null +++ b/.github/workflows/build-homeassistant.yml @@ -0,0 +1,358 @@ +#========================================================================== +# Description: Build Armbian +# Copyright (C) 2021 https://github.com/ophub/amlogic-s9xxx-armbian +#========================================================================== + +name: Build Homeassistant + +on: + repository_dispatch: + workflow_dispatch: + inputs: + set_release: + description: "Select OS Release." + required: false + default: "bookworm" + type: choice + options: + - jammy + - noble + - bullseye + - bookworm + armbian_board: + description: "Select device board." + required: false + default: "swan1-w28" + type: choice + options: + - all + - swan1-w28 + - s905w_s905x_s905mb_s905l3a_s905l3b_s905x2_s905x3_s912_s922x_s922x-ct2000_s922x-reva + - s905x3-x88-pro-x3_s912-m8s-pro_s905x-t95_s912-t95z-plus_s905l3-unt400g1_s905lb-r3300l + - seewo-sv21_smart-am40_station-m1_sw799_tn3399_zysj_tvi3315a_xiaobao_zcube1-max + - vplus_tanix-tx6_tqc-a01 + - a311d + - beikeyun + - chainedbox + - crrc + - dg3399 + - dlfr100 + - e20c + - e25 + - eaidk-610 + - emb3531 + - fine3399 + - firefly-rk3399 + - jp-tvbox + - h28k + - h66k + - h68k + - h69k + - h88k + - h88k-v3 + - hs530r + - hugsun-x99 + - ipc-r + - king3399 + - kylin3399 + - leez + - lx-r3s + - mrkaio-m68s + - nanopi-r5c + - nanopi-r5s + - panther-x2 + - r66s + - r68s + - renegade-rk3328 + - rk3318-box + - rock5b + - rock5c + - s905 + - s905-beelink-mini + - s905-mxqpro-plus + - s905d + - s905d-ki-pro + - s905d-sml5442tw + - s905l + - s905l-mg101 + - s905l2 + - s905l2-e900v21e + - s905l2-wojia + - s905l3 + - s905l3-cm211 + - s905l3-unt400g1 + - s905l3-unt402a + - s905l3a + - s905l3a-cm311 + - s905l3a-m401a + - s905l3b + - s905l3b-e900v22d + - s905l3b-e900v22e + - s905l3b-ip103h + - s905l3b-rg020et-ca + - s905l3b-unt403a + - s905lb-q96-mini + - s905lb-r3300l + - s905mb + - s905w + - s905w-w95 + - s905w-x96-mini + - s905w-x96w + - s905x + - s905x-b860h + - s905x-nexbox-a95x + - s905x-t95 + - s905x-tbee + - s905x-tx9 + - s905x2 + - s905x2-km3 + - s905x2-x96max-2g + - s905x3 + - s905x3-2101 + - s905x3-a100 + - s905x3-a95xf3 + - s905x3-a95xf3-gb + - s905x3-b + - s905x3-h96max + - s905x3-hk1 + - s905x3-ip1001m + - s905x3-q1 + - s905x3-q2 + - s905x3-tx3 + - s905x3-tx3-bz + - s905x3-ugoosx3 + - s905x3-whale + - s905x3-x88-pro-x3 + - s905x3-x96air + - s905x3-x96air-gb + - s905x3-x96max + - s912 + - s912-h96pro-plus + - s912-m8s-pro + - s912-nexbox-a1 + - s912-nexbox-a2 + - s912-onecloudpro + - s912-phicomm-t1 + - s912-t95z-plus + - s912-tx8-max + - s912-tx9-pro-2g + - s912-tx9-pro-3g + - s912-x92 + - s912-zyxq-fake + - s922x + - s922x-ct2000 + - s922x-gtking + - s922x-gtkingpro-h + - s922x-odroid-n2 + - s922x-reva + - s922x-ugoos-am6 + - seewo-sv21 + - smart-am40 + - station-m1 + - sw799 + - tanix-tx6 + - tb-ls3399 + - tn3399 + - tqc-a01 + - tvi3315a + - vplus + - xiaobao + - zcube1-max + - zysj + armbian_kernel: + description: "Select kernel version." + required: false + default: "6.1.y_6.6.y" + type: choice + options: + - 5.4.y + - 5.10.y + - 5.15.y + - 6.1.y + - 6.6.y + - 6.1.y_6.6.y + - 5.15.y_5.10.y + auto_kernel: + description: "Auto use the latest kernel." + required: false + default: true + type: boolean + kernel_repo: + description: "Set the kernel repository." + required: false + default: "dy008/kernel" + type: choice + options: + - ophub/kernel + - dy008/kernel + - dy008/amlogic-s9xxx-armbian + kernel_usage: + description: "Set the tags of the stable kernel." + required: false + default: "stable" + type: choice + options: + - stable + - flippy + - dev + - beta + armbian_fstype: + description: "Select armbian rootfs type." + required: false + default: "ext4" + type: choice + options: + - ext4 + - btrfs + armbian_storage: + description: "Select image storage type." + required: false + default: "save" + type: choice + options: + - save + - temp + builder_name: + description: "Set Armbian builder signature." + required: false + default: "dy008" + type: choice + options: + - ophub + - dy008 + +env: + TZ: America/New_York + ROOTFS_SCRIPT: compile-kernel/tools/script/armbian_rootfs.sh + +jobs: + build: + runs-on: ubuntu-22.04 + if: ${{ github.event.repository.owner.id }} == ${{ github.event.sender.id }} + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Initialization environment + id: init + env: + DEBIAN_FRONTEND: noninteractive + run: | + docker rmi $(docker images -q) 2>/dev/null + [[ -n "${AGENT_TOOLSDIRECTORY}" ]] && sudo rm -rf "${AGENT_TOOLSDIRECTORY}" + sudo rm -rf /usr/share/dotnet /etc/apt/sources.list.d /usr/local/lib/android 2>/dev/null + sudo swapoff -a + sudo rm -f /swapfile /mnt/swapfile + sudo -E apt-get -y update + sudo -E apt-get -y purge azure-cli ghc* zulu* llvm* firefox google* dotnet* powershell openjdk* mongodb* moby* || true + sudo -E apt-get -y install $(curl -fsSL https://is.gd/depend_ubuntu2204_armbian) + sudo -E systemctl daemon-reload + #sudo -E apt-get -y full-upgrade + sudo -E apt-get -y autoremove --purge + sudo -E apt-get clean + sudo sed -i '/NVM_DIR/d;/skel/d' /root/{.bashrc,.profile} + sudo rm -rf ~/{.cargo,.dotnet,.rustup} + sudo timedatectl set-timezone "${TZ}" + echo "status=success" >> ${GITHUB_OUTPUT} + + - name: Create simulated physical disk + run: | + mnt_size=$(expr $(df -h /mnt | tail -1 | awk '{print $4}' | sed 's/[[:alpha:]]//g' | sed 's/\..*//') - 1) + root_size=$(expr $(df -h / | tail -1 | awk '{print $4}' | sed 's/[[:alpha:]]//g' | sed 's/\..*//') - 4) + sudo truncate -s "${mnt_size}"G /mnt/mnt.img + sudo truncate -s "${root_size}"G /root.img + sudo losetup /dev/loop6 /mnt/mnt.img + sudo losetup /dev/loop7 /root.img + sudo pvcreate /dev/loop6 + sudo pvcreate /dev/loop7 + sudo vgcreate github /dev/loop6 /dev/loop7 + sudo lvcreate -n runner -l 100%FREE github + sudo mkfs.xfs /dev/github/runner + sudo mkdir -p /builder + sudo mount /dev/github/runner /builder + sudo chown -R runner.runner /builder + df -Th + + - name: Download source code + id: down + working-directory: /builder + if: ${{ steps.init.outputs.status }} == 'success' && !cancelled() + run: | + df -hT ${PWD} + git clone -q --single-branch --depth=1 --branch=main https://github.com/armbian/build.git build + ln -sf /builder/build ${GITHUB_WORKSPACE}/build + ln -sf /builder/build /home/runner/work/_actions/dy008/amlogic-s9xxx-armbian/main/build + # 下载扩展的安装homeasssistant脚本 + wget -P ./build/extensions https://raw.githubusercontent.com/armbian/os/main/userpatches/extensions/docker-ce.sh + wget -P ./build/extensions https://raw.githubusercontent.com/armbian/os/main/userpatches/extensions/ha.sh + # 修改ha.sh脚本中的命令以停止internet host IP地址检测 + sed -i "/sed -i \"\/update-grub\/d\"/a\sed -i \"s\/while ! ping\/while ping\/\" homeassistant-supervised/DEBIAN/postinst" ./build/extensions/ha.sh + echo "status=success" >> ${GITHUB_OUTPUT} + + - name: Compile Armbian [ ${{ inputs.set_release }} ] + id: compile + working-directory: /builder + if: ${{ steps.down.outputs.status }} == 'success' && !cancelled() + run: | + # Compile method and parameter description: https://docs.armbian.com/Developer-Guide_Build-Options + cd build/ + ./compile.sh RELEASE=${{ inputs.set_release }} BOARD=odroidn2 BRANCH=current ENABLE_EXTENSIONS="ha" BUILD_MINIMAL=no \ + BUILD_ONLY=default HOST=armbian BUILD_DESKTOP=no EXPERT=yes KERNEL_CONFIGURE=no \ + COMPRESS_OUTPUTIMAGE="sha" SHARE_LOG=yes + echo "status=success" >> ${GITHUB_OUTPUT} + + - name: Organize files and clear space + id: clean + if: ${{ steps.compile.outputs.status }} == 'success' && !cancelled() + run: | + # Organize and keep essential files, delete unnecessary files + chmod +x ${ROOTFS_SCRIPT} + ${ROOTFS_SCRIPT} -v ${{ inputs.set_release }} + + # Output cleaning result information + df -hT ${PWD} + echo "build_tag=Armbian_HassIoSupervisor_${{ inputs.set_release }}_${{ inputs.armbian_storage }}_$(date +"%Y.%m")" >> ${GITHUB_OUTPUT} + echo "status=success" >> ${GITHUB_OUTPUT} + + - name: Upload Armbian image to Release + uses: ncipollo/release-action@main + if: ${{ steps.clean.outputs.status }} == 'success' && !cancelled() + with: + tag: ${{ steps.clean.outputs.build_tag }} + artifacts: build/output/images/* + allowUpdates: true + token: ${{ secrets.GITHUB_TOKEN }} + + - name: Rebuild Armbian + uses: dy008/amlogic-s9xxx-armbian@main + if: ${{ steps.clean.outputs.status }} == 'success' && !cancelled() + with: + build_target: armbian + armbian_path: build/output/images/*.img.gz + armbian_board: ${{ inputs.armbian_board }} + armbian_kernel: ${{ inputs.armbian_kernel }} + auto_kernel: ${{ inputs.auto_kernel }} + kernel_repo: ${{ inputs.kernel_repo }} + kernel_usage: ${{ inputs.kernel_usage }} + armbian_fstype: ${{ inputs.armbian_fstype }} + builder_name: ${{ inputs.builder_name }} + + - name: Upload Rebuild image to Release + uses: ncipollo/release-action@main + if: ${{ env.PACKAGED_STATUS }} == 'success' && !cancelled() + with: + tag: ${{ steps.clean.outputs.build_tag }} + artifacts: ${{ env.PACKAGED_OUTPUTPATH }}/* + allowUpdates: true + removeArtifacts: false + replacesArtifacts: true + token: ${{ secrets.GITHUB_TOKEN }} + body: | + ### Armbian For Homeassistant Supervisor Image information + - Default username: root + - Default password: 1234 + - Install command: armbian-install + - Update command: armbian-update + ### Armbian Image Verification + - sha256sum diff --git a/.github/workflows/compile-kernel.yml b/.github/workflows/compile-kernel.yml index 548bd96fd1..d0dfe8aec9 100644 --- a/.github/workflows/compile-kernel.yml +++ b/.github/workflows/compile-kernel.yml @@ -18,10 +18,11 @@ on: options: - unifreq - codesnas + - dy008 kernel_version: description: "Select kernel version" required: false - default: "6.6.y" + default: "6.1.y_6.6.y" type: choice options: - 5.4.y @@ -69,11 +70,11 @@ on: kernel_sign: description: "Set the kernel custom signature" required: false - default: "-ophub" + default: "-dy008" type: choice options: - -ophub - - -yourname + - -dy008 env: TZ: America/New_York @@ -134,12 +135,12 @@ jobs: run: | df -hT ${PWD} mkdir -p /builder/{kernel,output} - ln -sf /builder/kernel /home/runner/work/_actions/ophub/amlogic-s9xxx-armbian/main/compile-kernel/kernel - ln -sf /builder/output /home/runner/work/_actions/ophub/amlogic-s9xxx-armbian/main/compile-kernel/output + ln -sf /builder/kernel /home/runner/work/_actions/dy008/amlogic-s9xxx-armbian/main/compile-kernel/kernel + ln -sf /builder/output /home/runner/work/_actions/dy008/amlogic-s9xxx-armbian/main/compile-kernel/output echo "status=success" >> ${GITHUB_OUTPUT} - name: Compile the kernel [ ${{ inputs.kernel_version }} ] - uses: ophub/amlogic-s9xxx-armbian@main + uses: dy008/amlogic-s9xxx-armbian@main if: ${{ steps.mapped.outputs.status }} == 'success' && !cancelled() with: build_target: kernel diff --git a/.github/workflows/rebuild-armbian.yml b/.github/workflows/rebuild-armbian.yml index 08d3af809a..cfccf9d020 100644 --- a/.github/workflows/rebuild-armbian.yml +++ b/.github/workflows/rebuild-armbian.yml @@ -16,10 +16,11 @@ on: armbian_board: description: "Select device board." required: false - default: "all" + default: "swan1-w28" type: choice options: - all + - swan1-w28 - s905w_s905x_s905mb_s905l3a_s905l3b_s905x2_s905x3_s912_s922x_s922x-ct2000_s922x-reva - s905x3-x88-pro-x3_s912-m8s-pro_s905x-t95_s912-t95z-plus_s905l3-unt400g1_s905lb-r3300l - seewo-sv21_smart-am40_station-m1_sw799_tn3399_zysj_tvi3315a_xiaobao_zcube1-max @@ -157,7 +158,7 @@ on: armbian_kernel: description: "Select kernel version." required: false - default: "6.1.y_6.6.y" + default: "6.1.y" type: choice options: - 5.4.y @@ -175,10 +176,11 @@ on: kernel_repo: description: "Set the kernel repository." required: false - default: "ophub/kernel" + default: "dy008/kernel" type: choice options: - ophub/kernel + - dy008/kernel kernel_usage: description: "Set the tags of the stable kernel." required: false @@ -208,12 +210,12 @@ on: builder_name: description: "Set Armbian builder signature." required: false - default: "ophub" + default: "dy008" type: choice options: - ophub - angel - - yourname + - dy008 env: TZ: America/New_York @@ -300,14 +302,14 @@ jobs: mkdir -p /builder/build ln -sf /builder/build ${GITHUB_WORKSPACE}/build - ln -sf /builder/build /home/runner/work/_actions/ophub/amlogic-s9xxx-armbian/main/build + ln -sf /builder/build /home/runner/work/_actions/dy008/amlogic-s9xxx-armbian/main/build sudo timedatectl set-timezone "${TZ}" echo "build_tag=Armbian${set_release}_${{ inputs.armbian_storage }}_$(date +"%Y.%m")" >> ${GITHUB_OUTPUT} echo "status=success" >> ${GITHUB_OUTPUT} - name: Rebuild Armbian - uses: ophub/amlogic-s9xxx-armbian@main + uses: dy008/amlogic-s9xxx-armbian@main if: ${{ env.ARMBIAN_URL }} != '' && !cancelled() with: build_target: armbian diff --git a/build-armbian/armbian-files/common-files/etc/model_database.conf b/build-armbian/armbian-files/common-files/etc/model_database.conf index fa4ced383f..c2896b488f 100644 --- a/build-armbian/armbian-files/common-files/etc/model_database.conf +++ b/build-armbian/armbian-files/common-files/etc/model_database.conf @@ -215,6 +215,7 @@ r207 :HLink-H68K :rk3568 :rk3568-hlink-h68 r208 :HLink-H69K :rk3568 :rk3568-hlink-h69k.dtb :NA :NA :bootloader.bin :2/4GB-LPDDR4,32G-eMMC,2x1Gb/2x2.5Gb-Nic :rk35xx :rockchip :rk3568 :armbianEnv.txt :unifreq :h69k :yes r209 :Seewo-sv21 :rk3568 :rk3568-seewo-sv21.dtb :NA :u-boot.itb :idbloader.img :2GB-DDR4,32G-eMMC,2x1Gb :6.1.y :rockchip :rk3568 :extlinux.conf :sehczaa :seewo-sv21 :yes r210 :Mrkaio-m68s :rk3568 :rk3568-mrkaio-m68s.dtb :NA :u-boot.itb :idbloader.img :2GB-DDR4,8G-eMMC,2x1Gb :6.1.y :rockchip :rk3568 :armbianEnv.txt :bnaand :mrkaio-m68s :yes +r211 :Swan1-w28 :rk3568 :rk3568-swan1-w28.dtb :NA :u-boot.itb :idbloader.img :2GB-DDR4,16G-eMMC,1x1Gb,BT,wifi :6.x.y :rockchip :rk3568 :armbianEnv.txt :dy008 :swan1-w28 :yes #-------+--------------------------------------------+---------+---------------------------------------+-----------------------------+------------------------------------+--------------------------------+-------------------------------------------+--------------+------------+-------------+----------------+------------------------------------------------+--------------------+---------- # 1.ID 2.MODEL 3.SOC 4.FDTFILE 5.TRUST_IMG 6.MAINLINE_UBOOT 7.BOOTLOADER_IMG 8.DESCRIPTION 9.KERNEL_TAGS 10.PLATFORM 11.FAMILY 12.BOOT_CONF 13.CONTRIBUTORS 14.BOARD 15.BUILD #-------+--------------------------------------------+---------+---------------------------------------+-----------------------------+------------------------------------+--------------------------------+-------------------------------------------+--------------+------------+-------------+----------------+------------------------------------------------+--------------------+---------- diff --git a/build-armbian/armbian-files/different-files/swan1-w28/bootfs/armbianEnv.txt b/build-armbian/armbian-files/different-files/swan1-w28/bootfs/armbianEnv.txt new file mode 100644 index 0000000000..e6a550e21a --- /dev/null +++ b/build-armbian/armbian-files/different-files/swan1-w28/bootfs/armbianEnv.txt @@ -0,0 +1,17 @@ +verbosity=9 +bootlogo=false +fdtfile=rockchip/rk3568-swan1-w28.dtb +rootdev=/dev/mmcblk0p2 +rootfstype=ext4 +rootflags=rw,errors=remount-ro +console=serial +consoleargs=console=ttyS2,1500000 +usbstoragequirks=0x2537:0x1066:u,0x2537:0x1068:u +docker_optimizations=on +earlycon=on +earlyconargs=earlycon=uart8250,mmio32,0xfe660000 +extraargs= +extraboardargs=net.ifnames=0 +overlay_prefix=rk3568 +overlays= +user_overlays= diff --git a/build-armbian/armbian-files/different-files/swan1-w28/bootfs/boot.cmd b/build-armbian/armbian-files/different-files/swan1-w28/bootfs/boot.cmd new file mode 100644 index 0000000000..7cad05ea0a --- /dev/null +++ b/build-armbian/armbian-files/different-files/swan1-w28/bootfs/boot.cmd @@ -0,0 +1,74 @@ +# DO NOT EDIT THIS FILE +# +# Please edit /boot/armbianEnv.txt to set supported parameters +# + +setenv load_addr "0x39000000" +setenv overlay_error "false" +# default values +setenv rootdev "/dev/mmcblk0p1" +setenv verbosity "1" +setenv console "both" +setenv bootlogo "false" +setenv rootfstype "ext4" +setenv rootflags "rw,errors=remount-ro" +setenv docker_optimizations "on" +setenv earlycon "off" + +echo "Boot script loaded from ${devtype} ${devnum}" + +if test -e ${devtype} ${devnum} ${prefix}armbianEnv.txt; then + load ${devtype} ${devnum} ${load_addr} ${prefix}armbianEnv.txt + env import -t ${load_addr} ${filesize} +fi + +if test "${logo}" = "disabled"; then setenv logo "logo.nologo"; fi + +if test "${console}" = "display" || test "${console}" = "both"; then setenv consoleargs "console=tty1"; fi +if test "${console}" = "serial" || test "${console}" = "both"; then setenv consoleargs "${consoleargs} console=tty1"; fi +if test "${earlycon}" = "on"; then setenv consoleargs "${earlyconargs} ${consoleargs}"; fi +if test "${bootlogo}" = "true"; then setenv consoleargs "bootsplash.bootfile=bootsplash.armbian ${consoleargs}"; fi + +# get PARTUUID of first partition on SD/eMMC the boot script was loaded from +if test "${devtype}" = "mmc"; then part uuid mmc ${devnum}:1 partuuid; fi + +setenv bootargs "root=${rootdev} rootwait rootfstype=${rootfstype} rootflags=${rootflags} ${consoleargs} consoleblank=0 loglevel=${verbosity} usb-storage.quirks=${usbstoragequirks} ${extraargs} ${extraboardargs}" + +if test "${docker_optimizations}" = "on"; then setenv bootargs "${bootargs} cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory swapaccount=1"; fi + +load ${devtype} ${devnum} ${ramdisk_addr_r} ${prefix}uInitrd +load ${devtype} ${devnum} ${kernel_addr_r} ${prefix}Image + +load ${devtype} ${devnum} ${fdt_addr_r} ${prefix}dtb/${fdtfile} +fdt addr ${fdt_addr_r} +fdt resize 65536 +for overlay_file in ${overlays}; do + if load ${devtype} ${devnum} ${load_addr} ${prefix}dtb/rockchip/overlay/${overlay_prefix}-${overlay_file}.dtbo; then + echo "Applying kernel provided DT overlay ${overlay_prefix}-${overlay_file}.dtbo" + fdt apply ${load_addr} || setenv overlay_error "true" + fi +done +for overlay_file in ${user_overlays}; do + if load ${devtype} ${devnum} ${load_addr} ${prefix}overlay-user/${overlay_file}.dtbo; then + echo "Applying user provided DT overlay ${overlay_file}.dtbo" + fdt apply ${load_addr} || setenv overlay_error "true" + fi +done +if test "${overlay_error}" = "true"; then + echo "Error applying DT overlays, restoring original DT" + load ${devtype} ${devnum} ${fdt_addr_r} ${prefix}dtb/${fdtfile} +else + if load ${devtype} ${devnum} ${load_addr} ${prefix}dtb/rockchip/overlay/${overlay_prefix}-fixup.scr; then + echo "Applying kernel provided DT fixup script (${overlay_prefix}-fixup.scr)" + source ${load_addr} + fi + if test -e ${devtype} ${devnum} ${prefix}fixup.scr; then + load ${devtype} ${devnum} ${load_addr} ${prefix}fixup.scr + echo "Applying user provided fixup script (fixup.scr)" + source ${load_addr} + fi +fi +booti ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r} + +# Recompile with: +# mkimage -C none -A arm -T script -n 'flatmax load script' -d /boot/boot.cmd /boot/boot.scr diff --git a/build-armbian/armbian-files/different-files/swan1-w28/bootfs/boot.scr b/build-armbian/armbian-files/different-files/swan1-w28/bootfs/boot.scr new file mode 100644 index 0000000000..108563bd43 Binary files /dev/null and b/build-armbian/armbian-files/different-files/swan1-w28/bootfs/boot.scr differ diff --git a/build-armbian/armbian-files/different-files/swan1-w28/rootfs/etc/balance_irq.txt b/build-armbian/armbian-files/different-files/swan1-w28/rootfs/etc/balance_irq.txt new file mode 100644 index 0000000000..93d7b21b07 --- /dev/null +++ b/build-armbian/armbian-files/different-files/swan1-w28/rootfs/etc/balance_irq.txt @@ -0,0 +1,35 @@ +# /etc/balance_irq +# 用于中断设备的负载均衡 +# 用法: +# 首先, 用 cat /proc/interrupts 进行观察 +# 如果某个cpu负载过重,可以把对应的中断设备迁移到其它cpu +# /proc/interrupt格式: +# 最左列:中断号 +# 第 2 至第 2+cpus 列:cpu单核上产生的中断数量 +# 最右列:对应的设备名 +# +# 本配置文件格式: +# 第1列: 设备名 +# 第2列: 期望绑定在第几个cpu (从1开始) +# +# 配置文件改好,运行 balethirq.pl 即时生效 + +# pcie-lan rx +eth0-0 3 +# pcie-lan tx-0 +eth0-16 2 +# pcie-lan tx-1 +eth0-18 2 + +# pcie-wan rx +eth1-0 4 +# pcie wan tx-0 +eth1-16 1 +# pcie wan tx-1 +eth1-18 1 + +# usb 3.0 +xhci-hcd:usb2 1 + +# sata +ahci[fc400000.sata] 2 diff --git a/compile-kernel/tools/config/config-6.1 b/compile-kernel/tools/config/config-6.1 index dbf3f6b10c..600ffe4698 100755 --- a/compile-kernel/tools/config/config-6.1 +++ b/compile-kernel/tools/config/config-6.1 @@ -6986,10 +6986,10 @@ CONFIG_RTC_DRV_AC100=y # CONFIG_RTC_DRV_DS1307 is not set # CONFIG_RTC_DRV_DS1374 is not set # CONFIG_RTC_DRV_DS1672 is not set -CONFIG_RTC_DRV_HYM8563=m +CONFIG_RTC_DRV_HYM8563=y # CONFIG_RTC_DRV_MAX6900 is not set # CONFIG_RTC_DRV_NCT3018Y is not set -CONFIG_RTC_DRV_RK808=y +CONFIG_RTC_DRV_RK808=m # CONFIG_RTC_DRV_RS5C372 is not set # CONFIG_RTC_DRV_ISL1208 is not set # CONFIG_RTC_DRV_ISL12022 is not set diff --git a/compile-kernel/tools/config/config-6.6 b/compile-kernel/tools/config/config-6.6 index e0bf8a6aad..83af68aac2 100644 --- a/compile-kernel/tools/config/config-6.6 +++ b/compile-kernel/tools/config/config-6.6 @@ -6872,7 +6872,7 @@ CONFIG_RTC_DRV_AC100=y CONFIG_RTC_DRV_HYM8563=y # CONFIG_RTC_DRV_MAX6900 is not set # CONFIG_RTC_DRV_NCT3018Y is not set -CONFIG_RTC_DRV_RK808=y +CONFIG_RTC_DRV_RK808=m # CONFIG_RTC_DRV_RS5C372 is not set # CONFIG_RTC_DRV_ISL1208 is not set # CONFIG_RTC_DRV_ISL12022 is not set diff --git a/rebuild b/rebuild index 5c0c2ff68e..d6eb32d9e5 100755 --- a/rebuild +++ b/rebuild @@ -75,12 +75,12 @@ armbian_release_file="etc/armbian-release" ophub_release_file="etc/ophub-release" # U-BOOT files download repository -uboot_repo="https://github.com/ophub/u-boot" +uboot_repo="https://github.com/dy008/u-boot" # Firmware files download repository -firmware_repo="https://github.com/ophub/firmware" +firmware_repo="https://github.com/dy008/firmware" # Set the kernel download repository from github.com -kernel_repo="https://github.com/ophub/kernel" +kernel_repo="https://github.com/dy008/kernel" # Set the tags(kernel_xxx) of the default kernel that can be replaced via the [ -u ] parameter default_tags="stable" # Set the tags(kernel_xxx) of the specific kernel, such as 5.15.y, 6.1.y, etc.