reduce RHEL's overrides over platform's defconfig

(also bump kernel-stable from 6.6.1-001 to 6.6.1-002)

Out of all overrides that scripts/kconfig/merge_config.sh has mentioned
(and captured in rhel/log.merge_config), some have been kept for the sake of
keeping the kernel behaviour "mostly" RHEL-like. Except for the following
overrides, all other overrides have been removed:

CONFIG_SERIO_SERPORT=m

CONFIG_VFAT_FS=m
CONFIG_SQUASHFS=m
CONFIG_NFS_FS=m
CONFIG_NFS_V4=m

CONFIG_CRYPTO_ANSI_CPRNG=m
CONFIG_CRYPTO_USER_API_RNG=y
CONFIG_CRYPTO_CHACHA20_NEON=y
CONFIG_CRYPTO_GHASH_ARM64_CE=m
CONFIG_CRYPTO_SHA1_ARM64_CE=m
CONFIG_CRYPTO_SHA2_ARM64_CE=m

CONFIG_CMA_SIZE_MBYTES=0
This commit is contained in:
Pratham Patel 2023-11-20 13:59:02 +05:30
parent d1070076a9
commit b6bc0f627e
No known key found for this signature in database
2 changed files with 1 additions and 103 deletions

View File

@ -34,20 +34,14 @@ CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y
CONFIG_CMDLINE="console=ttyAMA0"
CONFIG_PM_DEBUG=y
CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
CONFIG_CPU_FREQ_GOV_POWERSAVE=y
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
CONFIG_CPUFREQ_DT=m
CONFIG_CPUFREQ_DT_PLATDEV=y
CONFIG_ARM_SCPI_CPUFREQ=m
CONFIG_ARM_SCMI_CPUFREQ=m
# CONFIG_ARM_TEGRA20_CPUFREQ is not set
# CONFIG_ARM_TEGRA124_CPUFREQ is not set
CONFIG_ACPI_IPMI=m
CONFIG_ACPI_PCI_SLOT=y
CONFIG_ACPI_BGRT=y
CONFIG_ACPI_NFIT=m
CONFIG_ACPI_APEI_EINJ=m
CONFIG_ACPI_PFRUT=m
CONFIG_COMPAT_32BIT_TIME=y
CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
@ -435,7 +429,6 @@ CONFIG_PCI_P2PDMA=y
CONFIG_PCI_HYPERV=m
CONFIG_VGA_ARB_MAX_GPUS=64
CONFIG_HOTPLUG_PCI_ACPI_IBM=m
CONFIG_PCIE_TEGRA194_HOST=y
CONFIG_CXL_BUS=y
CONFIG_CXL_PCI=m
CONFIG_PCCARD=y
@ -449,7 +442,6 @@ CONFIG_FW_LOADER_COMPRESS_ZSTD=y
CONFIG_MHI_BUS=m
CONFIG_CONNECTOR=y
CONFIG_ARM_SCMI_POWER_DOMAIN=m
CONFIG_ARM_SCPI_PROTOCOL=m
CONFIG_ARM_SDE_INTERFACE=y
CONFIG_DMI_SYSFS=y
CONFIG_FW_CFG_SYSFS=y
@ -457,24 +449,14 @@ CONFIG_SYSFB_SIMPLEFB=y
CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
# CONFIG_EFI_ARMSTUB_DTB_LOADER is not set
CONFIG_EFI_COCO_SECRET=y
CONFIG_MTD=m
CONFIG_MTD_BLOCK=m
CONFIG_MTD_CFI=m
CONFIG_MTD_CFI_INTELEXT=m
CONFIG_MTD_CFI_AMDSTD=m
CONFIG_MTD_CFI_STAA=m
CONFIG_MTD_PHYSMAP=m
CONFIG_MTD_RAW_NAND=m
# CONFIG_MTD_NAND_ECC_SW_HAMMING is not set
CONFIG_BLK_DEV_NULL_BLK=m
CONFIG_ZRAM=m
CONFIG_ZRAM_WRITEBACK=y
CONFIG_BLK_DEV_LOOP=m
CONFIG_BLK_DEV_LOOP_MIN_COUNT=0
CONFIG_BLK_DEV_RAM=m
CONFIG_BLK_DEV_RAM_SIZE=16384
CONFIG_CDROM_PKTCDVD=m
CONFIG_VIRTIO_BLK=m
CONFIG_BLK_DEV_RBD=m
CONFIG_NVME_MULTIPATH=y
CONFIG_NVME_VERBOSE_ERRORS=y
@ -512,9 +494,6 @@ CONFIG_ISCSI_TCP=m
CONFIG_SCSI_CXGB4_ISCSI=m
CONFIG_BE2ISCSI=m
CONFIG_SCSI_HPSA=m
CONFIG_SCSI_HISI_SAS=m
CONFIG_SCSI_HISI_SAS_PCI=m
CONFIG_MEGARAID_SAS=m
CONFIG_SCSI_MPI3MR=m
CONFIG_SCSI_SMARTPQI=m
CONFIG_LIBFC=m
@ -533,12 +512,9 @@ CONFIG_SCSI_DH_RDAC=y
CONFIG_SCSI_DH_HP_SW=y
CONFIG_SCSI_DH_EMC=y
CONFIG_SCSI_DH_ALUA=y
CONFIG_SATA_AHCI_PLATFORM=m
CONFIG_AHCI_XGENE=m
CONFIG_SATA_AHCI_SEATTLE=m
CONFIG_ATA_PIIX=y
CONFIG_ATA_GENERIC=m
CONFIG_BLK_DEV_MD=y
CONFIG_MD_LINEAR=m
CONFIG_MD_FAULTY=m
CONFIG_DM_DEBUG=y
@ -596,8 +572,6 @@ CONFIG_BAREUDP=m
CONFIG_MACSEC=m
CONFIG_NETCONSOLE=m
CONFIG_NETCONSOLE_DYNAMIC=y
CONFIG_TUN=m
CONFIG_VIRTIO_NET=m
CONFIG_NLMON=m
CONFIG_NET_VRF=m
CONFIG_VSOCKMON=m
@ -608,8 +582,6 @@ CONFIG_VSOCKMON=m
# CONFIG_NET_VENDOR_ALACRITECH is not set
# CONFIG_NET_VENDOR_ALTEON is not set
CONFIG_ENA_ETHERNET=m
CONFIG_AMD_XGBE=m
CONFIG_NET_XGENE=m
CONFIG_NET_XGENE_V2=m
# CONFIG_NET_VENDOR_ARC is not set
CONFIG_ATL1=m
@ -621,7 +593,6 @@ CONFIG_BNXT=m
CONFIG_BNXT_DCB=y
# CONFIG_BNXT_HWMON is not set
# CONFIG_NET_VENDOR_CADENCE is not set
CONFIG_THUNDER_NIC_PF=m
CONFIG_THUNDER_NIC_VF=m
CONFIG_CHELSIO_T4VF=m
CONFIG_CHELSIO_IPSEC_INLINE=m
@ -633,17 +604,10 @@ CONFIG_CHELSIO_TLS_DEVICE=m
# CONFIG_NET_VENDOR_EMULEX is not set
# CONFIG_NET_VENDOR_EZCHIP is not set
CONFIG_GVE=m
CONFIG_HNS_DSAF=m
CONFIG_HNS_ENET=m
CONFIG_HNS3=m
CONFIG_HNS3_DCB=y
CONFIG_HNS3_HCLGEVF=m
CONFIG_HINIC=m
# CONFIG_NET_VENDOR_I825XX is not set
CONFIG_E1000=m
CONFIG_E1000E=m
CONFIG_IGB=m
CONFIG_IGBVF=m
CONFIG_IXGBE=m
CONFIG_IXGBE_DCB=y
CONFIG_IXGBEVF=m
@ -689,7 +653,6 @@ CONFIG_ROCKER=m
# CONFIG_NET_VENDOR_SEEQ is not set
# CONFIG_NET_VENDOR_SILAN is not set
# CONFIG_NET_VENDOR_SIS is not set
CONFIG_SMC91X=m
# CONFIG_NET_VENDOR_SOCIONEXT is not set
CONFIG_DWMAC_DWC_QOS_ETH=m
# CONFIG_DWMAC_GENERIC is not set
@ -705,7 +668,6 @@ CONFIG_DWMAC_DWC_QOS_ETH=m
CONFIG_PHYLIB=y
CONFIG_LED_TRIGGER_PHY=y
CONFIG_AMD_PHY=m
CONFIG_AQUANTIA_PHY=m
CONFIG_BROADCOM_PHY=m
CONFIG_BCM87XX_PHY=m
CONFIG_CICADA_PHY=m
@ -715,23 +677,16 @@ CONFIG_ICPLUS_PHY=m
CONFIG_LXT_PHY=m
CONFIG_INTEL_XWAY_PHY=m
CONFIG_LSI_ET1011C_PHY=m
CONFIG_MARVELL_10G_PHY=m
CONFIG_MAXLINEAR_GPHY=m
CONFIG_MICREL_PHY=m
CONFIG_MICROCHIP_T1_PHY=m
CONFIG_MICROSEMI_PHY=m
CONFIG_NATIONAL_PHY=m
CONFIG_AT803X_PHY=m
CONFIG_QSEMI_PHY=m
CONFIG_RENESAS_PHY=m
CONFIG_ROCKCHIP_PHY=m
CONFIG_STE10XP=m
CONFIG_TERANETICS_PHY=m
CONFIG_DP83822_PHY=m
CONFIG_DP83TC811_PHY=m
CONFIG_DP83848_PHY=m
CONFIG_DP83867_PHY=m
CONFIG_VITESSE_PHY=m
CONFIG_XILINX_GMII2RGMII=m
CONFIG_MICREL_KS8995MA=m
CONFIG_CAN_VCAN=m
@ -745,7 +700,6 @@ CONFIG_CAN_EMS_USB=m
CONFIG_CAN_KVASER_USB=m
CONFIG_CAN_PEAK_USB=m
CONFIG_MDIO_BITBANG=m
CONFIG_MDIO_GPIO=m
CONFIG_MDIO_HISI_FEMAC=m
CONFIG_MDIO_MSCC_MIIM=m
CONFIG_MDIO_OCTEON=m
@ -792,7 +746,6 @@ CONFIG_HDLC_RAW=m
CONFIG_HDLC_CISCO=m
CONFIG_HDLC_FR=m
CONFIG_HDLC_PPP=m
CONFIG_WWAN=y
CONFIG_VMXNET3=m
CONFIG_USB4_NET=m
CONFIG_HYPERV_NET=m
@ -825,7 +778,6 @@ CONFIG_SERIAL_8250_RT288X=y
CONFIG_SERIAL_NONSTANDARD=y
CONFIG_N_HDLC=m
CONFIG_N_GSM=m
CONFIG_VIRTIO_CONSOLE=m
CONFIG_IPMI_SSIF=m
CONFIG_IPMI_IPMB=m
CONFIG_IPMI_WATCHDOG=m
@ -837,19 +789,14 @@ CONFIG_HW_RANDOM_CAVIUM=m
CONFIG_HW_RANDOM_CN10K=m
# CONFIG_DEVMEM is not set
# CONFIG_DEVPORT is not set
CONFIG_TCG_TIS=y
CONFIG_TCG_TIS_I2C_NUVOTON=m
CONFIG_I2C=y
CONFIG_I2C_CHARDEV=m
CONFIG_I2C_MUX=m
CONFIG_I2C_ARB_GPIO_CHALLENGE=m
CONFIG_I2C_MUX_GPIO=m
CONFIG_I2C_MUX_PCA9541=m
CONFIG_I2C_MUX_PCA954x=m
CONFIG_I2C_MUX_PINCTRL=m
CONFIG_I2C_MUX_MLXCPLD=m
CONFIG_I2C_NFORCE2=m
CONFIG_I2C_DESIGNWARE_PLATFORM=m
CONFIG_I2C_MLXBF=m
CONFIG_I2C_PCA_PLATFORM=m
CONFIG_I2C_SIMTEC=m
@ -863,17 +810,13 @@ CONFIG_I2C_VIRTIO=m
CONFIG_I2C_STUB=m
CONFIG_I2C_SLAVE_EEPROM=m
CONFIG_SPI_BITBANG=m
CONFIG_SPI_PL022=m
CONFIG_SPI_XLP=m
CONFIG_SPI_AMD=y
CONFIG_PPS_CLIENT_LDISC=m
CONFIG_PPS_CLIENT_GPIO=m
CONFIG_DP83640_PHY=m
CONFIG_PTP_1588_CLOCK_KVM=m
CONFIG_GPIO_DWAPB=m
CONFIG_GPIO_XGENE_SB=m
CONFIG_GPIO_XLP=m
CONFIG_GPIO_PCA953X=m
CONFIG_GPIO_MLXBF2=m
CONFIG_GPIO_VIRTIO=m
CONFIG_GPIO_SIM=m
@ -883,8 +826,6 @@ CONFIG_POWER_RESET_HISI=y
CONFIG_POWER_RESET_RESTART=y
CONFIG_CHARGER_SMB347=m
CONFIG_SENSORS_AD7314=m
CONFIG_SENSORS_ARM_SCMI=m
CONFIG_SENSORS_ARM_SCPI=m
CONFIG_SENSORS_G762=m
CONFIG_SENSORS_POWR1220=m
CONFIG_SENSORS_LTC2945=m
@ -915,11 +856,9 @@ CONFIG_THERMAL_GOV_FAIR_SHARE=y
CONFIG_THERMAL_GOV_USER_SPACE=y
CONFIG_HISI_THERMAL=m
CONFIG_MAX77620_THERMAL=m
CONFIG_TEGRA_SOCTHERM=y
CONFIG_WATCHDOG_SYSFS=y
CONFIG_SOFT_WATCHDOG=m
CONFIG_MLX_WDT=m
CONFIG_ARM_SBSA_WATCHDOG=m
CONFIG_MAX77620_WATCHDOG=y
CONFIG_I6300ESB_WDT=m
CONFIG_HP_WATCHDOG=m
@ -927,14 +866,10 @@ CONFIG_BCMA=m
CONFIG_BCMA_DRIVER_GMAC_CMN=y
CONFIG_BCMA_DRIVER_GPIO=y
CONFIG_MFD_MAX77686=m
CONFIG_MFD_ROHM_BD718XX=m
# CONFIG_MFD_VEXPRESS_SYSREG is not set
CONFIG_REGULATOR=y
CONFIG_REGULATOR_USERSPACE_CONSUMER=m
CONFIG_REGULATOR_BD718XX=m
CONFIG_REGULATOR_GPIO=m
CONFIG_REGULATOR_MAX77686=m
CONFIG_REGULATOR_PFUZE100=m
CONFIG_MEDIA_CEC_SUPPORT=y
CONFIG_USB_PULSE8_CEC=m
CONFIG_USB_RAINSHADOW_CEC=m
@ -971,7 +906,6 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
CONFIG_BACKLIGHT_GPIO=m
CONFIG_BACKLIGHT_LED=m
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
CONFIG_SOUND=m
CONFIG_HID_BATTERY_STRENGTH=y
CONFIG_HIDRAW=y
CONFIG_UHID=m
@ -1058,13 +992,10 @@ CONFIG_USB_LED_TRIG=y
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
CONFIG_USB_LEDS_TRIGGER_USBPORT=m
CONFIG_USB_MON=y
CONFIG_USB_XHCI_TEGRA=m
CONFIG_USB_EHCI_TEGRA=m
CONFIG_USB_EHCI_HCD_PLATFORM=m
CONFIG_USB_UHCI_HCD=y
CONFIG_USB_PRINTER=m
CONFIG_USB_TMC=m
CONFIG_USB_STORAGE=m
CONFIG_USB_STORAGE_REALTEK=m
CONFIG_USB_STORAGE_DATAFAB=m
CONFIG_USB_STORAGE_FREECOM=m
@ -1086,7 +1017,6 @@ CONFIG_USB_DWC3_HOST=y
# CONFIG_USB_DWC3_HAPS is not set
# CONFIG_USB_DWC3_OF_SIMPLE is not set
# CONFIG_USB_DWC3_QCOM is not set
CONFIG_USB_SERIAL=y
CONFIG_USB_SERIAL_CONSOLE=y
CONFIG_USB_SERIAL_GENERIC=y
CONFIG_USB_SERIAL_SIMPLE=m
@ -1146,36 +1076,25 @@ CONFIG_USB_SISUSBVGA=m
CONFIG_USB_LD=m
CONFIG_USB_IOWARRIOR=m
CONFIG_USB_ISIGHTFW=m
CONFIG_USB_HSIC_USB3503=m
CONFIG_USB_CHAOSKEY=m
CONFIG_USB_ATM=m
CONFIG_USB_CXACRU=m
CONFIG_USB_UEAGLEATM=m
CONFIG_USB_XUSBATM=m
CONFIG_NOP_USB_XCEIV=m
CONFIG_TYPEC=y
CONFIG_TYPEC_UCSI=y
CONFIG_UCSI_ACPI=y
CONFIG_TYPEC_RT1719=m
CONFIG_TYPEC_WUSB3801=m
CONFIG_TYPEC_MUX_PI3USB30532=m
CONFIG_TYPEC_DP_ALTMODE=m
CONFIG_USB_ROLE_SWITCH=y
CONFIG_MMC=m
# CONFIG_PWRSEQ_EMMC is not set
# CONFIG_PWRSEQ_SIMPLE is not set
CONFIG_SDIO_UART=m
CONFIG_MMC_ARMMMCI=m
# CONFIG_MMC_STM32_SDMMC is not set
CONFIG_MMC_SDHCI=m
CONFIG_MMC_SDHCI_PCI=m
CONFIG_MMC_SDHCI_ACPI=m
CONFIG_MMC_SDHCI_PLTFM=m
CONFIG_MMC_SDHCI_TEGRA=m
CONFIG_MMC_TIFM_SD=m
CONFIG_MMC_CB710=m
CONFIG_MMC_VIA_SDMMC=m
CONFIG_MMC_DW=m
CONFIG_MMC_DW_BLUEFIELD=m
CONFIG_MMC_VUB300=m
CONFIG_MMC_USHC=m
@ -1192,11 +1111,8 @@ CONFIG_LEDS_LP3944=m
CONFIG_LEDS_LT3593=m
CONFIG_LEDS_BLINKM=m
CONFIG_LEDS_MLXREG=m
CONFIG_LEDS_TRIGGER_TIMER=m
CONFIG_LEDS_TRIGGER_ONESHOT=m
CONFIG_LEDS_TRIGGER_HEARTBEAT=m
CONFIG_LEDS_TRIGGER_BACKLIGHT=m
CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
CONFIG_LEDS_TRIGGER_TRANSIENT=m
CONFIG_LEDS_TRIGGER_CAMERA=m
CONFIG_LEDS_TRIGGER_AUDIO=m
@ -1227,7 +1143,6 @@ CONFIG_RTC_DRV_DS1374=m
CONFIG_RTC_DRV_DS1374_WDT=y
CONFIG_RTC_DRV_DS1672=m
CONFIG_RTC_DRV_MAX6900=m
CONFIG_RTC_DRV_MAX77686=m
CONFIG_RTC_DRV_RS5C372=m
CONFIG_RTC_DRV_ISL12022=m
CONFIG_RTC_DRV_X1205=m
@ -1251,7 +1166,6 @@ CONFIG_RTC_DRV_RS5C348=m
CONFIG_RTC_DRV_MAX6902=m
CONFIG_RTC_DRV_PCF2123=m
CONFIG_RTC_DRV_MCP795=m
CONFIG_RTC_DRV_DS3232=m
CONFIG_RTC_DRV_RV3029C2=m
# CONFIG_RTC_DRV_RV3029_HWMON is not set
CONFIG_RTC_DRV_DS1286=m
@ -1265,8 +1179,6 @@ CONFIG_RTC_DRV_M48T35=m
CONFIG_RTC_DRV_M48T59=m
CONFIG_RTC_DRV_MSM6242=m
CONFIG_RTC_DRV_RP5C01=m
CONFIG_QCOM_HIDMA_MGMT=m
CONFIG_QCOM_HIDMA=m
CONFIG_DW_DMAC=m
CONFIG_DW_DMAC_PCI=m
CONFIG_ASYNC_TX_DMA=y
@ -1278,15 +1190,11 @@ CONFIG_DMABUF_HEAPS_SYSTEM=y
CONFIG_UIO=m
CONFIG_UIO_PCI_GENERIC=m
CONFIG_UIO_HV_GENERIC=m
CONFIG_VFIO=m
CONFIG_VFIO_NOIOMMU=y
CONFIG_VFIO_PCI=m
CONFIG_VIRT_DRIVERS=y
CONFIG_NITRO_ENCLAVES=m
CONFIG_VIRTIO_BALLOON=m
CONFIG_VIRTIO_MEM=m
CONFIG_VIRTIO_INPUT=m
CONFIG_VIRTIO_MMIO=m
CONFIG_VHOST_NET=m
CONFIG_VHOST_VSOCK=m
CONFIG_HYPERV=m
@ -1302,12 +1210,9 @@ CONFIG_MLXBF_BOOTCTL=m
# CONFIG_SURFACE_PLATFORMS is not set
CONFIG_CLK_SP810=y
CONFIG_COMMON_CLK_MAX77686=m
CONFIG_COMMON_CLK_SCMI=m
CONFIG_COMMON_CLK_SCPI=m
# CONFIG_COMMON_CLK_HI3559A is not set
# CONFIG_COMMON_CLK_HI3670 is not set
# CONFIG_COMMON_CLK_HI6220 is not set
CONFIG_ARM_MHU=m
CONFIG_XGENE_SLIMPRO_MBOX=m
CONFIG_IOMMU_DEFAULT_DMA_LAZY=y
# CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT is not set
@ -1322,19 +1227,13 @@ CONFIG_DEVFREQ_GOV_PASSIVE=m
CONFIG_PM_DEVFREQ_EVENT=y
CONFIG_EXTCON_GPIO=m
CONFIG_MEMORY=y
CONFIG_PWM_TEGRA=y
# CONFIG_RESET_SCMI is not set
# CONFIG_COMMON_RESET_HI3660 is not set
CONFIG_COMMON_RESET_HI6220=m
CONFIG_PHY_HI6220_USB=m
CONFIG_PHY_TEGRA_XUSB=m
CONFIG_POWERCAP=y
CONFIG_ARM_CCN=y
CONFIG_XGENE_PMU=y
CONFIG_USB4=y
CONFIG_DEV_DAX=m
CONFIG_TEE=m
CONFIG_HTE_TEGRA194=m
CONFIG_EXT4_FS=m
CONFIG_EXT4_FS_SECURITY=y
CONFIG_XFS_FS=m
@ -1420,7 +1319,6 @@ CONFIG_NLS_ISO8859_8=m
CONFIG_NLS_CODEPAGE_1250=m
CONFIG_NLS_CODEPAGE_1251=m
CONFIG_NLS_ASCII=y
CONFIG_NLS_ISO8859_1=m
CONFIG_NLS_ISO8859_2=m
CONFIG_NLS_ISO8859_3=m
CONFIG_NLS_ISO8859_4=m

View File

@ -1,7 +1,7 @@
%global major_ver 6
%global minor_ver 6
%global patch_ver 1
%global release_v 001
%global release_v 002
Name: kernel-stable