From patchwork Tue Jul 12 12:04:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Renner Berthing X-Patchwork-Id: 1655359 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=Xb6wAD1J; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4Lhzwx0Gkzz9sB4 for ; Tue, 12 Jul 2022 22:05:53 +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 1oBEe7-0004lJ-7s; Tue, 12 Jul 2022 12:05:43 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1oBEdj-00041v-5b for kernel-team@lists.ubuntu.com; Tue, 12 Jul 2022 12:05:19 +0000 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (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-1.canonical.com (Postfix) with ESMTPS id 15F493F4D0 for ; Tue, 12 Jul 2022 12:05:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657627517; bh=78J86tRNMKr2QEjH4VgR4IFJwQHxPsXXNtvAwn3GttQ=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Xb6wAD1JqKufPQ9qdKygLPUOvcAszKv77CEx3yZvk0KwZUzDoii57VKNZNdYFAod0 P/qq2f7c9WLj/MC8HoMF0Ds4D60mAJyHB2Uvic4HbthvcfRoMpov9cspISpdJkqQen Q8AyfQDjgJUNxEmNWxAL752i1EifNRd3wDxeZumid+nRJWEyrRxlZ/+oNH6tBR3S8N 1rtZt69pBIshjqyrSH6jZmvbP57LuSY40cPn+CLixJrEANSschmvKTbGB0Rcucw6Zs k8Mugp4tX1w8OgLfPtBMlgbxZ32TrNcNJ5aY84uYOOgiO3JJHYy6/qvr1S5hhXPCZp 2jAD4eH0oT61Q== Received: by mail-wm1-f71.google.com with SMTP id t4-20020a1c7704000000b003a2cfaeca37so3669566wmi.5 for ; Tue, 12 Jul 2022 05:05:17 -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:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=78J86tRNMKr2QEjH4VgR4IFJwQHxPsXXNtvAwn3GttQ=; b=dPAWpvcBR75bLFkyNJ75ehagGjaDlQF6ouFOOLdVoi5rrJF1ABZsfm1zfLejBbmgd8 MiSAgZjFNUZgH98MRu4Gqe7DSv0u3XsKjJxhP7LwPYEf4621W1+Jdijxebl2bNFxYX53 v0ZRBbD8s/UWh4DW/84q1N/0Pv7WNfYFhHkCqWv3BgI/R3+kFuNKORCbfq0DQhwHpQoz 98tFdnF1m8R70TGCrGxb58WAr3Fd3UR9fg0f2PHp8z1SMSJPIVhobtOvQGrBBnAcj8Iv DLrD027HdATc3g7iKXgqWZ0nqhE2SCTzDgtlTQGl1EwNWaDbYLh3CXctAUY10TEcm07g PAAw== X-Gm-Message-State: AJIora8kcUmMIW4i2vIEJzWgFOOM/9asG+EpwY3k7B4CDw+tfz7jCJP6 E62RdnCvek3+AIAklXG7SgFAuHJ5fGENPR2TTj6EGCSe46Y7iGga5IbEkBUgWeLolBO+w7xYwOM 6WEI3/URGkkTFwEEq4ULUUObvWrfToYE/CavLZJUQCg== X-Received: by 2002:a5d:5919:0:b0:21d:60cf:cbf4 with SMTP id v25-20020a5d5919000000b0021d60cfcbf4mr20813918wrd.188.1657627500443; Tue, 12 Jul 2022 05:05:00 -0700 (PDT) X-Google-Smtp-Source: AGRyM1stZ5HozOV4b53EyZkKxxPAcRLcXVH/UjWM32w+63fSRlAm0hs5ZgXOWg58vyxQ+whdHLlwCQ== X-Received: by 2002:a5d:5919:0:b0:21d:60cf:cbf4 with SMTP id v25-20020a5d5919000000b0021d60cfcbf4mr20813885wrd.188.1657627500091; Tue, 12 Jul 2022 05:05:00 -0700 (PDT) Received: from stitch.. (80.71.140.73.ipv4.parknet.dk. [80.71.140.73]) by smtp.gmail.com with ESMTPSA id i15-20020adfefcf000000b0021d82a6095bsm7992246wrp.95.2022.07.12.05.04.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jul 2022 05:04:59 -0700 (PDT) From: Emil Renner Berthing To: kernel-team@lists.ubuntu.com Subject: [SRU][K][PATCH 14/16] UBUNTU: [Config] Enable CONFIG_WLAN_VENDOR_MICROCHIP on riscv64 Date: Tue, 12 Jul 2022 14:04:45 +0200 Message-Id: <20220712120447.355124-15-emil.renner.berthing@canonical.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220712120447.355124-1-emil.renner.berthing@canonical.com> References: <20220712120447.355124-1-emil.renner.berthing@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/1981437 This option was not annotated in the linux-riscv tree, so let's align it with the other architectures. Signed-off-by: Emil Renner Berthing --- debian.master/config/amd64/config.common.amd64 | 1 - debian.master/config/annotations | 8 ++++---- debian.master/config/arm64/config.common.arm64 | 1 - debian.master/config/armhf/config.common.armhf | 1 - debian.master/config/config.common.ubuntu | 1 + debian.master/config/ppc64el/config.common.ppc64el | 1 - debian.master/config/riscv64/config.common.riscv64 | 1 - 7 files changed, 5 insertions(+), 9 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index fe2f97f269e3..0e156a243542 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -691,7 +691,6 @@ CONFIG_VXGE=m CONFIG_W1=m CONFIG_WAN=y CONFIG_WDTPCI=m -CONFIG_WLAN_VENDOR_MICROCHIP=y CONFIG_WWAN=y CONFIG_X25=m CONFIG_XEN=y diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 328af633d8a7..7a04ae19385d 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -6619,10 +6619,10 @@ CONFIG_AT76C50X_USB policy<{'amd64': 'm', 'arm64': ' CONFIG_WLAN_VENDOR_CISCO policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y'}> CONFIG_AIRO policy<{'amd64': 'm', 'ppc64el': 'm'}> CONFIG_AIRO_CS policy<{'amd64': 'm'}> -CONFIG_WLAN_VENDOR_MICROCHIP policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'n'}> -CONFIG_WILC1000_SDIO policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}> -CONFIG_WILC1000_SPI policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}> -CONFIG_WILC1000_HW_OOB_INTR policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y'}> +CONFIG_WLAN_VENDOR_MICROCHIP policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y'}> +CONFIG_WILC1000_SDIO policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}> +CONFIG_WILC1000_SPI policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}> +CONFIG_WILC1000_HW_OOB_INTR policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y'}> CONFIG_WLAN_VENDOR_RALINK policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y'}> CONFIG_WLAN_VENDOR_RSI policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y'}> CONFIG_WLAN_VENDOR_ST policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y'}> diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index 7b04b130ce6a..72270e7d398c 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -723,7 +723,6 @@ CONFIG_VXGE=m CONFIG_W1=m CONFIG_WAN=y CONFIG_WDTPCI=m -CONFIG_WLAN_VENDOR_MICROCHIP=y CONFIG_WWAN=y CONFIG_X25=m CONFIG_XEN=y diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 92b2cac23531..26d3b1d3ecec 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -704,7 +704,6 @@ CONFIG_VXGE=m CONFIG_W1=m CONFIG_WAN=y CONFIG_WDTPCI=m -CONFIG_WLAN_VENDOR_MICROCHIP=y CONFIG_WWAN=y CONFIG_X25=m # CONFIG_XEN is not set diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index d21e40243221..ddce83712bd0 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -12982,6 +12982,7 @@ CONFIG_WLAN_VENDOR_INTEL=y CONFIG_WLAN_VENDOR_INTERSIL=y CONFIG_WLAN_VENDOR_MARVELL=y CONFIG_WLAN_VENDOR_MEDIATEK=y +CONFIG_WLAN_VENDOR_MICROCHIP=y CONFIG_WLAN_VENDOR_PURELIFI=y CONFIG_WLAN_VENDOR_QUANTENNA=y CONFIG_WLAN_VENDOR_RALINK=y diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index 2c41e161b8e7..d2c0e9de2396 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -694,7 +694,6 @@ CONFIG_VXGE=m CONFIG_W1=m CONFIG_WAN=y CONFIG_WDTPCI=m -CONFIG_WLAN_VENDOR_MICROCHIP=y CONFIG_WWAN=y CONFIG_X25=m CONFIG_XILINX_EMACLITE=m diff --git a/debian.master/config/riscv64/config.common.riscv64 b/debian.master/config/riscv64/config.common.riscv64 index 8c01ca4f83bd..4b4a9150e59c 100644 --- a/debian.master/config/riscv64/config.common.riscv64 +++ b/debian.master/config/riscv64/config.common.riscv64 @@ -686,7 +686,6 @@ CONFIG_VXGE=m CONFIG_W1=m CONFIG_WAN=y CONFIG_WDTPCI=m -# CONFIG_WLAN_VENDOR_MICROCHIP is not set CONFIG_WWAN=m CONFIG_X25=m CONFIG_XILINX_EMACLITE=m