aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorJohn Crispin <john@phrozen.org>2018-11-27 18:58:38 +0100
committerJohn Crispin <john@phrozen.org>2018-11-27 18:58:38 +0100
commitc6aa4f53e8179eb262d0da1e52ea869298ed3818 (patch)
tree4b511bd5b221f78e383a62171b9cf70e6b64a1f8 /target
parent231d9d5327d161aed166949ea9328609927674ff (diff)
downloadupstream-c6aa4f53e8179eb262d0da1e52ea869298ed3818.tar.gz
upstream-c6aa4f53e8179eb262d0da1e52ea869298ed3818.tar.bz2
upstream-c6aa4f53e8179eb262d0da1e52ea869298ed3818.zip
Revert "x86: add intel microcode entries to grub config"
This reverts commit 546fced2a23557e95dd34246744c3aa6cad92fe6. Signed-off-by: John Crispin <john@phrozen.org>
Diffstat (limited to 'target')
-rw-r--r--target/linux/x86/base-files/lib/preinit/02_load_x86_ucode6
-rw-r--r--target/linux/x86/image/Makefile4
-rw-r--r--target/linux/x86/image/grub-iso.cfg3
-rw-r--r--target/linux/x86/image/grub.cfg3
4 files changed, 4 insertions, 12 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
index d3a23e24b2..fb309c75c1 100644
--- a/target/linux/x86/base-files/lib/preinit/02_load_x86_ucode
+++ b/target/linux/x86/base-files/lib/preinit/02_load_x86_ucode
@@ -2,10 +2,8 @@
# 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
+ if [ -e "/sys/devices/system/cpu/microcode/reload" ]; then
+ echo 1 > /sys/devices/system/cpu/microcode/reload
fi
}
diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile
index f8c3700d32..dbf8a8594b 100644
--- a/target/linux/x86/image/Makefile
+++ b/target/linux/x86/image/Makefile
@@ -9,8 +9,8 @@ include $(INCLUDE_DIR)/image.mk
export PATH=$(TARGET_PATH):/sbin
-GRUB2_MODULES = biosdisk boot chain configfile ext2 linux ls part_msdos reboot serial test vga
-GRUB2_MODULES_ISO = biosdisk boot chain configfile iso9660 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 vga
GRUB_TERMINALS =
GRUB_SERIAL_CONFIG =
GRUB_TERMINAL_CONFIG =
diff --git a/target/linux/x86/image/grub-iso.cfg b/target/linux/x86/image/grub-iso.cfg
index 5d128aa3aa..9c59bdf6d4 100644
--- a/target/linux/x86/image/grub-iso.cfg
+++ b/target/linux/x86/image/grub-iso.cfg
@@ -7,7 +7,4 @@ set root='(cd)'
menuentry "@TITLE@" {
linux /boot/vmlinuz @CMDLINE@ noinitrd
- if [ -s /boot/intel-ucode.img ]; then
- initrd /boot/intel-ucode.img
- fi
}
diff --git a/target/linux/x86/image/grub.cfg b/target/linux/x86/image/grub.cfg
index a665686863..dedfa0a636 100644
--- a/target/linux/x86/image/grub.cfg
+++ b/target/linux/x86/image/grub.cfg
@@ -7,9 +7,6 @@ set root='(@ROOT@)'
menuentry "@TITLE@" {
linux /boot/vmlinuz @CMDLINE@ noinitrd
- if [ -s /boot/intel-ucode.img ]; then
- initrd /boot/intel-ucode.img
- fi
}
menuentry "@TITLE@ (failsafe)" {
linux /boot/vmlinuz failsafe=true @CMDLINE@ noinitrd