domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "x86: add amd microcode entries to grub config"

Browse Source 
This reverts commit a822283c7e.

Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
John Crispin
2018-11-27 18:58:35 +01:00
parent 30f30d3e11
commit 8ead5a735d
3 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
target/linux/x86/base-files/lib/preinit/02_load_x86_ucode Normal file
View File

@@ -0,0 +1,12 @@
#!/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

9
target/linux/x86/image/grub-iso.cfg
View File

@@ -7,12 +7,7 @@ set root='(cd)'
menuentry "@TITLE@" {
linux /boot/vmlinuz @CMDLINE@ noinitrd
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
if [ -s /boot/intel-ucode.img ]; then
initrd /boot/intel-ucode.img
fi
}

9
target/linux/x86/image/grub.cfg
View File

@@ -7,13 +7,8 @@ set root='(@ROOT@)'
menuentry "@TITLE@" {
linux /boot/vmlinuz @CMDLINE@ noinitrd
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
if [ -s /boot/intel-ucode.img ]; then
initrd /boot/intel-ucode.img
fi
}
menuentry "@TITLE@ (failsafe)" {