From 4c68b91abe8d7fd7e0235a293dd56013919195d2 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 8 Oct 2023 16:20:30 +0800
Subject: [PATCH] update 2023-10-08 16:20:30
---
luci-app-amlogic/Makefile | 2 +-
.../luasrc/view/amlogic/other_info.htm | 2 +-
luci-app-amlogic/po/zh-cn/amlogic.po | 4 +-
.../root/usr/sbin/openwrt-update-rockchip | 48 -------------------
4 files changed, 4 insertions(+), 52 deletions(-)
diff --git a/luci-app-amlogic/Makefile b/luci-app-amlogic/Makefile
index 8544baee5..b5763d731 100644
--- a/luci-app-amlogic/Makefile
+++ b/luci-app-amlogic/Makefile
@@ -16,7 +16,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-amlogic
-PKG_VERSION:=3.1.203
+PKG_VERSION:=3.1.204
PKG_RELEASE:=1
PKG_LICENSE:=GPL-2.0 License
diff --git a/luci-app-amlogic/luasrc/view/amlogic/other_info.htm b/luci-app-amlogic/luasrc/view/amlogic/other_info.htm
index 2c2832cdb..a3415b5e0 100644
--- a/luci-app-amlogic/luasrc/view/amlogic/other_info.htm
+++ b/luci-app-amlogic/luasrc/view/amlogic/other_info.htm
@@ -31,7 +31,7 @@
<%:Amlogic s905l3b - [ CM211-1, CM311-1, E900V22D, E900V21E, E900V22E, M302A/M304A ]%>
<%:Amlogic s905 ---- [ Beelink-Mini-MX-2G, Sunvell-T95M, MXQ-Pro+4K, SumaVision-Q5 ]%>
<%:Allwinner H6 ---- [ V-Plus Cloud ]%>
- <%:Rockchip -------- [ BeikeYun, L1-Pro, FastRhino R66S/R68S, Radxa 5B/E25, HinLink H66K/H68K/H88k ]%>
+ <%:Rockchip -------- [ BeikeYun, L1-Pro, FastRhino R66S/R68S, Radxa 5B/E25 ]%>
<%:Used in KVM ----- [ Can be used in KVM virtual machine of Armbian system. ]%>
diff --git a/luci-app-amlogic/po/zh-cn/amlogic.po b/luci-app-amlogic/po/zh-cn/amlogic.po
index 3c6542d8d..36d851d2d 100644
--- a/luci-app-amlogic/po/zh-cn/amlogic.po
+++ b/luci-app-amlogic/po/zh-cn/amlogic.po
@@ -215,8 +215,8 @@ msgstr "晶晨 s905 ---- [ Beelink-Mini-MX-2G, Sunvell-T95M, MXQ-Pro+4K, SumaVis
msgid "Allwinner H6 ---- [ V-Plus Cloud ]"
msgstr "全志 H6 ------ [ 微加云 ]"
-msgid "Rockchip -------- [ BeikeYun, L1-Pro, FastRhino R66S/R68S, Radxa 5B/E25, HinLink H66K/H68K/H88k ]"
-msgstr "瑞芯微 ------- [ 贝壳云, 我家云, 电犀牛R66S/R68S, 瑞莎5B/E25, 恒领H66K/H68K/H88k ]"
+msgid "Rockchip -------- [ BeikeYun, L1-Pro, FastRhino R66S/R68S, Radxa 5B/E25 ]"
+msgstr "瑞芯微 ------- [ 贝壳云, 我家云, 电犀牛R66S/R68S, 瑞莎5B/E25 ]"
msgid "Used in KVM ----- [ Can be used in KVM virtual machine of Armbian system. ]"
msgstr "KVM 中使用 --- [ 可以在 Armbian 系统的 KVM 虚拟机中使用。 ]"
diff --git a/luci-app-amlogic/root/usr/sbin/openwrt-update-rockchip b/luci-app-amlogic/root/usr/sbin/openwrt-update-rockchip
index 6e2ed2563..82b0f558d 100755
--- a/luci-app-amlogic/root/usr/sbin/openwrt-update-rockchip
+++ b/luci-app-amlogic/root/usr/sbin/openwrt-update-rockchip
@@ -70,30 +70,6 @@ case $MYDEVICE_NAME in
fi
SOC="r68s"
;;
- "HINLINK OPC-H66K Board"|"Hlink H66K")
- if [ -n "${CURRENT_FDTFILE}" ] && [ "${CURRENT_FDTFILE}" != "rk3568-opc-h66k.dtb" ];then
- MYDTB_FDTFILE="${CURRENT_FDTFILE}"
- else
- MYDTB_FDTFILE="rk3568-hlink-h66k.dtb"
- fi
- SOC="h66k"
- ;;
- "HINLINK OPC-H68K Board"|"Hlink H68K")
- if [ -n "${CURRENT_FDTFILE}" ] && [ "${CURRENT_FDTFILE}" != "rk3568-opc-h68k.dtb" ];then
- MYDTB_FDTFILE="${CURRENT_FDTFILE}"
- else
- MYDTB_FDTFILE="rk3568-hlink-h68k.dtb"
- fi
- SOC="h68k"
- ;;
- "HINLINK OPC-H69K Board"|"Hlink H69K")
- if [ -n "${CURRENT_FDTFILE}" ] && [ "${CURRENT_FDTFILE}" != "rk3568-opc-h69k.dtb" ];then
- MYDTB_FDTFILE="${CURRENT_FDTFILE}"
- else
- MYDTB_FDTFILE="rk3568-hlink-h69k.dtb"
- fi
- SOC="h69k"
- ;;
"Radxa E25")
if [ -n "${CURRENT_FDTFILE}" ]; then
MYDTB_FDTFILE="${CURRENT_FDTFILE}"
@@ -126,30 +102,6 @@ case $MYDEVICE_NAME in
fi
SOC="rock5b"
;;
- "HINLINK OWL H88K-V3 Board"|"Hlink H88K-V3")
- if [ -n "${CURRENT_FDTFILE}" ] && [ "${CURRENT_FDTFILE}" != "rk3568-hinlink-h88k-v3.dtb" ];then
- MYDTB_FDTFILE="${CURRENT_FDTFILE}"
- else
- MYDTB_FDTFILE="rk3588-hlink-h88k-v3.dtb"
- fi
- SOC="h88k-v3"
- ;;
- "HINLINK OWL H88K Board"|"Hlink H88K")
- if [ -n "${CURRENT_FDTFILE}" ] && [ "${CURRENT_FDTFILE}" != "rk3568-hinlink-h88k.dtb" ];then
- MYDTB_FDTFILE="${CURRENT_FDTFILE}"
- else
- MYDTB_FDTFILE="rk3588-hlink-h88k.dtb"
- fi
- SOC="ak88/h88k"
- ;;
- "Hlink H28K")
- if [ -n "${CURRENT_FDTFILE}" ]; then
- MYDTB_FDTFILE="${CURRENT_FDTFILE}"
- else
- MYDTB_FDTFILE="rk3528-hlink-h28k.dtb"
- fi
- SOC="h28k"
- ;;
*) #default
if [ -f "/etc/flippy-openwrt-release" ]; then
source /etc/flippy-openwrt-release 2>/dev/null