ARM: multi_v7: Rebuild default configuration on v4.3-rc1
PATCH 1/1 ARM: multi_v7: Rebuild default configuration on v4.3-rc1
From: Thierry Reding <[email protected]>
It's becoming more and more difficult to update the multi_v7 default configuration because it hasn't been kept in proper order. Typically the workflow to update it would be to do the following:
$ make multi_v7_defconfig $ make menuconfig [select new options] $ make [to verify that everything still builds fine] $ make savedefconfig $ mv defconfig arch/arm/configs/multi_v7_defconfig
However, the savedefconfig target will write options in the order that they appear in Kconfig, which means that if multi_v7_defconfig isn't kept properly sorted then it becomes very difficult to create a proper patch that contains only the actual changes.
A relatively common practice for platform-specific default configuration files is to rebuild the configuration on the latest -rc1 shortly after it is released. That way everybody can start from a clean slate and the diff will show only the actual changes.
This commit rebuilds the multi_v7 default configuration on top of v4.3-rc1. A lot of the changes are merely moving things around to match the order in which they appear in Kconfig. Some symbols have been converted from 'y' to 'm' to satisfy dependencies.
Other options are dropped because they:
* have been removed are dropped, such as:
- MACH_MARZEN
- TEGRA_EMC_SCALING_ENABLE
- MACH_UX500_DT
- ARCH_VEXPRESS_CA9X4
- SCSI_MULTI_LUN
- OMAP_USB3
- CRYPTO_DEV_TEGRA_AES
* are enabled by default:
- TRUSTED_FOUNDATIONS
- CAN_RAW
- CAN_BCM
- CAN_DEV
- I2C_EXYNOS5
- USB_GSPCA
* selected by other options:
- PCI
- PCI_HOST_GENERIC
- PCIEPORTBUS
- NEON
- GPIO_GENERIC_PLATFORM
- THERMAL
- EXYNOS_THERMAL
- MFD_SYSCON
- BACKLIGHT_LCD_SUPPORT
- BACKLIGHT_CLASS_DEVICE
- USB_EHCI_HCD_PLATFORM
- USB_OHCI_HCD_PLATFORM
- MMC_DW_PLTFM
- CHROME_PLATFORMS
- MEMORY
- TMPFS
- CRYPTO_SHA1_ARM
- CRYPTO_SHA256_ARM
- CRYPTO_AES_ARM
One of the drivers has been replaced by another, but the new option was never selected, so this commit selects the new one to ensure the same compile coverage:
- EEPROM_SUNXI_SID -> NVMEM_SUNXI_SID
--- arch/arm/configs/multi_v7_defconfig | 141 ++++++++++++++---------------------- 1 file changed, 55 insertions(+), 86 deletions(-)
arch/arm/configs/multi_v7_defconfig +55 -86
@@ -12,7 +12,6 @@ CONFIG_MODULE_UNLOAD=y CONFIG_PARTITION_ADVANCED=y CONFIG_CMDLINE_PARTITION=y CONFIG_ARCH_VIRT=y -CONFIG_ARCH_ALPINE=y CONFIG_ARCH_MVEBU=y CONFIG_MACH_ARMADA_370=y CONFIG_MACH_ARMADA_375=y
@@ -20,14 +19,15 @@ CONFIG_MACH_ARMADA_38X=y CONFIG_MACH_ARMADA_39X=y CONFIG_MACH_ARMADA_XP=y CONFIG_MACH_DOVE=y +CONFIG_ARCH_ALPINE=y CONFIG_ARCH_AT91=y CONFIG_SOC_SAMA5D3=y CONFIG_SOC_SAMA5D4=y CONFIG_ARCH_BCM=y CONFIG_ARCH_BCM_CYGNUS=y -CONFIG_ARCH_BCM_21664=y -CONFIG_ARCH_BCM_281XX=y CONFIG_ARCH_BCM_5301X=y +CONFIG_ARCH_BCM_281XX=y +CONFIG_ARCH_BCM_21664=y CONFIG_ARCH_BRCMSTB=y CONFIG_ARCH_BERLIN=y CONFIG_MACH_BERLIN_BG2=y
@@ -37,9 +37,9 @@ CONFIG_ARCH_DIGICOLOR=y CONFIG_ARCH_HIGHBANK=y CONFIG_ARCH_HISI=y CONFIG_ARCH_HI3xxx=y -CONFIG_ARCH_HIX5HD2=y CONFIG_ARCH_HIP01=y CONFIG_ARCH_HIP04=y +CONFIG_ARCH_HIX5HD2=y CONFIG_ARCH_KEYSTONE=y CONFIG_ARCH_MESON=y CONFIG_ARCH_MXC=y
@@ -51,8 +51,9 @@ CONFIG_SOC_IMX6SL=y CONFIG_SOC_IMX6SX=y CONFIG_SOC_IMX6UL=y CONFIG_SOC_IMX7D=y -CONFIG_SOC_VF610=y CONFIG_SOC_LS1021A=y +CONFIG_SOC_VF610=y +CONFIG_ARCH_MEDIATEK=y CONFIG_ARCH_OMAP3=y CONFIG_ARCH_OMAP4=y CONFIG_SOC_OMAP5=y
@@ -60,7 +61,6 @@ CONFIG_SOC_AM33XX=y CONFIG_SOC_AM43XX=y CONFIG_SOC_DRA7XX=y CONFIG_ARCH_QCOM=y -CONFIG_ARCH_MEDIATEK=y CONFIG_ARCH_MSM8X60=y CONFIG_ARCH_MSM8960=y CONFIG_ARCH_MSM8974=y
@@ -85,7 +85,6 @@ CONFIG_ARCH_R8A7791=y CONFIG_ARCH_R8A7793=y CONFIG_ARCH_R8A7794=y CONFIG_ARCH_SH73A0=y -CONFIG_MACH_MARZEN=y CONFIG_ARCH_SUNXI=y CONFIG_ARCH_SIRF=y CONFIG_ARCH_TEGRA=y
@@ -93,27 +92,20 @@ CONFIG_ARCH_TEGRA_2x_SOC=y CONFIG_ARCH_TEGRA_3x_SOC=y CONFIG_ARCH_TEGRA_114_SOC=y CONFIG_ARCH_TEGRA_124_SOC=y -CONFIG_TEGRA_EMC_SCALING_ENABLE=y CONFIG_ARCH_UNIPHIER=y CONFIG_ARCH_U8500=y CONFIG_MACH_HREFV60=y CONFIG_MACH_SNOWBALL=y -CONFIG_MACH_UX500_DT=y CONFIG_ARCH_VEXPRESS=y -CONFIG_ARCH_VEXPRESS_CA9X4=y CONFIG_ARCH_VEXPRESS_TC2_PM=y CONFIG_ARCH_WM8850=y CONFIG_ARCH_ZYNQ=y -CONFIG_TRUSTED_FOUNDATIONS=y -CONFIG_PCI=y -CONFIG_PCI_HOST_GENERIC=y -CONFIG_PCI_KEYSTONE=y CONFIG_PCI_MSI=y CONFIG_PCI_MVEBU=y CONFIG_PCI_TEGRA=y CONFIG_PCI_RCAR_GEN2=y CONFIG_PCI_RCAR_GEN2_PCIE=y -CONFIG_PCIEPORTBUS=y +CONFIG_PCI_KEYSTONE=y CONFIG_SMP=y CONFIG_NR_CPUS=16 CONFIG_HIGHPTE=y
@@ -124,12 +116,12 @@ CONFIG_KEXEC=y CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_STAT_DETAILS=y CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +CONFIG_CPUFREQ_DT=y CONFIG_CPU_IDLE=y CONFIG_ARM_CPUIDLE=y -CONFIG_NEON=y -CONFIG_KERNEL_MODE_NEON=y CONFIG_ARM_ZYNQ_CPUIDLE=y CONFIG_ARM_EXYNOS_CPUIDLE=y +CONFIG_KERNEL_MODE_NEON=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y
@@ -147,9 +139,6 @@ CONFIG_IPV6_MIP6=m CONFIG_IPV6_TUNNEL=m CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_CAN=y -CONFIG_CAN_RAW=y -CONFIG_CAN_BCM=y -CONFIG_CAN_DEV=y CONFIG_CAN_AT91=m CONFIG_CAN_XILINXCAN=y CONFIG_CAN_MCP251X=y
@@ -186,10 +175,8 @@ CONFIG_ATMEL_SSC=m CONFIG_APDS9802ALS=y CONFIG_ISL29003=y CONFIG_EEPROM_AT24=y -CONFIG_EEPROM_SUNXI_SID=y CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SR=y -CONFIG_SCSI_MULTI_LUN=y CONFIG_ATA=y CONFIG_SATA_AHCI=y CONFIG_SATA_AHCI_PLATFORM=y
@@ -200,10 +187,10 @@ CONFIG_SATA_HIGHBANK=y CONFIG_SATA_MV=y CONFIG_SATA_RCAR=y CONFIG_NETDEVICES=y -CONFIG_HIX5HD2_GMAC=y CONFIG_SUN4I_EMAC=y CONFIG_MACB=y CONFIG_NET_CALXEDA_XGMAC=y +CONFIG_HIX5HD2_GMAC=y CONFIG_IGB=y CONFIG_MV643XX_ETH=y CONFIG_MVNETA=y
@@ -234,8 +221,8 @@ CONFIG_INPUT_EVDEV=y CONFIG_KEYBOARD_QT1070=m CONFIG_KEYBOARD_GPIO=y CONFIG_KEYBOARD_TEGRA=y -CONFIG_KEYBOARD_SPEAR=y CONFIG_KEYBOARD_ST_KEYSCAN=y +CONFIG_KEYBOARD_SPEAR=y CONFIG_KEYBOARD_CROS_EC=y CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_MOUSE_CYAPA=m
@@ -289,17 +276,16 @@ CONFIG_SERIAL_CONEXANT_DIGICOLOR_CONSOLE=y CONFIG_SERIAL_ST_ASC=y CONFIG_SERIAL_ST_ASC_CONSOLE=y CONFIG_I2C_CHARDEV=y -CONFIG_I2C_DAVINCI=y CONFIG_I2C_MUX=y CONFIG_I2C_ARB_GPIO_CHALLENGE=m CONFIG_I2C_MUX_PCA954x=y CONFIG_I2C_MUX_PINCTRL=y CONFIG_I2C_AT91=m CONFIG_I2C_CADENCE=y +CONFIG_I2C_DAVINCI=y CONFIG_I2C_DESIGNWARE_PLATFORM=y CONFIG_I2C_DIGICOLOR=m CONFIG_I2C_GPIO=m -CONFIG_I2C_EXYNOS5=y CONFIG_I2C_MV64XXX=y CONFIG_I2C_RIIC=y CONFIG_I2C_S3C2410=y
@@ -334,21 +320,20 @@ CONFIG_PINCTRL_AS3722=y CONFIG_PINCTRL_PALMAS=y CONFIG_PINCTRL_APQ8084=y CONFIG_GPIO_SYSFS=y -CONFIG_GPIO_GENERIC_PLATFORM=y CONFIG_GPIO_DAVINCI=y CONFIG_GPIO_DWAPB=y CONFIG_GPIO_EM=y CONFIG_GPIO_RCAR=y +CONFIG_GPIO_SYSCON=y CONFIG_GPIO_XILINX=y CONFIG_GPIO_ZYNQ=y CONFIG_GPIO_PCA953X=y CONFIG_GPIO_PCA953X_IRQ=y CONFIG_GPIO_PCF857X=y -CONFIG_GPIO_TWL4030=y CONFIG_GPIO_PALMAS=y -CONFIG_GPIO_SYSCON=y CONFIG_GPIO_TPS6586X=y CONFIG_GPIO_TPS65910=y +CONFIG_GPIO_TWL4030=y CONFIG_BATTERY_SBS=y CONFIG_BATTERY_MAX17040=m CONFIG_BATTERY_MAX17042=m
@@ -359,24 +344,23 @@ CONFIG_POWER_RESET_AS3722=y CONFIG_POWER_RESET_GPIO=y CONFIG_POWER_RESET_GPIO_RESTART=y CONFIG_POWER_RESET_KEYSTONE=y +CONFIG_POWER_RESET_SYSCON=y CONFIG_POWER_RESET_RMOBILE=y CONFIG_SENSORS_LM90=y CONFIG_SENSORS_LM95245=y CONFIG_SENSORS_NTC_THERMISTOR=m -CONFIG_THERMAL=y CONFIG_CPU_THERMAL=y CONFIG_RCAR_THERMAL=y CONFIG_ARMADA_THERMAL=y -CONFIG_DAVINCI_WATCHDOG=m -CONFIG_EXYNOS_THERMAL=m CONFIG_ST_THERMAL_SYSCFG=y CONFIG_ST_THERMAL_MEMMAP=y CONFIG_WATCHDOG=y CONFIG_XILINX_WATCHDOG=y CONFIG_ARM_SP805_WATCHDOG=y +CONFIG_DAVINCI_WATCHDOG=m CONFIG_ORION_WATCHDOG=y -CONFIG_ST_LPC_WATCHDOG=y CONFIG_SUNXI_WATCHDOG=y +CONFIG_ST_LPC_WATCHDOG=y CONFIG_TEGRA_WATCHDOG=m CONFIG_MESON_WATCHDOG=y CONFIG_DIGICOLOR_WATCHDOG=y
@@ -404,8 +388,6 @@ CONFIG_REGULATOR_AXP20X=y CONFIG_REGULATOR_BCM590XX=y CONFIG_REGULATOR_DA9210=y CONFIG_REGULATOR_GPIO=y -CONFIG_MFD_SYSCON=y -CONFIG_POWER_RESET_SYSCON=y CONFIG_REGULATOR_MAX14577=m CONFIG_REGULATOR_MAX8907=y CONFIG_REGULATOR_MAX8973=y
@@ -429,8 +411,7 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_MEDIA_CONTROLLER=y CONFIG_VIDEO_V4L2_SUBDEV_API=y CONFIG_MEDIA_USB_SUPPORT=y -CONFIG_USB_VIDEO_CLASS=y -CONFIG_USB_GSPCA=y +CONFIG_USB_VIDEO_CLASS=m CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_SOC_CAMERA=m CONFIG_SOC_CAMERA_PLATFORM=m
@@ -443,24 +424,22 @@ CONFIG_VIDEO_ML86V7667=m CONFIG_DRM=y # CONFIG_DRM_I2C_CH7006 is not set # CONFIG_DRM_I2C_SIL164 is not set -CONFIG_DRM_NXP_PTN3460=m -CONFIG_DRM_PARADE_PS8622=m CONFIG_DRM_NOUVEAU=m CONFIG_DRM_EXYNOS=m -CONFIG_DRM_EXYNOS_DSI=y CONFIG_DRM_EXYNOS_FIMD=y +CONFIG_DRM_EXYNOS_DSI=y CONFIG_DRM_EXYNOS_HDMI=y CONFIG_DRM_RCAR_DU=m CONFIG_DRM_TEGRA=y -CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m CONFIG_DRM_PANEL_SIMPLE=y +CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m +CONFIG_DRM_NXP_PTN3460=m +CONFIG_DRM_PARADE_PS8622=m CONFIG_FB_ARMCLCD=y CONFIG_FB_WM8505=y CONFIG_FB_SH_MOBILE_LCDC=y CONFIG_FB_SIMPLE=y CONFIG_FB_SH_MOBILE_MERAM=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_LCD_PLATFORM=m CONFIG_BACKLIGHT_PWM=y CONFIG_BACKLIGHT_AS3711=y
@@ -474,7 +453,7 @@ CONFIG_SND_HDA_INPUT_BEEP=y CONFIG_SND_HDA_PATCH_LOADER=y CONFIG_SND_HDA_CODEC_REALTEK=m CONFIG_SND_HDA_CODEC_HDMI=m -CONFIG_SND_USB_AUDIO=y +CONFIG_SND_USB_AUDIO=m CONFIG_SND_SOC=m CONFIG_SND_ATMEL_SOC=m CONFIG_SND_ATMEL_SOC_WM8904=m
@@ -494,14 +473,11 @@ CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_MVEBU=y CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_EXYNOS=y -CONFIG_USB_EHCI_TEGRA=y CONFIG_USB_EHCI_HCD_STI=y -CONFIG_USB_EHCI_HCD_PLATFORM=y -CONFIG_USB_ISP1760=y +CONFIG_USB_EHCI_TEGRA=y +CONFIG_USB_EHCI_EXYNOS=y CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_HCD_STI=y -CONFIG_USB_OHCI_HCD_PLATFORM=y CONFIG_USB_OHCI_EXYNOS=m CONFIG_USB_R8A66597_HCD=m CONFIG_USB_RENESAS_USBHS=m
@@ -509,9 +485,9 @@ CONFIG_USB_STORAGE=y CONFIG_USB_DWC3=y CONFIG_USB_CHIPIDEA=y CONFIG_USB_CHIPIDEA_HOST=y +CONFIG_USB_ISP1760=y CONFIG_AB8500_USB=y CONFIG_KEYSTONE_USB_PHY=y -CONFIG_OMAP_USB3=y CONFIG_USB_GPIO_VBUS=y CONFIG_USB_ISP1301=y CONFIG_USB_MXS_PHY=y
@@ -527,9 +503,9 @@ CONFIG_MMC_SDHCI_OF_ARASAN=y CONFIG_MMC_SDHCI_ESDHC_IMX=y CONFIG_MMC_SDHCI_DOVE=y CONFIG_MMC_SDHCI_TEGRA=y +CONFIG_MMC_SDHCI_S3C=y CONFIG_MMC_SDHCI_PXAV3=y CONFIG_MMC_SDHCI_SPEAR=y -CONFIG_MMC_SDHCI_S3C=y CONFIG_MMC_SDHCI_S3C_DMA=y CONFIG_MMC_SDHCI_BCM_KONA=y CONFIG_MMC_SDHCI_ST=y
@@ -540,7 +516,6 @@ CONFIG_MMC_MVSDIO=y CONFIG_MMC_SDHI=y CONFIG_MMC_DW=y CONFIG_MMC_DW_IDMAC=y -CONFIG_MMC_DW_PLTFM=y CONFIG_MMC_DW_EXYNOS=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_MMC_SH_MMCIF=y
@@ -571,15 +546,14 @@ CONFIG_RTC_DRV_MAX77686=y CONFIG_RTC_DRV_MAX77802=m CONFIG_RTC_DRV_RS5C372=m CONFIG_RTC_DRV_PALMAS=y -CONFIG_RTC_DRV_ST_LPC=y CONFIG_RTC_DRV_TWL4030=y CONFIG_RTC_DRV_TPS6586X=y CONFIG_RTC_DRV_TPS65910=y CONFIG_RTC_DRV_S35390A=m CONFIG_RTC_DRV_RX8581=m CONFIG_RTC_DRV_EM3027=y -CONFIG_RTC_DRV_DIGICOLOR=m CONFIG_RTC_DRV_S5M=m +CONFIG_RTC_DRV_DIGICOLOR=m CONFIG_RTC_DRV_S3C=m CONFIG_RTC_DRV_PL031=y CONFIG_RTC_DRV_AT91RM9200=m
@@ -589,24 +563,25 @@ CONFIG_RTC_DRV_SUN6I=y CONFIG_RTC_DRV_SUNXI=y CONFIG_RTC_DRV_MV=y CONFIG_RTC_DRV_TEGRA=y +CONFIG_RTC_DRV_ST_LPC=y CONFIG_DMADEVICES=y -CONFIG_DW_DMAC=y CONFIG_AT_HDMAC=y CONFIG_AT_XDMAC=y +CONFIG_DMA_OMAP=y +CONFIG_DMA_SUN6I=y +CONFIG_IMX_DMA=y +CONFIG_IMX_SDMA=y CONFIG_MV_XOR=y -CONFIG_TEGRA20_APB_DMA=y -CONFIG_SH_DMAE=y -CONFIG_RCAR_DMAC=y -CONFIG_STE_DMA40=y +CONFIG_MXS_DMA=y +CONFIG_PL330_DMA=y CONFIG_SIRF_DMA=y +CONFIG_STE_DMA40=y +CONFIG_TEGRA20_APB_DMA=y CONFIG_TI_EDMA=y -CONFIG_PL330_DMA=y -CONFIG_IMX_SDMA=y -CONFIG_IMX_DMA=y -CONFIG_MXS_DMA=y -CONFIG_DMA_OMAP=y CONFIG_XILINX_VDMA=y -CONFIG_DMA_SUN6I=y +CONFIG_DW_DMAC=y +CONFIG_SH_DMAE=y +CONFIG_RCAR_DMAC=y CONFIG_STAGING=y CONFIG_SENSORS_ISL29018=y CONFIG_SENSORS_ISL29028=y
@@ -615,23 +590,21 @@ CONFIG_KEYBOARD_NVEC=y CONFIG_SERIO_NVEC_PS2=y CONFIG_NVEC_POWER=y CONFIG_NVEC_PAZ00=y -CONFIG_QCOM_GSBI=y -CONFIG_QCOM_PM=y -CONFIG_COMMON_CLK_QCOM=y -CONFIG_CHROME_PLATFORMS=y CONFIG_CROS_EC_CHARDEV=m CONFIG_COMMON_CLK_MAX77686=y CONFIG_COMMON_CLK_MAX77802=m CONFIG_COMMON_CLK_S2MPS11=m +CONFIG_COMMON_CLK_QCOM=y CONFIG_APQ_MMCC_8084=y CONFIG_MSM_GCC_8660=y CONFIG_MSM_MMCC_8960=y CONFIG_MSM_MMCC_8974=y CONFIG_TEGRA_IOMMU_GART=y CONFIG_TEGRA_IOMMU_SMMU=y +CONFIG_QCOM_GSBI=y +CONFIG_QCOM_PM=y CONFIG_PM_DEVFREQ=y CONFIG_ARM_TEGRA_DEVFREQ=m -CONFIG_MEMORY=y CONFIG_EXTCON=y CONFIG_TI_AEMIF=y CONFIG_IIO=y
@@ -644,21 +617,24 @@ CONFIG_PWM_ATMEL=m CONFIG_PWM_ATMEL_TCB=m CONFIG_PWM_RENESAS_TPU=y CONFIG_PWM_SAMSUNG=m +CONFIG_PWM_STI=m CONFIG_PWM_SUN4I=y CONFIG_PWM_TEGRA=y CONFIG_PWM_VT8500=y -CONFIG_PHY_HIX5HD2_SATA=y -CONFIG_PWM_STI=m -CONFIG_OMAP_USB2=y -CONFIG_TI_PIPE3=y +CONFIG_KEYSTONE_IRQ=y CONFIG_PHY_MIPHY28LP=y CONFIG_PHY_MIPHY365X=y CONFIG_PHY_RCAR_GEN2=m -CONFIG_PHY_STIH41X_USB=y -CONFIG_PHY_STIH407_USB=y +CONFIG_OMAP_USB2=y +CONFIG_TI_PIPE3=y +CONFIG_PHY_HIX5HD2_SATA=y CONFIG_PHY_SUN4I_USB=y CONFIG_PHY_SUN9I_USB=y CONFIG_PHY_SAMSUNG_USB2=m +CONFIG_PHY_STIH407_USB=y +CONFIG_PHY_STIH41X_USB=y +CONFIG_NVMEM=y +CONFIG_NVMEM_SUNXI_SID=y CONFIG_EXT4_FS=y CONFIG_AUTOFS4_FS=y CONFIG_MSDOS_FS=y
@@ -666,7 +642,6 @@ CONFIG_VFAT_FS=y CONFIG_NTFS_FS=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_UBIFS_FS=y -CONFIG_TMPFS=y CONFIG_SQUASHFS=y CONFIG_SQUASHFS_LZO=y CONFIG_SQUASHFS_XZ=y
@@ -681,21 +656,15 @@ CONFIG_PRINTK_TIME=y CONFIG_DEBUG_FS=y CONFIG_MAGIC_SYSRQ=y CONFIG_LOCKUP_DETECTOR=y -CONFIG_CRYPTO_DEV_TEGRA_AES=y -CONFIG_CPUFREQ_DT=y -CONFIG_KEYSTONE_IRQ=y +CONFIG_CRYPTO_DEV_ATMEL_AES=m +CONFIG_CRYPTO_DEV_ATMEL_TDES=m +CONFIG_CRYPTO_DEV_ATMEL_SHA=m CONFIG_CRYPTO_DEV_SUN4I_SS=m CONFIG_ARM_CRYPTO=y -CONFIG_CRYPTO_SHA1_ARM=m CONFIG_CRYPTO_SHA1_ARM_NEON=m CONFIG_CRYPTO_SHA1_ARM_CE=m CONFIG_CRYPTO_SHA2_ARM_CE=m -CONFIG_CRYPTO_SHA256_ARM=m CONFIG_CRYPTO_SHA512_ARM=m -CONFIG_CRYPTO_AES_ARM=m CONFIG_CRYPTO_AES_ARM_BS=m CONFIG_CRYPTO_AES_ARM_CE=m CONFIG_CRYPTO_GHASH_ARM_CE=m -CONFIG_CRYPTO_DEV_ATMEL_AES=m -CONFIG_CRYPTO_DEV_ATMEL_TDES=m -CONFIG_CRYPTO_DEV_ATMEL_SHA=m
Signature · 1 line
2.5.0
PATCH 1/1 ARM: multi_v7: Rebuild default configuration on v4.3-rc1
Quoted 5 lines · Thierry Reding
From: Thierry Reding <[email protected]>
It's becoming more and more difficult to update the
multi_v7default configuration because it hasn't been kept in proper order. Typically the workflow to update it would be to do the following:
If we start regularly updating the defconfigs, it'll annoy Linus, because it will create a lot of useless churn, bloating his diffstats needlessly.
Since the defconfig files are not order specific, it would have been a good idea if savedefconfig had sorted the options into alphanumeric order propr to outputting them. That would cut down on the useless churn, some of which is in your patch.
In fact, most of this patch is pure churn - it's merely moving options about. It provides very little in the way of useful benefit for its size. We need to do better than this.
Quoted 13 lines
arch/arm/configs/multi_v7_defconfig +0
-1@@ -12,7 +12,6 @@ CONFIG_MODULE_UNLOAD=y CONFIG_PARTITION_ADVANCED=y CONFIG_CMDLINE_PARTITION=y CONFIG_ARCH_VIRT=y -CONFIG_ARCH_ALPINE=y CONFIG_ARCH_MVEBU=y CONFIG_MACH_ARMADA_370=y CONFIG_MACH_ARMADA_375=y
arch/arm/configs/multi_v7_defconfig CONFIG_MACH_ARMADA_38X=y · line 22
Quoted 4 lines
arch/arm/configs/multi_v7_defconfig +1
-0@@ -20,14 +19,15 @@ CONFIG_MACH_ARMADA_38X=y CONFIG_MACH_ARMADA_39X=y CONFIG_MACH_ARMADA_XP=y CONFIG_MACH_DOVE=y +CONFIG_ARCH_ALPINE=y
This option has moved, and the above two changes are therefore nothing but churn.
arch/arm/configs/multi_v7_defconfig CONFIG_MACH_ARMADA_38X=y · line 30
Quoted 10 lines
arch/arm/configs/multi_v7_defconfig +2
-2CONFIG_ARCH_AT91=y CONFIG_SOC_SAMA5D3=y CONFIG_SOC_SAMA5D4=y CONFIG_ARCH_BCM=y CONFIG_ARCH_BCM_CYGNUS=y -CONFIG_ARCH_BCM_21664=y -CONFIG_ARCH_BCM_281XX=y CONFIG_ARCH_BCM_5301X=y +CONFIG_ARCH_BCM_281XX=y +CONFIG_ARCH_BCM_21664=y
Same here.
arch/arm/configs/multi_v7_defconfig CONFIG_ARCH_DIGICOLOR=y · line 42
Quoted 11 lines
arch/arm/configs/multi_v7_defconfig +1
-1CONFIG_ARCH_BRCMSTB=y CONFIG_ARCH_BERLIN=y CONFIG_MACH_BERLIN_BG2=y@@ -37,9 +37,9 @@ CONFIG_ARCH_DIGICOLOR=y CONFIG_ARCH_HIGHBANK=y CONFIG_ARCH_HISI=y CONFIG_ARCH_HI3xxx=y -CONFIG_ARCH_HIX5HD2=y CONFIG_ARCH_HIP01=y CONFIG_ARCH_HIP04=y +CONFIG_ARCH_HIX5HD2=y
Same here.
arch/arm/configs/multi_v7_defconfig CONFIG_SOC_IMX6SL=y · line 55
Quoted 10 lines
arch/arm/configs/multi_v7_defconfig +1
-1CONFIG_ARCH_KEYSTONE=y CONFIG_ARCH_MESON=y CONFIG_ARCH_MXC=y@@ -51,8 +51,9 @@ CONFIG_SOC_IMX6SL=y CONFIG_SOC_IMX6SX=y CONFIG_SOC_IMX6UL=y CONFIG_SOC_IMX7D=y -CONFIG_SOC_VF610=y CONFIG_SOC_LS1021A=y +CONFIG_SOC_VF610=y
Same here.
arch/arm/configs/multi_v7_defconfig CONFIG_SOC_AM33XX=y · line 63
Quoted 9 lines
arch/arm/configs/multi_v7_defconfig +1
-1+CONFIG_ARCH_MEDIATEK=y CONFIG_ARCH_OMAP3=y CONFIG_ARCH_OMAP4=y CONFIG_SOC_OMAP5=y@@ -60,7 +61,6 @@ CONFIG_SOC_AM33XX=y CONFIG_SOC_AM43XX=y CONFIG_SOC_DRA7XX=y CONFIG_ARCH_QCOM=y -CONFIG_ARCH_MEDIATEK=y
Same here.
arch/arm/configs/multi_v7_defconfig CONFIG_ARCH_R8A7791=y · line 88
Quoted 8 lines
arch/arm/configs/multi_v7_defconfig +0
-1CONFIG_ARCH_MSM8X60=y CONFIG_ARCH_MSM8960=y CONFIG_ARCH_MSM8974=y@@ -85,7 +85,6 @@ CONFIG_ARCH_R8A7791=y CONFIG_ARCH_R8A7793=y CONFIG_ARCH_R8A7794=y CONFIG_ARCH_SH73A0=y -CONFIG_MACH_MARZEN=y
First possibly useful change, but as it's an option which has gone away, it serves little benefit.
arch/arm/configs/multi_v7_defconfig CONFIG_ARCH_TEGRA_2x_SOC=y · line 96
Quoted 8 lines
arch/arm/configs/multi_v7_defconfig +0
-1CONFIG_ARCH_SUNXI=y CONFIG_ARCH_SIRF=y CONFIG_ARCH_TEGRA=y@@ -93,27 +92,20 @@ CONFIG_ARCH_TEGRA_2x_SOC=y CONFIG_ARCH_TEGRA_3x_SOC=y CONFIG_ARCH_TEGRA_114_SOC=y CONFIG_ARCH_TEGRA_124_SOC=y -CONFIG_TEGRA_EMC_SCALING_ENABLE=y
Same comment as above.
arch/arm/configs/multi_v7_defconfig CONFIG_ARCH_TEGRA_2x_SOC=y · line 101
Quoted 5 lines
arch/arm/configs/multi_v7_defconfig +0
-1CONFIG_ARCH_UNIPHIER=y CONFIG_ARCH_U8500=y CONFIG_MACH_HREFV60=y CONFIG_MACH_SNOWBALL=y -CONFIG_MACH_UX500_DT=y
Same as above.
arch/arm/configs/multi_v7_defconfig CONFIG_ARCH_TEGRA_2x_SOC=y · line 103
Quoted 2 lines
arch/arm/configs/multi_v7_defconfig +0
-1CONFIG_ARCH_VEXPRESS=y -CONFIG_ARCH_VEXPRESS_CA9X4=y
Same as above.
arch/arm/configs/multi_v7_defconfig CONFIG_ARCH_TEGRA_2x_SOC=y · line 109
Quoted 6 lines
arch/arm/configs/multi_v7_defconfig +0
-3CONFIG_ARCH_VEXPRESS_TC2_PM=y CONFIG_ARCH_WM8850=y CONFIG_ARCH_ZYNQ=y -CONFIG_TRUSTED_FOUNDATIONS=y -CONFIG_PCI=y -CONFIG_PCI_HOST_GENERIC=y
Same as above.
arch/arm/configs/multi_v7_defconfig CONFIG_ARCH_TEGRA_2x_SOC=y · line 110
Quoted 1 line
arch/arm/configs/multi_v7_defconfig +0
-1-CONFIG_PCI_KEYSTONE=y
This one has only moved location.
arch/arm/configs/multi_v7_defconfig CONFIG_ARCH_TEGRA_2x_SOC=y · line 116
Quoted 6 lines
arch/arm/configs/multi_v7_defconfig +0
-1CONFIG_PCI_MSI=y CONFIG_PCI_MVEBU=y CONFIG_PCI_TEGRA=y CONFIG_PCI_RCAR_GEN2=y CONFIG_PCI_RCAR_GEN2_PCIE=y -CONFIG_PCIEPORTBUS=y
Questionable - if something selects this, then yes. Otherwise, this should be enabled if booting on PCIe systems. Some PCIe devices seem to burn power unless they think they're in a proper PCIe system. (I have an ASM1062 SATA board which the chip gets noticably "smelly" and hot without the PCIEPORTBUS enabled, thereby setting the common clock bit in the link control register.)
arch/arm/configs/multi_v7_defconfig CONFIG_KEXEC=y · line 119
Quoted 9 lines
arch/arm/configs/multi_v7_defconfig +2
-0+CONFIG_PCI_KEYSTONE=y CONFIG_SMP=y CONFIG_NR_CPUS=16 CONFIG_HIGHPTE=y@@ -124,12 +116,12 @@ CONFIG_KEXEC=y CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_STAT_DETAILS=y CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +CONFIG_CPUFREQ_DT=y
Churn.
arch/arm/configs/multi_v7_defconfig CONFIG_KEXEC=y · line 124
Quoted 7 lines
arch/arm/configs/multi_v7_defconfig +1
-2CONFIG_CPU_IDLE=y CONFIG_ARM_CPUIDLE=y -CONFIG_NEON=y -CONFIG_KERNEL_MODE_NEON=y CONFIG_ARM_ZYNQ_CPUIDLE=y CONFIG_ARM_EXYNOS_CPUIDLE=y +CONFIG_KERNEL_MODE_NEON=y
Churn.
arch/arm/configs/multi_v7_defconfig CONFIG_IPV6_MIP6=m · line 152
Quoted 10 lines
arch/arm/configs/multi_v7_defconfig +0
-3CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y@@ -147,9 +139,6 @@ CONFIG_IPV6_MIP6=m CONFIG_IPV6_TUNNEL=m CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_CAN=y -CONFIG_CAN_RAW=y -CONFIG_CAN_BCM=y -CONFIG_CAN_DEV=y
Possibly useful.
arch/arm/configs/multi_v7_defconfig CONFIG_ATMEL_SSC=m · line 192
Quoted 11 lines
arch/arm/configs/multi_v7_defconfig +0
-2CONFIG_CAN_AT91=m CONFIG_CAN_XILINXCAN=y CONFIG_CAN_MCP251X=y@@ -186,10 +175,8 @@ CONFIG_ATMEL_SSC=m CONFIG_APDS9802ALS=y CONFIG_ISL29003=y CONFIG_EEPROM_AT24=y -CONFIG_EEPROM_SUNXI_SID=y CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SR=y -CONFIG_SCSI_MULTI_LUN=y
Possibly useful.
arch/arm/configs/multi_v7_defconfig CONFIG_SATA_HIGHBANK=y · line 193
Quoted 12 lines
arch/arm/configs/multi_v7_defconfig +1
-1CONFIG_ATA=y CONFIG_SATA_AHCI=y CONFIG_SATA_AHCI_PLATFORM=y@@ -200,10 +187,10 @@ CONFIG_SATA_HIGHBANK=y CONFIG_SATA_MV=y CONFIG_SATA_RCAR=y CONFIG_NETDEVICES=y -CONFIG_HIX5HD2_GMAC=y CONFIG_SUN4I_EMAC=y CONFIG_MACB=y CONFIG_NET_CALXEDA_XGMAC=y +CONFIG_HIX5HD2_GMAC=y
Churn.
arch/arm/configs/multi_v7_defconfig CONFIG_INPUT_EVDEV=y · line 225
Quoted 10 lines
arch/arm/configs/multi_v7_defconfig +1
-1CONFIG_IGB=y CONFIG_MV643XX_ETH=y CONFIG_MVNETA=y@@ -234,8 +221,8 @@ CONFIG_INPUT_EVDEV=y CONFIG_KEYBOARD_QT1070=m CONFIG_KEYBOARD_GPIO=y CONFIG_KEYBOARD_TEGRA=y -CONFIG_KEYBOARD_SPEAR=y CONFIG_KEYBOARD_ST_KEYSCAN=y +CONFIG_KEYBOARD_SPEAR=y
Churn.
Quoted 5 lines
arch/arm/configs/multi_v7_defconfig +0
-0CONFIG_KEYBOARD_CROS_EC=y CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_MOUSE_CYAPA=m@@ -289,17 +276,16 @@ CONFIG_SERIAL_CONEXANT_DIGICOLOR_CONSOLE=y CONFIG_SERIAL_ST_ASC=y
arch/arm/configs/multi_v7_defconfig CONFIG_SERIAL_CONEXANT_DIGICOLOR_CONSOLE=y · line 285
Quoted 10 lines
arch/arm/configs/multi_v7_defconfig +1
-1CONFIG_SERIAL_ST_ASC_CONSOLE=y CONFIG_I2C_CHARDEV=y -CONFIG_I2C_DAVINCI=y CONFIG_I2C_MUX=y CONFIG_I2C_ARB_GPIO_CHALLENGE=m CONFIG_I2C_MUX_PCA954x=y CONFIG_I2C_MUX_PINCTRL=y CONFIG_I2C_AT91=m CONFIG_I2C_CADENCE=y +CONFIG_I2C_DAVINCI=y
Churn.
arch/arm/configs/multi_v7_defconfig CONFIG_SERIAL_CONEXANT_DIGICOLOR_CONSOLE=y · line 302
Quoted 4 lines
arch/arm/configs/multi_v7_defconfig +0
-1CONFIG_I2C_DESIGNWARE_PLATFORM=y CONFIG_I2C_DIGICOLOR=m CONFIG_I2C_GPIO=m -CONFIG_I2C_EXYNOS5=y
Possibly useful.
arch/arm/configs/multi_v7_defconfig CONFIG_PINCTRL_AS3722=y · line 337
Quoted 8 lines
arch/arm/configs/multi_v7_defconfig +0
-1CONFIG_I2C_MV64XXX=y CONFIG_I2C_RIIC=y CONFIG_I2C_S3C2410=y@@ -334,21 +320,20 @@ CONFIG_PINCTRL_AS3722=y CONFIG_PINCTRL_PALMAS=y CONFIG_PINCTRL_APQ8084=y CONFIG_GPIO_SYSFS=y -CONFIG_GPIO_GENERIC_PLATFORM=y
Possibly useful.
arch/arm/configs/multi_v7_defconfig CONFIG_PINCTRL_AS3722=y · line 327
Quoted 5 lines
arch/arm/configs/multi_v7_defconfig +1
-0CONFIG_GPIO_DAVINCI=y CONFIG_GPIO_DWAPB=y CONFIG_GPIO_EM=y CONFIG_GPIO_RCAR=y +CONFIG_GPIO_SYSCON=y
Churn.
arch/arm/configs/multi_v7_defconfig CONFIG_PINCTRL_AS3722=y · line 336
Quoted 11 lines
arch/arm/configs/multi_v7_defconfig +1
-2CONFIG_GPIO_XILINX=y CONFIG_GPIO_ZYNQ=y CONFIG_GPIO_PCA953X=y CONFIG_GPIO_PCA953X_IRQ=y CONFIG_GPIO_PCF857X=y -CONFIG_GPIO_TWL4030=y CONFIG_GPIO_PALMAS=y -CONFIG_GPIO_SYSCON=y CONFIG_GPIO_TPS6586X=y CONFIG_GPIO_TPS65910=y +CONFIG_GPIO_TWL4030=y
Churn.
arch/arm/configs/multi_v7_defconfig CONFIG_POWER_RESET_AS3722=y · line 347
Quoted 8 lines
arch/arm/configs/multi_v7_defconfig +1
-0CONFIG_BATTERY_SBS=y CONFIG_BATTERY_MAX17040=m CONFIG_BATTERY_MAX17042=m@@ -359,24 +344,23 @@ CONFIG_POWER_RESET_AS3722=y CONFIG_POWER_RESET_GPIO=y CONFIG_POWER_RESET_GPIO_RESTART=y CONFIG_POWER_RESET_KEYSTONE=y +CONFIG_POWER_RESET_SYSCON=y
Churn (moved from below.)
arch/arm/configs/multi_v7_defconfig CONFIG_POWER_RESET_AS3722=y · line 366
Quoted 5 lines
arch/arm/configs/multi_v7_defconfig +0
-1CONFIG_POWER_RESET_RMOBILE=y CONFIG_SENSORS_LM90=y CONFIG_SENSORS_LM95245=y CONFIG_SENSORS_NTC_THERMISTOR=m -CONFIG_THERMAL=y
Possibly useful.
arch/arm/configs/multi_v7_defconfig CONFIG_POWER_RESET_AS3722=y · line 371
Quoted 5 lines
arch/arm/configs/multi_v7_defconfig +0
-2CONFIG_CPU_THERMAL=y CONFIG_RCAR_THERMAL=y CONFIG_ARMADA_THERMAL=y -CONFIG_DAVINCI_WATCHDOG=m -CONFIG_EXYNOS_THERMAL=m
Possibly useful.
arch/arm/configs/multi_v7_defconfig CONFIG_POWER_RESET_AS3722=y · line 360
Quoted 6 lines
arch/arm/configs/multi_v7_defconfig +1
-0CONFIG_ST_THERMAL_SYSCFG=y CONFIG_ST_THERMAL_MEMMAP=y CONFIG_WATCHDOG=y CONFIG_XILINX_WATCHDOG=y CONFIG_ARM_SP805_WATCHDOG=y +CONFIG_DAVINCI_WATCHDOG=m
Churn.
arch/arm/configs/multi_v7_defconfig CONFIG_POWER_RESET_AS3722=y · line 363
Quoted 4 lines
arch/arm/configs/multi_v7_defconfig +1
-1CONFIG_ORION_WATCHDOG=y -CONFIG_ST_LPC_WATCHDOG=y CONFIG_SUNXI_WATCHDOG=y +CONFIG_ST_LPC_WATCHDOG=y
Churn.
Quoted 13 lines
arch/arm/configs/multi_v7_defconfig +0
-2CONFIG_TEGRA_WATCHDOG=m CONFIG_MESON_WATCHDOG=y CONFIG_DIGICOLOR_WATCHDOG=y@@ -404,8 +388,6 @@ CONFIG_REGULATOR_AXP20X=y CONFIG_REGULATOR_BCM590XX=y CONFIG_REGULATOR_DA9210=y CONFIG_REGULATOR_GPIO=y -CONFIG_MFD_SYSCON=y -CONFIG_POWER_RESET_SYSCON=y CONFIG_REGULATOR_MAX14577=m CONFIG_REGULATOR_MAX8907=y CONFIG_REGULATOR_MAX8973=y
arch/arm/configs/multi_v7_defconfig CONFIG_MEDIA_CAMERA_SUPPORT=y · line 414
Quoted 6 lines
arch/arm/configs/multi_v7_defconfig +1
-2@@ -429,8 +411,7 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_MEDIA_CONTROLLER=y CONFIG_VIDEO_V4L2_SUBDEV_API=y CONFIG_MEDIA_USB_SUPPORT=y -CONFIG_USB_VIDEO_CLASS=y -CONFIG_USB_GSPCA=y +CONFIG_USB_VIDEO_CLASS=m
Possibly useful.
Quoted 4 lines
arch/arm/configs/multi_v7_defconfig +0
-0CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_SOC_CAMERA=m CONFIG_SOC_CAMERA_PLATFORM=m
arch/arm/configs/multi_v7_defconfig CONFIG_VIDEO_ML86V7667=m · line 430
Quoted 10 lines
arch/arm/configs/multi_v7_defconfig +1
-3@@ -443,24 +424,22 @@ CONFIG_VIDEO_ML86V7667=m CONFIG_DRM=y # CONFIG_DRM_I2C_CH7006 is not set # CONFIG_DRM_I2C_SIL164 is not set -CONFIG_DRM_NXP_PTN3460=m -CONFIG_DRM_PARADE_PS8622=m CONFIG_DRM_NOUVEAU=m CONFIG_DRM_EXYNOS=m -CONFIG_DRM_EXYNOS_DSI=y CONFIG_DRM_EXYNOS_FIMD=y +CONFIG_DRM_EXYNOS_DSI=y
Churn.
arch/arm/configs/multi_v7_defconfig CONFIG_VIDEO_ML86V7667=m · line 437
Quoted 8 lines
arch/arm/configs/multi_v7_defconfig +3
-1CONFIG_DRM_EXYNOS_HDMI=y CONFIG_DRM_RCAR_DU=m CONFIG_DRM_TEGRA=y -CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m CONFIG_DRM_PANEL_SIMPLE=y +CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m +CONFIG_DRM_NXP_PTN3460=m +CONFIG_DRM_PARADE_PS8622=m
Churn.
Quoted 20 lines
arch/arm/configs/multi_v7_defconfig +1
-3CONFIG_FB_ARMCLCD=y CONFIG_FB_WM8505=y CONFIG_FB_SH_MOBILE_LCDC=y CONFIG_FB_SIMPLE=y CONFIG_FB_SH_MOBILE_MERAM=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_LCD_PLATFORM=m CONFIG_BACKLIGHT_PWM=y CONFIG_BACKLIGHT_AS3711=y@@ -474,7 +453,7 @@ CONFIG_SND_HDA_INPUT_BEEP=y CONFIG_SND_HDA_PATCH_LOADER=y CONFIG_SND_HDA_CODEC_REALTEK=m CONFIG_SND_HDA_CODEC_HDMI=m -CONFIG_SND_USB_AUDIO=y +CONFIG_SND_USB_AUDIO=m CONFIG_SND_SOC=m CONFIG_SND_ATMEL_SOC=m CONFIG_SND_ATMEL_SOC_WM8904=m
arch/arm/configs/multi_v7_defconfig CONFIG_USB=y · line 500
Quoted 7 lines
arch/arm/configs/multi_v7_defconfig +0
-3@@ -494,14 +473,11 @@ CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_MVEBU=y CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_EXYNOS=y -CONFIG_USB_EHCI_TEGRA=y CONFIG_USB_EHCI_HCD_STI=y -CONFIG_USB_EHCI_HCD_PLATFORM=y
Possibly useful.
arch/arm/configs/multi_v7_defconfig CONFIG_USB=y · line 478
Quoted 3 lines
arch/arm/configs/multi_v7_defconfig +2
-1-CONFIG_USB_ISP1760=y +CONFIG_USB_EHCI_TEGRA=y +CONFIG_USB_EHCI_EXYNOS=y
Churn.
arch/arm/configs/multi_v7_defconfig CONFIG_USB_STORAGE=y · line 488
Quoted 11 lines
arch/arm/configs/multi_v7_defconfig +1
-1CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_HCD_STI=y -CONFIG_USB_OHCI_HCD_PLATFORM=y CONFIG_USB_OHCI_EXYNOS=m CONFIG_USB_R8A66597_HCD=m CONFIG_USB_RENESAS_USBHS=m@@ -509,9 +485,9 @@ CONFIG_USB_STORAGE=y CONFIG_USB_DWC3=y CONFIG_USB_CHIPIDEA=y CONFIG_USB_CHIPIDEA_HOST=y +CONFIG_USB_ISP1760=y
Churn.
arch/arm/configs/multi_v7_defconfig CONFIG_USB_STORAGE=y · line 514
Quoted 3 lines
arch/arm/configs/multi_v7_defconfig +0
-1CONFIG_AB8500_USB=y CONFIG_KEYSTONE_USB_PHY=y -CONFIG_OMAP_USB3=y
Possibly useful.
arch/arm/configs/multi_v7_defconfig CONFIG_MMC_SDHCI_OF_ARASAN=y · line 506
Quoted 8 lines
arch/arm/configs/multi_v7_defconfig +1
-0CONFIG_USB_GPIO_VBUS=y CONFIG_USB_ISP1301=y CONFIG_USB_MXS_PHY=y@@ -527,9 +503,9 @@ CONFIG_MMC_SDHCI_OF_ARASAN=y CONFIG_MMC_SDHCI_ESDHC_IMX=y CONFIG_MMC_SDHCI_DOVE=y CONFIG_MMC_SDHCI_TEGRA=y +CONFIG_MMC_SDHCI_S3C=y
Churn.
arch/arm/configs/multi_v7_defconfig CONFIG_MMC_MVSDIO=y · line 543
Quoted 11 lines
arch/arm/configs/multi_v7_defconfig +0
-2CONFIG_MMC_SDHCI_PXAV3=y CONFIG_MMC_SDHCI_SPEAR=y -CONFIG_MMC_SDHCI_S3C=y CONFIG_MMC_SDHCI_S3C_DMA=y CONFIG_MMC_SDHCI_BCM_KONA=y CONFIG_MMC_SDHCI_ST=y@@ -540,7 +516,6 @@ CONFIG_MMC_MVSDIO=y CONFIG_MMC_SDHI=y CONFIG_MMC_DW=y CONFIG_MMC_DW_IDMAC=y -CONFIG_MMC_DW_PLTFM=y
Possibly useful.
Quoted 7 lines
arch/arm/configs/multi_v7_defconfig +0
-0CONFIG_MMC_DW_EXYNOS=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_MMC_SH_MMCIF=y@@ -571,15 +546,14 @@ CONFIG_RTC_DRV_MAX77686=y CONFIG_RTC_DRV_MAX77802=m CONFIG_RTC_DRV_RS5C372=m CONFIG_RTC_DRV_PALMAS=y
arch/arm/configs/multi_v7_defconfig CONFIG_RTC_DRV_MAX77686=y · line 556
Quoted 10 lines
arch/arm/configs/multi_v7_defconfig +1
-2-CONFIG_RTC_DRV_ST_LPC=y CONFIG_RTC_DRV_TWL4030=y CONFIG_RTC_DRV_TPS6586X=y CONFIG_RTC_DRV_TPS65910=y CONFIG_RTC_DRV_S35390A=m CONFIG_RTC_DRV_RX8581=m CONFIG_RTC_DRV_EM3027=y -CONFIG_RTC_DRV_DIGICOLOR=m CONFIG_RTC_DRV_S5M=m +CONFIG_RTC_DRV_DIGICOLOR=m
Churn.
arch/arm/configs/multi_v7_defconfig CONFIG_RTC_DRV_SUN6I=y · line 566
Quoted 8 lines
arch/arm/configs/multi_v7_defconfig +1
-0CONFIG_RTC_DRV_S3C=m CONFIG_RTC_DRV_PL031=y CONFIG_RTC_DRV_AT91RM9200=m@@ -589,24 +563,25 @@ CONFIG_RTC_DRV_SUN6I=y CONFIG_RTC_DRV_SUNXI=y CONFIG_RTC_DRV_MV=y CONFIG_RTC_DRV_TEGRA=y +CONFIG_RTC_DRV_ST_LPC=y
Churn.
Quoted 4 lines
arch/arm/configs/multi_v7_defconfig +0
-1CONFIG_DMADEVICES=y -CONFIG_DW_DMAC=y CONFIG_AT_HDMAC=y CONFIG_AT_XDMAC=y
arch/arm/configs/multi_v7_defconfig CONFIG_RTC_DRV_SUN6I=y · line 575
Quoted 10 lines
arch/arm/configs/multi_v7_defconfig +5
-4+CONFIG_DMA_OMAP=y +CONFIG_DMA_SUN6I=y +CONFIG_IMX_DMA=y +CONFIG_IMX_SDMA=y CONFIG_MV_XOR=y -CONFIG_TEGRA20_APB_DMA=y -CONFIG_SH_DMAE=y -CONFIG_RCAR_DMAC=y -CONFIG_STE_DMA40=y +CONFIG_MXS_DMA=y
Churn.
arch/arm/configs/multi_v7_defconfig CONFIG_RTC_DRV_SUN6I=y · line 576
Quoted 1 line
arch/arm/configs/multi_v7_defconfig +1
-0+CONFIG_PL330_DMA=y
Churn.
arch/arm/configs/multi_v7_defconfig CONFIG_RTC_DRV_SUN6I=y · line 578
Quoted 2 lines
arch/arm/configs/multi_v7_defconfig +1
-0CONFIG_SIRF_DMA=y +CONFIG_STE_DMA40=y
Churn.
arch/arm/configs/multi_v7_defconfig CONFIG_RTC_DRV_SUN6I=y · line 579
Quoted 1 line
arch/arm/configs/multi_v7_defconfig +1
-0+CONFIG_TEGRA20_APB_DMA=y
Churn.
arch/arm/configs/multi_v7_defconfig CONFIG_RTC_DRV_SUN6I=y · line 582
Quoted 9 lines
arch/arm/configs/multi_v7_defconfig +1
-6CONFIG_TI_EDMA=y -CONFIG_PL330_DMA=y -CONFIG_IMX_SDMA=y -CONFIG_IMX_DMA=y -CONFIG_MXS_DMA=y -CONFIG_DMA_OMAP=y CONFIG_XILINX_VDMA=y -CONFIG_DMA_SUN6I=y +CONFIG_DW_DMAC=y
Churn.
arch/arm/configs/multi_v7_defconfig CONFIG_RTC_DRV_SUN6I=y · line 583
Quoted 1 line
arch/arm/configs/multi_v7_defconfig +1
-0+CONFIG_SH_DMAE=y
Churn.
arch/arm/configs/multi_v7_defconfig CONFIG_RTC_DRV_SUN6I=y · line 584
Quoted 1 line
arch/arm/configs/multi_v7_defconfig +1
-0+CONFIG_RCAR_DMAC=y
Churn.
Quoted 13 lines
arch/arm/configs/multi_v7_defconfig +0
-4CONFIG_STAGING=y CONFIG_SENSORS_ISL29018=y CONFIG_SENSORS_ISL29028=y@@ -615,23 +590,21 @@ CONFIG_KEYBOARD_NVEC=y CONFIG_SERIO_NVEC_PS2=y CONFIG_NVEC_POWER=y CONFIG_NVEC_PAZ00=y -CONFIG_QCOM_GSBI=y -CONFIG_QCOM_PM=y -CONFIG_COMMON_CLK_QCOM=y -CONFIG_CHROME_PLATFORMS=y CONFIG_CROS_EC_CHARDEV=m CONFIG_COMMON_CLK_MAX77686=y
arch/arm/configs/multi_v7_defconfig CONFIG_KEYBOARD_NVEC=y · line 604
Quoted 10 lines
arch/arm/configs/multi_v7_defconfig +2
-0CONFIG_COMMON_CLK_MAX77802=m CONFIG_COMMON_CLK_S2MPS11=m +CONFIG_COMMON_CLK_QCOM=y CONFIG_APQ_MMCC_8084=y CONFIG_MSM_GCC_8660=y CONFIG_MSM_MMCC_8960=y CONFIG_MSM_MMCC_8974=y CONFIG_TEGRA_IOMMU_GART=y CONFIG_TEGRA_IOMMU_SMMU=y +CONFIG_QCOM_GSBI=y
Churn.
arch/arm/configs/multi_v7_defconfig CONFIG_KEYBOARD_NVEC=y · line 605
Quoted 1 line
arch/arm/configs/multi_v7_defconfig +1
-0+CONFIG_QCOM_PM=y
Churn.
arch/arm/configs/multi_v7_defconfig CONFIG_PWM_ATMEL=m · line 620
Quoted 11 lines
arch/arm/configs/multi_v7_defconfig +1
-1CONFIG_PM_DEVFREQ=y CONFIG_ARM_TEGRA_DEVFREQ=m -CONFIG_MEMORY=y CONFIG_EXTCON=y CONFIG_TI_AEMIF=y CONFIG_IIO=y@@ -644,21 +617,24 @@ CONFIG_PWM_ATMEL=m CONFIG_PWM_ATMEL_TCB=m CONFIG_PWM_RENESAS_TPU=y CONFIG_PWM_SAMSUNG=m +CONFIG_PWM_STI=m
Churn.
Quoted 62 lines
arch/arm/configs/multi_v7_defconfig +11
-16CONFIG_PWM_SUN4I=y CONFIG_PWM_TEGRA=y CONFIG_PWM_VT8500=y -CONFIG_PHY_HIX5HD2_SATA=y -CONFIG_PWM_STI=m -CONFIG_OMAP_USB2=y -CONFIG_TI_PIPE3=y +CONFIG_KEYSTONE_IRQ=y CONFIG_PHY_MIPHY28LP=y CONFIG_PHY_MIPHY365X=y CONFIG_PHY_RCAR_GEN2=m -CONFIG_PHY_STIH41X_USB=y -CONFIG_PHY_STIH407_USB=y +CONFIG_OMAP_USB2=y +CONFIG_TI_PIPE3=y +CONFIG_PHY_HIX5HD2_SATA=y CONFIG_PHY_SUN4I_USB=y CONFIG_PHY_SUN9I_USB=y CONFIG_PHY_SAMSUNG_USB2=m +CONFIG_PHY_STIH407_USB=y +CONFIG_PHY_STIH41X_USB=y +CONFIG_NVMEM=y +CONFIG_NVMEM_SUNXI_SID=y CONFIG_EXT4_FS=y CONFIG_AUTOFS4_FS=y CONFIG_MSDOS_FS=y@@ -666,7 +642,6 @@ CONFIG_VFAT_FS=y CONFIG_NTFS_FS=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_UBIFS_FS=y -CONFIG_TMPFS=y CONFIG_SQUASHFS=y CONFIG_SQUASHFS_LZO=y CONFIG_SQUASHFS_XZ=y@@ -681,21 +656,15 @@ CONFIG_PRINTK_TIME=y CONFIG_DEBUG_FS=y CONFIG_MAGIC_SYSRQ=y CONFIG_LOCKUP_DETECTOR=y -CONFIG_CRYPTO_DEV_TEGRA_AES=y -CONFIG_CPUFREQ_DT=y -CONFIG_KEYSTONE_IRQ=y +CONFIG_CRYPTO_DEV_ATMEL_AES=m +CONFIG_CRYPTO_DEV_ATMEL_TDES=m +CONFIG_CRYPTO_DEV_ATMEL_SHA=m CONFIG_CRYPTO_DEV_SUN4I_SS=m CONFIG_ARM_CRYPTO=y -CONFIG_CRYPTO_SHA1_ARM=m CONFIG_CRYPTO_SHA1_ARM_NEON=m CONFIG_CRYPTO_SHA1_ARM_CE=m CONFIG_CRYPTO_SHA2_ARM_CE=m -CONFIG_CRYPTO_SHA256_ARM=m CONFIG_CRYPTO_SHA512_ARM=m -CONFIG_CRYPTO_AES_ARM=m CONFIG_CRYPTO_AES_ARM_BS=m CONFIG_CRYPTO_AES_ARM_CE=m CONFIG_CRYPTO_GHASH_ARM_CE=m -CONFIG_CRYPTO_DEV_ATMEL_AES=m -CONFIG_CRYPTO_DEV_ATMEL_TDES=m -CONFIG_CRYPTO_DEV_ATMEL_SHA=mSignature · 1 line
2.5.0
Signature · 2 lines
FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net.
PATCH 1/1 ARM: multi_v7: Rebuild default configuration on v4.3-rc1
Quoted 10 lines · Russell King - ARM Linux
Quoted 5 lines · Thierry Reding
From: Thierry Reding <[email protected]>
It's becoming more and more difficult to update the
multi_v7default configuration because it hasn't been kept in proper order. Typically the workflow to update it would be to do the following:If we start regularly updating the defconfigs, it'll annoy Linus, because it will create a lot of useless churn, bloating his diffstats needlessly.
We are already regularly updating defconfigs. It's a natural thing to do as new features are implemented.
Quoted 4 lines
Since the defconfig files are not order specific, it would have been a good idea if savedefconfig had sorted the options into alphanumeric order propr to outputting them. That would cut down on the useless churn, some of which is in your patch.
That would be one solution. But it would also mean that people need to actually go and check that things are properly sorted. Most of the churn here doesn't come from the fact that these options have moved in Kconfig but because people have inserted them in the wrong places. The same could happen even if savedefconfig sorted options alphanumerically, because evidently people aren't using the tools properly.
Quoted 3 lines
In fact, most of this patch is pure churn - it's merely moving options about. It provides very little in the way of useful benefit for its size. We need to do better than this.
Yes, I know. In fact I stated that in the commit message. But this really should be a one-time thing. If we make it easy for people to properly update the default configuration there will be less churn further down the road. The changes that end up in multi_v7 default configuration patches should be what's generated from the defconfig output. So unless options get removed from Kconfig there should not be any unnecessary churn subsequently.
As for changes that move options in Kconfig, I think those should be discouraged. The sane thing to do is order them alphabetically, which will remove any need to move things around.
Quoted 12 lines
Quoted 12 lines
arch/arm/configs/multi_v7_defconfig +0
-1@@ -12,7 +12,6 @@ CONFIG_MODULE_UNLOAD=y CONFIG_PARTITION_ADVANCED=y CONFIG_CMDLINE_PARTITION=y CONFIG_ARCH_VIRT=y -CONFIG_ARCH_ALPINE=y CONFIG_ARCH_MVEBU=y CONFIG_MACH_ARMADA_370=y CONFIG_MACH_ARMADA_375=y
Quoted 8 lines
arch/arm/configs/multi_v7_defconfig CONFIG_MACH_ARMADA_38X=y · line 22
Quoted 5 lines
arch/arm/configs/multi_v7_defconfig +1
-0@@ -20,14 +19,15 @@ CONFIG_MACH_ARMADA_38X=y CONFIG_MACH_ARMADA_39X=y CONFIG_MACH_ARMADA_XP=y CONFIG_MACH_DOVE=y +CONFIG_ARCH_ALPINE=yThis option has moved, and the above two changes are therefore nothing but churn.
[...]
This and all the below I know already. I went through each and every one of these options and checked what happened to them. Those listed in the commit message are the ones that have actually changed. Those not listed are the ones that have only moved around.
Thierry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150915/c773f3f6/attachment.sig>
PATCH 1/1 ARM: multi_v7: Rebuild default configuration on v4.3-rc1
[Added Linus]
Quoted 20 lines · Thierry Reding
Quoted 10 lines · Russell King - ARM Linux
Quoted 5 lines · Thierry Reding
From: Thierry Reding <[email protected]>
It's becoming more and more difficult to update the
multi_v7default configuration because it hasn't been kept in proper order. Typically the workflow to update it would be to do the following:If we start regularly updating the defconfigs, it'll annoy Linus, because it will create a lot of useless churn, bloating his diffstats needlessly.
We are already regularly updating defconfigs. It's a natural thing to do as new features are implemented.
Quoted 4 lines
Since the defconfig files are not order specific, it would have been a good idea if savedefconfig had sorted the options into alphanumeric order propr to outputting them. That would cut down on the useless churn, some of which is in your patch.
Quoted 6 lines
That would be one solution. But it would also mean that people need to actually go and check that things are properly sorted. Most of the churn here doesn't come from the fact that these options have moved in
Kconfigbut because people have inserted them in the wrong places. The same could happen even if savedefconfig sorted options alphanumerically, because evidently people aren't using the tools properly.
Hardly surprising - if people are going around adding an option to all architectures, they're not going to run 'make savedefconfig' on each and every configuration they find to add that option. That's far too much work. It's not that "people aren't using the tools properly" it's that the tools are too much effort when you've got a global change to do.
However, there's not really anything that can be done about it, because nothing is simpler than concatenating an option to all configs, or adding it using an editor.
Quoted 6 lines
Quoted 3 lines
In fact, most of this patch is pure churn - it's merely moving options about. It provides very little in the way of useful benefit for its size. We need to do better than this.
Yes, I know. In fact I stated that in the commit message. But this really should be a one-time thing.
The fact is, this won't be a one-time thing. People will continue to add options in random places in these files, and we'll need to "fix" it with useless churn yet again, and again, and again.
Quoted 6 lines
If we make it easy for people to
properly update the default configuration there will be less churn further down the road. The changes that end up inmulti_v7default configuration patches should be what's generated from the defconfig output. So unless options get removed fromKconfigthere should not be any unnecessary churn subsequently.
I think you're living in an ideal world...
Quoted 3 lines
As for changes that move options in
Kconfig, I think those should be discouraged. The sane thing to do is order them alphabetically, which will remove any need to move things around.
... which is why you re-ordered drivers/gpu/drm/Kconfig, moving bridge/Kconfig after the panel Kconfig, which now resulted in this churn in _this_ churn filled patch:
CONFIG_DRM=y
# CONFIG_DRM_I2C_CH7006 is not set
# CONFIG_DRM_I2C_SIL164 is not set
-CONFIG_DRM_NXP_PTN3460=m
-CONFIG_DRM_PARADE_PS8622=m
CONFIG_DRM_NOUVEAU=m
CONFIG_DRM_EXYNOS=m
...
CONFIG_DRM_PANEL_SIMPLE=y
+CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
+CONFIG_DRM_NXP_PTN3460=m
+CONFIG_DRM_PARADE_PS8622=m
CONFIG_FB_ARMCLCD=y
Quoted 20 lines
Quoted 12 lines
Quoted 12 lines
arch/arm/configs/multi_v7_defconfig +0
-1@@ -12,7 +12,6 @@ CONFIG_MODULE_UNLOAD=y CONFIG_PARTITION_ADVANCED=y CONFIG_CMDLINE_PARTITION=y CONFIG_ARCH_VIRT=y -CONFIG_ARCH_ALPINE=y CONFIG_ARCH_MVEBU=y CONFIG_MACH_ARMADA_370=y CONFIG_MACH_ARMADA_375=yQuoted 8 lines
arch/arm/configs/multi_v7_defconfig CONFIG_MACH_ARMADA_38X=y · line 22
Quoted 5 lines
arch/arm/configs/multi_v7_defconfig +1
-0@@ -20,14 +19,15 @@ CONFIG_MACH_ARMADA_38X=y CONFIG_MACH_ARMADA_39X=y CONFIG_MACH_ARMADA_XP=y CONFIG_MACH_DOVE=y +CONFIG_ARCH_ALPINE=yThis option has moved, and the above two changes are therefore nothing but churn.
Quoted 6 lines
[...]
This and all the below I know already. I went through each and every one of these options and checked what happened to them. Those listed in the commit message are the ones that have actually changed. Those not listed are the ones that have only moved around.
Right, so from me this patch gets a NAK, because it's mostly churn with very little benefit.
Linus has threatened to remove the defconfigs in the past for this kind of stupid churn. For me to say anything else about this would be re-inviting their removal.
Signature · 2 lines
FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net.
PATCH 1/1 ARM: multi_v7: Rebuild default configuration on v4.3-rc1
Quoted 30 lines · Russell King - ARM Linux
[Added Linus]
Quoted 20 lines · Thierry Reding
Quoted 10 lines · Russell King - ARM Linux
Quoted 5 lines · Thierry Reding
From: Thierry Reding <[email protected]>
It's becoming more and more difficult to update the
multi_v7default configuration because it hasn't been kept in proper order. Typically the workflow to update it would be to do the following:If we start regularly updating the defconfigs, it'll annoy Linus, because it will create a lot of useless churn, bloating his diffstats needlessly.
We are already regularly updating defconfigs. It's a natural thing to do as new features are implemented.
Quoted 4 lines
Since the defconfig files are not order specific, it would have been a good idea if savedefconfig had sorted the options into alphanumeric order propr to outputting them. That would cut down on the useless churn, some of which is in your patch.
Quoted 6 lines
That would be one solution. But it would also mean that people need to actually go and check that things are properly sorted. Most of the churn here doesn't come from the fact that these options have moved in
Kconfigbut because people have inserted them in the wrong places. The same could happen even if savedefconfig sorted options alphanumerically, because evidently people aren't using the tools properly.
Quoted 6 lines
Hardly surprising - if people are going around adding an option to all architectures, they're not going to run 'make savedefconfig' on each and every configuration they find to add that option. That's far too much work. It's not that "people aren't using the tools properly" it's that the tools are too much effort when you've got a global change to do.
I don't expect people to do this for every option they add. What I was expecting people to do is when they add a new feature to a default configuration that they add it in the right place. I'm also not advocating for doing this for every default configuration, but the multi_v7_defconfig is where pretty much everyone in the ARM world adds options. It is also one which /should/ be updated through the ARM SoC tree only, so there's technically a way to enforce this.
Quoted 3 lines
However, there's not really anything that can be done about it, because nothing is simpler than concatenating an option to all configs, or adding it using an editor.
It's not that easy. As a platform maintainer I often need to deal with the situation where the default configuration needs to be updated with the latest options so that "everything works". But because the default configuration is all messed up there is no easy way for me to do that, because once I have a .config that has all the new options enabled the corresponding defconfig has a huge diff compared to the default and it takes a ridiculous amount of work to sort out the actual changes.
I doubt that I'm the only one in that position and I think this has the potential to make things a little easier for everyone contributing to this default configuration.
Quoted 10 lines
Quoted 6 lines
Quoted 3 lines
In fact, most of this patch is pure churn - it's merely moving options about. It provides very little in the way of useful benefit for its size. We need to do better than this.
Yes, I know. In fact I stated that in the commit message. But this really should be a one-time thing.
The fact is, this won't be a one-time thing. People will continue to add options in random places in these files, and we'll need to "fix" it with useless churn yet again, and again, and again.
Like I said, this file should only ever get modified via the ARM SoC tree and hence we should be able to enforce proper updates.
Quoted 20 lines
Quoted 6 lines
If we make it easy for people to
properly update the default configuration there will be less churn further down the road. The changes that end up inmulti_v7default configuration patches should be what's generated from the defconfig output. So unless options get removed fromKconfigthere should not be any unnecessary churn subsequently.I think you're living in an ideal world...
Quoted 3 lines
As for changes that move options in
Kconfig, I think those should be discouraged. The sane thing to do is order them alphabetically, which will remove any need to move things around.... which is why you re-ordered
drivers/gpu/drm/Kconfig, moving bridge/Kconfig after the panelKconfig, which now resulted in this churn in _this_ churn filled patch:
CONFIG_DRM=y
#CONFIG_DRM_I2C_CH7006is not set
#CONFIG_DRM_I2C_SIL164is not set
arch/arm/configs/multi_v7_defconfig CONFIG_VIDEO_ML86V7667=m · line 438
Quoted 10 lines
arch/arm/configs/multi_v7_defconfig +3
-2-CONFIG_DRM_NXP_PTN3460=m -CONFIG_DRM_PARADE_PS8622=m CONFIG_DRM_NOUVEAU=m CONFIG_DRM_EXYNOS=m CONFIG_DRM_PANEL_SIMPLE=y +CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m +CONFIG_DRM_NXP_PTN3460=m +CONFIG_DRM_PARADE_PS8622=m CONFIG_FB_ARMCLCD=y
The reason for those changes were that bridge drivers were completely randomly added in Kconfig. That should've never happened in the first place and the changes you mentioned are actually supposed to prevent this kind of random additions in the future and keep things properly sorted.
Quoted 27 lines
Quoted 20 lines
Quoted 12 lines
Quoted 12 lines
arch/arm/configs/multi_v7_defconfig +0
-1@@ -12,7 +12,6 @@ CONFIG_MODULE_UNLOAD=y CONFIG_PARTITION_ADVANCED=y CONFIG_CMDLINE_PARTITION=y CONFIG_ARCH_VIRT=y -CONFIG_ARCH_ALPINE=y CONFIG_ARCH_MVEBU=y CONFIG_MACH_ARMADA_370=y CONFIG_MACH_ARMADA_375=yQuoted 8 lines
arch/arm/configs/multi_v7_defconfig CONFIG_MACH_ARMADA_38X=y · line 22
Quoted 5 lines
arch/arm/configs/multi_v7_defconfig +1
-0@@ -20,14 +19,15 @@ CONFIG_MACH_ARMADA_38X=y CONFIG_MACH_ARMADA_39X=y CONFIG_MACH_ARMADA_XP=y CONFIG_MACH_DOVE=y +CONFIG_ARCH_ALPINE=yThis option has moved, and the above two changes are therefore nothing but churn.
Quoted 6 lines
[...]
This and all the below I know already. I went through each and every one of these options and checked what happened to them. Those listed in the commit message are the ones that have actually changed. Those not listed are the ones that have only moved around.
Quoted 6 lines
Right, so from me this patch gets a NAK, because it's mostly churn with very little benefit.
Linus has threatened to remove the defconfigs in the past for this kind of stupid churn. For me to say anything else about this would be re-inviting their removal.
Like I said, I consider the churn a mostly one-time thing. But keeping this file properly up to date is going to help prevent it from becoming stale and crufty.
But if everyone else feels really strongly about this, consider the patch dropped. I'll go and do something else instead.
Thierry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150915/da1af186/attachment.sig>
PATCH 1/1 ARM: multi_v7: Rebuild default configuration on v4.3-rc1
Quoted 143 lines · Thierry Reding
Quoted 30 lines · Russell King - ARM Linux
[Added Linus]
Quoted 20 lines · Thierry Reding
Quoted 10 lines · Russell King - ARM Linux
Quoted 5 lines · Thierry Reding
From: Thierry Reding <[email protected]>
It's becoming more and more difficult to update the
multi_v7default configuration because it hasn't been kept in proper order. Typically the workflow to update it would be to do the following:If we start regularly updating the defconfigs, it'll annoy Linus, because it will create a lot of useless churn, bloating his diffstats needlessly.
We are already regularly updating defconfigs. It's a natural thing to do as new features are implemented.
Quoted 4 lines
Since the defconfig files are not order specific, it would have been a good idea if savedefconfig had sorted the options into alphanumeric order propr to outputting them. That would cut down on the useless churn, some of which is in your patch.
Quoted 6 lines
That would be one solution. But it would also mean that people need to actually go and check that things are properly sorted. Most of the churn here doesn't come from the fact that these options have moved in
Kconfigbut because people have inserted them in the wrong places. The same could happen even if savedefconfig sorted options alphanumerically, because evidently people aren't using the tools properly.Quoted 6 lines
Hardly surprising - if people are going around adding an option to all architectures, they're not going to run 'make savedefconfig' on each and every configuration they find to add that option. That's far too much work. It's not that "people aren't using the tools properly" it's that the tools are too much effort when you've got a global change to do.
I don't expect people to do this for every option they add. What I was expecting people to do is when they add a new feature to a default configuration that they add it in the right place. I'm also not advocating for doing this for every default configuration, but the
multi_v7_defconfigis where pretty much everyone in the ARM world adds options. It is also one which /should/ be updated through the ARM SoC tree only, so there's technically a way to enforce this.Quoted 3 lines
However, there's not really anything that can be done about it, because nothing is simpler than concatenating an option to all configs, or adding it using an editor.
It's not that easy. As a platform maintainer I often need to deal with the situation where the default configuration needs to be updated with the latest options so that "everything works". But because the default configuration is all messed up there is no easy way for me to do that, because once I have a .config that has all the new options enabled the corresponding defconfig has a huge diff compared to the default and it takes a ridiculous amount of work to sort out the actual changes.
I doubt that I'm the only one in that position and I think this has the potential to make things a little easier for everyone contributing to this default configuration.
Quoted 10 lines
Quoted 6 lines
Quoted 3 lines
In fact, most of this patch is pure churn - it's merely moving options about. It provides very little in the way of useful benefit for its size. We need to do better than this.
Yes, I know. In fact I stated that in the commit message. But this really should be a one-time thing.
The fact is, this won't be a one-time thing. People will continue to add options in random places in these files, and we'll need to "fix" it with useless churn yet again, and again, and again.
Like I said, this file should only ever get modified via the ARM SoC tree and hence we should be able to enforce proper updates.
Quoted 20 lines
Quoted 6 lines
If we make it easy for people to
properly update the default configuration there will be less churn further down the road. The changes that end up inmulti_v7default configuration patches should be what's generated from the defconfig output. So unless options get removed fromKconfigthere should not be any unnecessary churn subsequently.I think you're living in an ideal world...
Quoted 3 lines
As for changes that move options in
Kconfig, I think those should be discouraged. The sane thing to do is order them alphabetically, which will remove any need to move things around.... which is why you re-ordered
drivers/gpu/drm/Kconfig, moving bridge/Kconfig after the panelKconfig, which now resulted in this churn in _this_ churn filled patch:
CONFIG_DRM=y
#CONFIG_DRM_I2C_CH7006is not set
#CONFIG_DRM_I2C_SIL164is not setarch/arm/configs/multi_v7_defconfig CONFIG_VIDEO_ML86V7667=m · line 438
Quoted 10 lines
arch/arm/configs/multi_v7_defconfig +3
-2-CONFIG_DRM_NXP_PTN3460=m -CONFIG_DRM_PARADE_PS8622=m CONFIG_DRM_NOUVEAU=m CONFIG_DRM_EXYNOS=m CONFIG_DRM_PANEL_SIMPLE=y +CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m +CONFIG_DRM_NXP_PTN3460=m +CONFIG_DRM_PARADE_PS8622=m CONFIG_FB_ARMCLCD=yThe reason for those changes were that bridge drivers were completely randomly added in
Kconfig. That should've never happened in the first place and the changes you mentioned are actually supposed to prevent this kind of random additions in the future and keep things properly sorted.Quoted 30 lines
Quoted 20 lines
Quoted 12 lines
Quoted 12 lines
arch/arm/configs/multi_v7_defconfig +0
-1@@ -12,7 +12,6 @@ CONFIG_MODULE_UNLOAD=y CONFIG_PARTITION_ADVANCED=y CONFIG_CMDLINE_PARTITION=y CONFIG_ARCH_VIRT=y -CONFIG_ARCH_ALPINE=y CONFIG_ARCH_MVEBU=y CONFIG_MACH_ARMADA_370=y CONFIG_MACH_ARMADA_375=yQuoted 8 lines
arch/arm/configs/multi_v7_defconfig CONFIG_MACH_ARMADA_38X=y · line 22
Quoted 5 lines
arch/arm/configs/multi_v7_defconfig +1
-0@@ -20,14 +19,15 @@ CONFIG_MACH_ARMADA_38X=y CONFIG_MACH_ARMADA_39X=y CONFIG_MACH_ARMADA_XP=y CONFIG_MACH_DOVE=y +CONFIG_ARCH_ALPINE=yThis option has moved, and the above two changes are therefore nothing but churn.
Quoted 6 lines
[...]
This and all the below I know already. I went through each and every one of these options and checked what happened to them. Those listed in the commit message are the ones that have actually changed. Those not listed are the ones that have only moved around.
Right, so from me this patch gets a NAK, because it's mostly churn with very little benefit.
Quoted 7 lines
Quoted 3 lines
Linus has threatened to remove the defconfigs in the past for this kind of stupid churn. For me to say anything else about this would be re-inviting their removal.
Like I said, I consider the churn a mostly one-time thing. But keeping this file properly up to date is going to help prevent it from becoming stale and crufty.
As one of the maintainers of multi_v7_defconfig, I'm fully supportive of avoiding the growing cruftyness of this file, and making it more maintainable, especially because we have a better opportunity to enforce it. IMO, there's a big difference between churn and cleanup for better maintainability.
Also, I think we've already signficantly cleaned up the ARM defconfig space compared to when Linus complainted about the churn there. We're (mostly) down to the multi*config files and then one sub-arch specific defconfig per platform, and personally, I don't see a huge amount of churn there:
$ git diff --shortstat v3.10..v4.3-rc1 arch/arm/configs/ 99 files changed, 3830 insertions(+), 3348 deletions(-)
In fact, one of the ways to continue removing sub-arch specific defconfigs is to make multi_v7 usable for more platforms, and part of that is cleaning it up so future changes easier and cause less churn.
If we're really worried about churn, we might need to look elsewhere ;)
$ git diff --shortstat v3.10..v4.3-rc1 arch/arm/boot/dts/ 1157 files changed, 256438 insertions(+), 19699 deletions(-)
Kevin
PATCH 1/1 ARM: multi_v7: Rebuild default configuration on v4.3-rc1
Quoted 1 line · Kevin Hilman
As one of the maintainers of
multi_v7_defconfig, I'm fully supportive of
As ARM maintainer...
Quoted 4 lines
avoiding the growing cruftyness of this file, and making it more maintainable, especially because we have a better opportunity to enforce it. IMO, there's a big difference between churn and cleanup for better maintainability.
Moving options around (which is the majority of what this patch does) is not cruftyness. It's a fact of life that changes to the Kconfig files change the order of configuration options all the time. It's got nothing to do with the order that the options appear. Just adding another dependency can change the ordering.
I've no problem with adding and removing options where it's appropriate to do so. What I have a problem with is all the needless churn such as in this patch, where options are moved from one place to another without any benefit what so ever.
Signature · 2 lines
FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net.