From 2b86e6fb751ec76d236f08e45f5d32b739e2c464 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 8 Jul 2019 22:01:26 +0100 Subject: [PATCH] kernel: Fix configuration diff generation New kernels add a new line into the configuration files that ends a section. The script recognised that as a new section which was wrong and is corrected in this patch. Signed-off-by: Michael Tremer --- kernel/config-arm-generic | 101 +++++++++++------------ kernel/config-arm32-generic | 155 ++++++++++++++--------------------- kernel/config-arm64-generic | 118 +++++++++++--------------- kernel/config-generic | 2 +- kernel/config-x86-generic | 155 ++++++++++++++--------------------- kernel/kernel.nm | 2 +- kernel/scripts/configdiff.py | 37 +++++++-- 7 files changed, 247 insertions(+), 323 deletions(-) diff --git a/kernel/config-arm-generic b/kernel/config-arm-generic index 0c7a725d5..7ac419c32 100644 --- a/kernel/config-arm-generic +++ b/kernel/config-arm-generic @@ -6,20 +6,17 @@ CONFIG_GENERIC_IRQ_SHOW_LEVEL=y CONFIG_HARDIRQS_SW_RESEND=y CONFIG_IRQ_MSI_IOMMU=y CONFIG_HANDLE_DOMAIN_IRQ=y - -# # end of IRQ subsystem -# CONFIG_GENERIC_IRQ_MULTI_HANDLER=y CONFIG_ARCH_HAS_TICK_BROADCAST=y # -# end of RCU Subsystem +# RCU Subsystem # CONFIG_GENERIC_SCHED_CLOCK=y # -# end of General setup +# Kernel Performance Events And Counters # CONFIG_GENERIC_HWEIGHT=y CONFIG_KERNEL_MODE_NEON=y @@ -37,9 +34,10 @@ CONFIG_ARCH_MESON=y # CONFIG_ARCH_UNIPHIER is not set CONFIG_ARCH_VEXPRESS=y # CONFIG_ARCH_ZX is not set +# end of Platform selection # -# end of ARM errata workarounds via the alternatives framework +# ARM errata workarounds via the alternatives framework # # CONFIG_CPU_BIG_ENDIAN is not set CONFIG_HW_PERF_EVENTS=y @@ -50,11 +48,13 @@ CONFIG_KUSER_HELPERS=y # Boot options # # CONFIG_CMDLINE_FORCE is not set +# end of Boot options # # Power management options # CONFIG_CPU_PM=y +# end of Power management options # # CPU Idle @@ -66,6 +66,8 @@ CONFIG_DT_IDLE_STATES=y # ARM CPU Idle Drivers # CONFIG_ARM_CPUIDLE=y +# end of ARM CPU Idle Drivers +# end of CPU Idle # # CPU frequency scaling drivers @@ -84,9 +86,10 @@ CONFIG_ARM_SCPI_POWER_DOMAIN=m # CONFIG_FIRMWARE_MEMMAP is not set CONFIG_ARM_PSCI_FW=y # CONFIG_ARM_PSCI_CHECKER is not set +# end of Firmware Drivers # -# end of Firmware Drivers +# Tegra firmware driver # CONFIG_CRYPTO_CHACHA20_NEON=m CONFIG_CRYPTO_NHPOLY1305_NEON=m @@ -97,14 +100,16 @@ CONFIG_CRYPTO_NHPOLY1305_NEON=m CONFIG_GENERIC_IDLE_POLL_SETUP=y CONFIG_ARCH_HAS_KEEPINITRD=y CONFIG_CLONE_BACKWARDS=y +# end of General architecture-dependent options # # Memory Management options # CONFIG_ARCH_KEEP_MEMBLOCK=y +# end of Memory Management options # -# end of Networking options +# Network testing # # CONFIG_RFKILL_GPIO is not set @@ -122,12 +127,12 @@ CONFIG_PCI_SYSCALL=y # CONFIG_PCI_PASID is not set # -# end of PCI switch controller drivers +# PCI switch controller drivers # # CONFIG_PCCARD is not set # -# end of Firmware loader +# Firmware loader # CONFIG_SOC_BUS=y CONFIG_GENERIC_ARCH_TOPOLOGY=y @@ -138,10 +143,7 @@ CONFIG_GENERIC_ARCH_TOPOLOGY=y CONFIG_ARM_CCI=y CONFIG_ARM_CCI400_COMMON=y CONFIG_VEXPRESS_CONFIG=y - -# # end of Bus devices -# CONFIG_OF_EARLY_FLATTREE=y CONFIG_OF_RESERVED_MEM=y @@ -162,9 +164,10 @@ CONFIG_BLK_DEV_RAM_SIZE=4096 CONFIG_SRAM=y CONFIG_VEXPRESS_SYSCFG=y # CONFIG_PVPANIC is not set +# end of Misc devices # -# end of SCSI Transports +# SCSI Transports # CONFIG_AIC79XX_RESET_DELAY_MS=5000 CONFIG_AIC79XX_REG_PRETTY_PRINT=y @@ -178,7 +181,7 @@ CONFIG_AIC79XX_REG_PRETTY_PRINT=y # CONFIG_PATA_OF_PLATFORM is not set # -# end of IEEE 1394 (FireWire) support +# IEEE 1394 (FireWire) support # CONFIG_MII=y # CONFIG_ATM_LANAI is not set @@ -189,7 +192,7 @@ CONFIG_MII=y # CONFIG_ATM_SOLOS is not set # -# end of Distributed Switch Architecture drivers +# Distributed Switch Architecture drivers # CONFIG_AMD8111_ETH=y # CONFIG_CHELSIO_T1_1G is not set @@ -241,6 +244,7 @@ CONFIG_INPUT_MAX77693_HAPTIC=m # Hardware I/O ports # # CONFIG_SERIO_AMBAKMI is not set +# end of Hardware I/O ports # # Character devices @@ -269,16 +273,15 @@ CONFIG_SERIAL_MESON=m # CONFIG_SERIAL_XILINX_PS_UART is not set # CONFIG_SERIAL_ARC is not set # CONFIG_SERIAL_RP2 is not set - -# # end of Serial drivers -# CONFIG_HW_RANDOM_MESON=y +# end of Character devices # # Multiplexer I2C Chip support # # CONFIG_I2C_ARB_GPIO_CHALLENGE is not set +# end of Multiplexer I2C Chip support # # PC SMBus host controller drivers @@ -296,7 +299,7 @@ CONFIG_I2C_MESON=m CONFIG_I2C_VERSATILE=m # -# end of PTP clock support +# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks. # CONFIG_PINCTRL_MESON=y CONFIG_PINCTRL_MESON8_PMX=y @@ -306,14 +309,16 @@ CONFIG_PINCTRL_MESON8_PMX=y # # CONFIG_GPIO_GRGPIO is not set CONFIG_GPIO_PL061=y +# end of Memory mapped GPIO drivers # # MFD GPIO expanders # # CONFIG_GPIO_TC3589X is not set +# end of MFD GPIO expanders # -# end of USB GPIO expanders +# USB GPIO expanders # CONFIG_POWER_RESET_BRCMSTB=y CONFIG_POWER_RESET_VEXPRESS=y @@ -358,14 +363,11 @@ CONFIG_MESON_WATCHDOG=m # CONFIG_LPC_ICH is not set # -# end of STMicroelectronics STMPE Interface Drivers +# STMicroelectronics STMPE Interface Drivers # # CONFIG_MFD_VX855 is not set CONFIG_MFD_VEXPRESS_SYSREG=y - -# # end of Multifunction device drivers -# CONFIG_REGULATOR_FIXED_VOLTAGE=y # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set # CONFIG_REGULATOR_USERSPACE_CONSUMER is not set @@ -428,6 +430,7 @@ CONFIG_DVB_LNBP21=y # I2C encoder or helper chips # # CONFIG_DRM_I2C_NXP_TDA998X is not set +# end of I2C encoder or helper chips # # ARM devices @@ -435,15 +438,13 @@ CONFIG_DVB_LNBP21=y CONFIG_DRM_HDLCD=m # CONFIG_DRM_HDLCD_SHOW_UNDERRUN is not set CONFIG_DRM_MALI_DISPLAY=m +# end of ARM devices # # Display Interface Bridges # CONFIG_DRM_DW_HDMI_I2S_AUDIO=m - -# # end of Display Interface Bridges -# CONFIG_DRM_MESON=m CONFIG_DRM_MESON_DW_HDMI=m CONFIG_DRM_PL111=m @@ -463,14 +464,15 @@ CONFIG_DRM_PANFROST=m # CONFIG_BACKLIGHT_LM3630A is not set # CONFIG_BACKLIGHT_LP855X is not set # CONFIG_BACKLIGHT_LP8788 is not set +# end of Backlight & LCD device support # -# end of Graphics support +# Console display driver support # CONFIG_SND_DMAENGINE_PCM=m # -# end of HD-Audio +# HD-Audio # CONFIG_SND_SOC=m CONFIG_SND_SOC_AC97_BUS=y @@ -492,10 +494,6 @@ CONFIG_SND_SOC_FSL_SSI=m CONFIG_SND_SOC_FSL_SPDIF=m CONFIG_SND_SOC_FSL_ESAI=m CONFIG_SND_SOC_IMX_AUDMUX=m - -# -# end of SoC Audio for Freescale CPUs -# CONFIG_SND_I2S_HI6210_I2S=m # CONFIG_SND_SOC_IMG is not set CONFIG_SND_SOC_MTK_BTCVSD=m @@ -514,14 +512,11 @@ CONFIG_SND_MESON_AXG_SOUND_CARD=m CONFIG_SND_MESON_AXG_SPDIFOUT=m CONFIG_SND_MESON_AXG_SPDIFIN=m CONFIG_SND_MESON_AXG_PDM=m - -# # end of ASoC support for Amlogic platforms -# # CONFIG_SND_SOC_SOF_TOPLEVEL is not set # -# end of STMicroelectronics STM32 SOC audio support +# STMicroelectronics STM32 SOC audio support # CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER=m CONFIG_SND_SOC_XILINX_SPDIF=m @@ -667,10 +662,7 @@ CONFIG_SND_SOC_NAU8810=m CONFIG_SND_SOC_NAU8822=m CONFIG_SND_SOC_NAU8824=m CONFIG_SND_SOC_TPA6130A2=m - -# # end of CODEC drivers -# CONFIG_SND_SIMPLE_CARD_UTILS=m CONFIG_SND_SIMPLE_CARD=m CONFIG_SND_AUDIO_GRAPH_CARD=m @@ -685,6 +677,7 @@ CONFIG_USB_DWC3_MESON_G12A=m # CONFIG_USB_ULPI=y CONFIG_USB_ULPI_VIEWPORT=y +# end of USB Physical Layer drivers # # MMC/SD/SDIO Host Controller Drivers @@ -743,6 +736,7 @@ CONFIG_COMMON_CLK_MESON_PHASE=m CONFIG_COMMON_CLK_MESON_PLL=y CONFIG_COMMON_CLK_MESON_SCLK_DIV=m CONFIG_COMMON_CLK_AXG_AUDIO=m +# end of Common Clock Framework # # Clock Source drivers @@ -753,10 +747,7 @@ CONFIG_CLKSRC_MMIO=y CONFIG_ARM_ARCH_TIMER=y CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y CONFIG_CLKSRC_VERSATILE=y - -# # end of Clock Source drivers -# CONFIG_ARM_MHU=m # @@ -767,10 +758,7 @@ CONFIG_IOMMU_IO_PGTABLE_LPAE=y # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set CONFIG_IOMMU_IO_PGTABLE_ARMV7S=y # CONFIG_IOMMU_IO_PGTABLE_ARMV7S_SELFTEST is not set - -# # end of Generic IOMMU Pagetable Support -# CONFIG_IOMMU_DMA=y # @@ -781,6 +769,7 @@ CONFIG_MESON_CLK_MEASURE=y CONFIG_MESON_GX_SOCINFO=y CONFIG_MESON_GX_PM_DOMAINS=y CONFIG_MESON_MX_SOCINFO=y +# end of Amlogic SoC drivers # # Extcon Device Drivers @@ -791,9 +780,10 @@ CONFIG_ARM_PL172_MPMC=m # Analog to digital converters # CONFIG_MESON_SARADC=m +# end of Analog to digital converters # -# end of Temperature sensors +# Temperature sensors # CONFIG_PWM=y CONFIG_PWM_SYSFS=y @@ -815,10 +805,7 @@ CONFIG_ARM_GIC_V3_ITS=y CONFIG_ARM_GIC_V3_ITS_PCI=y CONFIG_PARTITION_PERCPU=y CONFIG_MESON_IRQ_GPIO=y - -# # end of IRQ chip support -# CONFIG_RESET_MESON=y CONFIG_RESET_MESON_AUDIO_ARB=m @@ -830,6 +817,7 @@ CONFIG_PHY_MESON_GXL_USB2=y CONFIG_PHY_MESON_GXL_USB3=m CONFIG_PHY_MESON_G12A_USB2=y CONFIG_PHY_MESON_G12A_USB3_PCIE=y +# end of PHY Subsystem # # Performance monitor support @@ -839,11 +827,13 @@ CONFIG_ARM_CCI400_PMU=y CONFIG_ARM_CCI5xx_PMU=y # CONFIG_ARM_CCN is not set CONFIG_ARM_PMU=y +# end of Performance monitor support # -# end of Android +# Android # CONFIG_MESON_MX_EFUSE=m +# end of Device Drivers # # Library routines @@ -852,30 +842,31 @@ CONFIG_ZLIB_DEFLATE=m CONFIG_ARCH_HAS_SETUP_DMA_OPS=y CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y CONFIG_DMA_REMAP=y +# end of Library routines # # Compile-time checks and compiler options # # CONFIG_OPTIMIZE_INLINING is not set +# end of Compile-time checks and compiler options # # Memory Debugging # # CONFIG_DEBUG_RODATA_TEST is not set +# end of Memory Debugging # # Debug Lockups and Hangs # # CONFIG_SOFTLOCKUP_DETECTOR is not set +# end of Debug Lockups and Hangs # # RCU Debugging # CONFIG_RCU_CPU_STALL_TIMEOUT=21 - -# # end of RCU Debugging -# # CONFIG_FTRACE_SYSCALLS is not set # CONFIG_PID_IN_CONTEXTIDR is not set # CONFIG_CORESIGHT is not set diff --git a/kernel/config-arm32-generic b/kernel/config-arm32-generic index f891ef6b7..8618af2f8 100644 --- a/kernel/config-arm32-generic +++ b/kernel/config-arm32-generic @@ -12,14 +12,16 @@ CONFIG_KERNEL_XZ=y # Timers subsystem # CONFIG_CONTEXT_TRACKING_FORCE=y +# end of Timers subsystem # -# end of RCU Subsystem +# RCU Subsystem # CONFIG_PERF_USE_VMALLOC=y +# end of General setup # -# end of General setup +# Kernel Performance Events And Counters # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -62,10 +64,6 @@ CONFIG_ARCH_MULTIPLATFORM=y # CONFIG_ARCH_MULTI_V6 is not set CONFIG_ARCH_MULTI_V7=y CONFIG_ARCH_MULTI_V6_V7=y - -# -# end of Multiple platform selection -# CONFIG_ARCH_VIRT=y # CONFIG_ARCH_ARTPEC is not set # CONFIG_ARCH_AT91 is not set @@ -118,7 +116,7 @@ CONFIG_EXYNOS_CPU_SUSPEND=y CONFIG_PLAT_SAMSUNG=y # -# end of Samsung Common options +# Power management # CONFIG_ARCH_HIGHBANK=y CONFIG_ARCH_HISI=y @@ -130,10 +128,7 @@ CONFIG_ARCH_HI3xxx=y # CONFIG_ARCH_HIP01 is not set CONFIG_ARCH_HIP04=y CONFIG_ARCH_HIX5HD2=y - -# # end of Hisilicon platform type -# CONFIG_ARCH_MXC=y # @@ -181,10 +176,6 @@ CONFIG_ARCH_OMAP=y # CONFIG_OMAP_RESET_CLOCKS is not set CONFIG_OMAP_32K_TIMER=y # CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set - -# -# end of TI OMAP Common Features -# CONFIG_MACH_OMAP_GENERIC=y # @@ -215,15 +206,9 @@ CONFIG_OMAP_PACKAGE_CBB=y CONFIG_MACH_OMAP3517EVM=y CONFIG_MACH_OMAP3_PANDORA=y # CONFIG_OMAP3_SDRC_AC_TIMING is not set - -# # end of TI OMAP2/3/4 Specific Features -# CONFIG_OMAP5_ERRATA_801819=y - -# # end of TI OMAP/AM/DM/DRA Family -# CONFIG_ARCH_SIRF=y # @@ -330,10 +315,7 @@ CONFIG_ARM_ERRATA_821420=y CONFIG_ARM_ERRATA_825619=y CONFIG_ARM_ERRATA_852421=y CONFIG_ARM_ERRATA_852423=y - -# # end of System Type -# CONFIG_KRAIT_L2_ACCESSORS=y # @@ -370,6 +352,7 @@ CONFIG_FORCE_MAX_ZONEORDER=12 CONFIG_ALIGNMENT_TRAP=y # CONFIG_UACCESS_WITH_MEMCPY is not set CONFIG_STACKPROTECTOR_PER_TASK=y +# end of Kernel Features # # Boot options @@ -387,6 +370,7 @@ CONFIG_CMDLINE_FROM_BOOTLOADER=y CONFIG_CRASH_DUMP=y CONFIG_AUTO_ZRELADDR=y # CONFIG_EFI is not set +# end of Boot options # # CPU frequency scaling drivers @@ -412,10 +396,7 @@ CONFIG_ARM_HIGHBANK_CPUIDLE=y CONFIG_ARM_ZYNQ_CPUIDLE=y CONFIG_ARM_U8500_CPUIDLE=y CONFIG_ARM_EXYNOS_CPUIDLE=y - -# # end of ARM CPU Idle Drivers -# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED=y # @@ -430,6 +411,7 @@ CONFIG_NEON=y # CONFIG_APM_EMULATION=y CONFIG_ARM_CPU_SUSPEND=y +# end of Power management options # # Firmware Drivers @@ -447,10 +429,8 @@ CONFIG_BCM47XX_NVRAM=y # Tegra firmware driver # # CONFIG_TEGRA_IVC is not set - -# +# end of Tegra firmware driver # end of Firmware Drivers -# CONFIG_ARM_CRYPTO=y CONFIG_CRYPTO_SHA1_ARM=m CONFIG_CRYPTO_SHA1_ARM_NEON=m @@ -482,12 +462,15 @@ CONFIG_ARCH_HAS_PHYS_TO_DMA=y # GCC plugins # CONFIG_GCC_PLUGIN_ARM_SSP_PER_TASK=y +# end of GCC plugins +# end of General architecture-dependent options # # Executable file formats # # CONFIG_BINFMT_ELF_FDPIC is not set # CONFIG_BINFMT_FLAT is not set +# end of Executable file formats # # Memory Management options @@ -495,6 +478,7 @@ CONFIG_GCC_PLUGIN_ARM_SSP_PER_TASK=y CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y CONFIG_BOUNCE=y +# end of Memory Management options # # Classification @@ -507,7 +491,7 @@ CONFIG_BOUNCE=y CONFIG_TEGRA_AHB=y # -# end of Cadence PCIe controllers support +# Cadence PCIe controllers support # # CONFIG_PCI_FTPCI100 is not set CONFIG_PCI_TEGRA=y @@ -533,15 +517,13 @@ CONFIG_PCI_KEYSTONE_HOST=y CONFIG_PCI_LAYERSCAPE=y CONFIG_PCIE_QCOM=y CONFIG_PCIE_HISI_STB=y +# end of DesignWare PCI Core Support # # Firmware loader # CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y - -# # end of Firmware loader -# CONFIG_REGMAP_SPMI=m # @@ -557,10 +539,7 @@ CONFIG_QCOM_EBI2=y CONFIG_SUNXI_RSB=m CONFIG_TEGRA_GMI=m CONFIG_TI_SYSC=y - -# # end of Bus devices -# CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y # @@ -569,14 +548,15 @@ CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y # CONFIG_QCOM_COINCELL is not set # CONFIG_QCOM_FASTRPC is not set CONFIG_SRAM_EXEC=y +# end of Misc devices # -# end of Misc devices +# VOP Driver # # CONFIG_IDE is not set # -# end of SCSI Transports +# SCSI Transports # CONFIG_SCSI_UFS_QCOM=m CONFIG_SCSI_UFS_MEDIATEK=m @@ -605,7 +585,7 @@ CONFIG_SATA_HIGHBANK=m CONFIG_PATA_IMX=m # -# end of Distributed Switch Architecture drivers +# Distributed Switch Architecture drivers # CONFIG_NET_VENDOR_ALLWINNER=y CONFIG_SUN4I_EMAC=m @@ -695,6 +675,8 @@ CONFIG_INPUT_HISI_POWERKEY=m # Hardware I/O ports # CONFIG_SERIO_SUN4I_PS2=m +# end of Hardware I/O ports +# end of Input device support # # Character devices @@ -721,10 +703,7 @@ CONFIG_SERIAL_IMX=m CONFIG_SERIAL_OMAP=m CONFIG_SERIAL_BCM63XX=m CONFIG_SERIAL_ST_ASC=m - -# # end of Serial drivers -# CONFIG_SERIAL_MCTRL_GPIO=m # CONFIG_HVC_DCC is not set CONFIG_HW_RANDOM_BCM2835=y @@ -737,6 +716,7 @@ CONFIG_HW_RANDOM_ST=m CONFIG_HW_RANDOM_MTK=y CONFIG_HW_RANDOM_EXYNOS=m CONFIG_HW_RANDOM_KEYSTONE=m +# end of Character devices # # PC SMBus host controller drivers @@ -768,7 +748,7 @@ CONFIG_I2C_TEGRA=m CONFIG_I2C_WMT=m # -# end of I2C support +# Other I2C/SMBus bus drivers # CONFIG_SPMI_MSM_PMIC_ARB=m @@ -781,9 +761,10 @@ CONFIG_OMAP_SSI=m # PTP clock support # CONFIG_PTP_1588_CLOCK_QORIQ=m +# end of PTP clock support # -# end of PTP clock support +# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks. # # CONFIG_PINCTRL_AS3722 is not set CONFIG_PINCTRL_AMD=y @@ -874,10 +855,7 @@ CONFIG_PINCTRL_MT7629=y CONFIG_PINCTRL_MT8135=y CONFIG_PINCTRL_MT8127=y CONFIG_PINCTRL_MT6397=y - -# # end of MediaTek pinctrl drivers -# CONFIG_PINCTRL_MESON8=y CONFIG_PINCTRL_MESON8B=y CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y @@ -896,19 +874,22 @@ CONFIG_GPIO_VF610=y # CONFIG_GPIO_XILINX is not set # CONFIG_GPIO_ZEVIO is not set CONFIG_GPIO_ZYNQ=m +# end of Memory mapped GPIO drivers # # I2C GPIO expanders # CONFIG_GPIO_TS4900=m +# end of I2C GPIO expanders # # MFD GPIO expanders # # CONFIG_HTC_EGPIO is not set +# end of MFD GPIO expanders # -# end of USB GPIO expanders +# USB GPIO expanders # # CONFIG_ROCKCHIP_IODOMAIN is not set CONFIG_POWER_RESET_BRCMKONA=y @@ -936,16 +917,19 @@ CONFIG_MTK_THERMAL=m CONFIG_BRCMSTB_THERMAL=m CONFIG_BCM_NS_THERMAL=y CONFIG_BCM_SR_THERMAL=y +# end of Broadcom thermal drivers # # Texas Instruments thermal drivers # # CONFIG_TI_SOC_THERMAL is not set +# end of Texas Instruments thermal drivers # # Samsung thermal drivers # CONFIG_EXYNOS_THERMAL=y +# end of Samsung thermal drivers # # STMicroelectronics thermal drivers @@ -953,17 +937,20 @@ CONFIG_EXYNOS_THERMAL=y CONFIG_ST_THERMAL=m CONFIG_ST_THERMAL_SYSCFG=m CONFIG_ST_THERMAL_MEMMAP=m +# end of STMicroelectronics thermal drivers # # NVIDIA Tegra thermal drivers # CONFIG_TEGRA_SOCTHERM=m +# end of NVIDIA Tegra thermal drivers # # Qualcomm thermal drivers # CONFIG_QCOM_TSENS=m CONFIG_QCOM_SPMI_TEMP_ALARM=m +# end of Qualcomm thermal drivers # # Watchdog Device Drivers @@ -1009,7 +996,7 @@ CONFIG_AB8500_CORE=y CONFIG_MFD_DB8500_PRCMU=y # -# end of STMicroelectronics STMPE Interface Drivers +# STMicroelectronics STMPE Interface Drivers # CONFIG_MFD_SUN6I_PRCM=y CONFIG_MFD_OMAP_USB_HOST=y @@ -1017,10 +1004,7 @@ CONFIG_TWL4030_POWER=y # CONFIG_MFD_T7L66XB is not set # CONFIG_MFD_TC6387XB is not set # CONFIG_MFD_TC6393XB is not set - -# # end of Multifunction device drivers -# CONFIG_REGULATOR_88PM8607=y # CONFIG_REGULATOR_AB8500 is not set CONFIG_REGULATOR_DBX500_PRCMU=y @@ -1090,7 +1074,7 @@ CONFIG_TEGRA_HOST1X_FIREWALL=y CONFIG_IMX_IPUV3_CORE=m # -# end of Display Engine Configuration +# Display Engine Configuration # CONFIG_NOUVEAU_PLATFORM_DRIVER=y CONFIG_DRM_EXYNOS=m @@ -1162,10 +1146,7 @@ CONFIG_DRM_OMAP_CONNECTOR_HDMI=m CONFIG_DRM_OMAP_CONNECTOR_ANALOG_TV=m CONFIG_DRM_OMAP_PANEL_DSI_CM=m CONFIG_DRM_OMAP_PANEL_SHARP_LS037V7DW01=m - -# # end of OMAPDRM External Display Device Drivers -# # CONFIG_DRM_TILCDC is not set CONFIG_DRM_MSM=m CONFIG_DRM_MSM_GPU_STATE=y @@ -1189,10 +1170,7 @@ CONFIG_DRM_TEGRA=m # CONFIG_DRM_ANALOGIX_DP=m CONFIG_DRM_DW_MIPI_DSI=m - -# # end of Display Interface Bridges -# # CONFIG_DRM_STI is not set # CONFIG_DRM_IMX is not set CONFIG_DRM_V3D=m @@ -1213,9 +1191,10 @@ CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=m # CONFIG_FB_DA8XX is not set # CONFIG_FB_MX3 is not set # CONFIG_FB_MXS is not set +# end of Graphics support # -# end of Graphics support +# Console display driver support # CONFIG_SND_ALS300=m # CONFIG_SND_ALI5451 is not set @@ -1236,10 +1215,7 @@ CONFIG_SND_TRIDENT=m # HD-Audio # CONFIG_SND_HDA_TEGRA=m - -# # end of HD-Audio -# CONFIG_SND_ARM=y CONFIG_SND_ARMAACI=m # CONFIG_SND_SOC_ADI is not set @@ -1263,10 +1239,6 @@ CONFIG_SND_SOC_IMX_SGTL5000=m CONFIG_SND_SOC_IMX_SPDIF=m CONFIG_SND_SOC_FSL_ASOC_CARD=m CONFIG_SND_SOC_IMX_AUDMIX=m - -# -# end of SoC Audio for Freescale CPUs -# CONFIG_SND_SOC_MEDIATEK=m CONFIG_SND_SOC_MT2701=m CONFIG_SND_SOC_MT2701_CS42448=m @@ -1282,7 +1254,7 @@ CONFIG_SND_SOC_MT8183_MT6358_TS3A227E_MAX98357A=m CONFIG_SND_SOC_MT8183_DA7219_MAX98357A=m # -# end of ASoC support for Amlogic platforms +# ASoC support for Amlogic platforms # CONFIG_SND_SOC_QCOM=m CONFIG_SND_SOC_LPASS_CPU=m @@ -1323,10 +1295,7 @@ CONFIG_SND_SUN8I_CODEC_ANALOG=m CONFIG_SND_SUN4I_I2S=m CONFIG_SND_SUN4I_SPDIF=m CONFIG_SND_SUN8I_ADDA_PR_REGMAP=m - -# # end of Allwinner SoC Audio support -# CONFIG_SND_SOC_UX500=m CONFIG_SND_SOC_UX500_PLAT_DMA=m CONFIG_SND_SOC_XILINX_I2S=m @@ -1341,10 +1310,7 @@ CONFIG_SND_SOC_MAX98095=m CONFIG_SND_SOC_RT5514=m CONFIG_SND_SOC_RT5677=m CONFIG_SND_SOC_WM8994=m - -# # end of CODEC drivers -# CONFIG_SND_SYNTH_EMUX=m # @@ -1409,6 +1375,7 @@ CONFIG_AM335X_PHY_USB=m CONFIG_TWL6030_USB=m CONFIG_USB_MXS_PHY=m CONFIG_USB_TEGRA_PHY=y +# end of USB Physical Layer drivers # # MMC/SD/SDIO Host Controller Drivers @@ -1498,7 +1465,7 @@ CONFIG_MTK_CQDMA=m # CONFIG_DMA_OMAP is not set # -# end of Xen driver support +# Xen driver support # # CONFIG_MELLANOX_PLATFORM is not set @@ -1549,10 +1516,7 @@ CONFIG_COMMON_CLK_MT7629_HIFSYS=y CONFIG_COMMON_CLK_MT8135=y CONFIG_COMMON_CLK_MT8173=y CONFIG_COMMON_CLK_MT8516=y - -# # end of Clock driver for MediaTek SoC -# CONFIG_COMMON_CLK_MESON_INPUT=m CONFIG_COMMON_CLK_MESON8B=y CONFIG_KRAIT_CLOCKS=y @@ -1616,10 +1580,7 @@ CONFIG_SUN8I_R_CCU=y CONFIG_TEGRA_CLK_EMC=y CONFIG_TEGRA_CLK_DFLL=y CONFIG_COMMON_CLK_TI_ADPLL=m - -# # end of Common Clock Framework -# # CONFIG_HWSPINLOCK_OMAP is not set CONFIG_HWSPINLOCK_QCOM=m CONFIG_HWSPINLOCK_SIRF=m @@ -1652,10 +1613,7 @@ CONFIG_CLKSRC_SAMSUNG_PWM=y CONFIG_MTK_TIMER=y CONFIG_CLKSRC_IMX_GPT=y CONFIG_CLKSRC_ST_LPC=y - -# # end of Clock Source drivers -# CONFIG_IMX_MBOX=m CONFIG_PL320_MBOX=y CONFIG_OMAP2PLUS_MBOX=m @@ -1671,7 +1629,7 @@ CONFIG_BCM_PDC_MBOX=m CONFIG_MTK_CMDQ_MBOX=m # -# end of Generic IOMMU Pagetable Support +# Generic IOMMU Pagetable Support # CONFIG_OMAP_IOMMU=y # CONFIG_OMAP_IOMMU_DEBUG is not set @@ -1703,28 +1661,33 @@ CONFIG_QCOM_Q6V5_WCSS=m CONFIG_QCOM_WCNSS_PIL=m CONFIG_ST_REMOTEPROC=m CONFIG_ST_SLIM_REMOTEPROC=m +# end of Remoteproc drivers # # Rpmsg drivers # # CONFIG_RPMSG_QCOM_GLINK_SMEM is not set CONFIG_RPMSG_QCOM_SMD=m +# end of Rpmsg drivers # # Broadcom SoC drivers # CONFIG_SOC_BRCMSTB=y CONFIG_BRCMSTB_PM=y +# end of Broadcom SoC drivers # # NXP/Freescale QorIQ SoC drivers # CONFIG_FSL_GUTS=y +# end of NXP/Freescale QorIQ SoC drivers # # i.MX SoC drivers # # CONFIG_IMX_GPCV2_PM_DOMAINS is not set +# end of i.MX SoC drivers # # MediaTek SoC drivers @@ -1733,6 +1696,7 @@ CONFIG_MTK_CMDQ=m CONFIG_MTK_INFRACFG=y # CONFIG_MTK_PMIC_WRAP is not set # CONFIG_MTK_SCPSYS is not set +# end of MediaTek SoC drivers # # Qualcomm SoC drivers @@ -1753,10 +1717,7 @@ CONFIG_QCOM_SMD_RPM=m # CONFIG_QCOM_SMSM is not set # CONFIG_QCOM_WCNSS_CTRL is not set # CONFIG_QCOM_APR is not set - -# # end of Qualcomm SoC drivers -# CONFIG_ROCKCHIP_GRF=y CONFIG_ROCKCHIP_PM_DOMAINS=y CONFIG_SOC_SAMSUNG=y @@ -1824,9 +1785,10 @@ CONFIG_QCOM_PM8XXX_XOADC=m CONFIG_ROCKCHIP_SARADC=m CONFIG_SUN4I_GPADC=m # CONFIG_XILINX_XADC is not set +# end of Analog to digital converters # -# end of Temperature sensors +# Temperature sensors # # CONFIG_PWM_AB8500 is not set CONFIG_PWM_ATMEL_HLCDC_PWM=m @@ -1862,10 +1824,7 @@ CONFIG_IRQ_CROSSBAR=y # CONFIG_KEYSTONE_IRQ is not set # CONFIG_QCOM_PDC is not set CONFIG_IMX_IRQSTEER=y - -# # end of IRQ chip support -# CONFIG_ARCH_HAS_RESET_CONTROLLER=y CONFIG_RESET_BERLIN=y CONFIG_RESET_BRCMSTB=y @@ -1930,9 +1889,10 @@ CONFIG_OMAP_USB2=m CONFIG_TI_PIPE3=m CONFIG_TWL4030_USB=m CONFIG_PHY_TI_GMII_SEL=m +# end of PHY Subsystem # -# end of Android +# Android # CONFIG_NVMEM_IMX_IIM=m CONFIG_NVMEM_IMX_OCOTP=m @@ -1945,7 +1905,7 @@ CONFIG_NVMEM_VF610_OCOTP=m CONFIG_NVMEM_SNVS_LPGPR=m # -# end of HW tracing support +# HW tracing support # # CONFIG_TEE is not set @@ -1955,12 +1915,15 @@ CONFIG_NVMEM_SNVS_LPGPR=m # CONFIG_MUX_ADG792A is not set # CONFIG_MUX_GPIO is not set # CONFIG_MUX_MMIO is not set +# end of Multiplexer drivers +# end of Device Drivers # # Pseudo filesystems # CONFIG_PROC_VMCORE=y # CONFIG_PROC_VMCORE_DEVICE_DUMP is not set +# end of Pseudo filesystems # # Random Number Generation @@ -2000,14 +1963,16 @@ CONFIG_CRYPTO_DEV_BCM_SPU=m # Library routines # CONFIG_STMP_DEVICE=y +# end of Library routines # # Memory Debugging # # CONFIG_DEBUG_HIGHMEM is not set +# end of Memory Debugging # -# end of RCU Debugging +# RCU Debugging # CONFIG_DYNAMIC_FTRACE_WITH_REGS=y CONFIG_ARM_PTDUMP_CORE=y diff --git a/kernel/config-arm64-generic b/kernel/config-arm64-generic index f1a037a57..215eb15ca 100644 --- a/kernel/config-arm64-generic +++ b/kernel/config-arm64-generic @@ -4,9 +4,10 @@ CONFIG_THREAD_INFO_IN_TASK=y # Timers subsystem # # CONFIG_CONTEXT_TRACKING_FORCE is not set +# end of Timers subsystem # -# end of RCU Subsystem +# RCU Subsystem # CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y CONFIG_ARCH_SUPPORTS_INT128=y @@ -14,7 +15,7 @@ CONFIG_ARCH_SUPPORTS_INT128=y CONFIG_SYSCTL_EXCEPTION_TRACE=y # -# end of General setup +# Kernel Performance Events And Counters # CONFIG_ARM64=y CONFIG_64BIT=y @@ -59,6 +60,7 @@ CONFIG_ARCH_SEATTLE=y # CONFIG_ARCH_THUNDER2 is not set CONFIG_ARCH_XGENE=y # CONFIG_ARCH_ZYNQMP is not set +# end of Platform selection # # ARM errata workarounds via the alternatives framework @@ -90,10 +92,7 @@ CONFIG_QCOM_QDF2400_ERRATUM_0065=y # CONFIG_HISILICON_ERRATUM_161600802 is not set CONFIG_QCOM_FALKOR_ERRATUM_E1041=y CONFIG_FUJITSU_ERRATUM_010001=y - -# # end of ARM errata workarounds via the alternatives framework -# # CONFIG_ARM64_4K_PAGES is not set # CONFIG_ARM64_16K_PAGES is not set CONFIG_ARM64_64K_PAGES=y @@ -137,6 +136,7 @@ CONFIG_ARM64_HW_AFDBM=y CONFIG_ARM64_PAN=y CONFIG_ARM64_LSE_ATOMICS=y CONFIG_ARM64_VHE=y +# end of ARMv8.1 architectural features # # ARMv8.2 architectural features @@ -145,15 +145,13 @@ CONFIG_ARM64_UAO=y CONFIG_ARM64_PMEM=y CONFIG_ARM64_RAS_EXTN=y CONFIG_ARM64_CNP=y +# end of ARMv8.2 architectural features # # ARMv8.3 architectural features # CONFIG_ARM64_PTR_AUTH=y - -# # end of ARMv8.3 architectural features -# CONFIG_ARM64_SVE=y CONFIG_ARM64_MODULE_PLTS=y CONFIG_RELOCATABLE=y @@ -168,10 +166,7 @@ CONFIG_CMDLINE="" CONFIG_EFI_STUB=y CONFIG_EFI=y CONFIG_DMI=y - -# # end of Boot options -# CONFIG_SYSVIPC_COMPAT=y # @@ -203,14 +198,12 @@ CONFIG_EFI_ARMSTUB_DTB_LOADER=y # CONFIG_EFI_CAPSULE_LOADER is not set # CONFIG_EFI_TEST is not set # CONFIG_RESET_ATTACK_MITIGATION is not set - -# # end of EFI (Extensible Firmware Interface) Support -# CONFIG_EFI_EARLYCON=y +# end of Firmware Drivers # -# end of Firmware Drivers +# Tegra firmware driver # CONFIG_ARCH_SUPPORTS_ACPI=y CONFIG_ACPI=y @@ -286,14 +279,15 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8 CONFIG_COMPAT_OLD_SIGACTION=y CONFIG_VMAP_STACK=y CONFIG_ARCH_USE_MEMREMAP_PROT=y +# end of General architecture-dependent options # -# end of Partition Types +# Partition Types # CONFIG_BLOCK_COMPAT=y # -# end of IO Schedulers +# IO Schedulers # CONFIG_PREEMPT_NOTIFIERS=y CONFIG_ARCH_INLINE_SPIN_TRYLOCK=y @@ -352,6 +346,7 @@ CONFIG_ARCH_HAS_SYSCALL_WRAPPER=y # Executable file formats # CONFIG_COMPAT_BINFMT_ELF=y +# end of Executable file formats # # Memory Management options @@ -370,10 +365,7 @@ CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y # CONFIG_TRANSPARENT_HUGEPAGE is not set # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set CONFIG_ARCH_HAS_PTE_SPECIAL=y - -# # end of Memory Management options -# CONFIG_COMPAT_NETLINK_MESSAGES=y # @@ -384,7 +376,7 @@ CONFIG_HOTPLUG_PCI_ACPI=y CONFIG_HOTPLUG_PCI_ACPI_IBM=y # -# end of Cadence PCIe controllers support +# Cadence PCIe controllers support # CONFIG_PCI_FTPCI100=y CONFIG_PCI_XGENE=y @@ -398,25 +390,20 @@ CONFIG_PCI_HOST_THUNDER_ECAM=y # CONFIG_PCI_HISI=y # CONFIG_PCIE_KIRIN is not set +# end of DesignWare PCI Core Support # # Firmware loader # # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set - -# # end of Firmware loader -# CONFIG_GENERIC_CPU_VULNERABILITIES=y # # Bus devices # # CONFIG_BRCMSTB_GISB_ARB is not set - -# # end of Bus devices -# CONFIG_OF_NUMA=y CONFIG_PNP=y # CONFIG_PNP_DEBUG_MESSAGES is not set @@ -428,19 +415,15 @@ CONFIG_PNPACPI=y CONFIG_BLK_DEV_SKD=m # -# end of Intel MIC & related support +# VOP Driver # # CONFIG_GENWQE is not set # -# end of SCSI Transports +# SCSI Transports # CONFIG_SCSI_HISI_SAS=m CONFIG_SCSI_HISI_SAS_PCI=m - -# -# end of SCSI device support -# CONFIG_ATA_ACPI=y CONFIG_SATA_ZPODD=y @@ -456,7 +439,7 @@ CONFIG_SATA_AHCI_SEATTLE=m CONFIG_PATA_ACPI=m # -# end of Distributed Switch Architecture drivers +# Distributed Switch Architecture drivers # CONFIG_VORTEX=m CONFIG_AMD_XGBE=m @@ -493,14 +476,16 @@ CONFIG_MDIO_XGENE=m # Input device support # CONFIG_INPUT_MATRIXKMAP=m +# end of Input device support # # Serial drivers # CONFIG_SERIAL_8250_PNP=y +# end of Serial drivers # -# end of Serial drivers +# Non-8250 serial port support # CONFIG_HVC_DCC=y CONFIG_IPMI_DMI_DECODE=y @@ -536,9 +521,10 @@ CONFIG_I2C_THUNDERX=m # Other I2C/SMBus bus drivers # CONFIG_I2C_XGENE_SLIMPRO=m +# end of I2C support # -# end of PTP clock support +# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks. # CONFIG_PINCTRL_AS3722=m CONFIG_PINCTRL_AMD=m @@ -560,19 +546,22 @@ CONFIG_GPIO_DWAPB=m CONFIG_GPIO_XGENE=y CONFIG_GPIO_XGENE_SB=m CONFIG_GPIO_XILINX=m +# end of Memory mapped GPIO drivers # # MFD GPIO expanders # # CONFIG_GPIO_TPS68470 is not set +# end of MFD GPIO expanders # # PCI GPIO expanders # CONFIG_GPIO_MLXBF=m +# end of PCI GPIO expanders # -# end of USB GPIO expanders +# USB GPIO expanders # CONFIG_POWER_RESET_XGENE=y @@ -581,10 +570,6 @@ CONFIG_POWER_RESET_XGENE=y # CONFIG_SENSORS_MLXREG_FAN=m CONFIG_SENSORS_XGENE=m - -# -# ACPI drivers -# CONFIG_SENSORS_ACPI_POWER=m # @@ -601,13 +586,10 @@ CONFIG_ARM_SBSA_WATCHDOG=m # CONFIG_ABX500_CORE is not set # -# end of STMicroelectronics STMPE Interface Drivers +# STMicroelectronics STMPE Interface Drivers # CONFIG_MFD_TPS68470=y - -# # end of Multifunction device drivers -# # CONFIG_REGULATOR_88PM8607 is not set # CONFIG_REGULATOR_GPIO is not set CONFIG_REGULATOR_HI6421V530=m @@ -620,13 +602,13 @@ CONFIG_REGULATOR_HI6421V530=m # CONFIG_IR_NUVOTON is not set # -# end of Display Engine Configuration +# Display Engine Configuration # # CONFIG_HSA_AMD is not set CONFIG_DRM_RCAR_WRITEBACK=y # -# end of Display Interface Bridges +# Display Interface Bridges # CONFIG_DRM_HISI_KIRIN=m CONFIG_HISI_KIRIN_DW_DSI=m @@ -642,14 +624,11 @@ CONFIG_FB_EFI=y # CONFIG_DUMMY_CONSOLE_COLUMNS=80 CONFIG_DUMMY_CONSOLE_ROWS=25 - -# -# end of Graphics support -# +# end of Console display driver support # CONFIG_SND_LX6464ES is not set # -# end of HD-Audio +# HD-Audio # # CONFIG_SND_DESIGNWARE_PCM is not set @@ -659,7 +638,7 @@ CONFIG_DUMMY_CONSOLE_ROWS=25 CONFIG_SND_SOC_FSL_MICFIL=m # -# end of STMicroelectronics STM32 SOC audio support +# STMicroelectronics STM32 SOC audio support # # CONFIG_SND_SOC_XILINX_I2S is not set # CONFIG_SND_SOC_XTFPGA_I2S is not set @@ -710,10 +689,7 @@ CONFIG_XGENE_DMA=m # Xen driver support # CONFIG_XEN_EFI=y - -# # end of Xen driver support -# CONFIG_MELLANOX_PLATFORM=y CONFIG_MLXREG_HOTPLUG=m CONFIG_MLXREG_IO=m @@ -731,6 +707,7 @@ CONFIG_COMMON_CLK_MESON_EE_CLKC=y CONFIG_COMMON_CLK_GXBB=y CONFIG_COMMON_CLK_AXG=y CONFIG_COMMON_CLK_G12A=y +# end of Common Clock Framework # # Clock Source drivers @@ -740,16 +717,13 @@ CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND=y CONFIG_FSL_ERRATUM_A008585=y CONFIG_HISILICON_ERRATUM_161010101=y CONFIG_ARM64_ERRATUM_858921=y - -# # end of Clock Source drivers -# # CONFIG_PL320_MBOX is not set CONFIG_PCC=y CONFIG_XGENE_SLIMPRO_MBOX=m # -# end of Generic IOMMU Pagetable Support +# Generic IOMMU Pagetable Support # # CONFIG_ARM_SMMU is not set CONFIG_ARM_SMMU_V3=y @@ -758,11 +732,13 @@ CONFIG_ARM_SMMU_V3=y # Remoteproc drivers # # CONFIG_REMOTEPROC is not set +# end of Remoteproc drivers # # Broadcom SoC drivers # # CONFIG_SOC_BRCMSTB is not set +# end of Broadcom SoC drivers # # DEVFREQ Governors @@ -774,11 +750,13 @@ CONFIG_DEVFREQ_GOV_PASSIVE=m # Light sensors # # CONFIG_ACPI_ALS is not set +# end of Light sensors # # PHY Subsystem # CONFIG_PHY_XGENE=m +# end of PHY Subsystem # # Performance monitor support @@ -789,9 +767,10 @@ CONFIG_ARM_SMMU_V3_PMU=m # CONFIG_HISI_PMU is not set CONFIG_XGENE_PMU=y # CONFIG_ARM_SPE_PMU is not set +# end of Performance monitor support # -# end of Android +# Android # CONFIG_LIBNVDIMM=y CONFIG_BLK_DEV_PMEM=m @@ -806,10 +785,7 @@ CONFIG_DAX_DRIVER=y # HW tracing support # # CONFIG_INTEL_TH_ACPI is not set - -# # end of HW tracing support -# CONFIG_TEE=m # @@ -817,6 +793,7 @@ CONFIG_TEE=m # CONFIG_OPTEE=m CONFIG_OPTEE_SHM_NUM_PRIV_PAGES=1 +# end of TEE drivers # # Multiplexer drivers @@ -824,6 +801,8 @@ CONFIG_OPTEE_SHM_NUM_PRIV_PAGES=1 CONFIG_MUX_ADG792A=m CONFIG_MUX_GPIO=m CONFIG_MUX_MMIO=m +# end of Multiplexer drivers +# end of Device Drivers # # File systems @@ -837,6 +816,8 @@ CONFIG_MUX_MMIO=m # CONFIG_HUGETLBFS is not set CONFIG_ARCH_HAS_GIGANTIC_PAGE=y CONFIG_EFIVAR_FS=y +# end of Pseudo filesystems +# end of File systems # # Security options @@ -850,10 +831,8 @@ CONFIG_GCC_PLUGIN_STACKLEAK=y CONFIG_STACKLEAK_TRACK_MIN_SIZE=100 # CONFIG_STACKLEAK_METRICS is not set # CONFIG_STACKLEAK_RUNTIME_DISABLE is not set - -# +# end of Memory initialization # end of Security options -# CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y @@ -890,20 +869,23 @@ CONFIG_UCS2_STRING=y CONFIG_SG_SPLIT=y CONFIG_ARCH_HAS_PMEM_API=y CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y +# end of Library routines # # Compile-time checks and compiler options # CONFIG_ARCH_WANT_FRAME_POINTERS=y CONFIG_FRAME_POINTER=y +# end of Compile-time checks and compiler options # # Memory Debugging # # CONFIG_KASAN is not set +# end of Memory Debugging # -# end of RCU Debugging +# RCU Debugging # CONFIG_FUNCTION_GRAPH_TRACER=y # CONFIG_HIST_TRIGGERS is not set diff --git a/kernel/config-generic b/kernel/config-generic index 9118afccd..1a80b8c3b 100644 --- a/kernel/config-generic +++ b/kernel/config-generic @@ -4,7 +4,7 @@ # # CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=80200 +CONFIG_GCC_VERSION=90100 CONFIG_CLANG_VERSION=0 CONFIG_CC_HAS_ASM_GOTO=y CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y diff --git a/kernel/config-x86-generic b/kernel/config-x86-generic index 87c89cdb5..76720f0d5 100644 --- a/kernel/config-x86-generic +++ b/kernel/config-x86-generic @@ -16,10 +16,7 @@ CONFIG_KERNEL_XZ=y CONFIG_GENERIC_PENDING_IRQ=y CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y CONFIG_GENERIC_IRQ_RESERVATION_MODE=y - -# # end of IRQ subsystem -# CONFIG_CLOCKSOURCE_WATCHDOG=y CONFIG_ARCH_CLOCKSOURCE_INIT=y CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y @@ -30,9 +27,10 @@ CONFIG_GENERIC_CMOS_UPDATE=y # Timers subsystem # CONFIG_CONTEXT_TRACKING_FORCE=y +# end of Timers subsystem # -# end of RCU Subsystem +# RCU Subsystem # CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y @@ -41,9 +39,10 @@ CONFIG_ARCH_SUPPORTS_INT128=y CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_PCSPKR_PLATFORM=y CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y +# end of General setup # -# end of General setup +# Kernel Performance Events And Counters # CONFIG_64BIT=y CONFIG_X86_64=y @@ -151,10 +150,7 @@ CONFIG_PERF_EVENTS_INTEL_UNCORE=y CONFIG_PERF_EVENTS_INTEL_RAPL=y CONFIG_PERF_EVENTS_INTEL_CSTATE=y CONFIG_PERF_EVENTS_AMD_POWER=m - -# # end of Performance monitoring -# CONFIG_X86_VSYSCALL_EMULATION=y CONFIG_I8K=m CONFIG_MICROCODE=y @@ -215,10 +211,7 @@ CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0x0 CONFIG_LEGACY_VSYSCALL_NONE=y # CONFIG_CMDLINE_BOOL is not set # CONFIG_MODIFY_LDT_SYSCALL is not set - -# # end of Processor type and features -# CONFIG_ARCH_HAS_ADD_PAGES=y CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y CONFIG_USE_PERCPU_NUMA_NODE_ID=y @@ -309,9 +302,10 @@ CONFIG_X86_P4_CLOCKMOD=m CONFIG_X86_SPEEDSTEP_LIB=m # -# end of CPU Idle +# CPU Idle # CONFIG_INTEL_IDLE=y +# end of Power management and ACPI options # # Bus options (PCI etc.) @@ -325,6 +319,7 @@ CONFIG_MMCONF_FAM10H=y CONFIG_ISA_DMA_API=y CONFIG_AMD_NB=y # CONFIG_X86_SYSFB is not set +# end of Bus options (PCI etc.) # # Binary Emulations @@ -335,10 +330,7 @@ CONFIG_COMPAT_32=y CONFIG_COMPAT=y CONFIG_COMPAT_FOR_U64_ALIGNMENT=y CONFIG_SYSVIPC_COMPAT=y - -# # end of Binary Emulations -# CONFIG_X86_DEV_DMA_OPS=y # @@ -369,17 +361,15 @@ CONFIG_EFI_RUNTIME_WRAPPERS=y # CONFIG_EFI_TEST is not set CONFIG_APPLE_PROPERTIES=y # CONFIG_RESET_ATTACK_MITIGATION is not set - -# # end of EFI (Extensible Firmware Interface) Support -# CONFIG_UEFI_CPER=y CONFIG_UEFI_CPER_X86=y CONFIG_EFI_DEV_PATH_PARSER=y CONFIG_EFI_EARLYCON=y +# end of Firmware Drivers # -# end of Firmware Drivers +# Tegra firmware driver # CONFIG_KVM_MMIO=y CONFIG_KVM_ASYNC_PF=y @@ -412,14 +402,15 @@ CONFIG_COMPAT_OLD_SIGACTION=y CONFIG_VMAP_STACK=y CONFIG_ARCH_HAS_REFCOUNT=y CONFIG_ARCH_USE_MEMREMAP_PROT=y +# end of General architecture-dependent options # -# end of Partition Types +# Partition Types # CONFIG_BLOCK_COMPAT=y # -# end of IO Schedulers +# IO Schedulers # CONFIG_PREEMPT_NOTIFIERS=y CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y @@ -433,6 +424,7 @@ CONFIG_ARCH_HAS_SYSCALL_WRAPPER=y # Executable file formats # CONFIG_COMPAT_BINFMT_ELF=y +# end of Executable file formats # # Memory Management options @@ -463,10 +455,7 @@ CONFIG_ARCH_HAS_HMM_MIRROR=y CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y CONFIG_ARCH_HAS_PKEYS=y CONFIG_ARCH_HAS_PTE_SPECIAL=y - -# # end of Memory Management options -# CONFIG_COMPAT_NETLINK_MESSAGES=y # @@ -476,7 +465,7 @@ CONFIG_VMWARE_VMCI_VSOCKETS=m CONFIG_HYPERV_VSOCKETS=m # -# end of Networking options +# Network testing # CONFIG_RFKILL_GPIO=m @@ -501,13 +490,13 @@ CONFIG_HOTPLUG_PCI_ACPI=y CONFIG_HOTPLUG_PCI_ACPI_IBM=m # -# end of Cadence PCIe controllers support +# Cadence PCIe controllers support # CONFIG_PCI_FTPCI100=y CONFIG_VMD=m # -# end of PCI switch controller drivers +# PCI switch controller drivers # CONFIG_PCCARD=m # CONFIG_PCMCIA is not set @@ -527,14 +516,11 @@ CONFIG_YENTA_TOSHIBA=y # Firmware loader # # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set - -# # end of Firmware loader -# CONFIG_GENERIC_CPU_VULNERABILITIES=y # -# end of Bus devices +# Bus devices # CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y CONFIG_PNP=y @@ -564,7 +550,7 @@ CONFIG_VMWARE_BALLOON=m CONFIG_PVPANIC=m # -# end of Texas Instruments shared transport line discipline +# Texas Instruments shared transport line discipline # CONFIG_INTEL_MEI=m CONFIG_INTEL_MEI_ME=m @@ -583,17 +569,14 @@ CONFIG_INTEL_MIC_BUS=m # CONFIG_SCIF_BUS is not set # -# end of Intel MIC & related support +# VOP Driver # # CONFIG_GENWQE is not set - -# # end of Misc devices -# # CONFIG_IDE is not set # -# end of SCSI Transports +# SCSI Transports # CONFIG_AIC79XX_RESET_DELAY_MS=4000 # CONFIG_AIC79XX_REG_PRETTY_PRINT is not set @@ -609,10 +592,6 @@ CONFIG_VMWARE_PVSCSI=m CONFIG_HYPERV_STORAGE=m CONFIG_FCOE_FNIC=m CONFIG_SCSI_ISCI=m - -# -# end of SCSI device support -# CONFIG_ATA_ACPI=y # CONFIG_SATA_ZPODD is not set @@ -627,7 +606,7 @@ CONFIG_PATA_OF_PLATFORM=m CONFIG_PATA_ACPI=m # -# end of IEEE 1394 (FireWire) support +# IEEE 1394 (FireWire) support # # CONFIG_MACINTOSH_DRIVERS is not set CONFIG_MII=m @@ -651,7 +630,7 @@ CONFIG_ATM_HE=m CONFIG_ATM_SOLOS=m # -# end of Distributed Switch Architecture drivers +# Distributed Switch Architecture drivers # CONFIG_VORTEX=m CONFIG_AMD8111_ETH=m @@ -743,6 +722,8 @@ CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y CONFIG_SERIO_I8042=y # CONFIG_SERIO_CT82C710 is not set CONFIG_HYPERV_KEYBOARD=m +# end of Hardware I/O ports +# end of Input device support # # Character devices @@ -775,10 +756,7 @@ CONFIG_SERIAL_ARC=m CONFIG_SERIAL_ARC_NR_PORTS=1 CONFIG_SERIAL_RP2=m CONFIG_SERIAL_RP2_NR_UARTS=32 - -# # end of Serial drivers -# CONFIG_IPMI_DMI_DECODE=y CONFIG_HW_RANDOM_INTEL=m CONFIG_HW_RANDOM_AMD=m @@ -789,10 +767,7 @@ CONFIG_HPET=y # CONFIG_HPET_MMAP is not set CONFIG_HANGCHECK_TIMER=m # CONFIG_TELCLOCK is not set - -# # end of Character devices -# # CONFIG_RANDOM_TRUST_CPU is not set # @@ -804,6 +779,7 @@ CONFIG_ACPI_I2C_OPREGION=y # Multiplexer I2C Chip support # CONFIG_I2C_ARB_GPIO_CHALLENGE=m +# end of Multiplexer I2C Chip support # # PC SMBus host controller drivers @@ -835,15 +811,12 @@ CONFIG_I2C_DESIGNWARE_BAYTRAIL=y # Other I2C/SMBus bus drivers # CONFIG_I2C_MLXCPLD=m +# end of I2C support # # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks. # CONFIG_PTP_1588_CLOCK_KVM=m - -# -# end of PTP clock support -# # CONFIG_PINCTRL_AS3722 is not set CONFIG_PINCTRL_AMD=y CONFIG_PINCTRL_MCP23S08=m @@ -872,6 +845,7 @@ CONFIG_GPIO_ICH=m # CONFIG_GPIO_LYNXPOINT is not set # CONFIG_GPIO_VX855 is not set CONFIG_GPIO_XILINX=m +# end of Memory mapped GPIO drivers # # Port-mapped I/O GPIO drivers @@ -882,6 +856,7 @@ CONFIG_GPIO_SCH=m # CONFIG_GPIO_SCH311X is not set # CONFIG_GPIO_WINBOND is not set # CONFIG_GPIO_WS16C48 is not set +# end of Port-mapped I/O GPIO drivers # # MFD GPIO expanders @@ -890,6 +865,7 @@ CONFIG_GPIO_CRYSTAL_COVE=m CONFIG_GPIO_TC3589X=y # CONFIG_GPIO_TPS68470 is not set # CONFIG_GPIO_WHISKEY_COVE is not set +# end of MFD GPIO expanders # # PCI GPIO expanders @@ -897,9 +873,10 @@ CONFIG_GPIO_TC3589X=y # CONFIG_GPIO_AMD8111 is not set # CONFIG_GPIO_ML_IOH is not set CONFIG_GPIO_SODAVILLE=y +# end of PCI GPIO expanders # -# end of USB GPIO expanders +# USB GPIO expanders # CONFIG_MAX8925_POWER=m CONFIG_WM831X_BACKUP=m @@ -930,10 +907,6 @@ CONFIG_SENSORS_I5500=m CONFIG_SENSORS_CORETEMP=m CONFIG_SENSORS_VIA_CPUTEMP=m CONFIG_SENSORS_XGENE=m - -# -# ACPI drivers -# CONFIG_SENSORS_ACPI_POWER=m CONFIG_SENSORS_ATK0110=m @@ -951,12 +924,10 @@ CONFIG_INTEL_SOC_DTS_THERMAL=m CONFIG_INT340X_THERMAL=m CONFIG_ACPI_THERMAL_REL=m CONFIG_INT3406_THERMAL=m - -# # end of ACPI INT340X thermal drivers -# CONFIG_INTEL_BXT_PMIC_THERMAL=m CONFIG_INTEL_PCH_THERMAL=m +# end of Intel thermal drivers # # Watchdog Device Drivers @@ -1020,14 +991,11 @@ CONFIG_MFD_INTEL_LPSS_PCI=m # CONFIG_ABX500_CORE is not set # -# end of STMicroelectronics STMPE Interface Drivers +# STMicroelectronics STMPE Interface Drivers # CONFIG_MFD_TPS68470=y CONFIG_MFD_VX855=m - -# # end of Multifunction device drivers -# CONFIG_REGULATOR_FIXED_VOLTAGE=m CONFIG_REGULATOR_VIRTUAL_CONSUMER=m CONFIG_REGULATOR_USERSPACE_CONSUMER=m @@ -1201,16 +1169,14 @@ CONFIG_VGA_SWITCHEROO=y # I2C encoder or helper chips # CONFIG_DRM_I2C_NXP_TDA998X=m +# end of I2C encoder or helper chips # # Display Engine Configuration # CONFIG_DRM_AMD_DC_DCN1_0=y CONFIG_DRM_AMD_DC_DCN1_01=y - -# # end of Display Engine Configuration -# CONFIG_HSA_AMD=y CONFIG_DRM_I915=m CONFIG_DRM_I915_ALPHA_SUPPORT=y @@ -1231,16 +1197,13 @@ CONFIG_DRM_I915_USERPTR=y # CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set # CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set # CONFIG_DRM_I915_DEBUG_RUNTIME_PM is not set - -# # end of drm/i915 Debugging -# CONFIG_DRM_VMWGFX=m # CONFIG_DRM_VMWGFX_FBCON is not set # CONFIG_DRM_GMA500 is not set # -# end of Display Interface Bridges +# Display Interface Bridges # CONFIG_DRM_VBOXVIDEO=m # CONFIG_DRM_I810 is not set @@ -1265,6 +1228,7 @@ CONFIG_FB_EFI=y # CONFIG_FB_INTEL is not set # CONFIG_FB_VIA is not set # CONFIG_FB_HYPERV is not set +# end of Frame buffer Devices # # Backlight & LCD device support @@ -1272,6 +1236,7 @@ CONFIG_FB_EFI=y CONFIG_LCD_PLATFORM=m CONFIG_BACKLIGHT_APPLE=m # CONFIG_BACKLIGHT_SAHARA is not set +# end of Backlight & LCD device support # # Console display driver support @@ -1280,10 +1245,8 @@ CONFIG_VGA_CONSOLE=y # CONFIG_VGACON_SOFT_SCROLLBACK is not set CONFIG_DUMMY_CONSOLE_COLUMNS=80 CONFIG_DUMMY_CONSOLE_ROWS=25 - -# +# end of Console display driver support # end of Graphics support -# CONFIG_SND_DMA_SGBUF=y CONFIG_SND_PCSP=m CONFIG_SND_SB_COMMON=m @@ -1306,7 +1269,7 @@ CONFIG_SND_SONICVIBES=m CONFIG_SND_TRIDENT=m # -# end of HD-Audio +# HD-Audio # CONFIG_SND_HDA_COMPONENT=y CONFIG_SND_HDA_I915=y @@ -1321,11 +1284,13 @@ CONFIG_SND_SYNTH_EMUX=m # Special HID drivers # # CONFIG_HID_HYPERV_MOUSE is not set +# end of Special HID drivers # # Intel ISH HID support # # CONFIG_INTEL_ISH_HID is not set +# end of Intel ISH HID support # # MUSB DMA mode @@ -1338,7 +1303,7 @@ CONFIG_MUSB_PIO_ONLY=y CONFIG_USB_DWC3_PCI=m # -# end of USB Type-C Alternate Mode drivers +# USB Type-C Alternate Mode drivers # CONFIG_USB_ROLES_INTEL_XHCI=m @@ -1407,7 +1372,7 @@ CONFIG_DW_DMAC_PCI=y CONFIG_HSU_DMA=m # -# end of DMABUF options +# DMABUF options # CONFIG_DCA=m # CONFIG_UIO_HV_GENERIC is not set @@ -1421,6 +1386,7 @@ CONFIG_HYPERV=m CONFIG_HYPERV_TSCPAGE=y CONFIG_HYPERV_UTILS=m CONFIG_HYPERV_BALLOON=m +# end of Microsoft Hyper-V guest support # # Xen driver support @@ -1435,10 +1401,7 @@ CONFIG_XEN_EFI=y CONFIG_XEN_ACPI=y # CONFIG_XEN_SYMS is not set CONFIG_XEN_HAVE_VPMU=y - -# # end of Xen driver support -# CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACER_WMI=m # CONFIG_ACER_WIRELESS is not set @@ -1528,6 +1491,7 @@ CONFIG_PMC_ATOM=y # CONFIG_COMMON_CLK_WM831X=m CONFIG_COMMON_CLK_MAX77686=m +# end of Common Clock Framework # # Clock Source drivers @@ -1535,14 +1499,11 @@ CONFIG_COMMON_CLK_MAX77686=m CONFIG_CLKEVT_I8253=y CONFIG_I8253_LOCK=y CONFIG_CLKBLD_I8253=y - -# # end of Clock Source drivers -# CONFIG_PCC=y # -# end of Generic IOMMU Pagetable Support +# Generic IOMMU Pagetable Support # CONFIG_AMD_IOMMU=y CONFIG_AMD_IOMMU_V2=m @@ -1558,6 +1519,7 @@ CONFIG_HYPERV_IOMMU=y # Remoteproc drivers # # CONFIG_REMOTEPROC is not set +# end of Remoteproc drivers # # DEVFREQ Governors @@ -1576,20 +1538,21 @@ CONFIG_EXTCON_INTEL_CHT_WC=m # Light sensors # # CONFIG_ACPI_ALS is not set +# end of Light sensors # -# end of Temperature sensors +# Temperature sensors # # CONFIG_PWM is not set # -# end of Performance monitor support +# Performance monitor support # # CONFIG_RAS_CEC is not set CONFIG_THUNDERBOLT=m # -# end of Android +# Android # CONFIG_LIBNVDIMM=y CONFIG_BLK_DEV_PMEM=m @@ -1605,6 +1568,7 @@ CONFIG_DAX_DRIVER=y # HW tracing support # # CONFIG_INTEL_TH_ACPI is not set +# end of HW tracing support # # Multiplexer drivers @@ -1612,11 +1576,9 @@ CONFIG_DAX_DRIVER=y # CONFIG_MUX_ADG792A is not set # CONFIG_MUX_GPIO is not set # CONFIG_MUX_MMIO is not set - -# # end of Multiplexer drivers -# # CONFIG_UNISYS_VISORBUS is not set +# end of Device Drivers # # File systems @@ -1633,6 +1595,8 @@ CONFIG_PROC_VMCORE=y # CONFIG_HUGETLBFS is not set CONFIG_ARCH_HAS_GIGANTIC_PAGE=y CONFIG_EFIVAR_FS=m +# end of Pseudo filesystems +# end of File systems # # Security options @@ -1648,6 +1612,8 @@ CONFIG_GCC_PLUGIN_STACKLEAK=y CONFIG_STACKLEAK_TRACK_MIN_SIZE=100 # CONFIG_STACKLEAK_METRICS is not set # CONFIG_STACKLEAK_RUNTIME_DISABLE is not set +# end of Memory initialization +# end of Security options # # Crypto core or helper @@ -1742,18 +1708,21 @@ CONFIG_ARCH_HAS_PMEM_API=y CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y CONFIG_ARCH_HAS_UACCESS_MCSAFE=y CONFIG_ARCH_STACKWALK=y +# end of Library routines # # Compile-time checks and compiler options # CONFIG_OPTIMIZE_INLINING=y CONFIG_STACK_VALIDATION=y +# end of Compile-time checks and compiler options # # Memory Debugging # CONFIG_DEBUG_RODATA_TEST=y # CONFIG_KASAN is not set +# end of Memory Debugging # # Debug Lockups and Hangs @@ -1767,15 +1736,13 @@ CONFIG_HARDLOCKUP_CHECK_TIMESTAMP=y CONFIG_HARDLOCKUP_DETECTOR=y # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0 +# end of Debug Lockups and Hangs # # RCU Debugging # CONFIG_RCU_CPU_STALL_TIMEOUT=60 - -# # end of RCU Debugging -# CONFIG_USER_STACKTRACE_SUPPORT=y CONFIG_FUNCTION_GRAPH_TRACER=y CONFIG_FTRACE_SYSCALLS=y diff --git a/kernel/kernel.nm b/kernel/kernel.nm index 80a013e93..b2f00c2a6 100644 --- a/kernel/kernel.nm +++ b/kernel/kernel.nm @@ -5,7 +5,7 @@ name = kernel version = 5.2 -release = 1 +release = 1.1 thisapp = linux-%{version} maintainer = Arne Fitzenreiter diff --git a/kernel/scripts/configdiff.py b/kernel/scripts/configdiff.py index 166acd747..ef938666a 100755 --- a/kernel/scripts/configdiff.py +++ b/kernel/scripts/configdiff.py @@ -36,17 +36,36 @@ f.close() f = open(filelist[1]) +printed_sections = [] section = None for line in f.readlines(): - m = re.match("^# (.*)$", line) + line = line.rstrip() + + # Ignore some stuff + if not line or line == "#": + continue + + if line.startswith("# Automatically generated file;"): + continue + + if line.endswith("Kernel Configuration"): + continue + + # End of section + m = re.match("# end of (.*)$", line) if m: _section = m.group(1) - if not _section.startswith("CONFIG_") and \ - not _section.endswith("Kernel Configuration") and \ - not _section.startswith("Automatically generated file;"): - section = _section - elif not line: - section = None + + if _section in printed_sections: + print "# end of %s" % _section + + continue + + # New section + m = re.match("^# (.*)$", line) + if m and not "CONFIG_" in line: + section = m.group(1) + continue option = None value = None @@ -71,12 +90,12 @@ for line in f.readlines(): option_value = "%s=%s" % (option, value) if not option_value in options: - if section: + if section and not section in printed_sections: print print "#" print "# %s" % section print "#" - section = None + printed_sections.append(section) if value == "n": print "# %s is not set" % option -- 2.39.2