Browse Source

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

This reverts commit 546fced2a23557e95dd34246744c3aa6cad92fe6.

Signed-off-by: John Crispin <[email protected]>
John Crispin 7 years ago
parent
commit
c6aa4f53e8

+ 2 - 4
target/linux/x86/base-files/lib/preinit/02_load_x86_ucode

@@ -2,10 +2,8 @@
 # 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
-			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
 }
 }
 
 

+ 2 - 2
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_TERMINALS =
 GRUB_SERIAL_CONFIG =
 GRUB_SERIAL_CONFIG =
 GRUB_TERMINAL_CONFIG =
 GRUB_TERMINAL_CONFIG =

+ 0 - 3
target/linux/x86/image/grub-iso.cfg

@@ -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
 }
 }

+ 0 - 3
target/linux/x86/image/grub.cfg

@@ -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