From de5d6a8726a4bd3c2f821c99c50ae625b57392e2 Mon Sep 17 00:00:00 2001 From: Viacheslav Bocharov Date: Wed, 27 Nov 2024 17:19:17 +0300 Subject: [PATCH 1/4] board: khadas-vim4: add panfrost Signed-off-by: Viacheslav Bocharov --- config/boards/khadas-vim4.conf | 1 + .../overlay/t7-a311d2-4k2k_fb.dtbo | Bin 0 -> 229 bytes .../overlay/t7-a311d2-panfrost.dtbo | Bin 0 -> 327 bytes 3 files changed, 1 insertion(+) create mode 100644 patch/kernel/archive/meson-s4t7-5.15/overlay/t7-a311d2-4k2k_fb.dtbo create mode 100644 patch/kernel/archive/meson-s4t7-5.15/overlay/t7-a311d2-panfrost.dtbo diff --git a/config/boards/khadas-vim4.conf b/config/boards/khadas-vim4.conf index d6ebedd7ef9e..217e33bc91b3 100644 --- a/config/boards/khadas-vim4.conf +++ b/config/boards/khadas-vim4.conf @@ -13,6 +13,7 @@ KHADAS_BOARD_ID="kvim4" # used to compile the fip blobs declare -g KHADAS_OOWOW_BOARD_ID="VIM4" # for use with EXT=output-image-oowow OVERLAY_PREFIX='t7-a311d2' +DEFAULT_OVERLAYS="panfrost" function post_family_tweaks_bsp__enable_fan_service() { if [[ ${BRANCH} = "legacy" ]]; then diff --git a/patch/kernel/archive/meson-s4t7-5.15/overlay/t7-a311d2-4k2k_fb.dtbo b/patch/kernel/archive/meson-s4t7-5.15/overlay/t7-a311d2-4k2k_fb.dtbo new file mode 100644 index 0000000000000000000000000000000000000000..05ae6ebd673f79926132e484176432be934a0bad GIT binary patch literal 229 zcmcb>`|m9S1H)4wwgBQ2K&%18f nl%85*1+fXCmlGn+V3KW=9iNuOkW!QzUtF40Tv=R_n#%wH2qP!x literal 0 HcmV?d00001 diff --git a/patch/kernel/archive/meson-s4t7-5.15/overlay/t7-a311d2-panfrost.dtbo b/patch/kernel/archive/meson-s4t7-5.15/overlay/t7-a311d2-panfrost.dtbo new file mode 100644 index 0000000000000000000000000000000000000000..5dc4d8ff0f86284a9508224a4ca1a1aa84ad77ab GIT binary patch literal 327 zcmY*UQA)!=5S^$Xf&~?O0lyToRPB%S%fB8YOw!G|C6f)CjnrFu0I%Q`)Hg|`bl}aK zeZynke$IZriLx~jy?}4Q_rNu91!ygSuW>qV+5VZ;k)7B!y*`f0Df*dCzbH^v6ye>* zhChlzW!*mj=PXTdzRJb+p*8O5nT>GciKFB?n9|oV^hr%9^<4rtt{X^XplvAsb>%zY zWDne|{ch;`>E!60W4Blw!mbiWXVYp*eehmPI#oeBPQGj``8L@Yhc20xk(M^XrV4L1 J;@6~c{s8I8LOuWh literal 0 HcmV?d00001 From 622e358c9889a2f06c0218b8cc20b36001b2bbf1 Mon Sep 17 00:00:00 2001 From: Viacheslav Bocharov Date: Mon, 18 Nov 2024 16:34:39 +0300 Subject: [PATCH 2/4] jethub bsp: temporary relaxations in the strictness of script execution before refactoring. Signed-off-by: Viacheslav Bocharov --- packages/bsp/jethub/jethub-init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/bsp/jethub/jethub-init b/packages/bsp/jethub/jethub-init index d116ef46c201..c5f3a3585221 100755 --- a/packages/bsp/jethub/jethub-init +++ b/packages/bsp/jethub/jethub-init @@ -3,7 +3,7 @@ declare -g GPIOS declare -g LEDS -set -e +#set -e RP=$(realpath "${0}") SCRIPTPATH=$(dirname "${RP}") From 40e16345a5f9d251716abdf30c99fcf7b3a0b1bb Mon Sep 17 00:00:00 2001 From: Viacheslav Bocharov Date: Tue, 26 Nov 2024 18:03:39 +0300 Subject: [PATCH 3/4] Add jethome repository mirror. use via DOWNLOAD_MIRROR = "jethome" --- config/jethome.key | 42 +++++++++++++++++++++++++ config/sources/families/jethub.conf | 13 +++++--- lib/functions/rootfs/distro-specific.sh | 3 ++ 3 files changed, 53 insertions(+), 5 deletions(-) create mode 100644 config/jethome.key diff --git a/config/jethome.key b/config/jethome.key new file mode 100644 index 000000000000..ce5f19f923ea --- /dev/null +++ b/config/jethome.key @@ -0,0 +1,42 @@ +-----BEGIN PGP ARMORED FILE----- +Comment: Use "gpg --dearmor" for unpacking + +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 +GNca1ww8oGIkPSdd1Wezkhg= +=k584 +-----END PGP ARMORED FILE----- diff --git a/config/sources/families/jethub.conf b/config/sources/families/jethub.conf index 75f66b92b47c..280311e9b632 100644 --- a/config/sources/families/jethub.conf +++ b/config/sources/families/jethub.conf @@ -211,11 +211,14 @@ family_tweaks() { chroot_sdcard systemctl mask suspend.target fi - display_alert "Adding JetHome repository and authentication key" "/etc/apt/sources.list.d/jethome.list" "info" - run_host_command_logged cp -pv "${SRC}"/packages/bsp/jethub/jethome.gpg "${SDCARD}/etc/apt/trusted.gpg.d/" - - echo "deb http://repo.jethome.ru"$([[ $BETA == yes ]] && echo "/beta")" ${RELEASE} jethome-${RELEASE}" \ - >> "${SDCARD}"/etc/apt/sources.list.d/jethome.list + if [[ "$DOWNLOAD_MIRROR" == "jethome" ]]; then + display_alert "JetHome repository and authentication key already added" "family_tweaks" "info" + else + display_alert "Adding JetHome repository and authentication key" "/etc/apt/sources.list.d/jethome.list" "info" + run_host_command_logged cp -pv "${SRC}"/packages/bsp/jethub/jethome.gpg "${SDCARD}/etc/apt/trusted.gpg.d/" + echo "deb http://repo.jethome.ru"$([[ $BETA == yes ]] && echo "/beta")" ${RELEASE} jethome-${RELEASE}" \ + >> "${SDCARD}"/etc/apt/sources.list.d/jethome.list + fi } family_tweaks_bsp() { diff --git a/lib/functions/rootfs/distro-specific.sh b/lib/functions/rootfs/distro-specific.sh index db40363be3ff..cb8793ea84e6 100644 --- a/lib/functions/rootfs/distro-specific.sh +++ b/lib/functions/rootfs/distro-specific.sh @@ -181,6 +181,9 @@ function create_sources_list_and_deploy_repo_key() { echo "deb ${SIGNED_BY}https://mirrors.tuna.tsinghua.edu.cn/armbian $RELEASE ${components[*]}" > "${basedir}"/etc/apt/sources.list.d/armbian.list elif [[ $DOWNLOAD_MIRROR == "bfsu" ]]; then echo "deb ${SIGNED_BY}http://mirrors.bfsu.edu.cn/armbian $RELEASE ${components[*]}" > "${basedir}"/etc/apt/sources.list.d/armbian.list + elif [[ "$DOWNLOAD_MIRROR" == "jethome" ]]; then + echo "deb http://repo.jethome.ru"$([[ $BETA == yes ]] && echo "/beta")" ${RELEASE} jethome-${RELEASE}" > "${basedir}"/etc/apt/sources.list.d/armbian.list + gpg --dearmor < "${SRC}"/config/jethome.key > "${basedir}"/etc/apt/trusted.gpg.d/jethome.gpg else echo "deb ${SIGNED_BY}http://$([[ $BETA == yes ]] && echo "beta" || echo "apt").armbian.com $RELEASE ${components[*]}" > "${basedir}"/etc/apt/sources.list.d/armbian.list fi From e4157bddefe6792a9937dbcc278ade504fe69041 Mon Sep 17 00:00:00 2001 From: Viacheslav Bocharov Date: Mon, 13 Jan 2025 17:23:20 +0300 Subject: [PATCH 4/4] update rtl8822cs driver link to latest commit (update for kernel 6.13+) Signed-off-by: Viacheslav Bocharov --- lib/functions/compilation/patch/drivers_network.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/functions/compilation/patch/drivers_network.sh b/lib/functions/compilation/patch/drivers_network.sh index 090b0e257ce2..7480255e464e 100644 --- a/lib/functions/compilation/patch/drivers_network.sh +++ b/lib/functions/compilation/patch/drivers_network.sh @@ -413,7 +413,7 @@ driver_rtl88x2cs() { if linux-version compare "${version}" ge 5.9 && [[ "$LINUXFAMILY" == meson64 ]]; then # Attach to specific commit (track branch:tune_for_jethub) - local rtl88x2csver='commit:40450f759c8a930d271b5f0a663685f412debc72' # Commit date: Jan 24, 2024 (please update when updating commit ref) + local rtl88x2csver='commit:e2fce3c61059d1977f0ae65e648db2720dcba5f5' # Commit date: Jan 13, 2025 (please update when updating commit ref) display_alert "Adding" "Wireless drivers for Realtek 88x2cs chipsets ${rtl88x2csver}" "info"