From 8e511f1acff576756beb80cf7dd129b5be9d1b81 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 28 Jul 2021 19:10:56 +0100 Subject: [PATCH] arm/linux-yocto: re-generate defconfig.patch for qemuarm64-sbsa and generic-arm64 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 Signed-off-by: Jon Mason --- .../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 afbbabe2..5646a845 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 the - defconfig via `make savedefconfig`. +Clean up defconfig warnings from our config sanity checker. -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_TEGRA_XUSB +which is y. + +Upstream-Status: Submitted +Signed-off-by: Ross Burton --- arch/arm64/configs/defconfig | 65 +++++++++++++----------------------- 1 file changed, 24 insertions(+), 41 deletions(-) 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=y - CONFIG_IKCONFIG_PROC=y - CONFIG_NUMA_BALANCING=y - CONFIG_MEMCG=y --CONFIG_MEMCG_SWAP=y - CONFIG_BLK_CGROUP=y - CONFIG_CGROUP_PIDS=y - CONFIG_CGROUP_HUGETLB=y -@@ -65,7 +64,6 @@ CONFIG_ARM64_VA_BITS_48=y - CONFIG_SCHED_MC=y - CONFIG_SCHED_SMT=y - CONFIG_NUMA=y --CONFIG_SECCOMP=y - CONFIG_KEXEC=y - CONFIG_KEXEC_FILE=y - CONFIG_CRASH_DUMP=y -@@ -83,7 +81,6 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=m - CONFIG_CPU_FREQ_GOV_USERSPACE=y - CONFIG_CPU_FREQ_GOV_ONDEMAND=y - CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m --CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y - CONFIG_CPUFREQ_DT=y - CONFIG_ACPI_CPPC_CPUFREQ=m - CONFIG_ARM_ALLWINNER_SUN50I_CPUFREQ_NVMEM=m -@@ -105,7 +102,6 @@ CONFIG_IMX_SCU_PD=y - CONFIG_ACPI=y - CONFIG_ACPI_APEI=y - CONFIG_ACPI_APEI_GHES=y --CONFIG_PCIEAER=y - CONFIG_ACPI_APEI_PCIEAER=y - CONFIG_ACPI_APEI_MEMORY_FAILURE=y - CONFIG_ACPI_APEI_EINJ=y -@@ -181,12 +177,11 @@ CONFIG_QRTR_SMD=m - CONFIG_QRTR_TUN=m - CONFIG_BPF_JIT=y - CONFIG_CAN=m -+CONFIG_CAN_FLEXCAN=m - CONFIG_CAN_RCAR=m - CONFIG_CAN_RCAR_CANFD=m --CONFIG_CAN_FLEXCAN=m - CONFIG_BT=m - CONFIG_BT_HIDP=m --# CONFIG_BT_HS is not set - # CONFIG_BT_LE is not set - CONFIG_BT_LEDS=y - # CONFIG_BT_DEBUGFS is not set -@@ -206,6 +201,7 @@ CONFIG_NFC_NCI=m - CONFIG_NFC_S3FWRN5_I2C=m - CONFIG_PCI=y - CONFIG_PCIEPORTBUS=y -+CONFIG_PCIEAER=y - CONFIG_PCI_IOV=y - CONFIG_PCI_PASID=y - CONFIG_HOTPLUG_PCI=y -@@ -223,13 +219,13 @@ CONFIG_PCI_HOST_THUNDER_ECAM=y - CONFIG_PCIE_ROCKCHIP_HOST=m - CONFIG_PCIE_BRCMSTB=m - CONFIG_PCI_LAYERSCAPE=y --CONFIG_PCIE_LAYERSCAPE_GEN4=y - CONFIG_PCI_HISI=y - CONFIG_PCIE_QCOM=y - CONFIG_PCIE_ARMADA_8K=y - CONFIG_PCIE_KIRIN=y - CONFIG_PCIE_HISI_STB=y - CONFIG_PCIE_TEGRA194_HOST=m -+CONFIG_PCIE_LAYERSCAPE_GEN4=y - CONFIG_PCI_ENDPOINT=y - CONFIG_PCI_ENDPOINT_CONFIGFS=y - CONFIG_PCI_EPF_TEST=m -@@ -239,7 +235,6 @@ CONFIG_FW_LOADER_USER_HELPER=y - CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y - CONFIG_HISILICON_LPC=y - CONFIG_SIMPLE_PM_BUS=y --CONFIG_FSL_MC_BUS=y - CONFIG_TEGRA_ACONNECT=m - CONFIG_MTD=y - CONFIG_MTD_BLOCK=y -@@ -258,7 +253,6 @@ CONFIG_MTD_NAND_MARVELL=y - CONFIG_MTD_NAND_FSL_IFC=y - CONFIG_MTD_NAND_QCOM=y - CONFIG_MTD_SPI_NOR=y --CONFIG_SPI_CADENCE_QUADSPI=y - CONFIG_BLK_DEV_LOOP=y - CONFIG_BLK_DEV_NBD=m - CONFIG_VIRTIO_BLK=y -@@ -343,18 +337,18 @@ CONFIG_SNI_NETSEC=y - CONFIG_STMMAC_ETH=m - CONFIG_TI_K3_AM65_CPSW_NUSS=y - CONFIG_QCOM_IPA=m --CONFIG_MDIO_BUS_MUX_MMIOREG=y --CONFIG_MDIO_BUS_MUX_MULTIPLEXER=y -+CONFIG_MESON_GXL_PHY=m - CONFIG_AQUANTIA_PHY=y - CONFIG_MARVELL_PHY=m - CONFIG_MARVELL_10G_PHY=m --CONFIG_MESON_GXL_PHY=m - CONFIG_MICREL_PHY=y - CONFIG_MICROSEMI_PHY=y - CONFIG_AT803X_PHY=y - CONFIG_REALTEK_PHY=m - CONFIG_ROCKCHIP_PHY=y - CONFIG_VITESSE_PHY=y -+CONFIG_MDIO_BUS_MUX_MULTIPLEXER=y -+CONFIG_MDIO_BUS_MUX_MMIOREG=y - CONFIG_USB_PEGASUS=m - CONFIG_USB_RTL8150=m - CONFIG_USB_RTL8152=m -@@ -454,6 +448,7 @@ CONFIG_SPI=y - CONFIG_SPI_ARMADA_3700=y - CONFIG_SPI_BCM2835=m - CONFIG_SPI_BCM2835AUX=m -+CONFIG_SPI_CADENCE_QUADSPI=y - CONFIG_SPI_FSL_LPSPI=y - CONFIG_SPI_FSL_QUADSPI=y - CONFIG_SPI_NXP_FLEXSPI=y -@@ -514,9 +509,6 @@ CONFIG_GPIO_PCA953X_IRQ=y +@@ -514,7 +514,6 @@ CONFIG_GPIO_PCA953X_IRQ=y CONFIG_GPIO_BD9571MWV=m CONFIG_GPIO_MAX77620=y CONFIG_GPIO_SL28CPLD=m -CONFIG_POWER_AVS=y --CONFIG_QCOM_CPR=y --CONFIG_ROCKCHIP_IODOMAIN=y + CONFIG_QCOM_CPR=y + CONFIG_ROCKCHIP_IODOMAIN=y CONFIG_POWER_RESET_MSM=y - CONFIG_POWER_RESET_XGENE=y - CONFIG_POWER_RESET_SYSCON=y -@@ -533,10 +525,10 @@ CONFIG_SENSORS_INA3221=m - CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y - CONFIG_CPU_THERMAL=y - CONFIG_THERMAL_EMULATION=y --CONFIG_QORIQ_THERMAL=m --CONFIG_SUN8I_THERMAL=y - CONFIG_IMX_SC_THERMAL=m - CONFIG_IMX8MM_THERMAL=m -+CONFIG_QORIQ_THERMAL=m -+CONFIG_SUN8I_THERMAL=y - CONFIG_ROCKCHIP_THERMAL=m - CONFIG_RCAR_THERMAL=y - CONFIG_RCAR_GEN3_THERMAL=y -@@ -553,7 +545,6 @@ CONFIG_WATCHDOG=y - CONFIG_SL28CPLD_WATCHDOG=m - CONFIG_ARM_SP805_WATCHDOG=y - CONFIG_ARM_SBSA_WATCHDOG=y --CONFIG_ARM_SMC_WATCHDOG=y - CONFIG_S3C2410_WATCHDOG=y - CONFIG_DW_WATCHDOG=y - CONFIG_SUNXI_WATCHDOG=m -@@ -562,6 +553,7 @@ CONFIG_IMX_SC_WDT=m - CONFIG_QCOM_WDT=m - CONFIG_MESON_GXBB_WATCHDOG=m - CONFIG_MESON_WATCHDOG=m -+CONFIG_ARM_SMC_WATCHDOG=y - CONFIG_RENESAS_WDT=y - CONFIG_UNIPHIER_WATCHDOG=y - CONFIG_BCM2835_WDT=y -@@ -608,13 +600,12 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y - CONFIG_MEDIA_ANALOG_TV_SUPPORT=y - CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y - CONFIG_MEDIA_SDR_SUPPORT=y --CONFIG_MEDIA_CONTROLLER=y --CONFIG_VIDEO_V4L2_SUBDEV_API=y - CONFIG_MEDIA_PLATFORM_SUPPORT=y - # CONFIG_DVB_NET is not set - CONFIG_MEDIA_USB_SUPPORT=y - CONFIG_USB_VIDEO_CLASS=m - CONFIG_V4L_PLATFORM_DRIVERS=y -+CONFIG_VIDEO_QCOM_CAMSS=m - CONFIG_VIDEO_RCAR_CSI2=m - CONFIG_VIDEO_RCAR_VIN=m - CONFIG_VIDEO_SUN6I_CSI=m -@@ -629,7 +620,6 @@ CONFIG_SDR_PLATFORM_DRIVERS=y - CONFIG_VIDEO_RCAR_DRIF=m - CONFIG_VIDEO_IMX219=m - CONFIG_VIDEO_OV5645=m --CONFIG_VIDEO_QCOM_CAMSS=m - CONFIG_DRM=m - CONFIG_DRM_I2C_NXP_TDA998X=m - CONFIG_DRM_MALI_DISPLAY=m -@@ -661,8 +651,8 @@ CONFIG_DRM_PANEL_RAYDIUM_RM67191=m - CONFIG_DRM_PANEL_SITRONIX_ST7703=m - CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m - CONFIG_DRM_DISPLAY_CONNECTOR=m --CONFIG_DRM_NWL_MIPI_DSI=m - CONFIG_DRM_LONTIUM_LT9611=m -+CONFIG_DRM_NWL_MIPI_DSI=m - CONFIG_DRM_SII902X=m - CONFIG_DRM_SIMPLE_BRIDGE=m - CONFIG_DRM_THINE_THC63LVD1024=m -@@ -683,7 +673,6 @@ CONFIG_DRM_PANFROST=m +@@ -683,7 +682,6 @@ CONFIG_DRM_PANFROST=m CONFIG_FB=y CONFIG_FB_MODE_HELPERS=y CONFIG_FB_EFI=y @@ -209,110 +33,12 @@ index 6d84761d1285..8a2f7e075ba9 100644 CONFIG_BACKLIGHT_PWM=m CONFIG_BACKLIGHT_LP855X=m CONFIG_LOGO=y -@@ -727,7 +716,6 @@ CONFIG_SND_SOC_WSA881X=m +@@ -727,7 +725,7 @@ CONFIG_SND_SOC_WSA881X=m CONFIG_SND_SIMPLE_CARD=m CONFIG_SND_AUDIO_GRAPH_CARD=m CONFIG_I2C_HID=m -CONFIG_USB_CONN_GPIO=m ++CONFIG_USB_CONN_GPIO=y CONFIG_USB=y CONFIG_USB_OTG=y CONFIG_USB_XHCI_HCD=y -@@ -859,7 +847,6 @@ CONFIG_VIRTIO_BALLOON=y - CONFIG_VIRTIO_MMIO=y - CONFIG_XEN_GNTDEV=y - CONFIG_XEN_GRANT_DEV_ALLOC=y --CONFIG_MFD_CROS_EC_DEV=y - CONFIG_CHROME_PLATFORMS=y - CONFIG_CROS_EC=y - CONFIG_CROS_EC_I2C=y -@@ -885,8 +872,8 @@ CONFIG_QCOM_A53PLL=y - CONFIG_QCOM_CLK_APCS_MSM8916=y - CONFIG_QCOM_CLK_SMD_RPM=y - CONFIG_QCOM_CLK_RPMH=y --CONFIG_IPQ_GCC_8074=y - CONFIG_IPQ_GCC_6018=y -+CONFIG_IPQ_GCC_8074=y - CONFIG_MSM_GCC_8916=y - CONFIG_MSM_GCC_8994=y - CONFIG_MSM_MMCC_8996=y -@@ -894,12 +881,9 @@ CONFIG_MSM_GCC_8998=y - CONFIG_QCS_GCC_404=y - CONFIG_SC_GCC_7180=y - CONFIG_SDM_CAMCC_845=m --CONFIG_SDM_GCC_845=y - CONFIG_SDM_GPUCC_845=y - CONFIG_SDM_VIDEOCC_845=y - CONFIG_SDM_DISPCC_845=y --CONFIG_SM_GCC_8150=y --CONFIG_SM_GCC_8250=y - CONFIG_SM_GPUCC_8150=y - CONFIG_SM_GPUCC_8250=y - CONFIG_QCOM_HFPLL=y -@@ -930,6 +914,7 @@ CONFIG_RASPBERRYPI_POWER=y - CONFIG_FSL_DPAA=y - CONFIG_FSL_MC_DPIO=y - CONFIG_QCOM_AOSS_QMP=y -+CONFIG_QCOM_CPR=y - CONFIG_QCOM_GENI_SE=y - CONFIG_QCOM_RMTFS_MEM=m - CONFIG_QCOM_RPMH=y -@@ -941,19 +926,20 @@ CONFIG_QCOM_SMP2P=y - CONFIG_QCOM_SMSM=y - CONFIG_QCOM_SOCINFO=m - CONFIG_QCOM_APR=m --CONFIG_ARCH_R8A774A1=y --CONFIG_ARCH_R8A774B1=y --CONFIG_ARCH_R8A774C0=y --CONFIG_ARCH_R8A774E1=y -+CONFIG_ARCH_R8A77995=y -+CONFIG_ARCH_R8A77990=y - CONFIG_ARCH_R8A77950=y - CONFIG_ARCH_R8A77951=y -+CONFIG_ARCH_R8A77965=y - CONFIG_ARCH_R8A77960=y - CONFIG_ARCH_R8A77961=y --CONFIG_ARCH_R8A77965=y --CONFIG_ARCH_R8A77970=y - CONFIG_ARCH_R8A77980=y --CONFIG_ARCH_R8A77990=y --CONFIG_ARCH_R8A77995=y -+CONFIG_ARCH_R8A77970=y -+CONFIG_ARCH_R8A774C0=y -+CONFIG_ARCH_R8A774E1=y -+CONFIG_ARCH_R8A774A1=y -+CONFIG_ARCH_R8A774B1=y -+CONFIG_ROCKCHIP_IODOMAIN=y - CONFIG_ROCKCHIP_PM_DOMAINS=y - CONFIG_ARCH_TEGRA_132_SOC=y - CONFIG_ARCH_TEGRA_210_SOC=y -@@ -1017,9 +1003,9 @@ CONFIG_PHY_UNIPHIER_USB3=y - CONFIG_PHY_TEGRA_XUSB=y - CONFIG_ARM_SMMU_V3_PMU=m - CONFIG_FSL_IMX8_DDR_PMU=m --CONFIG_HISI_PMU=y - CONFIG_QCOM_L2_PMU=y - CONFIG_QCOM_L3_PMU=y -+CONFIG_HISI_PMU=y - CONFIG_NVMEM_IMX_OCOTP=y - CONFIG_NVMEM_IMX_OCOTP_SCU=y - CONFIG_QCOM_QFPROM=y -@@ -1035,10 +1021,9 @@ CONFIG_FPGA_REGION=m - CONFIG_OF_FPGA_REGION=m - CONFIG_TEE=y - CONFIG_OPTEE=y --CONFIG_SLIMBUS=m -+CONFIG_MUX_MMIO=y - CONFIG_SLIM_QCOM_CTRL=m - CONFIG_SLIM_QCOM_NGD_CTRL=m --CONFIG_MUX_MMIO=y - CONFIG_INTERCONNECT=y - CONFIG_INTERCONNECT_QCOM=y - CONFIG_INTERCONNECT_QCOM_MSM8916=m -@@ -1059,7 +1044,6 @@ CONFIG_CUSE=m - CONFIG_OVERLAY_FS=m - CONFIG_VFAT_FS=y - CONFIG_HUGETLBFS=y --CONFIG_CONFIGFS_FS=y - CONFIG_EFIVAR_FS=y - CONFIG_SQUASHFS=y - CONFIG_NFS_FS=y