machines: replace Intel-SCH config-aggregator kernel patches with direct configs

bhouse-nexthop · bhouse-nexthop · commit 924f456ac45f · 2026-07-09T22:22:55.000Z
Nine x86 platforms (the Dell C2xxx/S-series family + agema_ag7648c) each
carried a kernel patch whose sole purpose was to add a platform Kconfig
symbol that select()ed a fixed set of standard Intel SoC options
(I2C_ISCH, I2C_ISMT, GPIO_SCH, MFD_CORE, LPC_SCH) with no driver code.
Replace each with those CONFIG_* set directly in the machine kernel
config and drop the patch.

The aggregator was each platform's only kernel patch, so with it gone they
carry no version-bound kernel code: drop their LINUX_VERSION pins too and
let them ride the default kernel (6.18 LTS, which builds under GCC 14).
The five options were verified to survive `make olddefconfig` against the
6.18 base config.

Signed-off-by: Brad House &lt;bhouse@nexthop.ai&gt;
diff --git a/machine/agema/agema_ag7648c/kernel/config b/machine/agema/agema_ag7648c/kernel/config
@@ -1 +1,5 @@
-CONFIG_AGEMA_AG7648C=y
+CONFIG_I2C_ISCH=y
+CONFIG_I2C_ISMT=y
+CONFIG_GPIO_SCH=y
+CONFIG_MFD_CORE=y
+CONFIG_LPC_SCH=y
diff --git a/machine/agema/agema_ag7648c/kernel/platform-agema-ag7648c.patch b/machine/agema/agema_ag7648c/kernel/platform-agema-ag7648c.patch
diff --git a/machine/agema/agema_ag7648c/kernel/series b/machine/agema/agema_ag7648c/kernel/series
@@ -1 +0,0 @@
-platform-agema-ag7648c.patch
diff --git a/machine/agema/agema_ag7648c/machine.make b/machine/agema/agema_ag7648c/machine.make
@@ -31,9 +31,6 @@ CONSOLE_FLAG = 0
 
 EXTRA_CMDLINE_LINUX = i2c-ismt.bus_speed=100 acpi=off dhcp=eth0
 
-# Set Linux kernel version
-LINUX_VERSION		= 3.2
-LINUX_MINOR_VERSION	= 69
 
 
 #-------------------------------------------------------------------------------
diff --git a/machine/dell/dell_s3000_c2338/kernel/config b/machine/dell/dell_s3000_c2338/kernel/config
@@ -1 +1,5 @@
-CONFIG_DELL_S3000_C2338=y
+CONFIG_I2C_ISCH=y
+CONFIG_I2C_ISMT=y
+CONFIG_GPIO_SCH=y
+CONFIG_MFD_CORE=y
+CONFIG_LPC_SCH=y
diff --git a/machine/dell/dell_s3000_c2338/kernel/platform-dell-s3000-c2338.patch b/machine/dell/dell_s3000_c2338/kernel/platform-dell-s3000-c2338.patch
diff --git a/machine/dell/dell_s3000_c2338/kernel/series b/machine/dell/dell_s3000_c2338/kernel/series
@@ -1 +0,0 @@
-platform-dell-s3000-c2338.patch
diff --git a/machine/dell/dell_s3000_c2338/machine.make b/machine/dell/dell_s3000_c2338/machine.make
@@ -31,9 +31,6 @@ CONSOLE_FLAG = 0
 
 EXTRA_CMDLINE_LINUX = i2c-ismt.bus_speed=100
 
-# Set Linux kernel version
-LINUX_VERSION		= 3.2
-LINUX_MINOR_VERSION	= 69
 
 
 #-------------------------------------------------------------------------------
diff --git a/machine/dell/dell_s4000_c2338/kernel/config b/machine/dell/dell_s4000_c2338/kernel/config
@@ -1 +1,5 @@
-CONFIG_DELL_S4000_C2338=y
+CONFIG_I2C_ISCH=y
+CONFIG_I2C_ISMT=y
+CONFIG_GPIO_SCH=y
+CONFIG_MFD_CORE=y
+CONFIG_LPC_SCH=y
diff --git a/machine/dell/dell_s4000_c2338/kernel/platform-dell-s4000-c2338.patch b/machine/dell/dell_s4000_c2338/kernel/platform-dell-s4000-c2338.patch
diff --git a/machine/dell/dell_s4000_c2338/kernel/series b/machine/dell/dell_s4000_c2338/kernel/series
@@ -1 +0,0 @@
-platform-dell-s4000-c2338.patch
diff --git a/machine/dell/dell_s4000_c2338/machine.make b/machine/dell/dell_s4000_c2338/machine.make
@@ -31,9 +31,6 @@ CONSOLE_FLAG = 0
 
 EXTRA_CMDLINE_LINUX = i2c-ismt.bus_speed=100
 
-# Set Linux kernel version
-LINUX_VERSION		= 3.2
-LINUX_MINOR_VERSION	= 69
 
 
 #-------------------------------------------------------------------------------
diff --git a/machine/dell/dell_s4048t_c2338/kernel/config b/machine/dell/dell_s4048t_c2338/kernel/config
@@ -1 +1,5 @@
-CONFIG_DELL_S4048T_C2338=y
+CONFIG_I2C_ISCH=y
+CONFIG_I2C_ISMT=y
+CONFIG_GPIO_SCH=y
+CONFIG_MFD_CORE=y
+CONFIG_LPC_SCH=y
diff --git a/machine/dell/dell_s4048t_c2338/kernel/platform-dell-s4048t-c2338.patch b/machine/dell/dell_s4048t_c2338/kernel/platform-dell-s4048t-c2338.patch
diff --git a/machine/dell/dell_s4048t_c2338/kernel/series b/machine/dell/dell_s4048t_c2338/kernel/series
@@ -1 +0,0 @@
-platform-dell-s4048t-c2338.patch
diff --git a/machine/dell/dell_s4048t_c2338/machine.make b/machine/dell/dell_s4048t_c2338/machine.make
@@ -28,9 +28,6 @@ CONSOLE_FLAG = 0
 
 EXTRA_CMDLINE_LINUX = i2c-ismt.bus_speed=100
 
-# Set Linux kernel version
-LINUX_VERSION		= 3.2
-LINUX_MINOR_VERSION	= 69
 
 
 #-------------------------------------------------------------------------------
diff --git a/machine/dell/dell_s6010_c2538/kernel/config b/machine/dell/dell_s6010_c2538/kernel/config
@@ -1 +1,5 @@
-CONFIG_DELL_S6010_C2538=y
+CONFIG_I2C_ISCH=y
+CONFIG_I2C_ISMT=y
+CONFIG_GPIO_SCH=y
+CONFIG_MFD_CORE=y
+CONFIG_LPC_SCH=y
diff --git a/machine/dell/dell_s6010_c2538/kernel/platform-dell-s6010-c2538.patch b/machine/dell/dell_s6010_c2538/kernel/platform-dell-s6010-c2538.patch
diff --git a/machine/dell/dell_s6010_c2538/kernel/series b/machine/dell/dell_s6010_c2538/kernel/series
@@ -1 +0,0 @@
-platform-dell-s6010-c2538.patch
diff --git a/machine/dell/dell_s6010_c2538/machine.make b/machine/dell/dell_s6010_c2538/machine.make
@@ -28,9 +28,6 @@ CONSOLE_FLAG = 0
 
 EXTRA_CMDLINE_LINUX = i2c-ismt.bus_speed=100
 
-# Set Linux kernel version
-LINUX_VERSION		= 3.2
-LINUX_MINOR_VERSION	= 69
 
 
 #-------------------------------------------------------------------------------
diff --git a/machine/dell/dell_s6100_c2538/kernel/config b/machine/dell/dell_s6100_c2538/kernel/config
@@ -1 +1,5 @@
-CONFIG_DELL_S6100_C2538=y
+CONFIG_I2C_ISCH=y
+CONFIG_I2C_ISMT=y
+CONFIG_GPIO_SCH=y
+CONFIG_MFD_CORE=y
+CONFIG_LPC_SCH=y
diff --git a/machine/dell/dell_s6100_c2538/kernel/platform-dell-s6100-c2538.patch b/machine/dell/dell_s6100_c2538/kernel/platform-dell-s6100-c2538.patch
diff --git a/machine/dell/dell_s6100_c2538/kernel/series b/machine/dell/dell_s6100_c2538/kernel/series
@@ -1 +0,0 @@
-platform-dell-s6100-c2538.patch
diff --git a/machine/dell/dell_s6100_c2538/machine.make b/machine/dell/dell_s6100_c2538/machine.make
@@ -29,9 +29,6 @@ CONSOLE_SPEED = 115200
 CONSOLE_DEV = 1
 CONSOLE_FLAG = 0
 
-# Set Linux kernel version
-LINUX_VERSION		= 3.2
-LINUX_MINOR_VERSION	= 69
 
 
 EXTRA_CMDLINE_LINUX = i2c-ismt.bus_speed=100
diff --git a/machine/dell/dell_z9100_c2538/kernel/config b/machine/dell/dell_z9100_c2538/kernel/config
@@ -1,2 +1,6 @@
-CONFIG_DELL_Z9100_C2538=y
+CONFIG_I2C_ISCH=y
+CONFIG_I2C_ISMT=y
+CONFIG_GPIO_SCH=y
+CONFIG_MFD_CORE=y
+CONFIG_LPC_SCH=y
 CONFIG_STRICT_DEVMEM=y
diff --git a/machine/dell/dell_z9100_c2538/kernel/platform-dell-z9100-c2538.patch b/machine/dell/dell_z9100_c2538/kernel/platform-dell-z9100-c2538.patch
diff --git a/machine/dell/dell_z9100_c2538/kernel/series b/machine/dell/dell_z9100_c2538/kernel/series
@@ -1 +0,0 @@
-platform-dell-z9100-c2538.patch
diff --git a/machine/dell/dell_z9100_c2538/machine.make b/machine/dell/dell_z9100_c2538/machine.make
@@ -31,9 +31,6 @@ CONSOLE_FLAG = 0
 
 EXTRA_CMDLINE_LINUX = i2c-ismt.bus_speed=100
 
-# Set Linux kernel version
-LINUX_VERSION		= 3.2
-LINUX_MINOR_VERSION	= 69
 
 
 #-------------------------------------------------------------------------------
diff --git a/machine/dell/dellemc_s4100_c2338/kernel/config b/machine/dell/dellemc_s4100_c2338/kernel/config
@@ -1 +1,5 @@
-CONFIG_DELLEMC_S4100_C2338=y
+CONFIG_I2C_ISCH=y
+CONFIG_I2C_ISMT=y
+CONFIG_GPIO_SCH=y
+CONFIG_MFD_CORE=y
+CONFIG_LPC_SCH=y
diff --git a/machine/dell/dellemc_s4100_c2338/kernel/platform-dellemc-s4100-c2338.patch b/machine/dell/dellemc_s4100_c2338/kernel/platform-dellemc-s4100-c2338.patch
diff --git a/machine/dell/dellemc_s4100_c2338/kernel/series b/machine/dell/dellemc_s4100_c2338/kernel/series
@@ -1 +0,0 @@
-platform-dellemc-s4100-c2338.patch
diff --git a/machine/dell/dellemc_s4100_c2338/machine.make b/machine/dell/dellemc_s4100_c2338/machine.make
@@ -29,9 +29,6 @@ EXTRA_CMDLINE_LINUX = i2c-ismt.bus_speed=100
 # Enable UEFI support
 UEFI_ENABLE = yes
 
-# Set Linux kernel version
-LINUX_VERSION		= 4.9
-LINUX_MINOR_VERSION	= 95
 
 #-------------------------------------------------------------------------------
 #
diff --git a/machine/dell/dellemc_s5100_c2538/kernel/config b/machine/dell/dellemc_s5100_c2538/kernel/config
@@ -1 +1,5 @@
-CONFIG_DELLEMC_S5100_C2538=y
+CONFIG_I2C_ISCH=y
+CONFIG_I2C_ISMT=y
+CONFIG_GPIO_SCH=y
+CONFIG_MFD_CORE=y
+CONFIG_LPC_SCH=y
diff --git a/machine/dell/dellemc_s5100_c2538/kernel/platform-dellemc-s5100-c2538.patch b/machine/dell/dellemc_s5100_c2538/kernel/platform-dellemc-s5100-c2538.patch
diff --git a/machine/dell/dellemc_s5100_c2538/kernel/series b/machine/dell/dellemc_s5100_c2538/kernel/series
diff --git a/machine/dell/dellemc_s5100_c2538/machine.make b/machine/dell/dellemc_s5100_c2538/machine.make
