From 4a496e1511c290a2765028622b89fb36f10d7374 Mon Sep 17 00:00:00 2001 From: Adrian Vladu Date: Tue, 10 Sep 2024 07:56:32 +0000 Subject: [PATCH] linux: remove CONFIG_AMD_IOMMU_V2 See: https://github.com/torvalds/linux/commit/5a0b11a180a9b82b4437a4be1cf73530053f139b linux: remove CONFIG_MD_LINEAR See: https://github.com/torvalds/linux/commit/849d18e27be9a1253f2318cb4549cc857219d991 linux: remove CONFIG_NET_ACT_IPT See: https://github.com/torvalds/linux/commit/86fe596b588fc9ec23bf93a5c8f86fc16225dd3a linux: add required CONFIG_MODULE_COMPRESS=y See: https://github.com/torvalds/linux/commit/c7ff693fa2094ba0a9d0a20feb4ab1658eff9c33 linux: remove CONFIG_FB_ARMCLCD See: https://github.com/torvalds/linux/commit/dee56ccb468a832074397fdbf22bbd9bf6d710aa --- .../sys-kernel/coreos-modules/files/amd64_defconfig-6.12 | 1 - .../sys-kernel/coreos-modules/files/arm64_defconfig-6.12 | 1 - .../sys-kernel/coreos-modules/files/commonconfig-6.12 | 3 +-- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-6.12 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-6.12 index 7ff0ac660f..75be392da1 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-6.12 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-6.12 @@ -12,7 +12,6 @@ CONFIG_ACPI_IPMI=m CONFIG_ACPI_PCI_SLOT=y CONFIG_ACPI_PROCESSOR_AGGREGATOR=y CONFIG_AMD_IOMMU=y -CONFIG_AMD_IOMMU_V2=m CONFIG_AQTION=m CONFIG_ARCH_MEMORY_PROBE=y CONFIG_AUTOFS_FS=y diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 index 0ca2fb3897..e83ace56d3 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 @@ -32,7 +32,6 @@ CONFIG_CRYPTO_SHA1_ARM64_CE=y CONFIG_CRYPTO_SHA2_ARM64_CE=y # CONFIG_DEBUG_PREEMPT is not set CONFIG_DM_DEBUG=y -CONFIG_FB_ARMCLCD=y CONFIG_GPIO_PL061=y CONFIG_GPIO_XGENE=y CONFIG_GPIO_XGENE_SB=y diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.12 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.12 index 27561fdd1d..b441b45658 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.12 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.12 @@ -436,7 +436,6 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_MARVELL_PHY=m CONFIG_MAX_RAW_DEVS=8192 CONFIG_MD=y -CONFIG_MD_LINEAR=m CONFIG_MD_RAID0=m CONFIG_MEGARAID_MAILBOX=m CONFIG_MEGARAID_MM=m @@ -460,6 +459,7 @@ CONFIG_MMC_BLOCK_MINORS=16 CONFIG_MMC_SDHCI=m CONFIG_MMC_SDHCI_PCI=m CONFIG_MODULES=y +CONFIG_MODULE_COMPRESS=y CONFIG_MODULE_COMPRESS_XZ=y CONFIG_MODULE_SIG=y CONFIG_MODULE_SIG_KEY="certs/modules.pem" @@ -558,7 +558,6 @@ CONFIG_NET_9P_RDMA=m CONFIG_NET_9P_VIRTIO=m CONFIG_NET_ACT_CSUM=m CONFIG_NET_ACT_GACT=m -CONFIG_NET_ACT_IPT=m CONFIG_NET_ACT_MIRRED=m CONFIG_NET_ACT_NAT=m CONFIG_NET_ACT_PEDIT=m