[PATCH 09/11] kernel/x86: remove CONFIG_M686 from common configuration

Elliott Mitchell ehem+openwrt at m5p.com
Tue Nov 14 17:08:53 PST 2023


Date: Mon, 17 Apr 2023 08:21:26 -0700

All of the sublevels choose their own values, so there is no point
in the common file having anything.  This also removes a warning from
the kernel build process.

Signed-off-by: Elliott Mitchell <ehem+openwrt at m5p.com>
Reviewed-by: Philip Prindeville <philipp at redfish-solutions.com> 04/2023
---
 target/linux/x86/config-5.15         | 2 +-
 target/linux/x86/config-6.1          | 2 +-
 target/linux/x86/generic/config-5.15 | 1 -
 target/linux/x86/generic/config-6.1  | 1 -
 target/linux/x86/geode/config-5.15   | 1 -
 target/linux/x86/geode/config-6.1    | 1 -
 target/linux/x86/legacy/config-5.15  | 1 -
 target/linux/x86/legacy/config-6.1   | 1 -
 8 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/target/linux/x86/config-5.15 b/target/linux/x86/config-5.15
index e4ec6520e5..71f06ad470 100644
--- a/target/linux/x86/config-5.15
+++ b/target/linux/x86/config-5.15
@@ -204,7 +204,7 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y
 # CONFIG_M586 is not set
 # CONFIG_M586MMX is not set
 # CONFIG_M586TSC is not set
-CONFIG_M686=y
+# CONFIG_M686 is not set
 # CONFIG_MACHZ_WDT is not set
 # CONFIG_MATOM is not set
 # CONFIG_MCORE2 is not set
diff --git a/target/linux/x86/config-6.1 b/target/linux/x86/config-6.1
index 95e88f210b..d6f8f6180b 100644
--- a/target/linux/x86/config-6.1
+++ b/target/linux/x86/config-6.1
@@ -215,7 +215,7 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y
 # CONFIG_M586 is not set
 # CONFIG_M586MMX is not set
 # CONFIG_M586TSC is not set
-CONFIG_M686=y
+# CONFIG_M686 is not set
 # CONFIG_MACHZ_WDT is not set
 # CONFIG_MATOM is not set
 # CONFIG_MCORE2 is not set
diff --git a/target/linux/x86/generic/config-5.15 b/target/linux/x86/generic/config-5.15
index a06175f33a..940a0b1da6 100644
--- a/target/linux/x86/generic/config-5.15
+++ b/target/linux/x86/generic/config-5.15
@@ -240,7 +240,6 @@ 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_MDA_CONSOLE is not set
 CONFIG_MEMORY_BALLOON=y
 CONFIG_MEMREGION=y
diff --git a/target/linux/x86/generic/config-6.1 b/target/linux/x86/generic/config-6.1
index e62dc6575e..746ae3f47d 100644
--- a/target/linux/x86/generic/config-6.1
+++ b/target/linux/x86/generic/config-6.1
@@ -254,7 +254,6 @@ CONFIG_KVM_XFER_TO_GUEST_WORK=y
 # CONFIG_LG_LAPTOP is not set
 CONFIG_LIBNVDIMM=y
 CONFIG_LOCK_SPIN_ON_OWNER=y
-# CONFIG_M686 is not set
 # CONFIG_MDA_CONSOLE is not set
 CONFIG_MEMORY_BALLOON=y
 CONFIG_MEMREGION=y
diff --git a/target/linux/x86/geode/config-5.15 b/target/linux/x86/geode/config-5.15
index b5a1a641bb..977cfbd4aa 100644
--- a/target/linux/x86/geode/config-5.15
+++ b/target/linux/x86/geode/config-5.15
@@ -75,7 +75,6 @@ CONFIG_ISA_BUS_API=y
 # CONFIG_ISCSI_IBFT is not set
 # CONFIG_LANCE is not set
 CONFIG_LEDS_GPIO=y
-# CONFIG_M686 is not set
 # CONFIG_MDA_CONSOLE is not set
 CONFIG_MFD_CORE=y
 CONFIG_MFD_CS5535=y
diff --git a/target/linux/x86/geode/config-6.1 b/target/linux/x86/geode/config-6.1
index f459583c02..08972ed5d0 100644
--- a/target/linux/x86/geode/config-6.1
+++ b/target/linux/x86/geode/config-6.1
@@ -81,7 +81,6 @@ CONFIG_ISA_BUS_API=y
 # CONFIG_ISCSI_IBFT is not set
 # CONFIG_LANCE is not set
 CONFIG_LEDS_GPIO=y
-# CONFIG_M686 is not set
 # CONFIG_MDA_CONSOLE is not set
 CONFIG_MFD_CORE=y
 CONFIG_MFD_CS5535=y
diff --git a/target/linux/x86/legacy/config-5.15 b/target/linux/x86/legacy/config-5.15
index b6a29d57c9..64af1fbf5a 100644
--- a/target/linux/x86/legacy/config-5.15
+++ b/target/linux/x86/legacy/config-5.15
@@ -146,7 +146,6 @@ CONFIG_ISO9660_FS=y
 CONFIG_KCMP=y
 # CONFIG_LANCE is not set
 CONFIG_M586MMX=y
-# CONFIG_M686 is not set
 # CONFIG_MDA_CONSOLE is not set
 CONFIG_MFD_CORE=y
 CONFIG_MFD_INTEL_LPSS=y
diff --git a/target/linux/x86/legacy/config-6.1 b/target/linux/x86/legacy/config-6.1
index c1b132d834..fbadad9d15 100644
--- a/target/linux/x86/legacy/config-6.1
+++ b/target/linux/x86/legacy/config-6.1
@@ -156,7 +156,6 @@ CONFIG_KCMP=y
 # CONFIG_LANCE is not set
 # CONFIG_LG_LAPTOP is not set
 CONFIG_M586MMX=y
-# CONFIG_M686 is not set
 # CONFIG_MDA_CONSOLE is not set
 CONFIG_MFD_CORE=y
 CONFIG_MFD_INTEL_LPSS=y
-- 
(\___(\___(\______          --=> 8-) EHM <=--          ______/)___/)___/)
 \BS (    |       ehem+openwrt at m5p.com     PGP 87145445       |    )   /
  \_CS\   |  _____  -O #include <stddisclaimer.h> O-   _____  |   /  _/
8A19\___\_|_/58D2 7E3D DDF4 7BA6 <-PGP-> 41D1 B375 37D0 8714\_|_/___/5445






More information about the openwrt-devel mailing list