projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
231d9d5
)
Revert "x86: add intel microcode entries to grub config"
author
John Crispin
<john@phrozen.org>
Tue, 27 Nov 2018 17:58:38 +0000
(18:58 +0100)
committer
John Crispin
<john@phrozen.org>
Tue, 27 Nov 2018 17:58:38 +0000
(18:58 +0100)
This reverts commit
546fced2a23557e95dd34246744c3aa6cad92fe6
.
Signed-off-by: John Crispin <john@phrozen.org>
target/linux/x86/base-files/lib/preinit/02_load_x86_ucode
patch
|
blob
|
history
target/linux/x86/image/Makefile
patch
|
blob
|
history
target/linux/x86/image/grub-iso.cfg
patch
|
blob
|
history
target/linux/x86/image/grub.cfg
patch
|
blob
|
history
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 d3a23e24b231b52ddf16cf3cbc722a5c7c2400de..fb309c75c115c16436209f0f69df0c3f491bd19e 100644
(file)
--- 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() {
# 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
}
fi
}
diff --git
a/target/linux/x86/image/Makefile
b/target/linux/x86/image/Makefile
index f8c3700d321565ab9c0b41c4b072e6f81c203954..dbf8a8594b44865ef3ff509d8262d9d2103b4a56 100644
(file)
--- 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
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 =
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 5d128aa3aab17ec4df050479dea16e51a5d9783b..9c59bdf6d49e797ccecc310da08172d84aadf954 100644
(file)
--- 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
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 a665686863e230822b9ad26d43e9ffc54dcf0229..dedfa0a6367524e51e24f1128a3b7786ed1cba3a 100644
(file)
--- 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
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
}
menuentry "@TITLE@ (failsafe)" {
linux /boot/vmlinuz failsafe=true @CMDLINE@ noinitrd