[v2,3/3] ARM: qcom_defconfig: order items with savedefconfig

Run savedefconfig and order the entries, without removing or adding
anything.  This reduces conflicts, as new entries should not be added to
the end, and makes it easier to spot differences against actual config.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 arch/arm/configs/qcom_defconfig | 56 ++++++++++++++++-----------------
 1 file changed, 28 insertions(+), 28 deletions(-)

Hi Krzysztof,

On Donnerstag, 21. Juli 2022 17:53:56 CEST Krzysztof Kozlowski wrote:
> Run savedefconfig and order the entries, without removing or adding
> anything.  This reduces conflicts, as new entries should not be added to
> the end, and makes it easier to spot differences against actual config.

Could you also add a commit that regenerates it completely?

 rm .config; make qcom_defconfig; make savedefconfig; mv defconfig arch/arm/
configs/qcom_defconfig

There's a bunch of options not present in mainline anymore, most significant 
QCOM_ADSP_PIL and QCOM_Q6V5_PIL which are now CONFIG_QCOM_Q6V5_MSS and 
CONFIG_QCOM_Q6V5_PAS. 

See also 
https://lore.kernel.org/linux-arm-msm/20191104210943.101393-1-luca@z3ntu.xyz/
(never applied for some reason)

Regards
Luca

> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> ---
>  arch/arm/configs/qcom_defconfig | 56 ++++++++++++++++-----------------
>  1 file changed, 28 insertions(+), 28 deletions(-)
> 
> diff --git a/arch/arm/configs/qcom_defconfig
> b/arch/arm/configs/qcom_defconfig index 563a396bfb23..b6579b553447 100644
> --- a/arch/arm/configs/qcom_defconfig
> +++ b/arch/arm/configs/qcom_defconfig
> @@ -1,6 +1,7 @@
>  CONFIG_SYSVIPC=y
>  CONFIG_NO_HZ=y
>  CONFIG_HIGH_RES_TIMERS=y
> +CONFIG_PREEMPT=y
>  CONFIG_IKCONFIG=y
>  CONFIG_IKCONFIG_PROC=y
>  CONFIG_CGROUPS=y
> @@ -10,29 +11,28 @@ CONFIG_EMBEDDED=y
>  # CONFIG_SLUB_DEBUG is not set
>  # CONFIG_COMPAT_BRK is not set
>  CONFIG_PROFILING=y
> -CONFIG_KPROBES=y
> -CONFIG_MODULES=y
> -CONFIG_MODULE_UNLOAD=y
> -CONFIG_MODULE_FORCE_UNLOAD=y
> -CONFIG_MODVERSIONS=y
> -CONFIG_PARTITION_ADVANCED=y
>  CONFIG_ARCH_QCOM=y
>  CONFIG_ARCH_MSM8X60=y
>  CONFIG_ARCH_MSM8960=y
>  CONFIG_ARCH_MSM8974=y
>  CONFIG_ARCH_MDM9615=y
> -CONFIG_PCI=y
> -CONFIG_PCI_MSI=y
> -CONFIG_PCIE_QCOM=y
>  CONFIG_SMP=y
> -CONFIG_PREEMPT=y
> +CONFIG_ARM_PSCI=y
>  CONFIG_HIGHMEM=y
>  CONFIG_ARM_APPENDED_DTB=y
>  CONFIG_ARM_ATAG_DTB_COMPAT=y
> +CONFIG_CPU_FREQ=y
> +CONFIG_CPUFREQ_DT=y
>  CONFIG_CPU_IDLE=y
>  CONFIG_ARM_CPUIDLE=y
>  CONFIG_VFP=y
>  CONFIG_NEON=y
> +CONFIG_KPROBES=y
> +CONFIG_MODULES=y
> +CONFIG_MODULE_UNLOAD=y
> +CONFIG_MODULE_FORCE_UNLOAD=y
> +CONFIG_MODVERSIONS=y
> +CONFIG_PARTITION_ADVANCED=y
>  # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
>  CONFIG_CMA=y
>  CONFIG_NET=y
> @@ -56,15 +56,18 @@ CONFIG_BT_HCIUART_BCM=y
>  CONFIG_CFG80211=m
>  CONFIG_MAC80211=m
>  CONFIG_RFKILL=y
> +CONFIG_PCI=y
> +CONFIG_PCI_MSI=y
> +CONFIG_PCIE_QCOM=y
>  CONFIG_DEVTMPFS=y
>  CONFIG_DEVTMPFS_MOUNT=y
>  CONFIG_MTD=y
> +CONFIG_MTD_QCOMSMEM_PARTS=y
>  CONFIG_MTD_BLOCK=y
>  CONFIG_MTD_M25P80=y
>  CONFIG_MTD_RAW_NAND=y
>  CONFIG_MTD_NAND_QCOM=y
>  CONFIG_MTD_SPI_NOR=y
> -CONFIG_MTD_QCOMSMEM_PARTS=y
>  CONFIG_MTD_UBI=y
>  CONFIG_BLK_DEV_LOOP=y
>  CONFIG_BLK_DEV_RAM=y
> @@ -133,10 +136,10 @@ CONFIG_PINCTRL_MSM8660=y
>  CONFIG_PINCTRL_MSM8960=y
>  CONFIG_PINCTRL_MDM9615=y
>  CONFIG_PINCTRL_MSM8X74=y
> -CONFIG_PINCTRL_SDX55=y
>  CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
>  CONFIG_PINCTRL_QCOM_SSBI_PMIC=y
>  CONFIG_GPIOLIB=y
> +CONFIG_PINCTRL_SDX55=y
>  CONFIG_GPIO_SYSFS=y
>  CONFIG_POWER_RESET=y
>  CONFIG_POWER_RESET_MSM=y
> @@ -144,15 +147,17 @@ CONFIG_CHARGER_QCOM_SMBB=y
>  CONFIG_CHARGER_BQ24190=m
>  CONFIG_THERMAL=y
>  CONFIG_QCOM_TSENS=y
> +CONFIG_WATCHDOG=y
> +CONFIG_QCOM_WDT=y
>  CONFIG_MFD_PM8XXX=y
>  CONFIG_MFD_QCOM_RPM=y
>  CONFIG_MFD_SPMI_PMIC=y
>  CONFIG_REGULATOR=y
>  CONFIG_REGULATOR_FIXED_VOLTAGE=y
>  CONFIG_REGULATOR_QCOM_RPM=y
> +CONFIG_REGULATOR_QCOM_RPMH=y
>  CONFIG_REGULATOR_QCOM_SMD_RPM=y
>  CONFIG_REGULATOR_QCOM_SPMI=y
> -CONFIG_REGULATOR_QCOM_RPMH=y
>  CONFIG_MEDIA_SUPPORT=y
>  CONFIG_DRM=y
>  CONFIG_DRM_MSM=m
> @@ -160,11 +165,11 @@ CONFIG_DRM_PANEL_SIMPLE=y
>  CONFIG_DRM_PANEL_EDP=y
>  CONFIG_DRM_ANALOGIX_ANX78XX=m
>  CONFIG_FB=y
> -CONFIG_FRAMEBUFFER_CONSOLE=y
>  # CONFIG_LCD_CLASS_DEVICE is not set
>  CONFIG_BACKLIGHT_CLASS_DEVICE=y
>  CONFIG_BACKLIGHT_LM3630A=y
>  CONFIG_BACKLIGHT_LP855X=y
> +CONFIG_FRAMEBUFFER_CONSOLE=y
>  CONFIG_SOUND=y
>  CONFIG_SND=y
>  CONFIG_SND_DYNAMIC_MINORS=y
> @@ -180,6 +185,7 @@ CONFIG_USB_MON=y
>  CONFIG_USB_EHCI_HCD=y
>  CONFIG_USB_EHCI_MSM=y
>  CONFIG_USB_ACM=y
> +CONFIG_USB_DWC3=y
>  CONFIG_USB_CHIPIDEA=y
>  CONFIG_USB_CHIPIDEA_UDC=y
>  CONFIG_USB_CHIPIDEA_HOST=y
> @@ -196,7 +202,6 @@ CONFIG_USB_CONFIGFS_ECM=y
>  CONFIG_USB_CONFIGFS_F_FS=y
>  CONFIG_USB_ULPI_BUS=y
>  CONFIG_USB_ETH=m
> -CONFIG_USB_DWC3=y
>  CONFIG_MMC=y
>  CONFIG_MMC_BLOCK_MINORS=32
>  CONFIG_MMC_ARMMMCI=y
> @@ -218,8 +223,8 @@ CONFIG_COMMON_CLK_QCOM=y
>  CONFIG_QCOM_A7PLL=y
>  CONFIG_QCOM_CLK_APCS_SDX55=y
>  CONFIG_QCOM_CLK_RPM=y
> -CONFIG_QCOM_CLK_RPMH=y
>  CONFIG_QCOM_CLK_SMD_RPM=y
> +CONFIG_QCOM_CLK_RPMH=y
>  CONFIG_APQ_MMCC_8084=y
>  CONFIG_IPQ_GCC_4019=y
>  CONFIG_IPQ_LCC_806X=y
> @@ -229,12 +234,12 @@ CONFIG_MDM_LCC_9615=y
>  CONFIG_MSM_MMCC_8960=y
>  CONFIG_MSM_MMCC_8974=y
>  CONFIG_SDX_GCC_55=y
> -CONFIG_MSM_IOMMU=y
> -CONFIG_ARM_SMMU=y
>  CONFIG_HWSPINLOCK=y
>  CONFIG_HWSPINLOCK_QCOM=y
>  CONFIG_MAILBOX=y
>  CONFIG_QCOM_APCS_IPC=y
> +CONFIG_MSM_IOMMU=y
> +CONFIG_ARM_SMMU=y
>  CONFIG_REMOTEPROC=y
>  CONFIG_QCOM_ADSP_PIL=y
>  CONFIG_QCOM_Q6V5_PAS=y
> @@ -247,12 +252,12 @@ CONFIG_QCOM_COMMAND_DB=y
>  CONFIG_QCOM_GSBI=y
>  CONFIG_QCOM_OCMEM=y
>  CONFIG_QCOM_PM=y
> +CONFIG_QCOM_RPMH=y
> +CONFIG_QCOM_RPMHPD=y
>  CONFIG_QCOM_SMEM=y
>  CONFIG_QCOM_SMD_RPM=y
>  CONFIG_QCOM_SMP2P=y
>  CONFIG_QCOM_SMSM=y
> -CONFIG_QCOM_RPMH=y
> -CONFIG_QCOM_RPMHPD=y
>  CONFIG_QCOM_SOCINFO=y
>  CONFIG_QCOM_WCNSS_CTRL=y
>  CONFIG_EXTCON_QCOM_SPMI_MISC=y
> @@ -271,10 +276,10 @@ CONFIG_BMP280=y
>  CONFIG_PWM=y
>  CONFIG_PHY_QCOM_APQ8064_SATA=y
>  CONFIG_PHY_QCOM_IPQ806X_SATA=y
> -CONFIG_PHY_QCOM_USB_HS=y
> -CONFIG_PHY_QCOM_USB_HSIC=y
>  CONFIG_PHY_QCOM_QMP=y
> +CONFIG_PHY_QCOM_USB_HS=y
>  CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2=y
> +CONFIG_PHY_QCOM_USB_HSIC=y
>  CONFIG_QCOM_QFPROM=y
>  CONFIG_INTERCONNECT=y
>  CONFIG_INTERCONNECT_QCOM=y
> @@ -300,8 +305,8 @@ CONFIG_CRYPTO_USER=m
>  CONFIG_CRYPTO_USER_API=m
>  CONFIG_CRYPTO_USER_API_HASH=m
>  CONFIG_CRYPTO_USER_API_SKCIPHER=m
> -CONFIG_CRYPTO_USER_API_AEAD=m
>  CONFIG_CRYPTO_USER_API_RNG=m
> +CONFIG_CRYPTO_USER_API_AEAD=m
>  CONFIG_CRYPTO_DEV_QCOM_RNG=m
>  CONFIG_DMA_CMA=y
>  CONFIG_CMA_SIZE_MBYTES=64
> @@ -311,8 +316,3 @@ CONFIG_DEBUG_INFO=y
>  CONFIG_MAGIC_SYSRQ=y
>  CONFIG_DEBUG_FS=y
>  # CONFIG_SCHED_DEBUG is not set
> -CONFIG_WATCHDOG=y
> -CONFIG_QCOM_WDT=y
> -CONFIG_ARM_PSCI=y
> -CONFIG_CPU_FREQ=y
> -CONFIG_CPUFREQ_DT=y

On 23/07/2022 11:58, Luca Weiss wrote:
> Hi Krzysztof,
> 
> On Donnerstag, 21. Juli 2022 17:53:56 CEST Krzysztof Kozlowski wrote:
>> Run savedefconfig and order the entries, without removing or adding
>> anything.  This reduces conflicts, as new entries should not be added to
>> the end, and makes it easier to spot differences against actual config.
> 
> Could you also add a commit that regenerates it completely?
> 
>  rm .config; make qcom_defconfig; make savedefconfig; mv defconfig arch/arm/
> configs/qcom_defconfig
> 
> There's a bunch of options not present in mainline anymore, most significant 
> QCOM_ADSP_PIL and QCOM_Q6V5_PIL which are now CONFIG_QCOM_Q6V5_MSS and 
> CONFIG_QCOM_Q6V5_PAS. 
> 
> See also 
> https://lore.kernel.org/linux-arm-msm/20191104210943.101393-1-luca@z3ntu.xyz/
> (never applied for some reason)

No, I cannot, because it is wrong method and should never be used. Each
of such options needs careful investigation not to remove user-visible
symbols.


Best regards,
Krzysztof

On 23/07/2022 11:58, Luca Weiss wrote:
> 
> See also 
> https://lore.kernel.org/linux-arm-msm/20191104210943.101393-1-luca@z3ntu.xyz/
> (never applied for some reason)

Mentioned patch is incorrect so should not be applied - it removes at
least TMPFS which is not desired. I did not check other removed symbols.


Best regards,
Krzysztof