yuan/RROrg-rr
1
0
Fork 0
mirror of https://github.com/RROrg/rr.git synced 2025-06-21 05:51:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

新增对 geminilakenk 和 r1000nk 平台的支持，更新相关条件和配置

Browse Source
This commit is contained in:
Ing 2025-05-28 18:04:00 +08:00
parent f008216fec
commit 1a09dc6083
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
files/initrd/opt/rr/boot.sh
View File

@ -246,12 +246,12 @@ if [ "${USBASINTERNAL}" = "true" ]; then
CMDLINE['usbasinternal']="" CMDLINE['usbasinternal']=""
fi fi
if echo "apollolake geminilake purley" | grep -wq "${PLATFORM}"; then if echo "apollolake geminilake purley geminilakenk" | grep -wq "${PLATFORM}"; then
CMDLINE["nox2apic"]="" CMDLINE["nox2apic"]=""
fi fi
# # Save command line to grubenv RR_CMDLINE= ... nox2apic # # Save command line to grubenv RR_CMDLINE= ... nox2apic
# if echo "apollolake geminilake purley" | grep -wq "${PLATFORM}"; then # if echo "apollolake geminilake purley geminilakenk" | grep -wq "${PLATFORM}"; then
# if grep -Eq "^flags.*x2apic.*" /proc/cpuinfo; then # if grep -Eq "^flags.*x2apic.*" /proc/cpuinfo; then
# checkCmdline "rr_cmdline" "nox2apic" || addCmdline "rr_cmdline" "nox2apic" # checkCmdline "rr_cmdline" "nox2apic" || addCmdline "rr_cmdline" "nox2apic"
# fi # fi
@ -265,7 +265,7 @@ fi
# CMDLINE['modprobe.blacklist']+="sdhci,sdhci_pci,sdhci_acpi" # CMDLINE['modprobe.blacklist']+="sdhci,sdhci_pci,sdhci_acpi"
# fi # fi
# fi # fi
if [ "${DT}" = "true" ] && ! echo "v1000nk epyc7002 purley broadwellnkv2" | grep -wq "${PLATFORM}"; then if [ "${DT}" = "true" ] && ! echo "purley broadwellnkv2 epyc7002 geminilakenk r1000nk v1000nk" | grep -wq "${PLATFORM}"; then
if ! echo "${CMDLINE['modprobe.blacklist']}" | grep -q "mpt3sas"; then if ! echo "${CMDLINE['modprobe.blacklist']}" | grep -q "mpt3sas"; then
[ ! "${CMDLINE['modprobe.blacklist']}" = "" ] && CMDLINE['modprobe.blacklist']+="," [ ! "${CMDLINE['modprobe.blacklist']}" = "" ] && CMDLINE['modprobe.blacklist']+=","
CMDLINE['modprobe.blacklist']+="mpt3sas" CMDLINE['modprobe.blacklist']+="mpt3sas"
@ -277,7 +277,7 @@ fi
# CMDLINE['kvm.ignore_msrs']="1" # CMDLINE['kvm.ignore_msrs']="1"
# CMDLINE['kvm.report_ignored_msrs']="0" # CMDLINE['kvm.report_ignored_msrs']="0"
if echo "apollolake geminilake" | grep -wq "${PLATFORM}"; then if echo "apollolake geminilake geminilakenk" | grep -wq "${PLATFORM}"; then
CMDLINE["intel_iommu"]="igfx_off" CMDLINE["intel_iommu"]="igfx_off"
fi fi

6
files/initrd/opt/rr/menu.sh
View File

@ -150,9 +150,9 @@ function modelMenu() {
while true; do while true; do
rm -f "${TMP_PATH}/menu" rm -f "${TMP_PATH}/menu"
FLGNEX=0 FLGNEX=0
IGPU1L=(apollolake geminilake v1000nk epyc7002) IGPU1L=(apollolake geminilake epyc7002 geminilakenk r1000nk v1000nk)
IGPU2L=(v1000nk epyc7002) IGPU2L=(epyc7002 geminilakenk r1000nk v1000nk)
KVER5L=(v1000nk epyc7002) KVER5L=(epyc7002 geminilakenk r1000nk v1000nk)
IGPUID="$(lspci -nd ::300 2>/dev/null | grep "8086" | cut -d' ' -f3 | sed 's/://g')" IGPUID="$(lspci -nd ::300 2>/dev/null | grep "8086" | cut -d' ' -f3 | sed 's/://g')"
NVMEMS=(DS918+ RS1619xs+ DS419+ DS1019+ DS719+ DS1621xs+) NVMEMS=(DS918+ RS1619xs+ DS419+ DS1019+ DS719+ DS1621xs+)
NVMEMD=$(find /sys/devices -type d -name nvme | awk -F'/' '{print NF}' | sort -n | tail -n1) NVMEMD=$(find /sys/devices -type d -name nvme | awk -F'/' '{print NF}' | sort -n | tail -n1)

1
files/initrd/opt/rr/platforms.yml
View File

@ -119,6 +119,7 @@ platforms:
productvers: *productvers5 productvers: *productvers5
geminilakenk: geminilakenk:
dt: true dt: true
noflags: ["x2apic"]
synoinfo: synoinfo:
<<: *synoinfo <<: *synoinfo
netif_seq_by_dts: "no" netif_seq_by_dts: "no"