KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
This reverts commit 546fced2a2.

Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
John Crispin 2018-11-27 18:58:38 +01:00
parent 231d9d5327
commit c6aa4f53e8
4 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
target/linux/x86/base-files/lib/preinit/02_load_x86_ucode
View file

@ -2,11 +2,9 @@
# Copyright (C) 2018 OpenWrt.org # Copyright (C) 2018 OpenWrt.org
do_load_x86_ucode() { do_load_x86_ucode() {
if grep -q AuthenticAMD /proc/cpuinfo; then
if [ -e "/sys/devices/system/cpu/microcode/reload" ]; then if [ -e "/sys/devices/system/cpu/microcode/reload" ]; then
echo 1 > /sys/devices/system/cpu/microcode/reload echo 1 > /sys/devices/system/cpu/microcode/reload
fi fi
fi
} }
boot_hook_add preinit_main do_load_x86_ucode boot_hook_add preinit_main do_load_x86_ucode

4
target/linux/x86/image/Makefile
View file

@ -9,8 +9,8 @@ include $(INCLUDE_DIR)/image.mk
export PATH=$(TARGET_PATH):/sbin export PATH=$(TARGET_PATH):/sbin
GRUB2_MODULES = biosdisk boot chain configfile ext2 linux ls part_msdos reboot serial test vga GRUB2_MODULES = biosdisk boot chain configfile ext2 linux ls part_msdos reboot serial vga
GRUB2_MODULES_ISO = biosdisk boot chain configfile iso9660 linux ls part_msdos reboot serial test vga GRUB2_MODULES_ISO = biosdisk boot chain configfile iso9660 linux ls part_msdos reboot serial vga
GRUB_TERMINALS = GRUB_TERMINALS =
GRUB_SERIAL_CONFIG = GRUB_SERIAL_CONFIG =
GRUB_TERMINAL_CONFIG = GRUB_TERMINAL_CONFIG =

3
target/linux/x86/image/grub-iso.cfg
View file

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

3
target/linux/x86/image/grub.cfg
View file

@ -7,9 +7,6 @@ set root='(@ROOT@)'
menuentry "@TITLE@" { menuentry "@TITLE@" {
linux /boot/vmlinuz @CMDLINE@ noinitrd linux /boot/vmlinuz @CMDLINE@ noinitrd
if [ -s /boot/intel-ucode.img ]; then
initrd /boot/intel-ucode.img
fi
} }
menuentry "@TITLE@ (failsafe)" { menuentry "@TITLE@ (failsafe)" {
linux /boot/vmlinuz failsafe=true @CMDLINE@ noinitrd linux /boot/vmlinuz failsafe=true @CMDLINE@ noinitrd