[openwrt/openwrt] ramips: fix missing NVMEM subsystem

LEDE Commits lede-commits at lists.infradead.org
Wed Jul 21 02:39:56 PDT 2021


ynezz pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/373c08bcbb08b49715919597ed400abb4dd169c9

commit 373c08bcbb08b49715919597ed400abb4dd169c9
Author: David Bauer <mail at david-bauer.net>
AuthorDate: Wed Jul 21 10:28:50 2021 +0200

    ramips: fix missing NVMEM subsystem
    
    MAC address retrieval was switched to more generic upstream (5.13) NVMEM
    based solution in commit 06bb4a5018cd ("ramips: convert mtd-mac-address
    to nvmem implementation") , but NVMEM subsystem wasn't enabled in the
    kernel, so fix it now.
    
    References: https://github.com/openwrt/openwrt/pull/4041#issuecomment-883322801
    Fixes: 06bb4a5018cd ("ramips: convert mtd-mac-address to nvmem implementation")
    Signed-off-by: David Bauer <mail at david-bauer.net>
    Signed-off-by: Petr Štetiar <ynezz at true.cz> [commit message]
---
 target/linux/ramips/mt7620/config-5.10 | 1 +
 target/linux/ramips/mt7620/config-5.4  | 1 +
 target/linux/ramips/mt7621/config-5.10 | 1 +
 target/linux/ramips/mt7621/config-5.4  | 1 +
 target/linux/ramips/mt76x8/config-5.10 | 1 +
 target/linux/ramips/mt76x8/config-5.4  | 1 +
 target/linux/ramips/rt288x/config-5.10 | 1 +
 target/linux/ramips/rt288x/config-5.4  | 1 +
 target/linux/ramips/rt305x/config-5.10 | 1 +
 target/linux/ramips/rt305x/config-5.4  | 1 +
 target/linux/ramips/rt3883/config-5.10 | 1 +
 target/linux/ramips/rt3883/config-5.4  | 1 +
 12 files changed, 12 insertions(+)

diff --git a/target/linux/ramips/mt7620/config-5.10 b/target/linux/ramips/mt7620/config-5.10
index 391449cc51..f91d01bbd8 100644
--- a/target/linux/ramips/mt7620/config-5.10
+++ b/target/linux/ramips/mt7620/config-5.10
@@ -129,6 +129,7 @@ CONFIG_NET_RALINK_SOC=y
 # CONFIG_NET_VENDOR_MEDIATEK is not set
 CONFIG_NET_VENDOR_RALINK=y
 CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y
+CONFIG_NVMEM=y
 CONFIG_OF=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_EARLY_FLATTREE=y
diff --git a/target/linux/ramips/mt7620/config-5.4 b/target/linux/ramips/mt7620/config-5.4
index ca96f09c5b..d6d8ef483f 100644
--- a/target/linux/ramips/mt7620/config-5.4
+++ b/target/linux/ramips/mt7620/config-5.4
@@ -131,6 +131,7 @@ CONFIG_NET_RALINK_SOC=y
 # CONFIG_NET_VENDOR_MEDIATEK is not set
 CONFIG_NET_VENDOR_RALINK=y
 CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y
+CONFIG_NVMEM=y
 CONFIG_OF=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_EARLY_FLATTREE=y
diff --git a/target/linux/ramips/mt7621/config-5.10 b/target/linux/ramips/mt7621/config-5.10
index 92165590f6..b02e59588f 100644
--- a/target/linux/ramips/mt7621/config-5.10
+++ b/target/linux/ramips/mt7621/config-5.10
@@ -190,6 +190,7 @@ CONFIG_NET_VENDOR_MEDIATEK=y
 CONFIG_NO_HZ_COMMON=y
 CONFIG_NO_HZ_IDLE=y
 CONFIG_NR_CPUS=4
+CONFIG_NVMEM=y
 CONFIG_OF=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_EARLY_FLATTREE=y
diff --git a/target/linux/ramips/mt7621/config-5.4 b/target/linux/ramips/mt7621/config-5.4
index 0ce300c138..f303d354a8 100644
--- a/target/linux/ramips/mt7621/config-5.4
+++ b/target/linux/ramips/mt7621/config-5.4
@@ -180,6 +180,7 @@ CONFIG_NET_SWITCHDEV=y
 CONFIG_NET_VENDOR_MEDIATEK=y
 # CONFIG_NET_VENDOR_RALINK is not set
 CONFIG_NR_CPUS=4
+CONFIG_NVMEM=y
 CONFIG_OF=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_EARLY_FLATTREE=y
diff --git a/target/linux/ramips/mt76x8/config-5.10 b/target/linux/ramips/mt76x8/config-5.10
index 3a42a5770f..fd1e03685e 100644
--- a/target/linux/ramips/mt76x8/config-5.10
+++ b/target/linux/ramips/mt76x8/config-5.10
@@ -124,6 +124,7 @@ CONFIG_NET_RALINK_SOC=y
 # CONFIG_NET_VENDOR_MEDIATEK is not set
 CONFIG_NET_VENDOR_RALINK=y
 CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y
+CONFIG_NVMEM=y
 CONFIG_OF=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_EARLY_FLATTREE=y
diff --git a/target/linux/ramips/mt76x8/config-5.4 b/target/linux/ramips/mt76x8/config-5.4
index c69f120899..5b9792b30e 100644
--- a/target/linux/ramips/mt76x8/config-5.4
+++ b/target/linux/ramips/mt76x8/config-5.4
@@ -124,6 +124,7 @@ CONFIG_NET_RALINK_SOC=y
 # CONFIG_NET_VENDOR_MEDIATEK is not set
 CONFIG_NET_VENDOR_RALINK=y
 CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y
+CONFIG_NVMEM=y
 CONFIG_OF=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_EARLY_FLATTREE=y
diff --git a/target/linux/ramips/rt288x/config-5.10 b/target/linux/ramips/rt288x/config-5.10
index 88d06266b9..03b38fcad4 100644
--- a/target/linux/ramips/rt288x/config-5.10
+++ b/target/linux/ramips/rt288x/config-5.10
@@ -112,6 +112,7 @@ CONFIG_NET_RALINK_SOC=y
 CONFIG_NET_VENDOR_RALINK=y
 CONFIG_NLS=m
 CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y
+CONFIG_NVMEM=y
 CONFIG_OF=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_EARLY_FLATTREE=y
diff --git a/target/linux/ramips/rt288x/config-5.4 b/target/linux/ramips/rt288x/config-5.4
index d0de43e29c..2ddcb15741 100644
--- a/target/linux/ramips/rt288x/config-5.4
+++ b/target/linux/ramips/rt288x/config-5.4
@@ -112,6 +112,7 @@ CONFIG_NET_RALINK_SOC=y
 CONFIG_NET_VENDOR_RALINK=y
 CONFIG_NLS=m
 CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y
+CONFIG_NVMEM=y
 CONFIG_OF=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_EARLY_FLATTREE=y
diff --git a/target/linux/ramips/rt305x/config-5.10 b/target/linux/ramips/rt305x/config-5.10
index 1704accf95..a67b525f82 100644
--- a/target/linux/ramips/rt305x/config-5.10
+++ b/target/linux/ramips/rt305x/config-5.10
@@ -114,6 +114,7 @@ CONFIG_NET_RALINK_RT3050=y
 CONFIG_NET_RALINK_SOC=y
 CONFIG_NET_VENDOR_RALINK=y
 CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y
+CONFIG_NVMEM=y
 CONFIG_OF=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_EARLY_FLATTREE=y
diff --git a/target/linux/ramips/rt305x/config-5.4 b/target/linux/ramips/rt305x/config-5.4
index b4ee93c05b..8ba86b501c 100644
--- a/target/linux/ramips/rt305x/config-5.4
+++ b/target/linux/ramips/rt305x/config-5.4
@@ -114,6 +114,7 @@ CONFIG_NET_RALINK_RT3050=y
 CONFIG_NET_RALINK_SOC=y
 CONFIG_NET_VENDOR_RALINK=y
 CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y
+CONFIG_NVMEM=y
 CONFIG_OF=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_EARLY_FLATTREE=y
diff --git a/target/linux/ramips/rt3883/config-5.10 b/target/linux/ramips/rt3883/config-5.10
index 16d6fc32f8..664d93f454 100644
--- a/target/linux/ramips/rt3883/config-5.10
+++ b/target/linux/ramips/rt3883/config-5.10
@@ -113,6 +113,7 @@ CONFIG_NET_RALINK_RT3883=y
 CONFIG_NET_RALINK_SOC=y
 CONFIG_NET_VENDOR_RALINK=y
 CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y
+CONFIG_NVMEM=y
 CONFIG_OF=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_EARLY_FLATTREE=y
diff --git a/target/linux/ramips/rt3883/config-5.4 b/target/linux/ramips/rt3883/config-5.4
index f7d6a2cc2b..49e449f8b9 100644
--- a/target/linux/ramips/rt3883/config-5.4
+++ b/target/linux/ramips/rt3883/config-5.4
@@ -114,6 +114,7 @@ CONFIG_NET_RALINK_RT3883=y
 CONFIG_NET_RALINK_SOC=y
 CONFIG_NET_VENDOR_RALINK=y
 CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y
+CONFIG_NVMEM=y
 CONFIG_OF=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_EARLY_FLATTREE=y



More information about the lede-commits mailing list