From patchwork Sun Dec 9 15:14:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 1009994 X-Patchwork-Delegate: hauke@hauke-m.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=hauke-m.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="liGOyzMH"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43CVG22Pntz9s3q for ; Mon, 10 Dec 2018 02:18:18 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=V3ZaWSMlUvf6hVS7binRhdxfodYPU4nlca4Ml2Oo28Y=; b=liGOyzMHFu0Y2W 1x0cP8k5630jx2PO6yMoSRN1vvMrziGRF2Y4zXp0mGq7dzWo8MtFVCC5AtxC3WqLVboILYV7Hmxec iwzB4Dh9uW2/ty5OvgDzYma62k18Hqrd1h3IEJCTbc3zADaZlDJj6JUTP3nBgSzFO1G3NnOorO90Y J5ePyCtpdYZfCtJi5rOek7llcxXTBUS0M9Fn7TbIQVyO7cRzUI0rm07RLFyzWheEsbKtZdajPvvzl uF5FS8Ga/nUCRuvtiCSs80B5viLZ6h6nly9Rvra0/R9GrtRalGhBP8c3DlibSCV2A/6aQ0/p5tQ9q U6xWaAdO3fYI+TDX6t9A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gW0qU-0000Ai-8R; Sun, 09 Dec 2018 15:18:14 +0000 Received: from mx1.mailbox.org ([80.241.60.212]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gW0nx-00060d-Bi for openwrt-devel@lists.openwrt.org; Sun, 09 Dec 2018 15:15:44 +0000 Received: from smtp2.mailbox.org (unknown [IPv6:2001:67c:2050:105:465:1:2:0]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id E5A6E48935; Sun, 9 Dec 2018 16:15:18 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp2.mailbox.org ([80.241.60.241]) by spamfilter04.heinlein-hosting.de (spamfilter04.heinlein-hosting.de [80.241.56.122]) (amavisd-new, port 10030) with ESMTP id WAK-X71zOAR5; Sun, 9 Dec 2018 16:15:18 +0100 (CET) From: Hauke Mehrtens To: openwrt-devel@lists.openwrt.org Date: Sun, 9 Dec 2018 16:14:46 +0100 Message-Id: <20181209151451.8831-25-hauke@hauke-m.de> In-Reply-To: <20181209151451.8831-1-hauke@hauke-m.de> References: <20181209151451.8831-1-hauke@hauke-m.de> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181209_071538_326273_637A5FDF X-CRM114-Status: GOOD ( 17.66 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [80.241.60.212 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record Subject: [OpenWrt-Devel] [PATCH 24/29] kernel: Make CONFIG_NVMEM tristate X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hauke Mehrtens MIME-Version: 1.0 Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org CONFIG_OF_NET depends on CONFIG_NVMEM in kernel 4.19. To fix some build problems in mainline Linux kernel CONFIG_NVMEM was changed from tristate to bool in commit 2a37ce25d9 ("nvmem: disallow modular CONFIG_NVMEM"). This patch in OpenWrt revert the upstream commit and changes CONFIG_NVMEM back to tristate we just have to make sure to build this in for all targets which select CONFIG_OF_NET. Signed-off-by: Hauke Mehrtens --- ...90-nvmem-make-CONFIG_NVMEM-tristate-again.patch | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 target/linux/generic/hack-4.19/290-nvmem-make-CONFIG_NVMEM-tristate-again.patch diff --git a/target/linux/generic/hack-4.19/290-nvmem-make-CONFIG_NVMEM-tristate-again.patch b/target/linux/generic/hack-4.19/290-nvmem-make-CONFIG_NVMEM-tristate-again.patch new file mode 100644 index 0000000000..ad45dc9168 --- /dev/null +++ b/target/linux/generic/hack-4.19/290-nvmem-make-CONFIG_NVMEM-tristate-again.patch @@ -0,0 +1,33 @@ +From 2579d9b982c7232f9354bcca5262e26a84c38799 Mon Sep 17 00:00:00 2001 +From: Hauke Mehrtens +Date: Fri, 2 Nov 2018 17:40:32 +0100 +Subject: [PATCH] nvmem: make CONFIG_NVMEM tristate again + +Only build it in when OF_NET is selected and make it possible to build +it as module otherwise. + +Signed-off-by: Hauke Mehrtens +--- + drivers/nvmem/Kconfig | 2 +- + drivers/of/Kconfig | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/nvmem/Kconfig ++++ b/drivers/nvmem/Kconfig +@@ -1,5 +1,5 @@ + menuconfig NVMEM +- bool "NVMEM Support" ++ tristate "NVMEM Support" + help + Support for NVMEM(Non Volatile Memory) devices like EEPROM, EFUSES... + +--- a/drivers/of/Kconfig ++++ b/drivers/of/Kconfig +@@ -71,6 +71,7 @@ config OF_IRQ + + config OF_NET + depends on NETDEVICES ++ select NVMEM + def_bool y + + config OF_MDIO