Merging debian version 6.7.7-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

5 files changed, 49 insertions, 41 deletions

diff --git a/debian/config/armhf/config b/debian/config/armhf/config
index af51773b95..4ece0c6129 100644
--- a/debian/config/armhf/config
+++ b/debian/config/armhf/config
@@ -516,6 +516,11 @@ CONFIG_DRM_TEGRA_STAGING=y
 CONFIG_DRM_TILCDC=m
 
 ##
+## file: drivers/gpu/drm/tiny/Kconfig
+##
+CONFIG_DRM_PANEL_MIPI_DBI=m
+
+##
 ## file: drivers/gpu/host1x/Kconfig
 ##
 CONFIG_TEGRA_HOST1X=m
@@ -1064,6 +1069,11 @@ CONFIG_MDIO_SUN4I=y
 CONFIG_MDIO_ASPEED=m
 
 ##
+## file: drivers/net/phy/Kconfig
+##
+CONFIG_ADIN_PHY=m
+
+##
 ## file: drivers/net/wireless/broadcom/brcm80211/brcmfmac/Kconfig
 ##
 CONFIG_BRCMFMAC=m
@@ -1207,6 +1217,16 @@ CONFIG_OLPC_XO175=y
 CONFIG_OLPC_XO175_EC=m
 
 ##
+## file: drivers/pmdomain/bcm/Kconfig
+##
+CONFIG_RASPBERRYPI_POWER=y
+
+##
+## file: drivers/pmdomain/rockchip/Kconfig
+##
+CONFIG_ROCKCHIP_PM_DOMAINS=y
+
+##
 ## file: drivers/power/reset/Kconfig
 ##
 CONFIG_POWER_RESET=y
@@ -1345,15 +1365,9 @@ CONFIG_ASPEED_LPC_SNOOP=m
 CONFIG_ASPEED_P2A_CTRL=m
 
 ##
-## file: drivers/soc/bcm/Kconfig
-##
-CONFIG_RASPBERRYPI_POWER=y
-
-##
 ## file: drivers/soc/rockchip/Kconfig
 ##
 CONFIG_ROCKCHIP_IODOMAIN=m
-CONFIG_ROCKCHIP_PM_DOMAINS=y
 
 ##
 ## file: drivers/soc/tegra/Kconfig
diff --git a/debian/config/armhf/defines b/debian/config/armhf/defines
deleted file mode 100644
index 762775239f..0000000000
--- a/debian/config/armhf/defines
+++ /dev/null
@@ -1,24 +0,0 @@
-[base]
-featuresets:
- none
- rt
-kernel-arch: arm
-
-[build]
-image-file: arch/arm/boot/zImage
-vdso: true
-
-[image]
-install-stem: vmlinuz
-
-[armmp_description]
-hardware: ARMv7 multiplatform compatible SoCs
-hardware-long: ARMv7 multiplatform kernel. See
-  https://wiki.debian.org/DebianKernel/ARMMP for details of supported
-  platforms
-
-[armmp-lpae_description]
-hardware: ARMv7 multiplatform compatible SoCs supporting LPAE
-hardware-long: ARMv7 multiplatform kernel supporting LPAE. See
-  https://wiki.debian.org/DebianKernel/ARMMP for details of supported
-  platforms.
diff --git a/debian/config/armhf/defines.toml b/debian/config/armhf/defines.toml
new file mode 100644
index 0000000000..51cd3911a0
--- /dev/null
+++ b/debian/config/armhf/defines.toml
@@ -0,0 +1,29 @@
+[[flavour]]
+name = "armmp"
+[flavour.defs]
+is_default = true
+[flavour.description]
+hardware = 'ARMv7 multiplatform compatible SoCs'
+hardware_long = 'ARMv7 multiplatform kernel. See https://wiki.debian.org/DebianKernel/ARMMP for details of supported platforms'
+[flavour.packages]
+installer = true
+
+[[flavour]]
+name = "armmp-lpae"
+[flavour.description]
+hardware = 'ARMv7 multiplatform compatible SoCs supporting LPAE'
+hardware_long = 'ARMv7 multiplatform kernel supporting LPAE. See https://wiki.debian.org/DebianKernel/ARMMP for details of supported platforms.'
+
+[[featureset]]
+name = 'none'
+
+[[featureset]]
+name = 'rt'
+# Override available flavours in rt featureset
+[[featureset.flavour]]
+name = 'armmp'
+
+[build]
+enable_vdso = true
+kernel_file = 'arch/arm/boot/zImage'
+kernel_stem = 'vmlinuz'
diff --git a/debian/config/armhf/none/defines b/debian/config/armhf/none/defines
deleted file mode 100644
index 3b127c36a1..0000000000
--- a/debian/config/armhf/none/defines
+++ /dev/null
@@ -1,8 +0,0 @@
-[base]
-flavours:
- armmp
- armmp-lpae
-default-flavour: armmp
-
-[armmp_packages]
-installer: true
diff --git a/debian/config/armhf/rt/defines b/debian/config/armhf/rt/defines
deleted file mode 100644
index 897e415f89..0000000000
--- a/debian/config/armhf/rt/defines
+++ /dev/null
@@ -1,3 +0,0 @@
-[base]
-flavours:
- armmp