[PATCH 2/4] kernel/x86: revert "generic" to i686 ("Pentium Pro")

[Elliott Mitchell]

While many Intel P4 processors were produced, they do not represent
sufficient share of x86 to deserve an exclusive target.  i686 is
a much larger share.  Due to the feature of SMP, which was absent
from x86 before i686 this is still worthy of a distinct target.

Signed-off-by: Elliott Mitchell <ehem+openwrt at m5p.com>
---
 target/linux/x86/generic/config-5.10 | 8 ++++----
 target/linux/x86/generic/config-5.15 | 8 ++++----
 target/linux/x86/generic/target.mk   | 4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/target/linux/x86/generic/config-5.10 b/target/linux/x86/generic/config-5.10
index b683720bf8..65540dc385 100644
--- a/target/linux/x86/generic/config-5.10
+++ b/target/linux/x86/generic/config-5.10
@@ -235,7 +235,7 @@ CONFIG_KVM_XFER_TO_GUEST_WORK=y
 # CONFIG_LANCE is not set
 CONFIG_LIBNVDIMM=y
 CONFIG_LOCK_SPIN_ON_OWNER=y
-# CONFIG_M686 is not set
+CONFIG_M686=y
 # CONFIG_MDA_CONSOLE is not set
 CONFIG_MEMORY_BALLOON=y
 CONFIG_MEMREGION=y
@@ -271,7 +271,7 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y
 # CONFIG_MOUSE_PS2_VMMOUSE is not set
 # CONFIG_MOUSE_SERIAL is not set
 # CONFIG_MOUSE_VSXXXAA is not set
-CONFIG_MPENTIUM4=y
+# CONFIG_MPENTIUM4 is not set
 CONFIG_MUTEX_SPIN_ON_OWNER=y
 CONFIG_ND_BLK=y
 CONFIG_ND_BTT=y
@@ -411,8 +411,8 @@ CONFIG_X86_CPUID=y
 CONFIG_X86_HV_CALLBACK_VECTOR=y
 CONFIG_X86_INTEL_LPSS=y
 CONFIG_X86_INTEL_PSTATE=y
-CONFIG_X86_INTERNODE_CACHE_SHIFT=7
-CONFIG_X86_L1_CACHE_SHIFT=7
+CONFIG_X86_INTERNODE_CACHE_SHIFT=6
+CONFIG_X86_L1_CACHE_SHIFT=6
 # CONFIG_X86_LONGHAUL is not set
 CONFIG_X86_NEED_RELOCS=y
 CONFIG_X86_PAE=y
diff --git a/target/linux/x86/generic/config-5.15 b/target/linux/x86/generic/config-5.15
index 1da6ad555d..e27046c195 100644
--- a/target/linux/x86/generic/config-5.15
+++ b/target/linux/x86/generic/config-5.15
@@ -242,7 +242,7 @@ CONFIG_KVM_XFER_TO_GUEST_WORK=y
 # CONFIG_LANCE is not set
 CONFIG_LIBNVDIMM=y
 CONFIG_LOCK_SPIN_ON_OWNER=y
-# CONFIG_M686 is not set
+CONFIG_M686=y
 # CONFIG_MDA_CONSOLE is not set
 CONFIG_MEMORY_BALLOON=y
 CONFIG_MEMREGION=y
@@ -278,7 +278,7 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y
 # CONFIG_MOUSE_PS2_VMMOUSE is not set
 # CONFIG_MOUSE_SERIAL is not set
 # CONFIG_MOUSE_VSXXXAA is not set
-CONFIG_MPENTIUM4=y
+# CONFIG_MPENTIUM4 is not set
 CONFIG_MUTEX_SPIN_ON_OWNER=y
 CONFIG_ND_BLK=y
 CONFIG_ND_BTT=y
@@ -422,8 +422,8 @@ CONFIG_X86_CPUID=y
 CONFIG_X86_HV_CALLBACK_VECTOR=y
 CONFIG_X86_INTEL_LPSS=y
 CONFIG_X86_INTEL_PSTATE=y
-CONFIG_X86_INTERNODE_CACHE_SHIFT=7
-CONFIG_X86_L1_CACHE_SHIFT=7
+CONFIG_X86_INTERNODE_CACHE_SHIFT=6
+CONFIG_X86_L1_CACHE_SHIFT=6
 # CONFIG_X86_LONGHAUL is not set
 CONFIG_X86_NEED_RELOCS=y
 CONFIG_X86_PAE=y
diff --git a/target/linux/x86/generic/target.mk b/target/linux/x86/generic/target.mk
index 81a1d7a792..7e7f9f5a78 100644
--- a/target/linux/x86/generic/target.mk
+++ b/target/linux/x86/generic/target.mk
@@ -1,10 +1,10 @@
 BOARDNAME:=Generic
-CPU_TYPE :=pentium4
+CPU_TYPE :=i686
 FEATURES += audio pci pcie usb
 
 define Target/Description
 	Build firmware images for modern x86 based boards with CPUs
-	supporting at least the Intel Pentium 4 instruction set with
+	supporting at least the Intel Pentium Pro instruction set with
 	MMX, SSE and SSE2.
 endef
 
-- 
2.30.2