diff --git a/files/initrd/opt/rr/boot.sh b/files/initrd/opt/rr/boot.sh index e2dc4fcf..70b0760b 100755 --- a/files/initrd/opt/rr/boot.sh +++ b/files/initrd/opt/rr/boot.sh @@ -246,12 +246,12 @@ if [ "${USBASINTERNAL}" = "true" ]; then CMDLINE['usbasinternal']="" fi -if echo "apollolake geminilake purley" | grep -wq "${PLATFORM}"; then +if echo "apollolake geminilake purley geminilakenk" | grep -wq "${PLATFORM}"; then CMDLINE["nox2apic"]="" fi # # 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 # checkCmdline "rr_cmdline" "nox2apic" || addCmdline "rr_cmdline" "nox2apic" # fi @@ -265,7 +265,7 @@ fi # CMDLINE['modprobe.blacklist']+="sdhci,sdhci_pci,sdhci_acpi" # 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 [ ! "${CMDLINE['modprobe.blacklist']}" = "" ] && CMDLINE['modprobe.blacklist']+="," CMDLINE['modprobe.blacklist']+="mpt3sas" @@ -277,7 +277,7 @@ fi # CMDLINE['kvm.ignore_msrs']="1" # 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" fi diff --git a/files/initrd/opt/rr/menu.sh b/files/initrd/opt/rr/menu.sh index ddef649d..30930edc 100755 --- a/files/initrd/opt/rr/menu.sh +++ b/files/initrd/opt/rr/menu.sh @@ -150,9 +150,9 @@ function modelMenu() { while true; do rm -f "${TMP_PATH}/menu" FLGNEX=0 - IGPU1L=(apollolake geminilake v1000nk epyc7002) - IGPU2L=(v1000nk epyc7002) - KVER5L=(v1000nk epyc7002) + IGPU1L=(apollolake geminilake epyc7002 geminilakenk r1000nk v1000nk) + IGPU2L=(epyc7002 geminilakenk r1000nk v1000nk) + KVER5L=(epyc7002 geminilakenk r1000nk v1000nk) IGPUID="$(lspci -nd ::300 2>/dev/null | grep "8086" | cut -d' ' -f3 | sed 's/://g')" NVMEMS=(DS918+ RS1619xs+ DS419+ DS1019+ DS719+ DS1621xs+) NVMEMD=$(find /sys/devices -type d -name nvme | awk -F'/' '{print NF}' | sort -n | tail -n1) diff --git a/files/initrd/opt/rr/platforms.yml b/files/initrd/opt/rr/platforms.yml index 1cc1dc0e..566f84ed 100644 --- a/files/initrd/opt/rr/platforms.yml +++ b/files/initrd/opt/rr/platforms.yml @@ -119,6 +119,7 @@ platforms: productvers: *productvers5 geminilakenk: dt: true + noflags: ["x2apic"] synoinfo: <<: *synoinfo netif_seq_by_dts: "no"