diff mbox series

[06/20] kernel: remove drivers marked as modules

Message ID afe0d6c0e51d0d6b7d41724a3a53e7fca6a8c7d1.1700010290.git.ehem+openwrt@m5p.com
State Not Applicable
Delegated to: Petr Štetiar
Headers show
Series Kernel build fixups, split object directory off (partial WIP) | expand

Commit Message

Elliott Mitchell Nov. 11, 2023, 12:51 a.m. UTC 
Previously these would get built, then simply omitted from the
resultant image.  This behavior is expected to change in the future, so
remove these to avoid changing installed modules.

Signed-off-by: Elliott Mitchell <ehem+openwrt@m5p.com>
---
 target/linux/armsr/armv8/config-6.1       |  2 +-
 target/linux/ixp4xx/config-6.1            | 12 ++++++------
 target/linux/mediatek/filogic/config-5.15 |  2 +-
 target/linux/mediatek/filogic/config-6.1  |  2 +-
 target/linux/mediatek/mt7622/config-5.15  |  2 +-
 target/linux/mediatek/mt7622/config-6.1   |  2 +-
 target/linux/ramips/rt288x/config-5.15    | 14 +++++++-------
 target/linux/sifiveu/config-6.1           |  4 ++--
 target/linux/uml/config-5.15              |  2 +-
 target/linux/uml/config-6.1               |  2 +-
 target/linux/x86/64/config-5.15           |  2 +-
 target/linux/x86/64/config-6.1            |  2 +-
 target/linux/x86/generic/config-5.15      |  2 +-
 target/linux/x86/generic/config-6.1       |  2 +-
 14 files changed, 26 insertions(+), 26 deletions(-)

Comments

Bjørn Mork Nov. 15, 2023, 10:29 a.m. UTC | #1 
Elliott Mitchell <ehem+openwrt@m5p.com> writes:

> Previously these would get built, then simply omitted from the
> resultant image.

A kernel image built with a config symbol set to 'm' is sometimes
deliberately differerent from an image built with the same symbol set
to 'n'.  The kernel is sprinkled with IS_ENABLED() or similar open coded
tests. Some of the symbols you are removing are tested.

Did you verify that all these changes still produce the same kernel
images as before?


Bjørn
Elliott Mitchell Nov. 15, 2023, 10:44 p.m. UTC | #2 
On Wed, Nov 15, 2023 at 11:29:23AM +0100, Bjørn Mork wrote:
> Elliott Mitchell <ehem+openwrt@m5p.com> writes:
> 
> > Previously these would get built, then simply omitted from the
> > resultant image.
> 
> A kernel image built with a config symbol set to 'm' is sometimes
> deliberately differerent from an image built with the same symbol set
> to 'n'.  The kernel is sprinkled with IS_ENABLED() or similar open coded
> tests. Some of the symbols you are removing are tested.
> 
> Did you verify that all these changes still produce the same kernel
> images as before?

No, I haven't.  I would tend to look at the git log to find out why
those were added (no mention would suggest accident), but the git log
is rather troublesome for the config files.

I'll try to take a look, but right now I'm spending time testing the
split of kernel source and kernel build.  OpenWRT appears to have quite a
number of issues there.

If enabling those as modules helps then something is very wrong.
diff mbox series

Patch

diff --git a/target/linux/armsr/armv8/config-6.1 b/target/linux/armsr/armv8/config-6.1
index a4c132df55..52f4283394 100644
--- a/target/linux/armsr/armv8/config-6.1
+++ b/target/linux/armsr/armv8/config-6.1
@@ -390,7 +390,7 @@  CONFIG_KCMP=y
 # CONFIG_KEYBOARD_SUN4I_LRADC is not set
 CONFIG_KSM=y
 CONFIG_KVM=y
-CONFIG_LCD_CLASS_DEVICE=m
+# CONFIG_LCD_CLASS_DEVICE is not set
 # CONFIG_LCD_PLATFORM is not set
 # CONFIG_MAILBOX_TEST is not set
 CONFIG_MARVELL_10G_PHY=y
diff --git a/target/linux/ixp4xx/config-6.1 b/target/linux/ixp4xx/config-6.1
index a7b14bfb66..deef4982d9 100644
--- a/target/linux/ixp4xx/config-6.1
+++ b/target/linux/ixp4xx/config-6.1
@@ -51,15 +51,15 @@  CONFIG_CPU_TLB_V4WBI=y
 CONFIG_CPU_USE_DOMAINS=y
 CONFIG_CPU_XSCALE=y
 CONFIG_CRC16=y
-CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_CBC=m
+# CONFIG_CRYPTO_AUTHENC is not set
+# CONFIG_CRYPTO_CBC is not set
 CONFIG_CRYPTO_CRC32C=y
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_DEV_IXP4XX=m
-CONFIG_CRYPTO_ECB=m
+# CONFIG_CRYPTO_DES is not set
+# CONFIG_CRYPTO_DEV_IXP4XX is not set
+# CONFIG_CRYPTO_ECB is not set
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
-CONFIG_CRYPTO_LIB_DES=m
+# CONFIG_CRYPTO_LIB_DES is not set
 CONFIG_CRYPTO_LIB_SHA1=y
 CONFIG_CRYPTO_LIB_UTILS=y
 CONFIG_CRYPTO_RNG2=y
diff --git a/target/linux/mediatek/filogic/config-5.15 b/target/linux/mediatek/filogic/config-5.15
index a8f117f2c4..fe7ce6a5cb 100644
--- a/target/linux/mediatek/filogic/config-5.15
+++ b/target/linux/mediatek/filogic/config-5.15
@@ -426,7 +426,7 @@  CONFIG_WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC=y
 CONFIG_WATCHDOG_PRETIMEOUT_GOV=y
 # CONFIG_WATCHDOG_PRETIMEOUT_GOV_NOOP is not set
 CONFIG_WATCHDOG_PRETIMEOUT_GOV_PANIC=y
-CONFIG_WATCHDOG_PRETIMEOUT_GOV_SEL=m
+# CONFIG_WATCHDOG_PRETIMEOUT_GOV_SEL is not set
 CONFIG_WATCHDOG_SYSFS=y
 CONFIG_XPS=y
 CONFIG_XXHASH=y
diff --git a/target/linux/mediatek/filogic/config-6.1 b/target/linux/mediatek/filogic/config-6.1
index b41e87e10b..1099673929 100644
--- a/target/linux/mediatek/filogic/config-6.1
+++ b/target/linux/mediatek/filogic/config-6.1
@@ -459,7 +459,7 @@  CONFIG_WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC=y
 CONFIG_WATCHDOG_PRETIMEOUT_GOV=y
 # CONFIG_WATCHDOG_PRETIMEOUT_GOV_NOOP is not set
 CONFIG_WATCHDOG_PRETIMEOUT_GOV_PANIC=y
-CONFIG_WATCHDOG_PRETIMEOUT_GOV_SEL=m
+# CONFIG_WATCHDOG_PRETIMEOUT_GOV_SEL is not set
 CONFIG_WATCHDOG_SYSFS=y
 CONFIG_XPS=y
 CONFIG_XXHASH=y
diff --git a/target/linux/mediatek/mt7622/config-5.15 b/target/linux/mediatek/mt7622/config-5.15
index 99a170a2a8..eca08f1c54 100644
--- a/target/linux/mediatek/mt7622/config-5.15
+++ b/target/linux/mediatek/mt7622/config-5.15
@@ -444,7 +444,7 @@  CONFIG_WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC=y
 CONFIG_WATCHDOG_PRETIMEOUT_GOV=y
 # CONFIG_WATCHDOG_PRETIMEOUT_GOV_NOOP is not set
 CONFIG_WATCHDOG_PRETIMEOUT_GOV_PANIC=y
-CONFIG_WATCHDOG_PRETIMEOUT_GOV_SEL=m
+# CONFIG_WATCHDOG_PRETIMEOUT_GOV_SEL is not set
 CONFIG_WATCHDOG_SYSFS=y
 CONFIG_XPS=y
 CONFIG_XXHASH=y
diff --git a/target/linux/mediatek/mt7622/config-6.1 b/target/linux/mediatek/mt7622/config-6.1
index 26f6d8a1b1..a055617075 100644
--- a/target/linux/mediatek/mt7622/config-6.1
+++ b/target/linux/mediatek/mt7622/config-6.1
@@ -458,7 +458,7 @@  CONFIG_WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC=y
 CONFIG_WATCHDOG_PRETIMEOUT_GOV=y
 # CONFIG_WATCHDOG_PRETIMEOUT_GOV_NOOP is not set
 CONFIG_WATCHDOG_PRETIMEOUT_GOV_PANIC=y
-CONFIG_WATCHDOG_PRETIMEOUT_GOV_SEL=m
+# CONFIG_WATCHDOG_PRETIMEOUT_GOV_SEL is not set
 CONFIG_WATCHDOG_SYSFS=y
 CONFIG_XPS=y
 CONFIG_XXHASH=y
diff --git a/target/linux/ramips/rt288x/config-5.15 b/target/linux/ramips/rt288x/config-5.15
index 3f9014796a..af647ca129 100644
--- a/target/linux/ramips/rt288x/config-5.15
+++ b/target/linux/ramips/rt288x/config-5.15
@@ -118,7 +118,7 @@  CONFIG_NET_RALINK_RT2880=y
 CONFIG_NET_RALINK_SOC=y
 CONFIG_NET_SELFTESTS=y
 CONFIG_NET_VENDOR_RALINK=y
-CONFIG_NLS=m
+# CONFIG_NLS is not set
 CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y
 CONFIG_NVMEM=y
 CONFIG_OF=y
@@ -177,12 +177,12 @@  CONFIG_SYS_SUPPORTS_ZBOOT=y
 CONFIG_TARGET_ISA_REV=2
 CONFIG_TICK_CPU_ACCOUNTING=y
 CONFIG_TINY_SRCU=y
-CONFIG_USB=m
-CONFIG_USB_COMMON=m
-CONFIG_USB_EHCI_HCD=m
-CONFIG_USB_EHCI_HCD_PLATFORM=m
-CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_OHCI_HCD_PLATFORM=m
+# CONFIG_USB is not set
+# CONFIG_USB_COMMON is not set
+# CONFIG_USB_EHCI_HCD is not set
+# CONFIG_USB_EHCI_HCD_PLATFORM is not set
+# CONFIG_USB_OHCI_HCD is not set
+# CONFIG_USB_OHCI_HCD_PLATFORM is not set
 CONFIG_USB_SUPPORT=y
 CONFIG_USE_OF=y
 CONFIG_WATCHDOG_CORE=y
diff --git a/target/linux/sifiveu/config-6.1 b/target/linux/sifiveu/config-6.1
index 51ff357db4..fa8ec4b331 100644
--- a/target/linux/sifiveu/config-6.1
+++ b/target/linux/sifiveu/config-6.1
@@ -79,7 +79,7 @@  CONFIG_EDAC_LEGACY_SYSFS=y
 CONFIG_EDAC_SIFIVE=y
 CONFIG_EDAC_SUPPORT=y
 CONFIG_EFI=y
-CONFIG_EFIVAR_FS=m
+# CONFIG_EFIVAR_FS is not set
 # CONFIG_EFI_BOOTLOADER_CONTROL is not set
 # CONFIG_EFI_CAPSULE_LOADER is not set
 # CONFIG_EFI_COCO_SECRET is not set
@@ -243,7 +243,7 @@  CONFIG_PAGE_SIZE_LESS_THAN_256KB=y
 CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
 CONFIG_PCI=y
 CONFIG_PCIEAER=y
-CONFIG_PCIEAER_INJECT=m
+# CONFIG_PCIEAER_INJECT is not set
 CONFIG_PCIEASPM=y
 CONFIG_PCIEASPM_DEFAULT=y
 # CONFIG_PCIEASPM_PERFORMANCE is not set
diff --git a/target/linux/uml/config-5.15 b/target/linux/uml/config-5.15
index 32154633a4..1ba5daf7e3 100644
--- a/target/linux/uml/config-5.15
+++ b/target/linux/uml/config-5.15
@@ -89,7 +89,7 @@  CONFIG_RD_BZIP2=y
 CONFIG_RD_GZIP=y
 CONFIG_RELAY=y
 CONFIG_SG_POOL=y
-CONFIG_SOFT_WATCHDOG=m
+# CONFIG_SOFT_WATCHDOG is not set
 CONFIG_SRCU=y
 CONFIG_SSL=y
 CONFIG_SSL_CHAN="pty"
diff --git a/target/linux/uml/config-6.1 b/target/linux/uml/config-6.1
index 1c2dd5faae..2598069099 100644
--- a/target/linux/uml/config-6.1
+++ b/target/linux/uml/config-6.1
@@ -96,7 +96,7 @@  CONFIG_RD_BZIP2=y
 CONFIG_RD_GZIP=y
 CONFIG_RELAY=y
 CONFIG_SG_POOL=y
-CONFIG_SOFT_WATCHDOG=m
+# CONFIG_SOFT_WATCHDOG is not set
 CONFIG_SRCU=y
 CONFIG_SSL=y
 CONFIG_SSL_CHAN="pty"
diff --git a/target/linux/x86/64/config-5.15 b/target/linux/x86/64/config-5.15
index ea0a51f251..1b99692d69 100644
--- a/target/linux/x86/64/config-5.15
+++ b/target/linux/x86/64/config-5.15
@@ -151,7 +151,7 @@  CONFIG_DRM_TTM_HELPER=y
 CONFIG_DRM_VIRTIO_GPU=y
 CONFIG_DRM_VRAM_HELPER=y
 CONFIG_EFI=y
-CONFIG_EFIVAR_FS=m
+# CONFIG_EFIVAR_FS is not set
 # CONFIG_EFI_BOOTLOADER_CONTROL is not set
 # CONFIG_EFI_CAPSULE_LOADER is not set
 # CONFIG_EFI_CUSTOM_SSDT_OVERLAYS is not set
diff --git a/target/linux/x86/64/config-6.1 b/target/linux/x86/64/config-6.1
index 56ec0c56fd..9add8a4c40 100644
--- a/target/linux/x86/64/config-6.1
+++ b/target/linux/x86/64/config-6.1
@@ -166,7 +166,7 @@  CONFIG_DRM_TTM_HELPER=y
 CONFIG_DRM_VIRTIO_GPU=y
 CONFIG_DRM_VRAM_HELPER=y
 CONFIG_EFI=y
-CONFIG_EFIVAR_FS=m
+# CONFIG_EFIVAR_FS is not set
 # CONFIG_EFI_BOOTLOADER_CONTROL is not set
 # CONFIG_EFI_CAPSULE_LOADER is not set
 # CONFIG_EFI_COCO_SECRET is not set
diff --git a/target/linux/x86/generic/config-5.15 b/target/linux/x86/generic/config-5.15
index 940a0b1da6..dffd3d27eb 100644
--- a/target/linux/x86/generic/config-5.15
+++ b/target/linux/x86/generic/config-5.15
@@ -106,7 +106,7 @@  CONFIG_DRM_TTM_HELPER=y
 CONFIG_DRM_VIRTIO_GPU=y
 CONFIG_DRM_VRAM_HELPER=y
 CONFIG_EFI=y
-CONFIG_EFIVAR_FS=m
+# CONFIG_EFIVAR_FS is not set
 # CONFIG_EFI_BOOTLOADER_CONTROL is not set
 # CONFIG_EFI_CAPSULE_LOADER is not set
 # CONFIG_EFI_CAPSULE_QUIRK_QUARK_CSH is not set
diff --git a/target/linux/x86/generic/config-6.1 b/target/linux/x86/generic/config-6.1
index 746ae3f47d..ea602676b0 100644
--- a/target/linux/x86/generic/config-6.1
+++ b/target/linux/x86/generic/config-6.1
@@ -111,7 +111,7 @@  CONFIG_DRM_TTM_HELPER=y
 CONFIG_DRM_VIRTIO_GPU=y
 CONFIG_DRM_VRAM_HELPER=y
 CONFIG_EFI=y
-CONFIG_EFIVAR_FS=m
+# CONFIG_EFIVAR_FS is not set
 # CONFIG_EFI_BOOTLOADER_CONTROL is not set
 # CONFIG_EFI_CAPSULE_LOADER is not set
 # CONFIG_EFI_CAPSULE_QUIRK_QUARK_CSH is not set