From 38afd503329459808cbe0e52f17d1879587098d7 Mon Sep 17 00:00:00 2001 From: Andrea Righi Date: Mon, 21 Jun 2021 10:37:55 +0200 Subject: [PATCH] UBUNTU: [Config] update annotations after rebase to 5.13-rc7 Disable CONFIG_XILINX_ZYNQMP_DPDMA on amd64, beacuse this now depends on CONFIG_HAS_IOMEM. Also drop deprecated option CONFIG_ACPI_CPPC_CPUFREQ_FIE, and update modules list on amd64. Signed-off-by: Andrea Righi --- debian.master/abi/amd64/generic.modules | 6 +++++- debian.master/abi/amd64/lowlatency.modules | 6 +++++- debian.master/config/annotations | 2 +- debian.master/config/config.common.ubuntu | 1 - 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/debian.master/abi/amd64/generic.modules b/debian.master/abi/amd64/generic.modules index ce85d2f1a4b2..54b3d2c95ae4 100644 --- a/debian.master/abi/amd64/generic.modules +++ b/debian.master/abi/amd64/generic.modules @@ -5775,7 +5775,6 @@ xiaomi-wmi xilinx-pr-decoupler xilinx-spi xilinx-xadc -xilinx_dpdma xilinx_emac xilinx_emaclite xilinx_gmii2rgmii @@ -5916,3 +5915,8 @@ zstd zstd_compress zunicode zzstd +gpio-aaeon +mfd-aaeon +wdt_aaeon +leds-aaeon +hwmon-aaeon diff --git a/debian.master/abi/amd64/lowlatency.modules b/debian.master/abi/amd64/lowlatency.modules index 40f56e700c52..ae7eeeab7d2b 100644 --- a/debian.master/abi/amd64/lowlatency.modules +++ b/debian.master/abi/amd64/lowlatency.modules @@ -5775,7 +5775,6 @@ xiaomi-wmi xilinx-pr-decoupler xilinx-spi xilinx-xadc -xilinx_dpdma xilinx_emac xilinx_emaclite xilinx_gmii2rgmii @@ -5916,3 +5915,8 @@ zstd zstd_compress zunicode zzstd +gpio-aaeon +hwmon-aaeon +wdt_aaeon +leds-aaeon +mfd-aaeon diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 559bb9b2157e..930e8f5b01f0 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -1402,7 +1402,7 @@ CONFIG_UNIPHIER_XDMAC policy<{'armhf': 'm'}> CONFIG_XGENE_DMA policy<{'arm64': 'm'}> CONFIG_XILINX_DMA policy<{'arm64': 'm'}> CONFIG_XILINX_ZYNQMP_DMA policy<{'arm64': 'm'}> -CONFIG_XILINX_ZYNQMP_DPDMA policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}> +CONFIG_XILINX_ZYNQMP_DPDMA policy<{'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}> CONFIG_MTK_HSDMA policy<{'arm64': 'm', 'armhf': 'm'}> CONFIG_MTK_CQDMA policy<{'arm64': 'm', 'armhf': 'm'}> CONFIG_MTK_UART_APDMA policy<{'arm64': 'm', 'armhf': 'm'}> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index eb556ca429cf..ab828d5f61dd 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -61,7 +61,6 @@ CONFIG_ACPI_CMPC=m CONFIG_ACPI_CONFIGFS=m CONFIG_ACPI_CONTAINER=y CONFIG_ACPI_CPPC_CPUFREQ=m -CONFIG_ACPI_CPPC_CPUFREQ_FIE=y CONFIG_ACPI_CPPC_LIB=y CONFIG_ACPI_CPU_FREQ_PSS=y CONFIG_ACPI_CUSTOM_DSDT_FILE="" -- 2.39.5