diff options
| -rw-r--r-- | target/linux/x86/base-files/lib/preinit/02_load_x86_ucode | 12 | ||||
| -rw-r--r-- | target/linux/x86/image/grub-iso.cfg | 9 | ||||
| -rw-r--r-- | target/linux/x86/image/grub.cfg | 9 |
3 files changed, 14 insertions, 16 deletions
diff --git a/target/linux/x86/base-files/lib/preinit/02_load_x86_ucode b/target/linux/x86/base-files/lib/preinit/02_load_x86_ucode deleted file mode 100644 index d3a23e24b2..0000000000 --- a/target/linux/x86/base-files/lib/preinit/02_load_x86_ucode +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -# Copyright (C) 2018 OpenWrt.org - -do_load_x86_ucode() { - if grep -q AuthenticAMD /proc/cpuinfo; then - if [ -e "/sys/devices/system/cpu/microcode/reload" ]; then - echo 1 > /sys/devices/system/cpu/microcode/reload - fi - fi -} - -boot_hook_add preinit_main do_load_x86_ucode diff --git a/target/linux/x86/image/grub-iso.cfg b/target/linux/x86/image/grub-iso.cfg index 5d128aa3aa..c624cbe0ee 100644 --- a/target/linux/x86/image/grub-iso.cfg +++ b/target/linux/x86/image/grub-iso.cfg @@ -7,7 +7,12 @@ set root='(cd)' menuentry "@TITLE@" { linux /boot/vmlinuz @CMDLINE@ noinitrd - if [ -s /boot/intel-ucode.img ]; then - initrd /boot/intel-ucode.img + set amd="/boot/amd-ucode.img" + set intel="/boot/intel-ucode.img" + if [ -s "$amd" ]; then + initrd $amd $intel + fi + if [ -s "$intel" ]; then + initrd $intel $amd fi } diff --git a/target/linux/x86/image/grub.cfg b/target/linux/x86/image/grub.cfg index a665686863..21d719261b 100644 --- a/target/linux/x86/image/grub.cfg +++ b/target/linux/x86/image/grub.cfg @@ -7,8 +7,13 @@ set root='(@ROOT@)' menuentry "@TITLE@" { linux /boot/vmlinuz @CMDLINE@ noinitrd - if [ -s /boot/intel-ucode.img ]; then - initrd /boot/intel-ucode.img + set amd="/boot/amd-ucode.img" + set intel="/boot/intel-ucode.img" + if [ -s "$amd" ]; then + initrd $amd $intel + fi + if [ -s "$intel" ]; then + initrd $intel $amd fi } menuentry "@TITLE@ (failsafe)" { |