From 03507b9cd9b32832ce93d2436fe329b32901c23f Mon Sep 17 00:00:00 2001 From: Jon Mason Date: Sat, 1 May 2021 18:35:58 -0400 Subject: [PATCH] arm/kernel: fix broken defconfig patch Upstream kernel is now being patched, which prevents the patch being fixed here from applying cleanly. Rebase it on top of the existing one to resolve the issue. Signed-off-by: Jon Mason --- .../linux/linux-yocto/defconfig.patch | 66 ++++++++++--------- 1 file changed, 34 insertions(+), 32 deletions(-) diff --git a/meta-arm/recipes-kernel/linux/linux-yocto/defconfig.patch b/meta-arm/recipes-kernel/linux/linux-yocto/defconfig.patch index 5ff05c2c..66a8fd67 100644 --- a/meta-arm/recipes-kernel/linux/linux-yocto/defconfig.patch +++ b/meta-arm/recipes-kernel/linux/linux-yocto/defconfig.patch @@ -1,11 +1,5 @@ -Change USB_CONN_GPIO to 'y' by default and regenerate the defconfig via -`make savedefconfig`. - -Upstream-Status: Inappropriate [not needed in newer kernels] -Signed-off-by: Jon Mason - diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig -index 5cfe3cf6f2ac..1fed16950a7c 100644 +index 6d84761d1285..8a2f7e075ba9 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -13,7 +13,6 @@ CONFIG_IKCONFIG=y @@ -36,11 +30,11 @@ index 5cfe3cf6f2ac..1fed16950a7c 100644 CONFIG_ACPI=y CONFIG_ACPI_APEI=y CONFIG_ACPI_APEI_GHES=y --CONFIG_ACPI_APEI_PCIEAER=y +-CONFIG_PCIEAER=y + CONFIG_ACPI_APEI_PCIEAER=y CONFIG_ACPI_APEI_MEMORY_FAILURE=y CONFIG_ACPI_APEI_EINJ=y - CONFIG_VIRTUALIZATION=y -@@ -180,12 +176,11 @@ CONFIG_QRTR_SMD=m +@@ -181,12 +177,11 @@ CONFIG_QRTR_SMD=m CONFIG_QRTR_TUN=m CONFIG_BPF_JIT=y CONFIG_CAN=m @@ -54,7 +48,15 @@ index 5cfe3cf6f2ac..1fed16950a7c 100644 # CONFIG_BT_LE is not set CONFIG_BT_LEDS=y # CONFIG_BT_DEBUGFS is not set -@@ -222,13 +217,13 @@ CONFIG_PCI_HOST_THUNDER_ECAM=y +@@ -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 @@ -69,7 +71,7 @@ index 5cfe3cf6f2ac..1fed16950a7c 100644 CONFIG_PCI_ENDPOINT=y CONFIG_PCI_ENDPOINT_CONFIGFS=y CONFIG_PCI_EPF_TEST=m -@@ -238,7 +233,6 @@ CONFIG_FW_LOADER_USER_HELPER=y +@@ -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 @@ -77,7 +79,7 @@ index 5cfe3cf6f2ac..1fed16950a7c 100644 CONFIG_TEGRA_ACONNECT=m CONFIG_MTD=y CONFIG_MTD_BLOCK=y -@@ -257,7 +251,6 @@ CONFIG_MTD_NAND_MARVELL=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 @@ -85,7 +87,7 @@ index 5cfe3cf6f2ac..1fed16950a7c 100644 CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_NBD=m CONFIG_VIRTIO_BLK=y -@@ -342,18 +335,18 @@ CONFIG_SNI_NETSEC=y +@@ -343,18 +337,18 @@ CONFIG_SNI_NETSEC=y CONFIG_STMMAC_ETH=m CONFIG_TI_K3_AM65_CPSW_NUSS=y CONFIG_QCOM_IPA=m @@ -107,7 +109,7 @@ index 5cfe3cf6f2ac..1fed16950a7c 100644 CONFIG_USB_PEGASUS=m CONFIG_USB_RTL8150=m CONFIG_USB_RTL8152=m -@@ -453,6 +446,7 @@ CONFIG_SPI=y +@@ -454,6 +448,7 @@ CONFIG_SPI=y CONFIG_SPI_ARMADA_3700=y CONFIG_SPI_BCM2835=m CONFIG_SPI_BCM2835AUX=m @@ -115,7 +117,7 @@ index 5cfe3cf6f2ac..1fed16950a7c 100644 CONFIG_SPI_FSL_LPSPI=y CONFIG_SPI_FSL_QUADSPI=y CONFIG_SPI_NXP_FLEXSPI=y -@@ -513,9 +507,6 @@ CONFIG_GPIO_PCA953X_IRQ=y +@@ -514,9 +509,6 @@ CONFIG_GPIO_PCA953X_IRQ=y CONFIG_GPIO_BD9571MWV=m CONFIG_GPIO_MAX77620=y CONFIG_GPIO_SL28CPLD=m @@ -125,7 +127,7 @@ index 5cfe3cf6f2ac..1fed16950a7c 100644 CONFIG_POWER_RESET_MSM=y CONFIG_POWER_RESET_XGENE=y CONFIG_POWER_RESET_SYSCON=y -@@ -532,10 +523,10 @@ CONFIG_SENSORS_INA3221=m +@@ -533,10 +525,10 @@ CONFIG_SENSORS_INA3221=m CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y CONFIG_CPU_THERMAL=y CONFIG_THERMAL_EMULATION=y @@ -138,7 +140,7 @@ index 5cfe3cf6f2ac..1fed16950a7c 100644 CONFIG_ROCKCHIP_THERMAL=m CONFIG_RCAR_THERMAL=y CONFIG_RCAR_GEN3_THERMAL=y -@@ -552,7 +543,6 @@ CONFIG_WATCHDOG=y +@@ -553,7 +545,6 @@ CONFIG_WATCHDOG=y CONFIG_SL28CPLD_WATCHDOG=m CONFIG_ARM_SP805_WATCHDOG=y CONFIG_ARM_SBSA_WATCHDOG=y @@ -146,7 +148,7 @@ index 5cfe3cf6f2ac..1fed16950a7c 100644 CONFIG_S3C2410_WATCHDOG=y CONFIG_DW_WATCHDOG=y CONFIG_SUNXI_WATCHDOG=m -@@ -561,6 +551,7 @@ CONFIG_IMX_SC_WDT=m +@@ -562,6 +553,7 @@ CONFIG_IMX_SC_WDT=m CONFIG_QCOM_WDT=m CONFIG_MESON_GXBB_WATCHDOG=m CONFIG_MESON_WATCHDOG=m @@ -154,7 +156,7 @@ index 5cfe3cf6f2ac..1fed16950a7c 100644 CONFIG_RENESAS_WDT=y CONFIG_UNIPHIER_WATCHDOG=y CONFIG_BCM2835_WDT=y -@@ -607,13 +598,12 @@ CONFIG_MEDIA_CAMERA_SUPPORT=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 @@ -169,7 +171,7 @@ index 5cfe3cf6f2ac..1fed16950a7c 100644 CONFIG_VIDEO_RCAR_CSI2=m CONFIG_VIDEO_RCAR_VIN=m CONFIG_VIDEO_SUN6I_CSI=m -@@ -628,7 +618,6 @@ CONFIG_SDR_PLATFORM_DRIVERS=y +@@ -629,7 +620,6 @@ CONFIG_SDR_PLATFORM_DRIVERS=y CONFIG_VIDEO_RCAR_DRIF=m CONFIG_VIDEO_IMX219=m CONFIG_VIDEO_OV5645=m @@ -177,7 +179,7 @@ index 5cfe3cf6f2ac..1fed16950a7c 100644 CONFIG_DRM=m CONFIG_DRM_I2C_NXP_TDA998X=m CONFIG_DRM_MALI_DISPLAY=m -@@ -660,8 +649,8 @@ CONFIG_DRM_PANEL_RAYDIUM_RM67191=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 @@ -187,7 +189,7 @@ index 5cfe3cf6f2ac..1fed16950a7c 100644 CONFIG_DRM_SII902X=m CONFIG_DRM_SIMPLE_BRIDGE=m CONFIG_DRM_THINE_THC63LVD1024=m -@@ -682,7 +671,6 @@ CONFIG_DRM_PANFROST=m +@@ -683,7 +673,6 @@ CONFIG_DRM_PANFROST=m CONFIG_FB=y CONFIG_FB_MODE_HELPERS=y CONFIG_FB_EFI=y @@ -195,7 +197,7 @@ index 5cfe3cf6f2ac..1fed16950a7c 100644 CONFIG_BACKLIGHT_PWM=m CONFIG_BACKLIGHT_LP855X=m CONFIG_LOGO=y -@@ -726,7 +714,6 @@ CONFIG_SND_SOC_WSA881X=m +@@ -727,7 +716,6 @@ CONFIG_SND_SOC_WSA881X=m CONFIG_SND_SIMPLE_CARD=m CONFIG_SND_AUDIO_GRAPH_CARD=m CONFIG_I2C_HID=m @@ -203,7 +205,7 @@ index 5cfe3cf6f2ac..1fed16950a7c 100644 CONFIG_USB=y CONFIG_USB_OTG=y CONFIG_USB_XHCI_HCD=y -@@ -859,7 +846,6 @@ CONFIG_VIRTIO_BALLOON=y +@@ -859,7 +847,6 @@ CONFIG_VIRTIO_BALLOON=y CONFIG_VIRTIO_MMIO=y CONFIG_XEN_GNTDEV=y CONFIG_XEN_GRANT_DEV_ALLOC=y @@ -211,7 +213,7 @@ index 5cfe3cf6f2ac..1fed16950a7c 100644 CONFIG_CHROME_PLATFORMS=y CONFIG_CROS_EC=y CONFIG_CROS_EC_I2C=y -@@ -885,8 +871,8 @@ CONFIG_QCOM_A53PLL=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 @@ -221,7 +223,7 @@ index 5cfe3cf6f2ac..1fed16950a7c 100644 CONFIG_MSM_GCC_8916=y CONFIG_MSM_GCC_8994=y CONFIG_MSM_MMCC_8996=y -@@ -894,12 +880,9 @@ CONFIG_MSM_GCC_8998=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 @@ -234,7 +236,7 @@ index 5cfe3cf6f2ac..1fed16950a7c 100644 CONFIG_SM_GPUCC_8150=y CONFIG_SM_GPUCC_8250=y CONFIG_QCOM_HFPLL=y -@@ -930,6 +913,7 @@ CONFIG_RASPBERRYPI_POWER=y +@@ -930,6 +914,7 @@ CONFIG_RASPBERRYPI_POWER=y CONFIG_FSL_DPAA=y CONFIG_FSL_MC_DPIO=y CONFIG_QCOM_AOSS_QMP=y @@ -242,7 +244,7 @@ index 5cfe3cf6f2ac..1fed16950a7c 100644 CONFIG_QCOM_GENI_SE=y CONFIG_QCOM_RMTFS_MEM=m CONFIG_QCOM_RPMH=y -@@ -941,19 +925,20 @@ CONFIG_QCOM_SMP2P=y +@@ -941,19 +926,20 @@ CONFIG_QCOM_SMP2P=y CONFIG_QCOM_SMSM=y CONFIG_QCOM_SOCINFO=m CONFIG_QCOM_APR=m @@ -271,7 +273,7 @@ index 5cfe3cf6f2ac..1fed16950a7c 100644 CONFIG_ROCKCHIP_PM_DOMAINS=y CONFIG_ARCH_TEGRA_132_SOC=y CONFIG_ARCH_TEGRA_210_SOC=y -@@ -1017,9 +1002,9 @@ CONFIG_PHY_UNIPHIER_USB3=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 @@ -282,7 +284,7 @@ index 5cfe3cf6f2ac..1fed16950a7c 100644 CONFIG_NVMEM_IMX_OCOTP=y CONFIG_NVMEM_IMX_OCOTP_SCU=y CONFIG_QCOM_QFPROM=y -@@ -1035,10 +1020,9 @@ CONFIG_FPGA_REGION=m +@@ -1035,10 +1021,9 @@ CONFIG_FPGA_REGION=m CONFIG_OF_FPGA_REGION=m CONFIG_TEE=y CONFIG_OPTEE=y @@ -294,7 +296,7 @@ index 5cfe3cf6f2ac..1fed16950a7c 100644 CONFIG_INTERCONNECT=y CONFIG_INTERCONNECT_QCOM=y CONFIG_INTERCONNECT_QCOM_MSM8916=m -@@ -1059,7 +1043,6 @@ CONFIG_CUSE=m +@@ -1059,7 +1044,6 @@ CONFIG_CUSE=m CONFIG_OVERLAY_FS=m CONFIG_VFAT_FS=y CONFIG_HUGETLBFS=y