ouyang/Actions-iStoreOS-RK35XX
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

删除不要的文件和移除移植DG-NAS-LITE/IDO3568-CM4机型产生的内容

Browse Source
This commit is contained in:
519561910@qq.com
2024-10-10 19:51:44 +08:00
parent e266f50b55
commit e0c4d092b7
9 changed files with 8 additions and 1942 deletions
Download Patch File Download Diff File Expand all files Collapse all files

143
configfiles/02_network
View File

@@ -1,143 +0,0 @@
#!/bin/sh
#
# Copyright (C) 2013-2015 OpenWrt.org
#
. /lib/functions/uci-defaults.sh
. /lib/functions/system.sh
rockchip_setup_interfaces()
{
local board="$1"
case "$board" in
armsom,sige7-v1|\
easepi,ars4|\
friendlyelec,nanopi-r5c|\
friendlyelec,nanopi-r6c|\
fastrhino,r66s|\
hinlink,h88k-v2|\
hinlink,h88k|\
hinlink,opc-h66k|\
hinlink,hnas|\
jsy,h1|\
nlnet,xgp|\
firefly,rk3568-roc-pc)
ucidef_set_interfaces_lan_wan 'eth1' 'eth0'
;;
hinlink,opc-h69k|\
friendlyelec,nanopi-r5s)
ucidef_set_interfaces_lan_wan "eth1 eth2" "eth0"
;;
lyt,t68m|\
fastrhino,r68s|\
hinlink,opc-h68k)
ucidef_set_interfaces_lan_wan 'eth1 eth2 eth3' 'eth0'
;;
friendlyelec,nanopi-r6s)
ucidef_set_interfaces_lan_wan 'eth2 eth0' 'eth1'
;;
hinlink,h88k-v3)
ucidef_set_interfaces_lan_wan 'eth1 eth2 eth3 eth4' 'eth0'
;;
hlink,h28k)
ucidef_set_interfaces_lan_wan 'eth0' 'eth1'
;;
inspur,ihec301)
ucidef_add_switch "switch0" \
"0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "7t@eth0"
;;
*)
ucidef_set_interface_lan 'eth0' 'dhcp'
;;
esac
}
generate_mac_from_mmc()
{
local sd_hash
local bootdisk=$(
. /lib/upgrade/common.sh
export_bootdevice && export_partdevice bootdisk 0 && echo $bootdisk
)
if echo "$bootdisk" | grep -q '^mmcblk' && [ -f "/sys/class/block/$bootdisk/device/cid" ]; then
sd_hash=$(sha256sum /sys/class/block/$bootdisk/device/cid | head -n 1)
else
sd_hash=$(sha256sum /sys/class/block/mmcblk*/device/cid | head -n 1)
fi
local mac_base=$(macaddr_canonicalize "$(echo "${sd_hash}" | dd bs=1 count=12 2>/dev/null)")
echo "$(macaddr_unsetbit_mc "$(macaddr_setbit_la "${mac_base}")")"
}
rockchip_setup_macs()
{
local board="$1"
local lan_mac=""
local wan_mac=""
case "$board" in
armsom,sige7-v1|\
easepi,ars4|\
firefly,rk3568-roc-pc|\
friendlyelec,nanopi-r5s|\
friendlyelec,nanopi-r5c|\
friendlyelec,nanopi-r6s|\
friendlyelec,nanopi-r6c|\
hlink,h28k|\
hinlink,h88k-*|\
hinlink,h88k|\
hinlink,opc-h69k|\
hinlink,opc-h68k|\
hinlink,opc-h66k|\
hinlink,hnas|\
jsy,h1|\
yyy,h1|\
idiskk,h1|\
jp,tvbox|\
panther,x2|\
lyt,t68m|\
nlnet,xgp|\
fastrhino,r66s|\
fastrhino,r68s)
wan_mac=$(generate_mac_from_mmc)
lan_mac=$(macaddr_add "$wan_mac" 1)
;;
*)
lan_mac=$(generate_mac_from_mmc)
;;
esac
[ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" $wan_mac
[ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" $lan_mac
}
generate_wwan_uci()
{
local device="$1"
ucidef_set_interface "wwan" device "$device" protocol "modemmanager" metric "100"
[ -f /rom/note -o -f /etc/config/network ] || uci get firewall.@zone[1].network | grep -qFw wwan || uci add_list firewall.@zone[1].network='wwan'
}
rockchip_setup_wwan()
{
local board="$1"
case "$board" in
hinlink,opc-h69k)
generate_wwan_uci "/sys/devices/platform/usbhost/fd000000.dwc3/xhci-hcd.0.auto/usb4/4-1"
;;
hinlink,h88k-*|\
hinlink,h88k)
generate_wwan_uci "/sys/devices/platform/usbdrd3_1/fc400000.usb/xhci-hcd.4.auto/usb6/6-1/6-1.1"
;;
esac
}
board_config_update
board=$(board_name)
rockchip_setup_interfaces $board
rockchip_setup_macs $board
rockchip_setup_wwan $board
board_config_flush
exit 0

1152
configfiles/config-5.10
View File

File diff suppressed because it is too large Load Diff

2
configfiles/config_data.txt
View File

@@ -15,7 +15,7 @@ CONFIG_TARGET_DEVICE_rockchip_rk35xx_DEVICE_lyt_t68m=y
CONFIG_TARGET_DEVICE_rockchip_rk35xx_DEVICE_yyy_h1=y
CONFIG_TARGET_DEVICE_rockchip_rk35xx_DEVICE_jp_tvbox=y
CONFIG_TARGET_DEVICE_rockchip_rk35xx_DEVICE_panther_x2=y
CONFIG_TARGET_DEVICE_rockchip_rk35xx_DEVICE_dg_nas=y
CONFIG_TARGET_DEVICE_rockchip_rk35xx_DEVICE_dg_nas-lite=y
CONFIG_PACKAGE_brcmfmac-firmware-panther-x2=y
CONFIG_PACKAGE_brcmfmac-firmware-jp-tvbox=y

288
configfiles/init.sh
View File

@@ -1,288 +0,0 @@
#!/bin/sh
# based on https://github.com/6ang996/istoreos-rk356x/blob/rk356x/target/linux/rk356x/armv8/base-files/etc/init.d/rename_iface
. /lib/functions.sh
NPROCS="$(grep -c "^processor.*:" /proc/cpuinfo)"
PROC_MASK="$(( (1 << $NPROCS) - 1 ))"
PROC_MASK="$(printf %x "$PROC_MASK")"
rename_iface() {
ip link set $1 down && ip link set $1 name $2
}
get_iface_device() {
basename $(readlink /sys/class/net/$1/device)
}
set_iface_cpumask() {
local core_mask="$1"
local interface="$2"
local device="$3"
local irq
local seconds
local mq
local q
local queue_mask=$(( 0x${PROC_MASK} ^ 0x${core_mask} ))
queue_mask="$(printf %x "$queue_mask")"
local mq_mask="$4"
[[ -d "/sys/class/net/${interface}" ]] || return 1
[[ -n "${device}" && "${device}" = "${interface}-*" ]] && mq=1
[[ -z "${mq}" || "${device}" = "${interface}-0" ]] && ip link set dev "${interface}" up
[[ -z "${device}" ]] && device="$interface"
for seconds in $(seq 0 1); do
irq=$(grep -m1 " ${device}\$" /proc/interrupts | sed -n -e 's/^ *\([^ :]\+\):.*$/\1/p')
if [ -n "${irq}" ]; then
echo "${core_mask}" > /proc/irq/${irq}/smp_affinity
if [[ -z "${mq}" ]]; then
echo "${queue_mask}" > /sys/class/net/$interface/queues/rx-0/rps_cpus
echo "${queue_mask}" > /sys/class/net/$interface/queues/tx-0/xps_cpus
elif [[ "${device}" = "${interface}-0" ]]; then
[[ -n "$mq_mask" ]] || mq_mask="${queue_mask}"
for q in /sys/class/net/$interface/queues/rx-*; do
echo "$mq_mask" > "$q/rps_cpus"
done
# for q in /sys/class/net/$interface/queues/tx-*; do
# echo "$mq_mask" > "$q/xps_cpus"
# done
fi
return 0
fi
sleep 1
done
return 1
}
board_fixup_iface_name() {
local device
case $(board_name) in
friendlyelec,nanopi-r5c|\
fastrhino,r66s)
device="$(get_iface_device eth0)"
if [[ "$device" = "0001:11:00.0" ]]; then
rename_iface eth0 lan1
rename_iface eth1 eth0
rename_iface lan1 eth1
fi
;;
easepi,ars4|\
jsy,h1|\
hinlink,hnas|\
hinlink,opc-h66k)
device="$(get_iface_device eth1)"
if [[ "$device" = "0001:11:00.0" ]]; then
rename_iface eth0 lan1
rename_iface eth1 eth0
rename_iface lan1 eth1
fi
;;
lyt,t68m|\
fastrhino,r68s)
device="$(get_iface_device eth0)"
if [[ "$device" = "fe010000.ethernet" ]]; then
rename_iface eth0 wan
rename_iface eth1 eth0
rename_iface wan eth1
fi
device="$(get_iface_device eth3)"
if [[ "$device" = "0002:21:00.0" ]]; then
rename_iface eth2 lan3
rename_iface eth3 eth2
rename_iface lan3 eth3
fi
;;
firefly,rk3568-roc-pc)
device="$(get_iface_device eth0)"
if [[ "$device" = "fe010000.ethernet" ]]; then
rename_iface eth0 wan
rename_iface eth1 eth0
rename_iface wan eth1
fi
;;
friendlyelec,nanopi-r5s)
device="$(get_iface_device eth2)"
# r5s lan1 is under pcie2x1
if [[ "$device" = "0000:01:00.0" ]]; then
rename_iface eth1 lan2
rename_iface eth2 eth1
rename_iface lan2 eth2
fi
;;
hinlink,opc-h68k)
device="$(get_iface_device eth1)"
if [[ "$device" = "fe010000.ethernet" ]]; then
rename_iface eth0 wan
rename_iface eth1 eth0
rename_iface wan eth1
fi
device="$(get_iface_device eth3)"
if [[ "$device" = "0001:11:00.0" ]]; then
rename_iface eth2 lan3
rename_iface eth3 eth2
rename_iface lan3 eth3
fi
;;
hinlink,opc-h69k)
device="$(get_iface_device eth2)"
if [[ "$device" = "0001:11:00.0" ]]; then
rename_iface eth1 lan2
rename_iface eth2 eth1
rename_iface lan2 eth2
fi
;;
hinlink,h88k-v3|\
friendlyelec,nanopi-r6s)
device="$(get_iface_device eth1)"
if [[ "$device" = "0004:41:00.0" ]]; then
rename_iface eth1 lan2
rename_iface eth2 eth1
rename_iface lan2 eth2
fi
;;
armsom,sige7-v1)
device="$(get_iface_device eth1)"
if [[ "$device" = "0004:41:00.0" ]]; then
rename_iface eth1 wan
rename_iface eth0 eth1
rename_iface wan eth0
fi
;;
esac
}
board_set_iface_smp_affinity() {
case $(board_name) in
firefly,rk3568-roc-pc)
set_iface_cpumask 2 eth0
set_iface_cpumask 4 eth1
;;
hinlink,opc-h69k|\
friendlyelec,nanopi-r5s)
set_iface_cpumask 2 eth0
if ethtool -i eth1 | grep -Fq 'driver: r8169'; then
set_iface_cpumask 4 "eth1"
set_iface_cpumask 8 "eth2"
else
set_iface_cpumask 4 "eth1" "eth1-0" && \
set_iface_cpumask 4 "eth1" "eth1-16" && \
set_iface_cpumask 2 "eth1" "eth1-18" && \
set_iface_cpumask 8 "eth2" "eth2-0" && \
set_iface_cpumask 8 "eth2" "eth2-18" && \
set_iface_cpumask 1 "eth2" "eth2-16"
fi
;;
lyt,t68m|\
fastrhino,r68s|\
hinlink,opc-h68k)
set_iface_cpumask 1 "eth0"
set_iface_cpumask 2 "eth1"
if ethtool -i eth2 | grep -Fq 'driver: r8169'; then
set_iface_cpumask 4 "eth2"
set_iface_cpumask 8 "eth3"
else
set_iface_cpumask 4 "eth2" "eth2-0" && \
set_iface_cpumask 4 "eth2" "eth2-16" && \
set_iface_cpumask 2 "eth2" "eth2-18" && \
set_iface_cpumask 8 "eth3" "eth3-0" && \
set_iface_cpumask 8 "eth3" "eth3-18" && \
set_iface_cpumask 1 "eth3" "eth3-16"
fi
;;
jsy,h1|\
yyy,h1|\
easepi,ars4|\
friendlyelec,nanopi-r5c|\
fastrhino,r66s|\
hinlink,hnas|\
hinlink,opc-h66k)
if ethtool -i eth0 | grep -Fq 'driver: r8169'; then
set_iface_cpumask 4 "eth0"
set_iface_cpumask 8 "eth1"
else
set_iface_cpumask 2 "eth0" "eth0-0" && \
set_iface_cpumask 2 "eth0" "eth0-16" && \
set_iface_cpumask 8 "eth0" "eth0-18" && \
set_iface_cpumask 4 "eth1" "eth1-0" && \
set_iface_cpumask 4 "eth1" "eth1-18" && \
set_iface_cpumask 1 "eth1" "eth1-16"
fi
;;
armsom,sige7-v1|\
friendlyelec,nanopi-r6s|\
friendlyelec,nanopi-r6c)
set_iface_cpumask 2 eth0
if ethtool -i eth1 | grep -Fq 'driver: r8169'; then
set_iface_cpumask 4 "eth1"
set_iface_cpumask 8 "eth2"
else
set_iface_cpumask 4 "eth1" "eth1-0" f0 && \
set_iface_cpumask 4 "eth1" "eth1-16" && \
set_iface_cpumask 2 "eth1" "eth1-18" && \
set_iface_cpumask 8 "eth2" "eth2-0" f0 && \
set_iface_cpumask 8 "eth2" "eth2-18" && \
set_iface_cpumask 1 "eth2" "eth2-16"
fi
;;
hinlink,h88k-*|\
hinlink,h88k)
set_iface_cpumask 2 eth0
if ethtool -i eth1 | grep -Fq 'driver: r8169'; then
set_iface_cpumask 4 "eth1"
set_iface_cpumask 8 "eth2" && \
set_iface_cpumask 10 "eth3" && \
set_iface_cpumask 20 "eth4"
else
set_iface_cpumask 4 "eth1" "eth1-0" f0 && \
set_iface_cpumask 4 "eth1" "eth1-16" && \
set_iface_cpumask 2 "eth1" "eth1-18" && \
set_iface_cpumask 8 "eth2" "eth2-0" f0 && \
set_iface_cpumask 8 "eth2" "eth2-18" && \
set_iface_cpumask 1 "eth2" "eth2-16" && \
set_iface_cpumask 10 "eth3" "eth3-0" f0 && \
set_iface_cpumask 10 "eth3" "eth3-16" && \
set_iface_cpumask 8 "eth3" "eth3-18" && \
set_iface_cpumask 20 "eth4" "eth4-0" f0 && \
set_iface_cpumask 20 "eth4" "eth4-18" && \
set_iface_cpumask 4 "eth4" "eth4-16"
fi
;;
hlink,h28k)
set_iface_cpumask 5 eth0
set_iface_cpumask b eth1
;;
ynn,nas|\
jp,tvbox|\
panther,x2|\
hsa,bh2)
set_iface_cpumask 2 "eth0"
;;
esac
}
board_wait_wifi() {
local seconds
[[ -f "/etc/uci-defaults/01-rk35xx-wifi" ]] || return 0
case $(board_name) in
hinlink,h88k-*|\
hinlink,h88k|\
hinlink,opc-h68k|\
hinlink,opc-h69k)
for seconds in $(seq 0 30); do
[[ -s /etc/config/wireless ]] && break
sleep 1
done
sleep 1
;;
esac
}
board_fixup_iface_name
board_set_iface_smp_affinity
board_wait_wifi

0
configfiles/rk3568-firefly-roc-pc-se-core.dtsi → configfiles/rk3568-dg-nas-lite-core.dtsi
View File

9
configfiles/rk3568-firefly-roc-pc-se.dts → configfiles/rk3568-dg-nas-lite.dts
View File

@@ -8,17 +8,12 @@
#include <dt-bindings/display/rockchip_vop.h>
#include "rk3568.dtsi"
#include "rk3568-firefly-roc-pc-se-core.dtsi"
#include "rk3568-dg-nas-lite-core.dtsi"
#include "rk3568-linux.dtsi"
/ {
/*
model = "Rockchip RK3568 DG NAS LITE";
compatible = "rockchip,dg-nas-lite", "rockchip,rk3568";
*/
model = "DG NAS LITE";
compatible = "dg,nas", "rockchip,rk3568";
compatible = "dg,nas-lite", "rockchip,rk3568";
aliases {
ethernet0 = &gmac0;

308
configfiles/rk35xx.mk
View File

@@ -1,308 +0,0 @@
define Device/rk3568
SOC := rk3568
DEVICE_DTS_DIR := ../dts/rk3568
DEVICE_DTS = $$(SOC)-$$(lastword $$(subst _, ,$$(DEVICE_NAME)))
UBOOT_DEVICE_NAME := easepi-rk3568
IMAGE/sysupgrade.img.gz := boot-common | boot-script rk3568 | pine64-img | gzip | append-metadata
endef
define Device/rk3568_combined
IMAGE/combined.img.gz := boot-combined | boot-script rk3568-cb | pine64-img | gzip | append-metadata
IMAGES := combined.img.gz
endef
define Device/rk3568_combined_fastrhino
IMAGE/combined.img.gz := boot-combined | boot-script rk3568-fastrhino | pine64-img | gzip | append-metadata
IMAGES := combined.img.gz
endef
define Device/rk3568_combined_friendlyelec
IMAGE/combined.img.gz := boot-combined | boot-script rk3568-friendlyelec | pine64-img | gzip | append-metadata
IMAGES := combined.img.gz
endef
define Device/rk3568_combined_hinlink
IMAGE/combined.img.gz := boot-combined | boot-script rk3568-hinlink | pine64-img | gzip | append-metadata
IMAGES := combined.img.gz
endef
define Device/rk3568_combined_nlnet
IMAGE/combined.img.gz := boot-combined | boot-script rk3568-nlnet | pine64-img | gzip | append-metadata
IMAGES := combined.img.gz
endef
define Device/rk3588
SOC := rk3588
DEVICE_DTS_DIR := ../dts/rk3588
DEVICE_DTS = $$(SOC)-$$(lastword $$(subst _, ,$$(DEVICE_NAME)))
UBOOT_DEVICE_NAME := easepi-rk3588
IMAGE/sysupgrade.img.gz := boot-common | boot-script rk3588 | pine64-img | gzip | append-metadata
endef
define Device/rk3588_combined
IMAGE/combined.img.gz := boot-combined | boot-script rk3588-cb | pine64-img | gzip | append-metadata
IMAGES := combined.img.gz
endef
define Device/rk3588_combined_friendlyelec
IMAGE/combined.img.gz := boot-combined | boot-script rk3588-friendlyelec | pine64-img | gzip | append-metadata
IMAGES := combined.img.gz
endef
define Device/rk3588_combined_hinlink
IMAGE/combined.img.gz := boot-combined | boot-script rk3588-hinlink | pine64-img | gzip | append-metadata
IMAGES := combined.img.gz
endef
define Device/rk3528
SOC := rk3528
DEVICE_DTS_DIR := ../dts/rk3528
DEVICE_DTS = $$(SOC)-$$(lastword $$(subst _, ,$$(DEVICE_NAME)))
UBOOT_DEVICE_NAME := easepi-rk3528
IMAGE/sysupgrade.img.gz := boot-common | boot-script rk3528 | pine64-img | gzip | append-metadata
endef
define Device/rk3566
$(call Device/rk3568)
SOC := rk3566
endef
define Device/armsom_sige7-v1
$(call Device/rk3588)
DEVICE_VENDOR := ArmSoM
DEVICE_MODEL := sige7
DEVICE_PACKAGES := kmod-r8125 kmod-nvme kmod-hwmon-pwmfan kmod-thermal
endef
TARGET_DEVICES += armsom_sige7-v1
define Device/fastrhino_common
$(call Device/rk3568)
DEVICE_VENDOR := FastRhino
DEVICE_PACKAGES := kmod-r8125
endef
define Device/fastrhino_r66s
$(call Device/fastrhino_common)
DEVICE_MODEL := R66S
endef
TARGET_DEVICES += fastrhino_r66s
define Device/fastrhino_r68s
$(call Device/fastrhino_common)
DEVICE_MODEL := R68S
endef
TARGET_DEVICES += fastrhino_r68s
define Device/fastrhino_r6xs
$(call Device/fastrhino_common)
$(call Device/rk3568_combined_fastrhino)
DEVICE_MODEL := R68s/R66s combined
SUPPORTED_DEVICES += fastrhino,r66s fastrhino,r68s
DEVICE_DTS := rk3568-r66s rk3568-r68s
endef
TARGET_DEVICES += fastrhino_r6xs
define Device/hinlink_common
$(call Device/rk3568)
DEVICE_VENDOR := HINLINK
DEVICE_PACKAGES := kmod-r8125 kmod-nvme kmod-scsi-core kmod-hwmon-pwmfan kmod-thermal
endef
define Device/hinlink_opc-h6xk
$(call Device/hinlink_common)
$(call Device/rk3568_combined_hinlink)
DEVICE_MODEL := OPC-H69K/H68K/H66K combined
SUPPORTED_DEVICES += hinlink,opc-h66k hinlink,opc-h68k hinlink,opc-h69k
DEVICE_DTS := rk3568-opc-h66k rk3568-opc-h68k rk3568-opc-h69k
endef
TARGET_DEVICES += hinlink_opc-h6xk
define Device/hinlink_hnas
$(call Device/hinlink_common)
DEVICE_MODEL := HNAS
SUPPORTED_DEVICES += hinlink,hnas
endef
TARGET_DEVICES += hinlink_hnas
define Device/easepi_ars4
$(call Device/rk3568)
DEVICE_VENDOR := EasePi
DEVICE_MODEL := ARS4
SUPPORTED_DEVICES += easepi,ars4
DEVICE_PACKAGES := kmod-r8125 kmod-nvme kmod-scsi-core kmod-hwmon-pwmfan kmod-thermal
endef
TARGET_DEVICES += easepi_ars4
define Device/friendlyarm_nanopi-r5s
$(call Device/rk3568)
$(call Device/rk3568_combined_friendlyelec)
DEVICE_VENDOR := FriendlyARM
DEVICE_MODEL := NanoPi R5S/R5C combined
SUPPORTED_DEVICES += friendlyelec,nanopi-r5s friendlyarm,nanopi-r5s friendlyelec,nanopi-r5c
DEVICE_DTS := rk3568-nanopi-r5s rk3568-nanopi-r5c
DEVICE_PACKAGES := kmod-r8125 kmod-nvme kmod-scsi-core kmod-hwmon-pwmfan kmod-thermal
endef
TARGET_DEVICES += friendlyarm_nanopi-r5s
define Device/firefly_station-p2
$(call Device/rk3568)
DEVICE_VENDOR := Firefly
DEVICE_MODEL := Station P2 / ROC PC
DEVICE_DTS := rk3568-firefly-roc-pc
SUPPORTED_DEVICES += firefly,rk3568-roc-pc firefly,station-p2
DEVICE_PACKAGES := kmod-r8125 kmod-nvme kmod-scsi-core
endef
TARGET_DEVICES += firefly_station-p2
define Device/friendlyarm_nanopi-r6s
$(call Device/rk3588)
$(call Device/rk3588_combined_friendlyelec)
DEVICE_VENDOR := FriendlyARM
DEVICE_MODEL := NanoPi R6S/R6C
SUPPORTED_DEVICES += friendlyelec,nanopi-r6s friendlyelec,nanopi-r6c
DEVICE_DTS := rk3588-nanopi-r6s rk3588-nanopi-r6c
DEVICE_PACKAGES := kmod-r8125 kmod-nvme kmod-thermal
endef
TARGET_DEVICES += friendlyarm_nanopi-r6s
define Device/lyt_t68m
$(call Device/rk3568)
DEVICE_VENDOR := LYT
DEVICE_MODEL := T68M
SUPPORTED_DEVICES += lyt,t68m
DEVICE_PACKAGES := kmod-r8125 kmod-nvme kmod-scsi-core
endef
TARGET_DEVICES += lyt_t68m
define Device/hinlink_rk3588
$(call Device/rk3588)
DEVICE_VENDOR := HINLINK
DEVICE_PACKAGES := kmod-r8125 kmod-nvme
endef
define Device/hinlink_h88k
$(call Device/hinlink_rk3588)
$(call Device/rk3588_combined_hinlink)
DEVICE_MODEL := H88K
SUPPORTED_DEVICES += hinlink,h88k-v2 hinlink,h88k-v3 hinlink,h88k
DEVICE_DTS := rk3588-h88k-v2 rk3588-h88k-v3
endef
TARGET_DEVICES += hinlink_h88k
define Device/hinlink_rk3528
$(call Device/rk3528)
DEVICE_VENDOR := HINLINK
DEVICE_PACKAGES := kmod-r8168 kmod-thermal
endef
define Device/hlink_h28k
$(call Device/hinlink_rk3528)
DEVICE_VENDOR := Hlink
DEVICE_MODEL := H28K
SUPPORTED_DEVICES += hlink,h28k
endef
TARGET_DEVICES += hlink_h28k
define Device/inspur_ihec301
$(call Device/rk3588)
DEVICE_VENDOR := Inspur
DEVICE_MODEL := IHEC301
DEVICE_PACKAGES := kmod-scsi-core kmod-hwmon-pwmfan kmod-thermal kmod-switch-rtl8367b swconfig
endef
TARGET_DEVICES += inspur_ihec301
define Device/jsy_h1
$(call Device/rk3568)
DEVICE_VENDOR := JSY
DEVICE_MODEL := H1
DEVICE_DTS := rk3568-jsy-h1
SUPPORTED_DEVICES += jsy,h1
DEVICE_PACKAGES := kmod-r8125 kmod-nvme kmod-scsi-core kmod-thermal kmod-leds-pwm
endef
TARGET_DEVICES += jsy_h1
define Device/yyy_h1
$(call Device/rk3568)
DEVICE_VENDOR := YYY
DEVICE_MODEL := H1
DEVICE_DTS := rk3568-yyy-h1
SUPPORTED_DEVICES += yyy,h1
DEVICE_PACKAGES := kmod-r8125 kmod-nvme kmod-thermal kmod-hwmon-pwmfan kmod-backlight-gpio kmod-leds-pwm
endef
TARGET_DEVICES += yyy_h1
define Device/idiskk_h1
$(call Device/rk3568)
DEVICE_VENDOR := iDiskk
DEVICE_MODEL := H1
DEVICE_DTS := rk3568-idiskk-h1
SUPPORTED_DEVICES += idiskk,h1
DEVICE_PACKAGES := kmod-scsi-core kmod-thermal kmod-hwmon-pwmfan kmod-backlight-gpio kmod-leds-pwm
endef
TARGET_DEVICES += idiskk_h1
define Device/ynn_ynnnas
$(call Device/rk3566)
DEVICE_VENDOR := YingNiuNiu
DEVICE_MODEL := NAS
SUPPORTED_DEVICES += ynn,nas
DEVICE_PACKAGES := kmod-scsi-core
endef
TARGET_DEVICES += ynn_ynnnas
define Device/jp_tvbox
$(call Device/rk3566)
DEVICE_VENDOR := JianPian
DEVICE_MODEL := TV Box
DEVICE_DTS := rk3566-jp-tvbox
SUPPORTED_DEVICES += jp,tvbox
DEVICE_PACKAGES := kmod-scsi-core
endef
TARGET_DEVICES += jp_tvbox
define Device/panther_x2
$(call Device/rk3566)
DEVICE_VENDOR := Panther
DEVICE_MODEL := X2
DEVICE_DTS := rk3566-panther-x2
SUPPORTED_DEVICES += panther,x2
endef
TARGET_DEVICES += panther_x2
define Device/nlnet_xgp
$(call Device/rk3568)
$(call Device/rk3568_combined_nlnet)
DEVICE_VENDOR := NLnet
DEVICE_MODEL := XiGuaPi
UBOOT_DEVICE_NAME := xgp-rk3568
SUPPORTED_DEVICES += nlnet,xgp
DEVICE_PACKAGES := kmod-nvme kmod-scsi-core kmod-hwmon-pwmfan kmod-thermal
DEVICE_DTS := rk3568-xgp rk3568-xgp-v3
endef
TARGET_DEVICES += nlnet_xgp
define Device/rk_demo-rtl8367s
$(call Device/rk3568)
DEVICE_VENDOR := Rockchip
DEVICE_MODEL := Demo RTL8367S
DEVICE_PACKAGES := kmod-scsi-core kmod-hwmon-pwmfan kmod-thermal kmod-switch-rtl8367b swconfig
endef
# TARGET_DEVICES += rk_demo-rtl8367s
define Device/rk3308
SOC := rk3308
DEVICE_DTS_DIR := ../dts/rk3308
DEVICE_DTS = $$(SOC)-$$(lastword $$(subst _, ,$$(DEVICE_NAME)))
UBOOT_DEVICE_NAME := easepi-rk3308
IMAGE/sysupgrade.img.gz := boot-common | boot-script rk3308-uart2 | pine64-img | gzip | append-metadata
endef
define Device/armsom_p2-pro
$(call Device/rk3308)
DEVICE_VENDOR := ArmSoM
DEVICE_MODEL := P2 Pro
SUPPORTED_DEVICES := armsom,p2pro armsom,p2-pro
DEVICE_PACKAGES := kmod-usb-net-rtl8152 ethtool kmod-rkwifi-bcmdhd rkwifi-firmware-ap6256 kmod-sound-soc-rk3308
endef
# TARGET_DEVICES += armsom_p2-pro

46
diy-part2.sh
View File

@@ -17,23 +17,6 @@ sed -i "s/push @mirrors, 'https:\/\/mirror2.openwrt.org\/sources';/&\\npush @mir
# 移植黑豹x2（这些配置文件上游仓库已经有了不用在复制了）
# 上游仓库地址：https://github.com/istoreos/istoreos
# rm -f target/linux/rockchip/image/rk35xx.mk
# cp -f $GITHUB_WORKSPACE/configfiles/rk35xx.mk target/linux/rockchip/image/rk35xx.mk
# rm -f target/linux/rockchip/rk35xx/base-files/lib/board/init.sh
# cp -f $GITHUB_WORKSPACE/configfiles/init.sh target/linux/rockchip/rk35xx/base-files/lib/board/init.sh
# rm -f target/linux/rockchip/rk35xx/base-files/etc/board.d/02_network
# cp -f $GITHUB_WORKSPACE/configfiles/02_network target/linux/rockchip/rk35xx/base-files/etc/board.d/02_network
# 修改内核配置文件
# rm -f target/linux/rockchip/rk35xx/config-5.10
# cp -f $GITHUB_WORKSPACE/configfiles/config-5.10 target/linux/rockchip/rk35xx/config-5.10
@@ -51,6 +34,10 @@ cp -f $GITHUB_WORKSPACE/configfiles/rk3566-jp-tvbox.dts target/linux/rockchip/dt
cp -f $GITHUB_WORKSPACE/configfiles/rk3566-panther-x2.dts target/linux/rockchip/dts/rk3568/rk3566-panther-x2.dts
cp -f $GITHUB_WORKSPACE/configfiles/rk3568-dg-nas-lite-core.dtsi target/linux/rockchip/dts/rk3568/rk3568-dg-nas-lite-core.dtsi
cp -f $GITHUB_WORKSPACE/configfiles/rk3568-dg-nas-lite.dts target/linux/rockchip/dts/rk3568/rk3568-dg-nas-lite.dts
#修改uhttpd配置文件，启用nginx
@@ -66,31 +53,6 @@ cp -a $GITHUB_WORKSPACE/configfiles/etc/* package/base-files/files/etc/
# 增加ido3568 DG NAS LITE
echo -e "\\ndefine Device/dg_nas
\$(call Device/rk3568)
DEVICE_VENDOR := DG
DEVICE_MODEL := NAS LITE
DEVICE_DTS := rk3568-firefly-roc-pc-se
SUPPORTED_DEVICES += dg,nas
DEVICE_PACKAGES := kmod-nvme kmod-scsi-core
endef
TARGET_DEVICES += dg_nas" >> target/linux/rockchip/image/rk35xx.mk
sed -i "s/panther,x2|\\\/&\\n dg,nas|\\\/g" target/linux/rockchip/rk35xx/base-files/lib/board/init.sh
sed -i "s/panther,x2|\\\/&\\n dg,nas|\\\/g" target/linux/rockchip/rk35xx/base-files/etc/board.d/02_network
cp -f $GITHUB_WORKSPACE/configfiles/rk3568-firefly-roc-pc-se-core.dtsi target/linux/rockchip/dts/rk3568/rk3568-firefly-roc-pc-se-core.dtsi
cp -f $GITHUB_WORKSPACE/configfiles/rk3568-firefly-roc-pc-se.dts target/linux/rockchip/dts/rk3568/rk3568-firefly-roc-pc-se.dts
#轮询检查ubus服务是否崩溃，崩溃就重启ubus服务
cp -f $GITHUB_WORKSPACE/configfiles/httpubus package/base-files/files/etc/init.d/httpubus
cp -f $GITHUB_WORKSPACE/configfiles/ubus-examine.sh package/base-files/files/bin/ubus-examine.sh

2
rk35xx/.config
View File

@@ -911,7 +911,7 @@ CONFIG_TARGET_DEVICE_rockchip_rk35xx_DEVICE_lyt_t68m=y
CONFIG_TARGET_DEVICE_rockchip_rk35xx_DEVICE_yyy_h1=y
CONFIG_TARGET_DEVICE_rockchip_rk35xx_DEVICE_jp_tvbox=y
CONFIG_TARGET_DEVICE_rockchip_rk35xx_DEVICE_panther_x2=y
CONFIG_TARGET_DEVICE_rockchip_rk35xx_DEVICE_dg_nas=y
CONFIG_TARGET_DEVICE_rockchip_rk35xx_DEVICE_dg_nas-lite=y
CONFIG_PACKAGE_brcmfmac-firmware-panther-x2=y
CONFIG_PACKAGE_brcmfmac-firmware-jp-tvbox=y
CONFIG_PACKAGE_luci-app-usb-printer=y