From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web08.1534.1627495866108942570 for ; Wed, 28 Jul 2021 11:11:06 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 5D68B1063 for ; Wed, 28 Jul 2021 11:11:00 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id E150B3F66F for ; Wed, 28 Jul 2021 11:10:59 -0700 (PDT) From: "Ross Burton" To: meta-arm@lists.yoctoproject.org Subject: [PATCH 4/4] arm/linux-yocto: re-generate defconfig.patch for qemuarm64-sbsa and generic-arm64 Date: Wed, 28 Jul 2021 19:10:56 +0100 Message-Id: <20210728181056.287870-4-ross.burton@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210728181056.287870-1-ross.burton@arm.com> References: <20210728181056.287870-1-ross.burton@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable This patch was getting confusings, so regenerate the minimal form and explain what each change is for. Change-Id: I313249d46d55399626151cb22a9bc11bec9fb253 Signed-off-by: Ross Burton --- .../linux/linux-yocto/defconfig.patch | 308 +----------------- 1 file changed, 17 insertions(+), 291 deletions(-) diff --git a/meta-arm/recipes-kernel/linux/linux-yocto/defconfig.patch b/= meta-arm/recipes-kernel/linux/linux-yocto/defconfig.patch index afbbabe..5646a84 100644 --- a/meta-arm/recipes-kernel/linux/linux-yocto/defconfig.patch +++ b/meta-arm/recipes-kernel/linux/linux-yocto/defconfig.patch @@ -1,207 +1,31 @@ -From c72967164b63ea16c7c0276a306b66797998b62a Mon Sep 17 00:00:00 2001 -From: Jon Mason -Date: Sat, 1 May 2021 17:18:37 -0400 -Subject: [PATCH] Change USB_CONN_GPIO to 'y' by default and regenerate t= he - defconfig via `make savedefconfig`. +Clean up defconfig warnings from our config sanity checker. =20 -Upstream-Status: Inappropriate [not needed in newer kernels] -Signed-off-by: Jon Mason +CONFIG_POWER_AVS has been removed, submitted to linux-arm-kernel@. + +CONFIG_BACKLIGHT_GENERIC has been removed, backport of 717c4c8. + +CONFIG_USB_CONN_GPIO needs to be y not m as it is depended on by PHY_TEG= RA_XUSB +which is y. + +Upstream-Status: Submitted +Signed-off-by: Ross Burton --- arch/arm64/configs/defconfig | 65 +++++++++++++----------------------- 1 file changed, 24 insertions(+), 41 deletions(-) =20 diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig -index 6d84761d1285..8a2f7e075ba9 100644 +index 6d84761d1285..16367559b143 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig -@@ -13,7 +13,6 @@ CONFIG_IKCONFIG=3Dy - CONFIG_IKCONFIG_PROC=3Dy - CONFIG_NUMA_BALANCING=3Dy - CONFIG_MEMCG=3Dy --CONFIG_MEMCG_SWAP=3Dy - CONFIG_BLK_CGROUP=3Dy - CONFIG_CGROUP_PIDS=3Dy - CONFIG_CGROUP_HUGETLB=3Dy -@@ -65,7 +64,6 @@ CONFIG_ARM64_VA_BITS_48=3Dy - CONFIG_SCHED_MC=3Dy - CONFIG_SCHED_SMT=3Dy - CONFIG_NUMA=3Dy --CONFIG_SECCOMP=3Dy - CONFIG_KEXEC=3Dy - CONFIG_KEXEC_FILE=3Dy - CONFIG_CRASH_DUMP=3Dy -@@ -83,7 +81,6 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=3Dm - CONFIG_CPU_FREQ_GOV_USERSPACE=3Dy - CONFIG_CPU_FREQ_GOV_ONDEMAND=3Dy - CONFIG_CPU_FREQ_GOV_CONSERVATIVE=3Dm --CONFIG_CPU_FREQ_GOV_SCHEDUTIL=3Dy - CONFIG_CPUFREQ_DT=3Dy - CONFIG_ACPI_CPPC_CPUFREQ=3Dm - CONFIG_ARM_ALLWINNER_SUN50I_CPUFREQ_NVMEM=3Dm -@@ -105,7 +102,6 @@ CONFIG_IMX_SCU_PD=3Dy - CONFIG_ACPI=3Dy - CONFIG_ACPI_APEI=3Dy - CONFIG_ACPI_APEI_GHES=3Dy --CONFIG_PCIEAER=3Dy - CONFIG_ACPI_APEI_PCIEAER=3Dy - CONFIG_ACPI_APEI_MEMORY_FAILURE=3Dy - CONFIG_ACPI_APEI_EINJ=3Dy -@@ -181,12 +177,11 @@ CONFIG_QRTR_SMD=3Dm - CONFIG_QRTR_TUN=3Dm - CONFIG_BPF_JIT=3Dy - CONFIG_CAN=3Dm -+CONFIG_CAN_FLEXCAN=3Dm - CONFIG_CAN_RCAR=3Dm - CONFIG_CAN_RCAR_CANFD=3Dm --CONFIG_CAN_FLEXCAN=3Dm - CONFIG_BT=3Dm - CONFIG_BT_HIDP=3Dm --# CONFIG_BT_HS is not set - # CONFIG_BT_LE is not set - CONFIG_BT_LEDS=3Dy - # CONFIG_BT_DEBUGFS is not set -@@ -206,6 +201,7 @@ CONFIG_NFC_NCI=3Dm - CONFIG_NFC_S3FWRN5_I2C=3Dm - CONFIG_PCI=3Dy - CONFIG_PCIEPORTBUS=3Dy -+CONFIG_PCIEAER=3Dy - CONFIG_PCI_IOV=3Dy - CONFIG_PCI_PASID=3Dy - CONFIG_HOTPLUG_PCI=3Dy -@@ -223,13 +219,13 @@ CONFIG_PCI_HOST_THUNDER_ECAM=3Dy - CONFIG_PCIE_ROCKCHIP_HOST=3Dm - CONFIG_PCIE_BRCMSTB=3Dm - CONFIG_PCI_LAYERSCAPE=3Dy --CONFIG_PCIE_LAYERSCAPE_GEN4=3Dy - CONFIG_PCI_HISI=3Dy - CONFIG_PCIE_QCOM=3Dy - CONFIG_PCIE_ARMADA_8K=3Dy - CONFIG_PCIE_KIRIN=3Dy - CONFIG_PCIE_HISI_STB=3Dy - CONFIG_PCIE_TEGRA194_HOST=3Dm -+CONFIG_PCIE_LAYERSCAPE_GEN4=3Dy - CONFIG_PCI_ENDPOINT=3Dy - CONFIG_PCI_ENDPOINT_CONFIGFS=3Dy - CONFIG_PCI_EPF_TEST=3Dm -@@ -239,7 +235,6 @@ CONFIG_FW_LOADER_USER_HELPER=3Dy - CONFIG_FW_LOADER_USER_HELPER_FALLBACK=3Dy - CONFIG_HISILICON_LPC=3Dy - CONFIG_SIMPLE_PM_BUS=3Dy --CONFIG_FSL_MC_BUS=3Dy - CONFIG_TEGRA_ACONNECT=3Dm - CONFIG_MTD=3Dy - CONFIG_MTD_BLOCK=3Dy -@@ -258,7 +253,6 @@ CONFIG_MTD_NAND_MARVELL=3Dy - CONFIG_MTD_NAND_FSL_IFC=3Dy - CONFIG_MTD_NAND_QCOM=3Dy - CONFIG_MTD_SPI_NOR=3Dy --CONFIG_SPI_CADENCE_QUADSPI=3Dy - CONFIG_BLK_DEV_LOOP=3Dy - CONFIG_BLK_DEV_NBD=3Dm - CONFIG_VIRTIO_BLK=3Dy -@@ -343,18 +337,18 @@ CONFIG_SNI_NETSEC=3Dy - CONFIG_STMMAC_ETH=3Dm - CONFIG_TI_K3_AM65_CPSW_NUSS=3Dy - CONFIG_QCOM_IPA=3Dm --CONFIG_MDIO_BUS_MUX_MMIOREG=3Dy --CONFIG_MDIO_BUS_MUX_MULTIPLEXER=3Dy -+CONFIG_MESON_GXL_PHY=3Dm - CONFIG_AQUANTIA_PHY=3Dy - CONFIG_MARVELL_PHY=3Dm - CONFIG_MARVELL_10G_PHY=3Dm --CONFIG_MESON_GXL_PHY=3Dm - CONFIG_MICREL_PHY=3Dy - CONFIG_MICROSEMI_PHY=3Dy - CONFIG_AT803X_PHY=3Dy - CONFIG_REALTEK_PHY=3Dm - CONFIG_ROCKCHIP_PHY=3Dy - CONFIG_VITESSE_PHY=3Dy -+CONFIG_MDIO_BUS_MUX_MULTIPLEXER=3Dy -+CONFIG_MDIO_BUS_MUX_MMIOREG=3Dy - CONFIG_USB_PEGASUS=3Dm - CONFIG_USB_RTL8150=3Dm - CONFIG_USB_RTL8152=3Dm -@@ -454,6 +448,7 @@ CONFIG_SPI=3Dy - CONFIG_SPI_ARMADA_3700=3Dy - CONFIG_SPI_BCM2835=3Dm - CONFIG_SPI_BCM2835AUX=3Dm -+CONFIG_SPI_CADENCE_QUADSPI=3Dy - CONFIG_SPI_FSL_LPSPI=3Dy - CONFIG_SPI_FSL_QUADSPI=3Dy - CONFIG_SPI_NXP_FLEXSPI=3Dy -@@ -514,9 +509,6 @@ CONFIG_GPIO_PCA953X_IRQ=3Dy +@@ -514,7 +514,6 @@ CONFIG_GPIO_PCA953X_IRQ=3Dy CONFIG_GPIO_BD9571MWV=3Dm CONFIG_GPIO_MAX77620=3Dy CONFIG_GPIO_SL28CPLD=3Dm -CONFIG_POWER_AVS=3Dy --CONFIG_QCOM_CPR=3Dy --CONFIG_ROCKCHIP_IODOMAIN=3Dy + CONFIG_QCOM_CPR=3Dy + CONFIG_ROCKCHIP_IODOMAIN=3Dy CONFIG_POWER_RESET_MSM=3Dy - CONFIG_POWER_RESET_XGENE=3Dy - CONFIG_POWER_RESET_SYSCON=3Dy -@@ -533,10 +525,10 @@ CONFIG_SENSORS_INA3221=3Dm - CONFIG_THERMAL_GOV_POWER_ALLOCATOR=3Dy - CONFIG_CPU_THERMAL=3Dy - CONFIG_THERMAL_EMULATION=3Dy --CONFIG_QORIQ_THERMAL=3Dm --CONFIG_SUN8I_THERMAL=3Dy - CONFIG_IMX_SC_THERMAL=3Dm - CONFIG_IMX8MM_THERMAL=3Dm -+CONFIG_QORIQ_THERMAL=3Dm -+CONFIG_SUN8I_THERMAL=3Dy - CONFIG_ROCKCHIP_THERMAL=3Dm - CONFIG_RCAR_THERMAL=3Dy - CONFIG_RCAR_GEN3_THERMAL=3Dy -@@ -553,7 +545,6 @@ CONFIG_WATCHDOG=3Dy - CONFIG_SL28CPLD_WATCHDOG=3Dm - CONFIG_ARM_SP805_WATCHDOG=3Dy - CONFIG_ARM_SBSA_WATCHDOG=3Dy --CONFIG_ARM_SMC_WATCHDOG=3Dy - CONFIG_S3C2410_WATCHDOG=3Dy - CONFIG_DW_WATCHDOG=3Dy - CONFIG_SUNXI_WATCHDOG=3Dm -@@ -562,6 +553,7 @@ CONFIG_IMX_SC_WDT=3Dm - CONFIG_QCOM_WDT=3Dm - CONFIG_MESON_GXBB_WATCHDOG=3Dm - CONFIG_MESON_WATCHDOG=3Dm -+CONFIG_ARM_SMC_WATCHDOG=3Dy - CONFIG_RENESAS_WDT=3Dy - CONFIG_UNIPHIER_WATCHDOG=3Dy - CONFIG_BCM2835_WDT=3Dy -@@ -608,13 +600,12 @@ CONFIG_MEDIA_CAMERA_SUPPORT=3Dy - CONFIG_MEDIA_ANALOG_TV_SUPPORT=3Dy - CONFIG_MEDIA_DIGITAL_TV_SUPPORT=3Dy - CONFIG_MEDIA_SDR_SUPPORT=3Dy --CONFIG_MEDIA_CONTROLLER=3Dy --CONFIG_VIDEO_V4L2_SUBDEV_API=3Dy - CONFIG_MEDIA_PLATFORM_SUPPORT=3Dy - # CONFIG_DVB_NET is not set - CONFIG_MEDIA_USB_SUPPORT=3Dy - CONFIG_USB_VIDEO_CLASS=3Dm - CONFIG_V4L_PLATFORM_DRIVERS=3Dy -+CONFIG_VIDEO_QCOM_CAMSS=3Dm - CONFIG_VIDEO_RCAR_CSI2=3Dm - CONFIG_VIDEO_RCAR_VIN=3Dm - CONFIG_VIDEO_SUN6I_CSI=3Dm -@@ -629,7 +620,6 @@ CONFIG_SDR_PLATFORM_DRIVERS=3Dy - CONFIG_VIDEO_RCAR_DRIF=3Dm - CONFIG_VIDEO_IMX219=3Dm - CONFIG_VIDEO_OV5645=3Dm --CONFIG_VIDEO_QCOM_CAMSS=3Dm - CONFIG_DRM=3Dm - CONFIG_DRM_I2C_NXP_TDA998X=3Dm - CONFIG_DRM_MALI_DISPLAY=3Dm -@@ -661,8 +651,8 @@ CONFIG_DRM_PANEL_RAYDIUM_RM67191=3Dm - CONFIG_DRM_PANEL_SITRONIX_ST7703=3Dm - CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=3Dm - CONFIG_DRM_DISPLAY_CONNECTOR=3Dm --CONFIG_DRM_NWL_MIPI_DSI=3Dm - CONFIG_DRM_LONTIUM_LT9611=3Dm -+CONFIG_DRM_NWL_MIPI_DSI=3Dm - CONFIG_DRM_SII902X=3Dm - CONFIG_DRM_SIMPLE_BRIDGE=3Dm - CONFIG_DRM_THINE_THC63LVD1024=3Dm -@@ -683,7 +673,6 @@ CONFIG_DRM_PANFROST=3Dm +@@ -683,7 +682,6 @@ CONFIG_DRM_PANFROST=3Dm CONFIG_FB=3Dy CONFIG_FB_MODE_HELPERS=3Dy CONFIG_FB_EFI=3Dy @@ -209,110 +33,12 @@ index 6d84761d1285..8a2f7e075ba9 100644 CONFIG_BACKLIGHT_PWM=3Dm CONFIG_BACKLIGHT_LP855X=3Dm CONFIG_LOGO=3Dy -@@ -727,7 +716,6 @@ CONFIG_SND_SOC_WSA881X=3Dm +@@ -727,7 +725,7 @@ CONFIG_SND_SOC_WSA881X=3Dm CONFIG_SND_SIMPLE_CARD=3Dm CONFIG_SND_AUDIO_GRAPH_CARD=3Dm CONFIG_I2C_HID=3Dm -CONFIG_USB_CONN_GPIO=3Dm ++CONFIG_USB_CONN_GPIO=3Dy CONFIG_USB=3Dy CONFIG_USB_OTG=3Dy CONFIG_USB_XHCI_HCD=3Dy -@@ -859,7 +847,6 @@ CONFIG_VIRTIO_BALLOON=3Dy - CONFIG_VIRTIO_MMIO=3Dy - CONFIG_XEN_GNTDEV=3Dy - CONFIG_XEN_GRANT_DEV_ALLOC=3Dy --CONFIG_MFD_CROS_EC_DEV=3Dy - CONFIG_CHROME_PLATFORMS=3Dy - CONFIG_CROS_EC=3Dy - CONFIG_CROS_EC_I2C=3Dy -@@ -885,8 +872,8 @@ CONFIG_QCOM_A53PLL=3Dy - CONFIG_QCOM_CLK_APCS_MSM8916=3Dy - CONFIG_QCOM_CLK_SMD_RPM=3Dy - CONFIG_QCOM_CLK_RPMH=3Dy --CONFIG_IPQ_GCC_8074=3Dy - CONFIG_IPQ_GCC_6018=3Dy -+CONFIG_IPQ_GCC_8074=3Dy - CONFIG_MSM_GCC_8916=3Dy - CONFIG_MSM_GCC_8994=3Dy - CONFIG_MSM_MMCC_8996=3Dy -@@ -894,12 +881,9 @@ CONFIG_MSM_GCC_8998=3Dy - CONFIG_QCS_GCC_404=3Dy - CONFIG_SC_GCC_7180=3Dy - CONFIG_SDM_CAMCC_845=3Dm --CONFIG_SDM_GCC_845=3Dy - CONFIG_SDM_GPUCC_845=3Dy - CONFIG_SDM_VIDEOCC_845=3Dy - CONFIG_SDM_DISPCC_845=3Dy --CONFIG_SM_GCC_8150=3Dy --CONFIG_SM_GCC_8250=3Dy - CONFIG_SM_GPUCC_8150=3Dy - CONFIG_SM_GPUCC_8250=3Dy - CONFIG_QCOM_HFPLL=3Dy -@@ -930,6 +914,7 @@ CONFIG_RASPBERRYPI_POWER=3Dy - CONFIG_FSL_DPAA=3Dy - CONFIG_FSL_MC_DPIO=3Dy - CONFIG_QCOM_AOSS_QMP=3Dy -+CONFIG_QCOM_CPR=3Dy - CONFIG_QCOM_GENI_SE=3Dy - CONFIG_QCOM_RMTFS_MEM=3Dm - CONFIG_QCOM_RPMH=3Dy -@@ -941,19 +926,20 @@ CONFIG_QCOM_SMP2P=3Dy - CONFIG_QCOM_SMSM=3Dy - CONFIG_QCOM_SOCINFO=3Dm - CONFIG_QCOM_APR=3Dm --CONFIG_ARCH_R8A774A1=3Dy --CONFIG_ARCH_R8A774B1=3Dy --CONFIG_ARCH_R8A774C0=3Dy --CONFIG_ARCH_R8A774E1=3Dy -+CONFIG_ARCH_R8A77995=3Dy -+CONFIG_ARCH_R8A77990=3Dy - CONFIG_ARCH_R8A77950=3Dy - CONFIG_ARCH_R8A77951=3Dy -+CONFIG_ARCH_R8A77965=3Dy - CONFIG_ARCH_R8A77960=3Dy - CONFIG_ARCH_R8A77961=3Dy --CONFIG_ARCH_R8A77965=3Dy --CONFIG_ARCH_R8A77970=3Dy - CONFIG_ARCH_R8A77980=3Dy --CONFIG_ARCH_R8A77990=3Dy --CONFIG_ARCH_R8A77995=3Dy -+CONFIG_ARCH_R8A77970=3Dy -+CONFIG_ARCH_R8A774C0=3Dy -+CONFIG_ARCH_R8A774E1=3Dy -+CONFIG_ARCH_R8A774A1=3Dy -+CONFIG_ARCH_R8A774B1=3Dy -+CONFIG_ROCKCHIP_IODOMAIN=3Dy - CONFIG_ROCKCHIP_PM_DOMAINS=3Dy - CONFIG_ARCH_TEGRA_132_SOC=3Dy - CONFIG_ARCH_TEGRA_210_SOC=3Dy -@@ -1017,9 +1003,9 @@ CONFIG_PHY_UNIPHIER_USB3=3Dy - CONFIG_PHY_TEGRA_XUSB=3Dy - CONFIG_ARM_SMMU_V3_PMU=3Dm - CONFIG_FSL_IMX8_DDR_PMU=3Dm --CONFIG_HISI_PMU=3Dy - CONFIG_QCOM_L2_PMU=3Dy - CONFIG_QCOM_L3_PMU=3Dy -+CONFIG_HISI_PMU=3Dy - CONFIG_NVMEM_IMX_OCOTP=3Dy - CONFIG_NVMEM_IMX_OCOTP_SCU=3Dy - CONFIG_QCOM_QFPROM=3Dy -@@ -1035,10 +1021,9 @@ CONFIG_FPGA_REGION=3Dm - CONFIG_OF_FPGA_REGION=3Dm - CONFIG_TEE=3Dy - CONFIG_OPTEE=3Dy --CONFIG_SLIMBUS=3Dm -+CONFIG_MUX_MMIO=3Dy - CONFIG_SLIM_QCOM_CTRL=3Dm - CONFIG_SLIM_QCOM_NGD_CTRL=3Dm --CONFIG_MUX_MMIO=3Dy - CONFIG_INTERCONNECT=3Dy - CONFIG_INTERCONNECT_QCOM=3Dy - CONFIG_INTERCONNECT_QCOM_MSM8916=3Dm -@@ -1059,7 +1044,6 @@ CONFIG_CUSE=3Dm - CONFIG_OVERLAY_FS=3Dm - CONFIG_VFAT_FS=3Dy - CONFIG_HUGETLBFS=3Dy --CONFIG_CONFIGFS_FS=3Dy - CONFIG_EFIVAR_FS=3Dy - CONFIG_SQUASHFS=3Dy - CONFIG_NFS_FS=3Dy --=20 2.25.1