Skip to content

Commit ee1ab82

Browse files
committed
ARM: defconfig: move entries
Some Kconfig files got rearranged, so change the defconfig file to put everything back in the order used by 'make savedefconfig'. Link: https://lore.kernel.org/r/20260112153255.795553-1-arnd@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1 parent f8f9c1f commit ee1ab82

1 file changed

Lines changed: 16 additions & 15 deletions

File tree

arch/arm/configs/multi_v7_defconfig

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ CONFIG_PERF_EVENTS=y
88
CONFIG_KEXEC=y
99
CONFIG_ARCH_VIRT=y
1010
CONFIG_ARCH_AIROHA=y
11+
CONFIG_ARCH_HPE=y
12+
CONFIG_ARCH_HPE_GXP=y
1113
CONFIG_ARCH_SUNPLUS=y
1214
CONFIG_ARCH_UNIPHIER=y
1315
CONFIG_ARCH_ACTIONS=y
@@ -50,8 +52,6 @@ CONFIG_ARCH_HI3xxx=y
5052
CONFIG_ARCH_HIP01=y
5153
CONFIG_ARCH_HIP04=y
5254
CONFIG_ARCH_HIX5HD2=y
53-
CONFIG_ARCH_HPE=y
54-
CONFIG_ARCH_HPE_GXP=y
5555
CONFIG_ARCH_MXC=y
5656
CONFIG_SOC_IMX50=y
5757
CONFIG_SOC_IMX51=y
@@ -548,12 +548,12 @@ CONFIG_DEVFREQ_THERMAL=y
548548
CONFIG_IMX_THERMAL=y
549549
CONFIG_QORIQ_THERMAL=m
550550
CONFIG_ROCKCHIP_THERMAL=y
551-
CONFIG_RCAR_THERMAL=y
552551
CONFIG_ARMADA_THERMAL=y
553552
CONFIG_BCM2711_THERMAL=m
554553
CONFIG_BCM2835_THERMAL=m
555554
CONFIG_BRCMSTB_THERMAL=m
556555
CONFIG_ST_THERMAL_MEMMAP=y
556+
CONFIG_RCAR_THERMAL=y
557557
CONFIG_TEGRA_SOCTHERM=m
558558
CONFIG_TEGRA30_TSENSOR=m
559559
CONFIG_GENERIC_ADC_THERMAL=m
@@ -715,7 +715,6 @@ CONFIG_VIDEO_ADV7604_CEC=y
715715
CONFIG_VIDEO_ML86V7667=m
716716
CONFIG_IMX_IPUV3_CORE=m
717717
CONFIG_DRM=y
718-
CONFIG_DRM_I2C_NXP_TDA998X=m
719718
CONFIG_DRM_NOUVEAU=m
720719
# CONFIG_DRM_NOUVEAU_CH7006 is not set
721720
# CONFIG_DRM_NOUVEAU_SIL164 is not set
@@ -741,15 +740,16 @@ CONFIG_DRM_TEGRA=y
741740
CONFIG_DRM_STM=m
742741
CONFIG_DRM_STM_DSI=m
743742
CONFIG_DRM_PANEL_LVDS=m
744-
CONFIG_DRM_PANEL_SIMPLE=y
745-
CONFIG_DRM_PANEL_EDP=y
746-
CONFIG_DRM_PANEL_SAMSUNG_LD9040=m
747743
CONFIG_DRM_PANEL_ORISETECH_OTM8009A=m
748744
CONFIG_DRM_PANEL_RAYDIUM_RM68200=m
745+
CONFIG_DRM_PANEL_SAMSUNG_LD9040=m
749746
CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=m
750747
CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
751748
CONFIG_DRM_PANEL_SHARP_LQ101R1SX01=m
749+
CONFIG_DRM_PANEL_EDP=y
750+
CONFIG_DRM_PANEL_SIMPLE=y
752751
CONFIG_DRM_DISPLAY_CONNECTOR=m
752+
CONFIG_DRM_I2C_NXP_TDA998X=m
753753
CONFIG_DRM_LVDS_CODEC=m
754754
CONFIG_DRM_NXP_PTN3460=m
755755
CONFIG_DRM_PARADE_PS8622=m
@@ -789,9 +789,9 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
789789
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
790790
CONFIG_SOUND=m
791791
CONFIG_SND=m
792-
CONFIG_SND_HDA_TEGRA=m
793792
CONFIG_SND_HDA_INPUT_BEEP=y
794793
CONFIG_SND_HDA_PATCH_LOADER=y
794+
CONFIG_SND_HDA_TEGRA=m
795795
CONFIG_SND_HDA_CODEC_REALTEK=m
796796
CONFIG_SND_HDA_CODEC_REALTEK_LIB=m
797797
CONFIG_SND_HDA_CODEC_ALC269=m
@@ -814,6 +814,8 @@ CONFIG_SND_PXA910_SOC=m
814814
CONFIG_SND_SOC_QCOM=m
815815
CONFIG_SND_SOC_APQ8016_SBC=m
816816
CONFIG_SND_SOC_ROCKCHIP=m
817+
CONFIG_SND_SOC_SH4_FSI=m
818+
CONFIG_SND_SOC_RCAR=m
817819
CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
818820
CONFIG_SND_SOC_ROCKCHIP_MAX98090=m
819821
CONFIG_SND_SOC_ROCKCHIP_RT5645=m
@@ -824,8 +826,6 @@ CONFIG_SND_SOC_SNOW=m
824826
CONFIG_SND_SOC_ODROID=m
825827
CONFIG_SND_SOC_ARNDALE=m
826828
CONFIG_SND_SOC_SAMSUNG_MIDAS_WM1811=m
827-
CONFIG_SND_SOC_SH4_FSI=m
828-
CONFIG_SND_SOC_RCAR=m
829829
CONFIG_SND_SOC_STI=m
830830
CONFIG_SND_SOC_STM32_SAI=m
831831
CONFIG_SND_SOC_STM32_I2S=m
@@ -1002,7 +1002,6 @@ CONFIG_RTC_DRV_MAX8997=m
10021002
CONFIG_RTC_DRV_MAX77686=y
10031003
CONFIG_RTC_DRV_RK808=m
10041004
CONFIG_RTC_DRV_RS5C372=m
1005-
CONFIG_RTC_DRV_PCF85063=m
10061005
CONFIG_RTC_DRV_PCF85363=m
10071006
CONFIG_RTC_DRV_BQ32K=m
10081007
CONFIG_RTC_DRV_TWL4030=y
@@ -1013,6 +1012,7 @@ CONFIG_RTC_DRV_S35390A=m
10131012
CONFIG_RTC_DRV_RX8581=m
10141013
CONFIG_RTC_DRV_EM3027=y
10151014
CONFIG_RTC_DRV_S5M=m
1015+
CONFIG_RTC_DRV_PCF85063=m
10161016
CONFIG_RTC_DRV_DA9063=m
10171017
CONFIG_RTC_DRV_EFI=m
10181018
CONFIG_RTC_DRV_DIGICOLOR=m
@@ -1046,9 +1046,6 @@ CONFIG_OWL_DMA=y
10461046
CONFIG_PL330_DMA=y
10471047
CONFIG_STE_DMA40=y
10481048
CONFIG_ST_FDMA=m
1049-
CONFIG_STM32_DMA=y
1050-
CONFIG_STM32_DMAMUX=y
1051-
CONFIG_STM32_MDMA=y
10521049
CONFIG_TEGRA20_APB_DMA=y
10531050
CONFIG_UNIPHIER_MDMAC=y
10541051
CONFIG_XILINX_DMA=y
@@ -1057,6 +1054,9 @@ CONFIG_DW_DMAC=y
10571054
CONFIG_RZN1_DMAMUX=m
10581055
CONFIG_RCAR_DMAC=y
10591056
CONFIG_RENESAS_USB_DMAC=m
1057+
CONFIG_STM32_DMA=y
1058+
CONFIG_STM32_DMAMUX=y
1059+
CONFIG_STM32_MDMA=y
10601060
CONFIG_VIRTIO_PCI=y
10611061
CONFIG_VIRTIO_MMIO=y
10621062
CONFIG_STAGING=y
@@ -1094,12 +1094,12 @@ CONFIG_TI_MESSAGE_MANAGER=y
10941094
CONFIG_QCOM_APCS_IPC=y
10951095
CONFIG_STM32_IPCC=m
10961096
CONFIG_QCOM_IPCC=y
1097+
CONFIG_QCOM_IOMMU=y
10971098
CONFIG_OMAP_IOMMU=y
10981099
CONFIG_OMAP_IOMMU_DEBUG=y
10991100
CONFIG_ROCKCHIP_IOMMU=y
11001101
CONFIG_TEGRA_IOMMU_SMMU=y
11011102
CONFIG_EXYNOS_IOMMU=y
1102-
CONFIG_QCOM_IOMMU=y
11031103
CONFIG_REMOTEPROC=y
11041104
CONFIG_OMAP_REMOTEPROC=m
11051105
CONFIG_OMAP_REMOTEPROC_WATCHDOG=y
@@ -1135,6 +1135,7 @@ CONFIG_ARCH_TEGRA_124_SOC=y
11351135
CONFIG_SOC_TI=y
11361136
CONFIG_KEYSTONE_NAVIGATOR_QMSS=y
11371137
CONFIG_KEYSTONE_NAVIGATOR_DMA=y
1138+
CONFIG_TI_PRUSS=m
11381139
CONFIG_RASPBERRYPI_POWER=y
11391140
CONFIG_QCOM_CPR=y
11401141
CONFIG_QCOM_RPMHPD=y

0 commit comments

Comments
 (0)