Attachment 728695 Details for Bug 1043231

[patch] 0001-armv7hl-config-Update-config-to-fix-kernel-build.patch

0001-armv7hl-config-Update-config-to-fix-kernel-build.patch (text/plain), 9.55 KB, created by Matwey Kornilov on 2017-06-12 20:23:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matwey Kornilov

Created: 2017-06-12 20:23:40 UTC

Size: 9.55 KB

patch

obsolete

>From d9804601bcae730ba6675473d5c8285c833dfa1d Mon Sep 17 00:00:00 2001
>From: "Matwey V. Kornilov" <matwey.kornilov@gmail.com>
>Date: Mon, 12 Jun 2017 22:46:01 +0300
>Subject: [PATCH] armv7hl: config: Update config to fix kernel build
>
>Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com>
>---
> config/armv7hl/default | 50 ++++++++++++++++++++++++--------------------------
> config/armv7hl/lpae    | 45 +++++++++++++++++++++------------------------
> 2 files changed, 45 insertions(+), 50 deletions(-)
>
>diff --git a/config/armv7hl/default b/config/armv7hl/default
>index 71f9eae..d6ff246 100644
>--- a/config/armv7hl/default
>+++ b/config/armv7hl/default
>@@ -1,6 +1,6 @@
> #
> # Automatically generated file; DO NOT EDIT.
>-# Linux/arm 4.4.70 Kernel Configuration
>+# Linux/arm 4.4.71 Kernel Configuration
> #
> CONFIG_ARM=y
> CONFIG_ARM_HAS_SG_CHAIN=y
>@@ -738,8 +738,8 @@ CONFIG_PCIE_DW=y
> CONFIG_PCI_EXYNOS=y
> CONFIG_PCI_IMX6=y
> CONFIG_PCI_TEGRA=y
>-CONFIG_PCI_RCAR_GEN2=y
>-CONFIG_PCI_RCAR_GEN2_PCIE=y
>+# CONFIG_PCI_RCAR_GEN2 is not set
>+# CONFIG_PCI_RCAR_GEN2_PCIE is not set
> CONFIG_PCI_HOST_COMMON=y
> CONFIG_PCI_HOST_GENERIC=y
> # CONFIG_PCIE_SPEAR13XX is not set
>@@ -1656,7 +1656,7 @@ CONFIG_CAN_LEDS=y
> CONFIG_CAN_TI_HECC=m
> CONFIG_CAN_FLEXCAN=m
> # CONFIG_CAN_GRCAN is not set
>-CONFIG_CAN_RCAR=m
>+# CONFIG_CAN_RCAR is not set
> CONFIG_CAN_SUN4I=m
> CONFIG_CAN_XILINXCAN=m
> CONFIG_CAN_SJA1000=m
>@@ -2686,9 +2686,9 @@ CONFIG_NET_VENDOR_HISILICON=y
> CONFIG_HIX5HD2_GMAC=m
> CONFIG_HIP04_ETH=m
> CONFIG_HNS_MDIO=m
>-CONFIG_HNS=m
>-CONFIG_HNS_DSAF=m
>-CONFIG_HNS_ENET=m
>+# CONFIG_HNS is not set
>+# CONFIG_HNS_DSAF is not set
>+# CONFIG_HNS_ENET is not set
> CONFIG_NET_VENDOR_HP=y
> # CONFIG_HP100 is not set
> CONFIG_NET_VENDOR_INTEL=y
>@@ -3772,7 +3772,7 @@ CONFIG_I2C_TEGRA=m
> CONFIG_I2C_VERSATILE=m
> CONFIG_I2C_WMT=m
> CONFIG_I2C_XILINX=m
>-CONFIG_I2C_RCAR=m
>+# CONFIG_I2C_RCAR is not set
> 
> #
> # External I2C/SMBus adapter drivers
>@@ -3825,7 +3825,7 @@ CONFIG_SPI_ORION=m
> CONFIG_SPI_PL022=m
> # CONFIG_SPI_PXA2XX is not set
> # CONFIG_SPI_PXA2XX_PCI is not set
>-CONFIG_SPI_ROCKCHIP=m
>+# CONFIG_SPI_ROCKCHIP is not set
> CONFIG_SPI_RSPI=m
> CONFIG_SPI_QUP=m
> CONFIG_SPI_S3C64XX=m
>@@ -4024,7 +4024,7 @@ CONFIG_GPIO_MVEBU=y
> CONFIG_GPIO_MXC=y
> CONFIG_GPIO_OMAP=y
> CONFIG_GPIO_PL061=y
>-CONFIG_GPIO_RCAR=m
>+# CONFIG_GPIO_RCAR is not set
> CONFIG_GPIO_SPEAR_SPICS=y
> CONFIG_GPIO_SYSCON=m
> CONFIG_GPIO_VF610=y
>@@ -4147,8 +4147,8 @@ CONFIG_BATTERY_DA9030=m
> CONFIG_BATTERY_DA9052=m
> CONFIG_CHARGER_DA9150=m
> CONFIG_BATTERY_DA9150=m
>-CONFIG_AXP288_CHARGER=m
>-CONFIG_AXP288_FUEL_GAUGE=m
>+# CONFIG_AXP288_CHARGER is not set
>+# CONFIG_AXP288_FUEL_GAUGE is not set
> CONFIG_BATTERY_MAX17040=m
> CONFIG_BATTERY_MAX17042=m
> CONFIG_BATTERY_TWL4030_MADC=m
>@@ -4371,7 +4371,7 @@ CONFIG_IMX_THERMAL=m
> CONFIG_QORIQ_THERMAL=m
> CONFIG_SPEAR_THERMAL=y
> CONFIG_ROCKCHIP_THERMAL=m
>-CONFIG_RCAR_THERMAL=m
>+# CONFIG_RCAR_THERMAL is not set
> CONFIG_DOVE_THERMAL=m
> CONFIG_BCM2835_THERMAL=m
> CONFIG_DB8500_THERMAL=y
>@@ -4988,7 +4988,7 @@ CONFIG_SOC_CAMERA=m
> CONFIG_SOC_CAMERA_SCALE_CROP=m
> CONFIG_SOC_CAMERA_PLATFORM=m
> # CONFIG_VIDEO_MX3 is not set
>-CONFIG_VIDEO_RCAR_VIN=m
>+# CONFIG_VIDEO_RCAR_VIN is not set
> CONFIG_VIDEO_SH_MOBILE_CSI2=m
> CONFIG_VIDEO_SH_MOBILE_CEU=m
> CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS=y
>@@ -5381,9 +5381,7 @@ CONFIG_DRM_UDL=m
> # CONFIG_DRM_MGAG200 is not set
> # CONFIG_DRM_CIRRUS_QEMU is not set
> CONFIG_DRM_ARMADA=m
>-CONFIG_DRM_RCAR_DU=m
>-CONFIG_DRM_RCAR_HDMI=y
>-CONFIG_DRM_RCAR_LVDS=y
>+# CONFIG_DRM_RCAR_DU is not set
> CONFIG_DRM_SHMOBILE=m
> CONFIG_DRM_OMAP=y
> CONFIG_DRM_OMAP_NUM_CRTCS=2
>@@ -5431,7 +5429,7 @@ CONFIG_DRM_IMX_LDB=m
> CONFIG_DRM_IMX_IPUV3=m
> CONFIG_DRM_IMX_HDMI=m
> CONFIG_DRM_VC4=m
>-CONFIG_DRM_HISI_HIBMC=m
>+# CONFIG_DRM_HISI_HIBMC is not set
> 
> #
> # Frame buffer Devices
>@@ -5846,7 +5844,7 @@ CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631=m
> # SoC Audio support for SuperH
> #
> CONFIG_SND_SOC_SH4_FSI=m
>-CONFIG_SND_SOC_RCAR=m
>+# CONFIG_SND_SOC_RCAR is not set
> CONFIG_SND_SOC_RSRC_CARD=m
> CONFIG_SND_SOC_SIRF=m
> CONFIG_SND_SOC_SIRF_AUDIO=m
>@@ -6122,7 +6120,7 @@ CONFIG_USB_XHCI_HCD=m
> CONFIG_USB_XHCI_PCI=m
> CONFIG_USB_XHCI_PLATFORM=m
> CONFIG_USB_XHCI_MVEBU=m
>-CONFIG_USB_XHCI_RCAR=m
>+# CONFIG_USB_XHCI_RCAR is not set
> CONFIG_USB_EHCI_HCD=m
> CONFIG_USB_EHCI_ROOT_HUB_TT=y
> CONFIG_USB_EHCI_TT_NEWSCHED=y
>@@ -6379,7 +6377,7 @@ CONFIG_USB_ISP1301=m
> CONFIG_USB_MSM_OTG=m
> # CONFIG_USB_QCOM_8X16_PHY is not set
> CONFIG_USB_MXS_PHY=m
>-CONFIG_USB_RCAR_PHY=m
>+# CONFIG_USB_RCAR_PHY is not set
> CONFIG_USB_ULPI=y
> CONFIG_USB_ULPI_VIEWPORT=y
> CONFIG_USB_GADGET=m
>@@ -6785,8 +6783,8 @@ CONFIG_RENESAS_DMA=y
> CONFIG_SH_DMAE_BASE=y
> CONFIG_SH_DMAE=m
> CONFIG_SH_DMAE_R8A73A4=y
>-CONFIG_RCAR_DMAC=m
>-CONFIG_RCAR_HPB_DMAE=m
>+# CONFIG_RCAR_DMAC is not set
>+# CONFIG_RCAR_HPB_DMAE is not set
> CONFIG_RENESAS_USB_DMAC=m
> CONFIG_SUDMAC=m
> 
>@@ -7555,13 +7553,13 @@ CONFIG_PWM_IMX=m
> # CONFIG_PWM_LP3943 is not set
> CONFIG_PWM_MTK_DISP=m
> # CONFIG_PWM_PCA9685 is not set
>-CONFIG_PWM_RCAR=m
>+# CONFIG_PWM_RCAR is not set
> CONFIG_PWM_RENESAS_TPU=m
> CONFIG_PWM_ROCKCHIP=m
> CONFIG_PWM_SAMSUNG=m
> CONFIG_PWM_SPEAR=m
> CONFIG_PWM_STI=m
>-CONFIG_PWM_SUN4I=m
>+# CONFIG_PWM_SUN4I is not set
> CONFIG_PWM_TEGRA=m
> CONFIG_PWM_TIECAP=m
> CONFIG_PWM_TIEHRPWM=m
>@@ -7612,7 +7610,7 @@ CONFIG_PHY_EXYNOS_MIPI_VIDEO=m
> CONFIG_PHY_MVEBU_SATA=y
> CONFIG_PHY_MIPHY28LP=m
> CONFIG_PHY_MIPHY365X=m
>-CONFIG_PHY_RCAR_GEN2=m
>+# CONFIG_PHY_RCAR_GEN2 is not set
> CONFIG_OMAP_CONTROL_PHY=m
> CONFIG_OMAP_USB2=m
> CONFIG_TI_PIPE3=m
>diff --git a/config/armv7hl/lpae b/config/armv7hl/lpae
>index 0c98f88..74cd3fa 100644
>--- a/config/armv7hl/lpae
>+++ b/config/armv7hl/lpae
>@@ -1,6 +1,6 @@
> #
> # Automatically generated file; DO NOT EDIT.
>-# Linux/arm 4.4.70 Kernel Configuration
>+# Linux/arm 4.4.71 Kernel Configuration
> #
> CONFIG_ARM=y
> CONFIG_ARM_HAS_SG_CHAIN=y
>@@ -679,8 +679,8 @@ CONFIG_PCI_PASID=y
> CONFIG_PCIE_DW=y
> CONFIG_PCI_EXYNOS=y
> CONFIG_PCI_TEGRA=y
>-CONFIG_PCI_RCAR_GEN2=y
>-CONFIG_PCI_RCAR_GEN2_PCIE=y
>+# CONFIG_PCI_RCAR_GEN2 is not set
>+# CONFIG_PCI_RCAR_GEN2_PCIE is not set
> CONFIG_PCI_HOST_COMMON=y
> CONFIG_PCI_HOST_GENERIC=y
> CONFIG_PCI_KEYSTONE=y
>@@ -2610,9 +2610,9 @@ CONFIG_NET_VENDOR_HISILICON=y
> CONFIG_HIX5HD2_GMAC=m
> CONFIG_HIP04_ETH=m
> CONFIG_HNS_MDIO=m
>-CONFIG_HNS=m
>-CONFIG_HNS_DSAF=m
>-CONFIG_HNS_ENET=m
>+# CONFIG_HNS is not set
>+# CONFIG_HNS_DSAF is not set
>+# CONFIG_HNS_ENET is not set
> CONFIG_NET_VENDOR_HP=y
> # CONFIG_HP100 is not set
> CONFIG_NET_VENDOR_INTEL=y
>@@ -3652,7 +3652,7 @@ CONFIG_I2C_SUN6I_P2WI=m
> CONFIG_I2C_TEGRA=m
> CONFIG_I2C_VERSATILE=m
> # CONFIG_I2C_XILINX is not set
>-CONFIG_I2C_RCAR=m
>+# CONFIG_I2C_RCAR is not set
> 
> #
> # External I2C/SMBus adapter drivers
>@@ -3703,7 +3703,7 @@ CONFIG_SPI_TI_QSPI=m
> CONFIG_SPI_PL022=m
> # CONFIG_SPI_PXA2XX is not set
> # CONFIG_SPI_PXA2XX_PCI is not set
>-CONFIG_SPI_ROCKCHIP=m
>+# CONFIG_SPI_ROCKCHIP is not set
> CONFIG_SPI_RSPI=m
> CONFIG_SPI_QUP=m
> CONFIG_SPI_S3C64XX=m
>@@ -3973,8 +3973,8 @@ CONFIG_BATTERY_DA9030=m
> CONFIG_BATTERY_DA9052=m
> CONFIG_CHARGER_DA9150=m
> CONFIG_BATTERY_DA9150=m
>-CONFIG_AXP288_CHARGER=m
>-CONFIG_AXP288_FUEL_GAUGE=m
>+# CONFIG_AXP288_CHARGER is not set
>+# CONFIG_AXP288_FUEL_GAUGE is not set
> CONFIG_BATTERY_MAX17040=m
> CONFIG_BATTERY_MAX17042=m
> CONFIG_BATTERY_TWL4030_MADC=m
>@@ -4193,7 +4193,7 @@ CONFIG_DEVFREQ_THERMAL=y
> CONFIG_IMX_THERMAL=m
> CONFIG_QORIQ_THERMAL=m
> CONFIG_ROCKCHIP_THERMAL=m
>-CONFIG_RCAR_THERMAL=m
>+# CONFIG_RCAR_THERMAL is not set
> CONFIG_BCM2835_THERMAL=m
> CONFIG_TEGRA_SOCTHERM=m
> 
>@@ -4774,10 +4774,9 @@ CONFIG_V4L_PLATFORM_DRIVERS=y
> # CONFIG_VIDEO_CAFE_CCIC is not set
> # CONFIG_VIDEO_SH_VOU is not set
> CONFIG_SOC_CAMERA=m
>-CONFIG_SOC_CAMERA_SCALE_CROP=m
> CONFIG_SOC_CAMERA_PLATFORM=m
> # CONFIG_VIDEO_MX3 is not set
>-CONFIG_VIDEO_RCAR_VIN=m
>+# CONFIG_VIDEO_RCAR_VIN is not set
> # CONFIG_VIDEO_SH_MOBILE_CSI2 is not set
> # CONFIG_VIDEO_SH_MOBILE_CEU is not set
> # CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS is not set
>@@ -5157,9 +5156,7 @@ CONFIG_DRM_UDL=m
> # CONFIG_DRM_MGAG200 is not set
> # CONFIG_DRM_CIRRUS_QEMU is not set
> CONFIG_DRM_ARMADA=m
>-CONFIG_DRM_RCAR_DU=m
>-CONFIG_DRM_RCAR_HDMI=y
>-CONFIG_DRM_RCAR_LVDS=y
>+# CONFIG_DRM_RCAR_DU is not set
> # CONFIG_DRM_SHMOBILE is not set
> CONFIG_DRM_OMAP=m
> CONFIG_DRM_OMAP_NUM_CRTCS=2
>@@ -5198,7 +5195,7 @@ CONFIG_DRM_NXP_PTN3460=m
> CONFIG_DRM_PARADE_PS8622=m
> # CONFIG_DRM_STI is not set
> CONFIG_DRM_VC4=m
>-CONFIG_DRM_HISI_HIBMC=m
>+# CONFIG_DRM_HISI_HIBMC is not set
> 
> #
> # Frame buffer Devices
>@@ -5580,7 +5577,7 @@ CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631=m
> # SoC Audio support for SuperH
> #
> # CONFIG_SND_SOC_SH4_FSI is not set
>-CONFIG_SND_SOC_RCAR=m
>+# CONFIG_SND_SOC_RCAR is not set
> CONFIG_SND_SOC_RSRC_CARD=m
> 
> #
>@@ -6080,7 +6077,7 @@ CONFIG_USB_ISP1301=m
> CONFIG_USB_MSM_OTG=m
> # CONFIG_USB_QCOM_8X16_PHY is not set
> CONFIG_USB_MXS_PHY=m
>-CONFIG_USB_RCAR_PHY=m
>+# CONFIG_USB_RCAR_PHY is not set
> CONFIG_USB_ULPI=y
> CONFIG_USB_ULPI_VIEWPORT=y
> CONFIG_USB_GADGET=m
>@@ -6461,8 +6458,8 @@ CONFIG_RENESAS_DMA=y
> CONFIG_SH_DMAE_BASE=y
> CONFIG_SH_DMAE=m
> CONFIG_SH_DMAE_R8A73A4=y
>-CONFIG_RCAR_DMAC=m
>-CONFIG_RCAR_HPB_DMAE=m
>+# CONFIG_RCAR_DMAC is not set
>+# CONFIG_RCAR_HPB_DMAE is not set
> CONFIG_RENESAS_USB_DMAC=m
> CONFIG_SUDMAC=m
> 
>@@ -7194,11 +7191,11 @@ CONFIG_PWM_IMX=m
> CONFIG_PWM_LP3943=m
> CONFIG_PWM_MTK_DISP=m
> # CONFIG_PWM_PCA9685 is not set
>-CONFIG_PWM_RCAR=m
>+# CONFIG_PWM_RCAR is not set
> CONFIG_PWM_RENESAS_TPU=m
> CONFIG_PWM_ROCKCHIP=m
> CONFIG_PWM_SAMSUNG=m
>-CONFIG_PWM_SUN4I=m
>+# CONFIG_PWM_SUN4I is not set
> CONFIG_PWM_TEGRA=m
> CONFIG_PWM_TIECAP=m
> CONFIG_PWM_TIEHRPWM=m
>@@ -7231,7 +7228,7 @@ CONFIG_PHY_DM816X_USB=m
> CONFIG_PHY_EXYNOS_MIPI_VIDEO=m
> # CONFIG_PHY_PXA_28NM_HSIC is not set
> # CONFIG_PHY_PXA_28NM_USB2 is not set
>-CONFIG_PHY_RCAR_GEN2=m
>+# CONFIG_PHY_RCAR_GEN2 is not set
> CONFIG_OMAP_CONTROL_PHY=m
> CONFIG_OMAP_USB2=m
> CONFIG_TI_PIPE3=m
>-- 
>2.1.4
>

Actions: View | Diff

Attachments on bug 1043231: 728059 | 728060 | 728061 | 728062 | 728063 | 728064 | 728065 | 728066 | 728067 | 728068 | 728069 | 728070 | 728071 | 728072 | 728073 | 728074 | 728075 | 728076 | 728077 | 728521 | 728695 | 728770