From patchwork Fri Sep 10 11:51:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 1526486 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=UVNh7pbi; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4H5Z2r0Cy7z9t0T; Fri, 10 Sep 2021 21:51:14 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1mOf3m-0004bb-FN; Fri, 10 Sep 2021 11:51:10 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1mOf3j-0004b5-0d for kernel-team@lists.ubuntu.com; Fri, 10 Sep 2021 11:51:07 +0000 Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id D2C963F328 for ; Fri, 10 Sep 2021 11:51:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1631274666; bh=ziTQXk2WeIKmCvyqv3rTLGSWi1YNi9/mPIPyKewZwXI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=UVNh7pbidph20AxoC2C7vw8vCXCc/9rUuLWWn8qGxVlzOAYTV2EqWURzCLUeucRq0 EhzJ3ZwsxZzeZNBvrHJKljK1ZS19Ee8vl8FK4cGpTwE2h7nqLBhFF7h5t9hkiNYeHl VCqYTommj9VjkxjI8XEVxLYoOHrgM3/UXMxMedFJCa4m5ffb/rZ2Vqeb6d8t9CUKcf 7U5k617aDQudiXcoKbDJi3EGwwlnSalJ0EO0AK/AWjnuJzh+2+xtTKmtQhsQ1uamvA h0eKm1TnSBSDbFwlHAEeRPpKq7475mMEehcD5ldcyFMPrlUgaNWgv3ghvnjeWF+09H dcTO7HgEcXFOA== Received: by mail-pg1-f200.google.com with SMTP id t28-20020a63461c000000b00252078b83e4so1110847pga.15 for ; Fri, 10 Sep 2021 04:51:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ziTQXk2WeIKmCvyqv3rTLGSWi1YNi9/mPIPyKewZwXI=; b=aEpcSxVn7G9zTROCS56CIlz7mQ8LFJFG3TbMxIrswn5DXcJhnagrGp/ZMVtReATS74 S31TZuinHhBR5c/2pFvUqDpwwfPY/WOMnj0ccU3tvAh4LSv8DnqSryM0E6DxP3TIlEIO AInfjYIwoal1wOJkQvNcjpr6GOmW4eflHCN2K0N5Dng/YJVMhhkX+LM+MdSryqJNNHJX G71Tq+1uIsTnObGZQ/xG77gluHTnqJ08rEggwXs/OL3sHA1eWADhwfbe7D+CzL5sEeIG meYxtcH8t6LKnVR83li7OJ/zsJ3j2F5xp1cUPw5ZrrsRWF5IHm+veuD2t56UDXJXj+5I Q9HA== X-Gm-Message-State: AOAM531PqK3MLqunnoOiolOh/HYAXTmeCYXSjqs6XdZDg4mpUUOBT6mp eLFTT0RkFrpYcxAOS6XTUjM8tmceFhG8Ua9cgEN5I+q8VJh9vk9lNyA5kS64cnY9OXt4/zhIosK eCuJdLX2Pe/If1LYF0fe39DRPCa8s+Omsn3qW1nkqlg== X-Received: by 2002:a63:3545:: with SMTP id c66mr6897057pga.377.1631274665099; Fri, 10 Sep 2021 04:51:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyJSypchWK/t0cQbIinkqtwqqKclolzjp8/UP3nZFM+n/89vZ1TwGR43eNssnjZ3wnP9pieQA== X-Received: by 2002:a63:3545:: with SMTP id c66mr6897042pga.377.1631274664828; Fri, 10 Sep 2021 04:51:04 -0700 (PDT) Received: from localhost.localdomain ([69.163.84.166]) by smtp.gmail.com with ESMTPSA id t14sm5109121pga.62.2021.09.10.04.51.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Sep 2021 04:51:04 -0700 (PDT) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH] UBUNTU: [Config] CONFIG_SPEAKUP=m Date: Fri, 10 Sep 2021 05:51:00 -0600 Message-Id: <20210910115100.22147-3-tim.gardner@canonical.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210910115100.22147-1-tim.gardner@canonical.com> References: <20210910115100.22147-1-tim.gardner@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" 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 Acked-by: Thadeu Lima de Souza Cascardo --- 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 +CONFIG_ACCESSIBILITY mark note +CONFIG_SPEAKUP mark note # 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