[PATCH] UBUNTU: [Config] CONFIG_SPEAKUP=m

[Tim Gardner]

BugLink: https://bugs.launchpad.net/bugs/1942459

In order to enable the SPEAKUP accessibility modules, CONFIG_ACCESSIBILITY
must be set to 'y'. Note that nothing is changed for s390x.

CONFIG_SPEAKUP was enabled (as a module) on 5.8 and earlier kernels. It
moved from drivers/staging/ to drivers/accessibility/ between 5.8 and 5.11,
which would explain how it ended up being disabled on 5.11 and later.

Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
---
 debian.master/config/amd64/config.common.amd64     |  1 +
 debian.master/config/annotations                   |  6 ++++--
 debian.master/config/arm64/config.common.arm64     |  1 +
 debian.master/config/armhf/config.common.armhf     |  1 +
 debian.master/config/config.common.ubuntu          | 14 +++++++++++++-
 debian.master/config/ppc64el/config.common.ppc64el |  1 +
 debian.master/config/s390x/config.common.s390x     |  1 +
 7 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 183ab9687b7f..0cd5a3be91d2 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -3,6 +3,7 @@
 #
 CONFIG_6LOWPAN=m
 CONFIG_AC97_BUS=m
+CONFIG_ACCESSIBILITY=y
 CONFIG_ACPI_DEBUG=y
 CONFIG_ACPI_DEBUGGER=y
 # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index e96858795e64..b86039f5c844 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -519,9 +519,11 @@ CONFIG_UNISYS_VISORBUS                          policy<{'amd64': 'm'}>
 CONFIG_IDE                                      policy<{'amd64': 'n', 'armhf': 'n', 'ppc64el': 'n'}>
 
 # Menu: Device Drivers >> Accessibility support
-CONFIG_ACCESSIBILITY                            policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}>
+CONFIG_ACCESSIBILITY                            policy<{'amd64-generic': 'y', 'amd64-lowlatency': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'n'}>
+CONFIG_SPEAKUP                                  policy<{'amd64-generic': 'm', 'amd64-lowlatency': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': '-'}>
 #
-CONFIG_ACCESSIBILITY                            flag<REVIEW>
+CONFIG_ACCESSIBILITY                            mark<ENFORCED> note<LP: #1942459>
+CONFIG_SPEAKUP                                  mark<ENFORCED> note<LP: #1942459>
 
 # Menu: Device Drivers >> Accessibility support >> Speakup console speech
 
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 9274e8a68c5f..a25721c8be09 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -3,6 +3,7 @@
 #
 CONFIG_6LOWPAN=m
 CONFIG_AC97_BUS=m
+CONFIG_ACCESSIBILITY=y
 # CONFIG_ACPI_DEBUG is not set
 # CONFIG_ACPI_DEBUGGER is not set
 CONFIG_ACPI_REDUCED_HARDWARE_ONLY=y
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 0799dd9d1d3f..32c27494e4df 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -3,6 +3,7 @@
 #
 CONFIG_6LOWPAN=m
 CONFIG_AC97_BUS=y
+CONFIG_ACCESSIBILITY=y
 CONFIG_AD525X_DPOT=m
 CONFIG_ADFS_FS=m
 CONFIG_AFFS_FS=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 76f0360259be..89381428c3c4 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -33,9 +33,9 @@ CONFIG_9P_FS=m
 CONFIG_9P_FSCACHE=y
 CONFIG_9P_FS_POSIX_ACL=y
 CONFIG_9P_FS_SECURITY=y
+# CONFIG_A11Y_BRAILLE_CONSOLE is not set
 CONFIG_AAEON_IWMI_WDT=m
 CONFIG_ABP060MG=m
-# CONFIG_ACCESSIBILITY is not set
 CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
 CONFIG_ACERHDF=m
@@ -10455,6 +10455,18 @@ CONFIG_SPARSEMEM_STATIC=y
 CONFIG_SPARSEMEM_VMEMMAP=y
 CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
 CONFIG_SPARSE_IRQ=y
+CONFIG_SPEAKUP=m
+CONFIG_SPEAKUP_SYNTH_ACNTSA=m
+CONFIG_SPEAKUP_SYNTH_APOLLO=m
+CONFIG_SPEAKUP_SYNTH_AUDPTR=m
+CONFIG_SPEAKUP_SYNTH_BNS=m
+CONFIG_SPEAKUP_SYNTH_DECEXT=m
+CONFIG_SPEAKUP_SYNTH_DECTLK=m
+CONFIG_SPEAKUP_SYNTH_DUMMY=m
+CONFIG_SPEAKUP_SYNTH_LTLK=m
+CONFIG_SPEAKUP_SYNTH_SOFT=m
+CONFIG_SPEAKUP_SYNTH_SPKOUT=m
+CONFIG_SPEAKUP_SYNTH_TXPRT=m
 CONFIG_SPI_ALTERA=m
 CONFIG_SPI_ALTERA_CORE=m
 CONFIG_SPI_ALTERA_DFL=m
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index 8313e59d9b94..fba8105975ef 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -3,6 +3,7 @@
 #
 CONFIG_6LOWPAN=m
 CONFIG_AC97_BUS=m
+CONFIG_ACCESSIBILITY=y
 CONFIG_AD525X_DPOT=m
 CONFIG_ADFS_FS=m
 CONFIG_AFFS_FS=m
diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index 518750ccc1b7..f5694ca320b9 100644
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -2,6 +2,7 @@
 # Config options for config.common.s390x automatically generated by splitconfig.pl
 #
 # CONFIG_6LOWPAN is not set
+# CONFIG_ACCESSIBILITY is not set
 # CONFIG_AD525X_DPOT is not set
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
-- 
2.33.0