From 60cca8aec526efc9034d14d67bbcdda090457bd0 Mon Sep 17 00:00:00 2001
From: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date: Mon, 18 Feb 2019 14:02:05 +0100
Subject: [PATCH] Drop i.mx6 specialisations
I.mx6 is an important target but not the only arm target so drop the
various specialisations for it. The general images should be able to
boot on different SoC platforms as well
Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
---
apertis-ospack-minimal.yaml | 5 -----
apertis-ospack-target.yaml | 8 --------
.../etc/initramfs-tools/conf.d/modules | 1 -
.../usr/share/initramfs-tools/modules.d/fs | 2 --
.../usr/share/initramfs-tools/modules.d/sdhci | 3 ---
.../pulse/daemon.conf.d/fix-alternate-sample-rate.conf | 9 ---------
6 files changed, 28 deletions(-)
delete mode 100644 overlays/initramfs-modules-imx6/etc/initramfs-tools/conf.d/modules
delete mode 100644 overlays/initramfs-modules-imx6/usr/share/initramfs-tools/modules.d/fs
delete mode 100644 overlays/initramfs-modules-imx6/usr/share/initramfs-tools/modules.d/sdhci
delete mode 100644 overlays/pulseaudio-alternate-sample-rate-imx6/etc/pulse/daemon.conf.d/fix-alternate-sample-rate.conf
diff --git a/apertis-ospack-minimal.yaml b/apertis-ospack-minimal.yaml
index 5cfd8a0..42bb22f 100644
--- a/apertis-ospack-minimal.yaml
+++ b/apertis-ospack-minimal.yaml
@@ -90,11 +90,6 @@ actions:
source: overlays/initramfs-modules-amd64
{{ end }}
-{{ if eq $architecture "armhf" }}
- - action: overlay
- source: overlays/initramfs-modules-imx6
-{{ end }}
-
- action: overlay
source: overlays/minimal-dpkg-exclusions
diff --git a/apertis-ospack-target.yaml b/apertis-ospack-target.yaml
index af396f2..8429e14 100644
--- a/apertis-ospack-target.yaml
+++ b/apertis-ospack-target.yaml
@@ -217,14 +217,6 @@ actions:
source: overlays/initramfs-modules-amd64
{{ end }}
-{{ if eq $architecture "armhf" }}
- - action: overlay
- source: overlays/initramfs-modules-imx6
-
- - action: overlay
- source: overlays/pulseaudio-alternate-sample-rate-imx6
-{{ end }}
-
- action: run
chroot: true
script: scripts/add-xdg-user-metadata.sh
diff --git a/overlays/initramfs-modules-imx6/etc/initramfs-tools/conf.d/modules b/overlays/initramfs-modules-imx6/etc/initramfs-tools/conf.d/modules
deleted file mode 100644
index a724f56..0000000
--- a/overlays/initramfs-modules-imx6/etc/initramfs-tools/conf.d/modules
+++ /dev/null
@@ -1 +0,0 @@
-MODULES=list
diff --git a/overlays/initramfs-modules-imx6/usr/share/initramfs-tools/modules.d/fs b/overlays/initramfs-modules-imx6/usr/share/initramfs-tools/modules.d/fs
deleted file mode 100644
index 8e81c63..0000000
--- a/overlays/initramfs-modules-imx6/usr/share/initramfs-tools/modules.d/fs
+++ /dev/null
@@ -1,2 +0,0 @@
-ext4
-btrfs
diff --git a/overlays/initramfs-modules-imx6/usr/share/initramfs-tools/modules.d/sdhci b/overlays/initramfs-modules-imx6/usr/share/initramfs-tools/modules.d/sdhci
deleted file mode 100644
index d3b0fed..0000000
--- a/overlays/initramfs-modules-imx6/usr/share/initramfs-tools/modules.d/sdhci
+++ /dev/null
@@ -1,3 +0,0 @@
-sdhci-pltfm
-sdhci-esdhc-imx
-sdhci-pci
diff --git a/overlays/pulseaudio-alternate-sample-rate-imx6/etc/pulse/daemon.conf.d/fix-alternate-sample-rate.conf b/overlays/pulseaudio-alternate-sample-rate-imx6/etc/pulse/daemon.conf.d/fix-alternate-sample-rate.conf
deleted file mode 100644
index 2bbb5b4..0000000
--- a/overlays/pulseaudio-alternate-sample-rate-imx6/etc/pulse/daemon.conf.d/fix-alternate-sample-rate.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# On iMX6.q, the following error is visible preventing audio loopback
-# to start
-# W: [alsa-source-HiFi sgtl5000-0] alsa-source.c: Resume failed, couldn't restore original sample settings.
-#
-# Use this file to override the default value of alternate-sample-rate
-# to match that of default-sample-rate
-default-sample-format = s16le
-default-sample-rate = 44100
-alternate-sample-rate = 44100
--
GitLab