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 <andrea.righi@canonical.com>

diff --git a/debian.master/abi/amd64/generic.modules b/debian.master/abi/amd64/generic.modules
index ce85d2f1a4b2324ad59c162433358177965236ef..54b3d2c95ae41618d7049b23612cd5f8b0fbd8ac 100644 (file)
--- 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 40f56e700c527ef00bb954f3b7d52a64ac0e75a7..ae7eeeab7d2bdb2bd93c9faa6a4d8b4b63f96998 100644 (file)
--- 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 559bb9b2157eee0e48f5c952eda88cfac07cbda3..930e8f5b01f06c7a550a9f1e53c2ca75c2527382 100644 (file)
--- 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 eb556ca429cf7e32a1e42dc1762e760d61e7d315..ab828d5f61dd413a8d5e6af6df5d6e998ff34dca 100644 (file)
--- 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=""