Revert "x86: add amd microcode entries to grub config"
This reverts commit a822283c7e
.
Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
parent
30f30d3e11
commit
8ead5a735d
3 changed files with 16 additions and 14 deletions
12
target/linux/x86/base-files/lib/preinit/02_load_x86_ucode
Normal file
12
target/linux/x86/base-files/lib/preinit/02_load_x86_ucode
Normal 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
|
|
@ -7,12 +7,7 @@ set root='(cd)'
|
||||||
|
|
||||||
menuentry "@TITLE@" {
|
menuentry "@TITLE@" {
|
||||||
linux /boot/vmlinuz @CMDLINE@ noinitrd
|
linux /boot/vmlinuz @CMDLINE@ noinitrd
|
||||||
set amd="/boot/amd-ucode.img"
|
if [ -s /boot/intel-ucode.img ]; then
|
||||||
set intel="/boot/intel-ucode.img"
|
initrd /boot/intel-ucode.img
|
||||||
if [ -s "$amd" ]; then
|
|
||||||
initrd $amd $intel
|
|
||||||
fi
|
|
||||||
if [ -s "$intel" ]; then
|
|
||||||
initrd $intel $amd
|
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,13 +7,8 @@ set root='(@ROOT@)'
|
||||||
|
|
||||||
menuentry "@TITLE@" {
|
menuentry "@TITLE@" {
|
||||||
linux /boot/vmlinuz @CMDLINE@ noinitrd
|
linux /boot/vmlinuz @CMDLINE@ noinitrd
|
||||||
set amd="/boot/amd-ucode.img"
|
if [ -s /boot/intel-ucode.img ]; then
|
||||||
set intel="/boot/intel-ucode.img"
|
initrd /boot/intel-ucode.img
|
||||||
if [ -s "$amd" ]; then
|
|
||||||
initrd $amd $intel
|
|
||||||
fi
|
|
||||||
if [ -s "$intel" ]; then
|
|
||||||
initrd $intel $amd
|
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
menuentry "@TITLE@ (failsafe)" {
|
menuentry "@TITLE@ (failsafe)" {
|
||||||
|
|
Loading…
Reference in a new issue