forked from freifunk-franken/firmware
Compare commits
5 Commits
0d06be1749
...
0e62ca5307
Author | SHA1 | Date |
---|---|---|
Fabian Bläse | 0e62ca5307 | |
Fabian Bläse | d34438d8b1 | |
Robert Langhammer | 306ed093f7 | |
Fabian Bläse | 2085c5e4af | |
Fabian Bläse | e695b2a87a |
|
@ -0,0 +1,106 @@
|
||||||
|
From 3b63209f03007e755c4a076d0a81a60fdf15dcd0 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= <fabian@blaese.de>
|
||||||
|
Date: Wed, 16 Nov 2022 11:41:32 +0100
|
||||||
|
Subject: [PATCH] generic: add support for EON EN25QX128A spi nor flash
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
Add support for EON EN25QX128A spi nor flash with no flags as it does
|
||||||
|
support SFDP parsing.
|
||||||
|
|
||||||
|
Fixes: #9442
|
||||||
|
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
|
||||||
|
Tested-by: Szabolcs Hubai <szab.hu@gmail.com> [ramips/mt7621: xiaomi_mi-router-4a-gigabit]
|
||||||
|
[fabian@blaese.de: Backport to Kernel 5.4]
|
||||||
|
Signed-off-by: Fabian Bläse <fabian@blaese.de>
|
||||||
|
---
|
||||||
|
.../477-mtd-spi-nor-add-eon-en25qx128a.patch | 21 +++++++++++++++++++
|
||||||
|
.../477-mtd-spi-nor-add-eon-en25qx128a.patch | 21 +++++++++++++++++++
|
||||||
|
.../477-mtd-spi-nor-add-eon-en25qx128a.patch | 21 +++++++++++++++++++
|
||||||
|
3 files changed, 63 insertions(+)
|
||||||
|
create mode 100644 target/linux/generic/pending-5.10/477-mtd-spi-nor-add-eon-en25qx128a.patch
|
||||||
|
create mode 100644 target/linux/generic/pending-5.15/477-mtd-spi-nor-add-eon-en25qx128a.patch
|
||||||
|
create mode 100644 target/linux/generic/pending-5.4/477-mtd-spi-nor-add-eon-en25qx128a.patch
|
||||||
|
|
||||||
|
diff --git a/target/linux/generic/pending-5.10/477-mtd-spi-nor-add-eon-en25qx128a.patch b/target/linux/generic/pending-5.10/477-mtd-spi-nor-add-eon-en25qx128a.patch
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000000..0a681d6753
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/target/linux/generic/pending-5.10/477-mtd-spi-nor-add-eon-en25qx128a.patch
|
||||||
|
@@ -0,0 +1,21 @@
|
||||||
|
+From: Christian Marangi <ansuelsmth@gmail.com>
|
||||||
|
+Subject: kernel/mtd: add support for EON EN25QX128A
|
||||||
|
+
|
||||||
|
+Add support for EON EN25QX128A with no flags as it does
|
||||||
|
+support SFDP parsing.
|
||||||
|
+
|
||||||
|
+Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
|
||||||
|
+---
|
||||||
|
+ drivers/mtd/spi-nor/spi-nor.c | 1 +
|
||||||
|
+ 1 file changed, 1 insertion(+)
|
||||||
|
+
|
||||||
|
+--- a/drivers/mtd/spi-nor/eon.c
|
||||||
|
++++ b/drivers/mtd/spi-nor/eon.c
|
||||||
|
+@@ -15,6 +15,7 @@ static const struct flash_info eon_parts
|
||||||
|
+ { "en25q64", INFO(0x1c3017, 0, 64 * 1024, 128, SECT_4K) },
|
||||||
|
+ { "en25q128", INFO(0x1c3018, 0, 64 * 1024, 256,
|
||||||
|
+ SECT_4K | SPI_NOR_DUAL_READ) },
|
||||||
|
++ { "en25qx128a", INFO(0x1c7118, 0, 64 * 1024, 256, 0) },
|
||||||
|
+ { "en25q80a", INFO(0x1c3014, 0, 64 * 1024, 16,
|
||||||
|
+ SECT_4K | SPI_NOR_DUAL_READ) },
|
||||||
|
+ { "en25qh16", INFO(0x1c7015, 0, 64 * 1024, 32,
|
||||||
|
diff --git a/target/linux/generic/pending-5.15/477-mtd-spi-nor-add-eon-en25qx128a.patch b/target/linux/generic/pending-5.15/477-mtd-spi-nor-add-eon-en25qx128a.patch
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000000..0a681d6753
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/target/linux/generic/pending-5.15/477-mtd-spi-nor-add-eon-en25qx128a.patch
|
||||||
|
@@ -0,0 +1,21 @@
|
||||||
|
+From: Christian Marangi <ansuelsmth@gmail.com>
|
||||||
|
+Subject: kernel/mtd: add support for EON EN25QX128A
|
||||||
|
+
|
||||||
|
+Add support for EON EN25QX128A with no flags as it does
|
||||||
|
+support SFDP parsing.
|
||||||
|
+
|
||||||
|
+Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
|
||||||
|
+---
|
||||||
|
+ drivers/mtd/spi-nor/spi-nor.c | 1 +
|
||||||
|
+ 1 file changed, 1 insertion(+)
|
||||||
|
+
|
||||||
|
+--- a/drivers/mtd/spi-nor/eon.c
|
||||||
|
++++ b/drivers/mtd/spi-nor/eon.c
|
||||||
|
+@@ -15,6 +15,7 @@ static const struct flash_info eon_parts
|
||||||
|
+ { "en25q64", INFO(0x1c3017, 0, 64 * 1024, 128, SECT_4K) },
|
||||||
|
+ { "en25q128", INFO(0x1c3018, 0, 64 * 1024, 256,
|
||||||
|
+ SECT_4K | SPI_NOR_DUAL_READ) },
|
||||||
|
++ { "en25qx128a", INFO(0x1c7118, 0, 64 * 1024, 256, 0) },
|
||||||
|
+ { "en25q80a", INFO(0x1c3014, 0, 64 * 1024, 16,
|
||||||
|
+ SECT_4K | SPI_NOR_DUAL_READ) },
|
||||||
|
+ { "en25qh16", INFO(0x1c7015, 0, 64 * 1024, 32,
|
||||||
|
diff --git a/target/linux/generic/pending-5.4/477-mtd-spi-nor-add-eon-en25qx128a.patch b/target/linux/generic/pending-5.4/477-mtd-spi-nor-add-eon-en25qx128a.patch
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000000..0a681d6753
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/target/linux/generic/pending-5.4/477-mtd-spi-nor-add-eon-en25qx128a.patch
|
||||||
|
@@ -0,0 +1,18 @@
|
||||||
|
+From: Fabian Bläse <fabian@blaese.de>
|
||||||
|
+Subject: kernel/mtd: add support for EON EN25QX128A
|
||||||
|
+
|
||||||
|
+Signed-off-by: Fabian Bläse <fabian@blaese.de>
|
||||||
|
+---
|
||||||
|
+ drivers/mtd/spi-nor/spi-nor.c | 1 +
|
||||||
|
+ 1 file changed, 1 insertion(+)
|
||||||
|
+
|
||||||
|
+--- a/drivers/mtd/spi-nor/spi-nor.c
|
||||||
|
++++ b/drivers/mtd/spi-nor/spi-nor.c
|
||||||
|
+@@ -2240,8 +2240,9 @@ static const struct flash_info spi_nor_i
|
||||||
|
+ { "en25p64", INFO(0x1c2017, 0, 64 * 1024, 128, 0) },
|
||||||
|
+ { "en25q64", INFO(0x1c3017, 0, 64 * 1024, 128, SECT_4K) },
|
||||||
|
+ { "en25q128", INFO(0x1c3018, 0, 64 * 1024, 256, SECT_4K) },
|
||||||
|
++ { "en25qx128a", INFO(0x1c7118, 0, 64 * 1024, 256, 0) },
|
||||||
|
+ { "en25q80a", INFO(0x1c3014, 0, 64 * 1024, 16,
|
||||||
|
+ SECT_4K | SPI_NOR_DUAL_READ) },
|
||||||
|
+ { "en25qh32", INFO(0x1c7016, 0, 64 * 1024, 64, 0) },
|
||||||
|
--
|
||||||
|
2.38.1
|
||||||
|
|
|
@ -38,20 +38,20 @@ index ac11655904..147e159ea1 100755
|
||||||
;;
|
;;
|
||||||
avm,fritzbox-7530 |\
|
avm,fritzbox-7530 |\
|
||||||
diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network
|
diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network
|
||||||
index 1d4c78833a..ea2cc60186 100755
|
index 87c79db5e1..666be0d145 100755
|
||||||
--- a/target/linux/ipq40xx/base-files/etc/board.d/02_network
|
--- a/target/linux/ipq40xx/base-files/etc/board.d/02_network
|
||||||
+++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network
|
+++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network
|
||||||
@@ -59,9 +59,8 @@ ipq40xx_setup_interfaces()
|
@@ -58,9 +58,8 @@ ipq40xx_setup_interfaces()
|
||||||
|
avm,fritzbox-4040|\
|
||||||
linksys,ea6350v3|\
|
linksys,ea6350v3|\
|
||||||
linksys,ea8300|\
|
linksys,ea8300)
|
||||||
linksys,mr8300)
|
|
||||||
- ucidef_set_interfaces_lan_wan "eth0" "eth1"
|
- ucidef_set_interfaces_lan_wan "eth0" "eth1"
|
||||||
ucidef_add_switch "switch0" \
|
ucidef_add_switch "switch0" \
|
||||||
- "0u@eth0" "1:lan" "2:lan" "3:lan" "4:lan"
|
- "0u@eth0" "1:lan" "2:lan" "3:lan" "4:lan"
|
||||||
+ "0@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan"
|
+ "0@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan"
|
||||||
;;
|
;;
|
||||||
avm,fritzbox-7530)
|
linksys,mr8300)
|
||||||
ucidef_add_switch "switch0" \
|
ucidef_set_interfaces_lan_wan "eth0" "eth1"
|
||||||
diff --git a/target/linux/ipq40xx/files/drivers/net/ethernet/qualcomm/essedma/edma.h b/target/linux/ipq40xx/files/drivers/net/ethernet/qualcomm/essedma/edma.h
|
diff --git a/target/linux/ipq40xx/files/drivers/net/ethernet/qualcomm/essedma/edma.h b/target/linux/ipq40xx/files/drivers/net/ethernet/qualcomm/essedma/edma.h
|
||||||
index 015e5f5026..daa60639d1 100644
|
index 015e5f5026..daa60639d1 100644
|
||||||
--- a/target/linux/ipq40xx/files/drivers/net/ethernet/qualcomm/essedma/edma.h
|
--- a/target/linux/ipq40xx/files/drivers/net/ethernet/qualcomm/essedma/edma.h
|
||||||
|
@ -80,10 +80,10 @@ index 015e5f5026..daa60639d1 100644
|
||||||
/* Queues exposed to linux kernel */
|
/* Queues exposed to linux kernel */
|
||||||
#define EDMA_NETDEV_TX_QUEUE 4
|
#define EDMA_NETDEV_TX_QUEUE 4
|
||||||
diff --git a/target/linux/ipq40xx/files/drivers/net/phy/ar40xx.c b/target/linux/ipq40xx/files/drivers/net/phy/ar40xx.c
|
diff --git a/target/linux/ipq40xx/files/drivers/net/phy/ar40xx.c b/target/linux/ipq40xx/files/drivers/net/phy/ar40xx.c
|
||||||
index c35ba2799f..0517e4f29e 100644
|
index 545e3985ae..28453c2363 100644
|
||||||
--- a/target/linux/ipq40xx/files/drivers/net/phy/ar40xx.c
|
--- a/target/linux/ipq40xx/files/drivers/net/phy/ar40xx.c
|
||||||
+++ b/target/linux/ipq40xx/files/drivers/net/phy/ar40xx.c
|
+++ b/target/linux/ipq40xx/files/drivers/net/phy/ar40xx.c
|
||||||
@@ -1481,6 +1481,7 @@ ar40xx_vlan_init(struct ar40xx_priv *priv)
|
@@ -1483,6 +1483,7 @@ ar40xx_vlan_init(struct ar40xx_priv *priv)
|
||||||
unsigned long bmp;
|
unsigned long bmp;
|
||||||
|
|
||||||
/* By default Enable VLAN */
|
/* By default Enable VLAN */
|
||||||
|
@ -91,7 +91,7 @@ index c35ba2799f..0517e4f29e 100644
|
||||||
priv->vlan = 1;
|
priv->vlan = 1;
|
||||||
priv->vlan_table[AR40XX_LAN_VLAN] = priv->cpu_bmp | priv->lan_bmp;
|
priv->vlan_table[AR40XX_LAN_VLAN] = priv->cpu_bmp | priv->lan_bmp;
|
||||||
priv->vlan_table[AR40XX_WAN_VLAN] = priv->cpu_bmp | priv->wan_bmp;
|
priv->vlan_table[AR40XX_WAN_VLAN] = priv->cpu_bmp | priv->wan_bmp;
|
||||||
@@ -1492,6 +1493,7 @@ ar40xx_vlan_init(struct ar40xx_priv *priv)
|
@@ -1494,6 +1495,7 @@ ar40xx_vlan_init(struct ar40xx_priv *priv)
|
||||||
bmp = priv->wan_bmp;
|
bmp = priv->wan_bmp;
|
||||||
for_each_set_bit(port, &bmp, AR40XX_NUM_PORTS)
|
for_each_set_bit(port, &bmp, AR40XX_NUM_PORTS)
|
||||||
priv->pvid[port] = AR40XX_WAN_VLAN;
|
priv->pvid[port] = AR40XX_WAN_VLAN;
|
||||||
|
@ -100,7 +100,7 @@ index c35ba2799f..0517e4f29e 100644
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
diff --git a/target/linux/ipq40xx/patches-5.4/711-dts-ipq4019-add-ethernet-essedma-node.patch b/target/linux/ipq40xx/patches-5.4/711-dts-ipq4019-add-ethernet-essedma-node.patch
|
diff --git a/target/linux/ipq40xx/patches-5.4/711-dts-ipq4019-add-ethernet-essedma-node.patch b/target/linux/ipq40xx/patches-5.4/711-dts-ipq4019-add-ethernet-essedma-node.patch
|
||||||
index 7b2ddfe00d..1a01b08e41 100644
|
index 3567eb7810..b13b312a91 100644
|
||||||
--- a/target/linux/ipq40xx/patches-5.4/711-dts-ipq4019-add-ethernet-essedma-node.patch
|
--- a/target/linux/ipq40xx/patches-5.4/711-dts-ipq4019-add-ethernet-essedma-node.patch
|
||||||
+++ b/target/linux/ipq40xx/patches-5.4/711-dts-ipq4019-add-ethernet-essedma-node.patch
|
+++ b/target/linux/ipq40xx/patches-5.4/711-dts-ipq4019-add-ethernet-essedma-node.patch
|
||||||
@@ -36,7 +36,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
|
@@ -36,7 +36,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
|
||||||
|
|
|
@ -7,9 +7,9 @@ set -o pipefail
|
||||||
builddir=./build
|
builddir=./build
|
||||||
|
|
||||||
# OpenWrt: package hashes correspond to core repo version
|
# OpenWrt: package hashes correspond to core repo version
|
||||||
OPENWRTREV="v21.02.3"
|
OPENWRTREV="v21.02.5"
|
||||||
PACKAGEREV="78bcd00c13587571b5c79ed2fc3363aa674aaef7"
|
PACKAGEREV="0b16e3f359fe9d015861596d63c5bde4c56daa2e"
|
||||||
ROUTINGREV="a0d61bddb3ce4ca54bd76af86c28f58feb6cc044"
|
ROUTINGREV="25e76489c83cfcee61e36a491896e1e9bfc3ec13"
|
||||||
|
|
||||||
# Gluon packages: master from 2020-02-04
|
# Gluon packages: master from 2020-02-04
|
||||||
GLUONREV="12e41d0ff07ec54bbd67a31ab50d12ca04f2238c"
|
GLUONREV="12e41d0ff07ec54bbd67a31ab50d12ca04f2238c"
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=fff-babel-bird2
|
PKG_NAME:=fff-babel-bird2
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=$(COMMITCOUNT)
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/package.mk
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=fff-babel
|
PKG_NAME:=fff-babel
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=$(COMMITCOUNT)
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/package.mk
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
|
|
||||||
implementation=$(uci -q get babelimpl.impl.impl)
|
implementation=$(uci -q get babelimpl.impl.impl)
|
||||||
[ -z "$implementation" ] && implementation=babeld
|
[ -z "$implementation" ] && implementation=bird2
|
||||||
|
|
||||||
. /lib/functions/fff/babeldaemon/$implementation
|
. /lib/functions/fff/babeldaemon/$implementation
|
||||||
|
|
||||||
|
|
|
@ -26,6 +26,12 @@ uci batch >/dev/null <<EOF
|
||||||
set dhcp.@dnsmasq[-1].noresolv='1'
|
set dhcp.@dnsmasq[-1].noresolv='1'
|
||||||
set dhcp.@dnsmasq[-1].localservice='1'
|
set dhcp.@dnsmasq[-1].localservice='1'
|
||||||
|
|
||||||
|
# do not generate A or AAAA records for the routers hostname,
|
||||||
|
# because this might interfere with upstream records.
|
||||||
|
#
|
||||||
|
# e.g. hostname: 'router.fff.community'
|
||||||
|
set dhcp.@dnsmasq[-1].add_local_fqdn='0'
|
||||||
|
|
||||||
set dhcp.client=dhcp
|
set dhcp.client=dhcp
|
||||||
set dhcp.client.interface='client'
|
set dhcp.client.interface='client'
|
||||||
set dhcp.client.leasetime='1h'
|
set dhcp.client.leasetime='1h'
|
||||||
|
|
|
@ -31,8 +31,8 @@ write_deps() {
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
for v in $variant; do
|
for v in base $variant; do
|
||||||
defaults="$defaults fff-variant-$v"
|
defaults="$defaults fff-$v"
|
||||||
done
|
done
|
||||||
# start tree
|
# start tree
|
||||||
for package in $defaults; do
|
for package in $defaults; do
|
||||||
|
|
Loading…
Reference in New Issue