[OpenWrt-Devel] A note on selects vs. DEPENDS
Hi all, I just discovered something. It seems that in a package if you have a config section that does select PACKAGE_condition_dependency then the build succeeds but when you do opkg install, opkg does not 'know' about the dependency. That means if you have a situation like lldpd where you have a conditional dependency it is not enough to add selects to same config section as the conditional compilation flags, but you also need to add an EXTRA_DEPENDS:=$(if $(CONFIG_),conditional_dependency) line. I will be submitting a patch to lldpd with that fix, since my previous patch fixed compilation, but doesn't solve the opkg problem (although no one is likely to actually run across it because libjson-c is installed by default so it's unlikely any failure would actually occur). (Before my patch even compilation would fail if json output was disable due to missing dependency, now you would likely never notice the problem because libjson-c is installed by default, but I discovered the issue in reference to package to which I'm adding conditional build logic in the packages feed for which the conditional dependency is not included unless the package I'm working on depends on it). Regards, Daniel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] tar: write: Broken pi
On 22 December 2015 at 06:11, Heinrich Schuchardt wrote: > OpenWRT ChaosCalmer uses busybox 1.23.2. > > For many tar.gz files I receive errors like: > > user@MR3020:~/src$ wget http://tukaani.org/xz/xz-5.2.2.tar.gz > user@MR3020:~/src$ tar -xzf xz-5.2.2.tar.gz > tar: invalid tar magic > user@MR3020:~/src$ tar: write: Broken pipe > > GNU tar on Debian Jessie amd64 has no problem with the same file. > It requires CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY to be set for busybox to work with those tarballs. yousong > Best regards > > Heinrich Schuchardt > ___ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 1/1] [package] GNU Make
On 22 December 2015 at 06:08, Heinrich Schuchardt wrote: > OpenWRT provides gcc but lacks make. So building foreign software is > difficult. > GCC is provided as part of the OpenWrt packages feeds (https://github.com/openwrt/packages), so maybe this should also go there. > This patch provides GNU Make 4.1. > > Built on Debian Jessie amd64. > Tested on TP-Link MR3020 (ar71xx/generic). > > Signed-off-by: Heinrich Schuchardt > --- > package/devel/make/Makefile | 52 > + > 1 file changed, 52 insertions(+) > create mode 100644 package/devel/make/Makefile > > diff --git a/package/devel/make/Makefile b/package/devel/make/Makefile > new file mode 100644 > index 000..7c938bd > --- /dev/null > +++ b/package/devel/make/Makefile > @@ -0,0 +1,52 @@ > +# > +# Copyright (C) 2015 OpenWrt.org > +# > +# This is free software, licensed under the GNU General Public License v2. > +# See /LICENSE for more information. > +# > + > +include $(TOPDIR)/rules.mk > + > +PKG_NAME:=make > +PKG_VERSION:=4.1 > +PKG_RELEASE:=1 > + > +PKG_SOURCE_URL:=@GNU/make > +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz > +PKG_VERSION:=$(PKG_VERSION) This line should not be necessary. > +PKG_MD5SUM:=654f9117957e6fa6a1c49a8f08270ec9 > +PKG_MAINTAINER:=Heinrich Schuchardt > +PKG_LICENSE:=GPL-3.0+ > + > +PKG_INSTALL:=1 > + > +include $(INCLUDE_DIR)/package.mk > + > +define Package/make > + SECTION:=devel > + CATEGORY:=Development > + TITLE:=make > + DEPENDS:= > + URL:=https://www.gnu.org/software/make/ > +endef > + > +define Package/make/description > + The Make package contains a tool to create executables from source files. > +endef > + > +TARGET_CFLAGS += $(FPIC) -Wno-unused-value > + > +CONFIGURE_ARGS += \ > + --host=$(REAL_GNU_TARGET_NAME) \ > + --target=$(REAL_GNU_TARGET_NAME) \ > + --prefix=/usr Could this package be built and run without these statements? > + > +define Package/make/install > + $(INSTALL_DIR) $(1)/usr/bin > + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/make $(1)/usr/bin/ > + $(INSTALL_DIR) $(1)/usr/include > + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ > +endef > + > +$(eval $(call BuildPackage,make)) > -- > 2.1.4 > ___ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Ubiquiti UniFI AC Lite
Hello, good news for you: With Roman's patches, the UniFi AP AC LITE is now fully supported. I.e. eth0 works on 10/100/1000 MBit/s links. Before official support is given, you can get prebuilt images and patches at https://pwassi.privatedns.org/openwrt/unifiac/ Next step is to prepare patches for the patches (or a single patch?) -- P.Wassi ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 2/3] ar71xx: add support for QCA956x ethernet
Hi Roman, are you sure about the value of QCA956X_PLL_VAL_10, which is 0x1919 in your patch? At least for the UAPAC LITE I have the problem that packet transmission on 10MBit/s links does not work with 0x1919. Instead, with QCA956X_PLL_VAL_10 = 0x1313 everything is fine. Is this specific to the UAPAC LITE or the QCA9563? Regards, P.Wassi ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH V2 2/3] swconfig: support receiving SWITCH_TYPE_LINK from kernel
When using cli, print link state the same way kernel used to do it.
This will allow kernel switching PORT_LINK from SWITCH_TYPE_STRING.
Signed-off-by: Rafał Miłecki
---
V2:
* Rename SWLIB_LINK_FLAG_ enums
* Update link_policy to match kernel changes (few u32 -> flag)
---
package/network/config/swconfig/src/cli.c | 33 +++
package/network/config/swconfig/src/swlib.c | 42 +
package/network/config/swconfig/src/swlib.h | 17
3 files changed, 92 insertions(+)
diff --git a/package/network/config/swconfig/src/cli.c
b/package/network/config/swconfig/src/cli.c
index d472086..9055414 100644
--- a/package/network/config/swconfig/src/cli.c
+++ b/package/network/config/swconfig/src/cli.c
@@ -84,9 +84,27 @@ list_attributes(struct switch_dev *dev)
print_attrs(dev->port_ops);
}
+static const char *
+speed_str(int speed)
+{
+ switch (speed) {
+ case 10:
+ return "10baseT";
+ case 100:
+ return "100baseT";
+ case 1000:
+ return "1000baseT";
+ default:
+ break;
+ }
+
+ return "unknown";
+}
+
static void
print_attr_val(const struct switch_attr *attr, const struct switch_val *val)
{
+ struct switch_port_link *link;
int i;
switch (attr->type) {
@@ -104,6 +122,21 @@ print_attr_val(const struct switch_attr *attr, const
struct switch_val *val)
SWLIB_PORT_FLAG_TAGGED) ? "t" : "");
}
break;
+ case SWITCH_TYPE_LINK:
+ link = val->value.link;
+ if (link->link)
+ printf("port:%d link:up speed:%s %s-duplex %s%s%s%s%s",
+ val->port_vlan,
+ speed_str(link->speed),
+ link->duplex ? "full" : "half",
+ link->tx_flow ? "txflow " : "",
+ link->rx_flow ? "rxflow " : "",
+ link->eee & SWLIB_LINK_FLAG_EEE_100BASET ?
"eee100 " : "",
+ link->eee & SWLIB_LINK_FLAG_EEE_1000BASET ?
"eee1000 " : "",
+ link->aneg ? "auto" : "");
+ else
+ printf("port:%d link:down", val->port_vlan);
+ break;
default:
printf("?unknown-type?");
}
diff --git a/package/network/config/swconfig/src/swlib.c
b/package/network/config/swconfig/src/swlib.c
index 0dbace5..908e0fb 100644
--- a/package/network/config/swconfig/src/swlib.c
+++ b/package/network/config/swconfig/src/swlib.c
@@ -51,6 +51,15 @@ static struct nla_policy portmap_policy[SWITCH_PORTMAP_MAX]
= {
[SWITCH_PORTMAP_VIRT] = { .type = NLA_U32 },
};
+static struct nla_policy link_policy[SWITCH_LINK_ATTR_MAX] = {
+ [SWITCH_LINK_FLAG_LINK] = { .type = NLA_FLAG },
+ [SWITCH_LINK_FLAG_DUPLEX] = { .type = NLA_FLAG },
+ [SWITCH_LINK_FLAG_ANEG] = { .type = NLA_FLAG },
+ [SWITCH_LINK_SPEED] = { .type = NLA_U32 },
+ [SWITCH_LINK_FLAG_EEE_100BASET] = { .type = NLA_FLAG },
+ [SWITCH_LINK_FLAG_EEE_1000BASET] = { .type = NLA_FLAG },
+};
+
static inline void *
swlib_alloc(size_t size)
{
@@ -202,6 +211,37 @@ out:
}
static int
+store_link_val(struct nl_msg *msg, struct nlattr *nla, struct switch_val *val)
+{
+ struct nlattr *tb[SWITCH_LINK_ATTR_MAX + 1];
+ struct switch_port_link *link;
+ int err = 0;
+
+ if (!val->value.link)
+ val->value.link = malloc(sizeof(struct switch_port_link));
+
+ err = nla_parse_nested(tb, SWITCH_LINK_ATTR_MAX, nla, link_policy);
+ if (err < 0)
+ goto out;
+
+ link = val->value.link;
+ link->link = !!tb[SWITCH_LINK_FLAG_LINK];
+ link->duplex = !!tb[SWITCH_LINK_FLAG_DUPLEX];
+ link->aneg = !!tb[SWITCH_LINK_FLAG_ANEG];
+ link->tx_flow = !!tb[SWITCH_LINK_FLAG_TX_FLOW];
+ link->rx_flow = !!tb[SWITCH_LINK_FLAG_RX_FLOW];
+ link->speed = nla_get_u32(tb[SWITCH_LINK_SPEED]);
+ link->eee = 0;
+ if (tb[SWITCH_LINK_FLAG_EEE_100BASET])
+ link->eee |= SWLIB_LINK_FLAG_EEE_100BASET;
+ if (tb[SWITCH_LINK_FLAG_EEE_1000BASET])
+ link->eee |= SWLIB_LINK_FLAG_EEE_1000BASET;
+
+out:
+ return err;
+}
+
+static int
store_val(struct nl_msg *msg, void *arg)
{
struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
@@ -221,6 +261,8 @@ store_val(struct nl_msg *msg, void *arg)
val->value.s =
strdup(nla_get_string(tb[SWITCH_ATTR_OP_VALUE_STR]));
else if (tb[SWITCH_ATTR_OP_VALUE_PORTS])
val->err = store_port_val(msg, tb[SWITCH_ATTR_OP_VALUE_PORTS],
val);
+ else if (tb[SWITCH_ATTR_OP_VALUE_LINK])
+ val->err = store_link_val(msg, tb[SWITCH_ATTR_OP_VALUE_LINK],
val);
val->err = 0;
return 0;
diff --git a/p
[OpenWrt-Devel] [PATCH V2 1/3] swconfig: add SWITCH_TYPE_LINK and support sending link info to user space
So far we were sending link data as a string. It got some drawbacks:
1) Didn't allow writing clean user space apps reading link state. It was
needed to do some screen scraping.
2) Forced whole PORT_LINK communication to be string based. Adding
support for *setting* port link required passing string and parting
it in the kernel space.
Signed-off-by: Rafał Miłecki
---
V2:
* Rename SWITCH_LINK_* enums
* Use nla_put_flag for boolean values
---
.../linux/generic/files/drivers/net/phy/swconfig.c | 56 ++
target/linux/generic/files/include/linux/switch.h | 2 +
.../generic/files/include/uapi/linux/switch.h | 16 +++
3 files changed, 74 insertions(+)
diff --git a/target/linux/generic/files/drivers/net/phy/swconfig.c
b/target/linux/generic/files/drivers/net/phy/swconfig.c
index 6bb3be1..ef218bd 100644
--- a/target/linux/generic/files/drivers/net/phy/swconfig.c
+++ b/target/linux/generic/files/drivers/net/phy/swconfig.c
@@ -771,6 +771,53 @@ done:
}
static int
+swconfig_send_link(struct sk_buff *msg, struct genl_info *info, int attr,
+ const struct switch_port_link *link)
+{
+ struct nlattr *p = NULL;
+ int err = 0;
+
+ p = nla_nest_start(msg, attr);
+ if (link->link) {
+ if (nla_put_flag(msg, SWITCH_LINK_FLAG_LINK))
+ goto nla_put_failure;
+ }
+ if (link->duplex) {
+ if (nla_put_flag(msg, SWITCH_LINK_FLAG_DUPLEX))
+ goto nla_put_failure;
+ }
+ if (link->aneg) {
+ if (nla_put_flag(msg, SWITCH_LINK_FLAG_ANEG))
+ goto nla_put_failure;
+ }
+ if (link->tx_flow) {
+ if (nla_put_flag(msg, SWITCH_LINK_FLAG_TX_FLOW))
+ goto nla_put_failure;
+ }
+ if (link->rx_flow) {
+ if (nla_put_flag(msg, SWITCH_LINK_FLAG_RX_FLOW))
+ goto nla_put_failure;
+ }
+ if (nla_put_u32(msg, SWITCH_LINK_SPEED, link->speed))
+ goto nla_put_failure;
+ if (link->eee & ADVERTISED_100baseT_Full) {
+ if (nla_put_flag(msg, SWITCH_LINK_FLAG_EEE_100BASET))
+ goto nla_put_failure;
+ }
+ if (link->eee & ADVERTISED_1000baseT_Full) {
+ if (nla_put_flag(msg, SWITCH_LINK_FLAG_EEE_1000BASET))
+ goto nla_put_failure;
+ }
+ nla_nest_end(msg, p);
+
+ return err;
+
+nla_put_failure:
+ nla_nest_cancel(msg, p);
+ return -1;
+}
+
+static int
swconfig_get_attr(struct sk_buff *skb, struct genl_info *info)
{
struct genlmsghdr *hdr = nlmsg_data(info->nlhdr);
@@ -794,6 +841,9 @@ swconfig_get_attr(struct sk_buff *skb, struct genl_info
*info)
val.value.ports = dev->portbuf;
memset(dev->portbuf, 0,
sizeof(struct switch_port) * dev->ports);
+ } else if (attr->type == SWITCH_TYPE_LINK) {
+ val.value.link = &dev->linkbuf;
+ memset(&dev->linkbuf, 0, sizeof(struct switch_port_link));
}
err = attr->get(dev, attr, &val);
@@ -824,6 +874,12 @@ swconfig_get_attr(struct sk_buff *skb, struct genl_info
*info)
if (err < 0)
goto nla_put_failure;
break;
+ case SWITCH_TYPE_LINK:
+ err = swconfig_send_link(msg, info,
+SWITCH_ATTR_OP_VALUE_LINK,
val.value.link);
+ if (err < 0)
+ goto nla_put_failure;
+ break;
default:
pr_debug("invalid type in attribute\n");
err = -EINVAL;
diff --git a/target/linux/generic/files/include/linux/switch.h
b/target/linux/generic/files/include/linux/switch.h
index 4291364..eac35f9 100644
--- a/target/linux/generic/files/include/linux/switch.h
+++ b/target/linux/generic/files/include/linux/switch.h
@@ -122,6 +122,7 @@ struct switch_dev {
struct mutex sw_mutex;
struct switch_port *portbuf;
struct switch_portmap *portmap;
+ struct switch_port_link linkbuf;
char buf[128];
@@ -148,6 +149,7 @@ struct switch_val {
const char *s;
u32 i;
struct switch_port *ports;
+ struct switch_port_link *link;
} value;
};
diff --git a/target/linux/generic/files/include/uapi/linux/switch.h
b/target/linux/generic/files/include/uapi/linux/switch.h
index a59b239..c0071a4 100644
--- a/target/linux/generic/files/include/uapi/linux/switch.h
+++ b/target/linux/generic/files/include/uapi/linux/switch.h
@@ -50,6 +50,7 @@ enum {
SWITCH_ATTR_OP_VALUE_INT,
SWITCH_ATTR_OP_VALUE_STR,
SWITCH_ATTR_OP_VALUE_PORTS,
+ SWITCH_ATTR_OP_VALUE_LINK,
SWITCH_ATTR_OP_DESCRIPTION,
/* port lists */
SWITCH_ATTR_PORT,
@@ -86,6 +87,7 @@ enum switch_val_type {
SWITCH_TYPE_INT
[OpenWrt-Devel] [PATCH V2 3/3] swconfig: switch kernel PORT_LINK support to SWITCH_TYPE_LINK
As explained earlier, using SWITCH_TYPE_LINK gives more flexibility,
it doesn't require e.g. string parsing to read some data.
Signed-off-by: Rafał Miłecki
---
.../linux/generic/files/drivers/net/phy/swconfig.c | 51 ++
1 file changed, 4 insertions(+), 47 deletions(-)
diff --git a/target/linux/generic/files/drivers/net/phy/swconfig.c
b/target/linux/generic/files/drivers/net/phy/swconfig.c
index ef218bd..07efda0 100644
--- a/target/linux/generic/files/drivers/net/phy/swconfig.c
+++ b/target/linux/generic/files/drivers/net/phy/swconfig.c
@@ -127,30 +127,11 @@ swconfig_get_pvid(struct switch_dev *dev, const struct
switch_attr *attr,
return dev->ops->get_port_pvid(dev, val->port_vlan, &val->value.i);
}
-static const char *
-swconfig_speed_str(enum switch_port_speed speed)
-{
- switch (speed) {
- case SWITCH_PORT_SPEED_10:
- return "10baseT";
- case SWITCH_PORT_SPEED_100:
- return "100baseT";
- case SWITCH_PORT_SPEED_1000:
- return "1000baseT";
- default:
- break;
- }
-
- return "unknown";
-}
-
static int
swconfig_get_link(struct switch_dev *dev, const struct switch_attr *attr,
struct switch_val *val)
{
- struct switch_port_link link;
- int len;
- int ret;
+ struct switch_port_link *link = val->value.link;
if (val->port_vlan >= dev->ports)
return -EINVAL;
@@ -158,32 +139,8 @@ swconfig_get_link(struct switch_dev *dev, const struct
switch_attr *attr,
if (!dev->ops->get_port_link)
return -EOPNOTSUPP;
- memset(&link, 0, sizeof(link));
- ret = dev->ops->get_port_link(dev, val->port_vlan, &link);
- if (ret)
- return ret;
-
- memset(dev->buf, 0, sizeof(dev->buf));
-
- if (link.link)
- len = snprintf(dev->buf, sizeof(dev->buf),
- "port:%d link:up speed:%s %s-duplex %s%s%s%s%s",
- val->port_vlan,
- swconfig_speed_str(link.speed),
- link.duplex ? "full" : "half",
- link.tx_flow ? "txflow " : "",
- link.rx_flow ? "rxflow " : "",
- link.eee & ADVERTISED_100baseT_Full ? "eee100 "
: "",
- link.eee & ADVERTISED_1000baseT_Full ? "eee1000
" : "",
- link.aneg ? "auto" : "");
- else
- len = snprintf(dev->buf, sizeof(dev->buf), "port:%d link:down",
- val->port_vlan);
-
- val->value.s = dev->buf;
- val->len = len;
-
- return 0;
+ memset(link, 0, sizeof(*link));
+ return dev->ops->get_port_link(dev, val->port_vlan, link);
}
static int
@@ -246,7 +203,7 @@ static struct switch_attr default_port[] = {
.get = swconfig_get_pvid,
},
[PORT_LINK] = {
- .type = SWITCH_TYPE_STRING,
+ .type = SWITCH_TYPE_LINK,
.name = "link",
.description = "Get port link information",
.set = NULL,
--
1.8.4.5
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 10/10] imx6: Move to 4.3 kernel
Signed-off-by: Pushpal Sidhu --- target/linux/imx6/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/imx6/Makefile b/target/linux/imx6/Makefile index cd938c8..deea5d9 100644 --- a/target/linux/imx6/Makefile +++ b/target/linux/imx6/Makefile @@ -14,7 +14,7 @@ CPU_TYPE:=cortex-a9 CPU_SUBTYPE:=neon MAINTAINER:=Luka Perkov -KERNEL_PATCHVER:=4.1 +KERNEL_PATCHVER:=4.3 include $(INCLUDE_DIR)/target.mk -- 2.6.4 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 09/10] imx6: fix device-tree mac address assignment for ventana sky2/eth1
Some Ventana boards have a Marvell sky2 GigE controller as eth1 however
assigning the mac address through device-tree is difficult because the
PCI slot can move around depending on board configuration and slot population.
To work around this we add a patch to the sky2 driver to allow accessing its
mac address via a device-tree alias.
Signed-off-by: Tim Harvey
Signed-off-by: Pushpal Sidhu
---
.../208-sky2-allow-mac-to-come-from-dt.patch | 30 ++
.../209-ARM-imx-ventana-add-sky2-alias.patch | 24 +
2 files changed, 54 insertions(+)
create mode 100644
target/linux/imx6/patches-4.3/208-sky2-allow-mac-to-come-from-dt.patch
create mode 100644
target/linux/imx6/patches-4.3/209-ARM-imx-ventana-add-sky2-alias.patch
diff --git
a/target/linux/imx6/patches-4.3/208-sky2-allow-mac-to-come-from-dt.patch
b/target/linux/imx6/patches-4.3/208-sky2-allow-mac-to-come-from-dt.patch
new file mode 100644
index 000..7a29846
--- /dev/null
+++ b/target/linux/imx6/patches-4.3/208-sky2-allow-mac-to-come-from-dt.patch
@@ -0,0 +1,30 @@
+Index: linux-4.3/drivers/net/ethernet/marvell/sky2.c
+===
+--- linux-4.3.orig/drivers/net/ethernet/marvell/sky2.c 2015-11-01
16:05:25.0 -0800
linux-4.3/drivers/net/ethernet/marvell/sky2.c 2015-12-18
10:39:44.983158318 -0800
+@@ -4812,7 +4812,24 @@
+* 1) from device tree data
+* 2) from internal registers set by bootloader
+*/
+- iap = of_get_mac_address(hw->pdev->dev.of_node);
++
++ iap = NULL;
++ if (IS_ENABLED(CONFIG_OF)) {
++ struct device_node *np;
++ np = of_find_node_by_path("/aliases");
++ if (np) {
++ const char *path = of_get_property(np, "sky2", NULL);
++ if (path)
++ np = of_find_node_by_path(path);
++ if (np)
++ path = of_get_mac_address(np);
++ if (path)
++ iap = (unsigned char *) path;
++ }
++ }
++
++ if (!iap)
++ iap = of_get_mac_address(hw->pdev->dev.of_node);
+ if (iap)
+ memcpy(dev->dev_addr, iap, ETH_ALEN);
+ else
diff --git
a/target/linux/imx6/patches-4.3/209-ARM-imx-ventana-add-sky2-alias.patch
b/target/linux/imx6/patches-4.3/209-ARM-imx-ventana-add-sky2-alias.patch
new file mode 100644
index 000..7377ce3
--- /dev/null
+++ b/target/linux/imx6/patches-4.3/209-ARM-imx-ventana-add-sky2-alias.patch
@@ -0,0 +1,24 @@
+Index: linux-4.3/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
+===
+--- linux-4.3.orig/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi 2015-12-18
10:39:44.959158318 -0800
linux-4.3/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi2015-12-18
10:43:21.0 -0800
+@@ -15,6 +15,7 @@
+ /* these are used by bootloader for disabling nodes */
+ aliases {
+ ethernet1 = ð1;
++ sky2 = ð1;
+ led0 = &led0;
+ led1 = &led1;
+ led2 = &led2;
+Index: linux-4.3/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
+===
+--- linux-4.3.orig/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi 2015-12-18
10:39:44.959158318 -0800
linux-4.3/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi2015-12-18
10:43:21.0 -0800
+@@ -15,6 +15,7 @@
+ /* these are used by bootloader for disabling nodes */
+ aliases {
+ ethernet1 = ð1;
++ sky2 = ð1;
+ led0 = &led0;
+ led1 = &led1;
+ led2 = &led2;
--
2.6.4
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 08/10] imx6: add i2c retries for Ventana /dev/i2c-0
On Ventana boards the Gateworks System Controller is the only device on I2C1
(/dev/i2c-0) and it can NAK transfers if it is busy in an ADC loop. Because
this is a multi-function device with several slave addresses it is best to
add retries at the controller level instead of within each slave driver. This
adds a patch that adds 3 retries for i2c transactions only for Ventana boards
and only for I2C1
Signed-off-by: Tim Harvey
Signed-off-by: Pushpal Sidhu
---
...x-add-retries-for-NAK-s-on-ventana-boards.patch | 24 ++
1 file changed, 24 insertions(+)
create mode 100644
target/linux/imx6/patches-4.3/207-i2c-imx-add-retries-for-NAK-s-on-ventana-boards.patch
diff --git
a/target/linux/imx6/patches-4.3/207-i2c-imx-add-retries-for-NAK-s-on-ventana-boards.patch
b/target/linux/imx6/patches-4.3/207-i2c-imx-add-retries-for-NAK-s-on-ventana-boards.patch
new file mode 100644
index 000..bfb5707
--- /dev/null
+++
b/target/linux/imx6/patches-4.3/207-i2c-imx-add-retries-for-NAK-s-on-ventana-boards.patch
@@ -0,0 +1,24 @@
+Index: linux-4.3/drivers/i2c/busses/i2c-imx.c
+===
+--- linux-4.3.orig/drivers/i2c/busses/i2c-imx.c2015-11-01
16:05:25.0 -0800
linux-4.3/drivers/i2c/busses/i2c-imx.c 2015-12-18 10:39:44.971158318
-0800
+@@ -461,6 +461,8 @@
+ {
+ if (imx_i2c_read_reg(i2c_imx, IMX_I2C_I2SR) & I2SR_RXAK) {
+ dev_dbg(&i2c_imx->adapter.dev, "<%s> No ACK\n", __func__);
++ if (i2c_imx->adapter.retries)
++ return -EAGAIN;
+ return -EIO; /* No ACK */
+ }
+
+@@ -1010,6 +1012,10 @@
+ i2c_imx->adapter.nr = pdev->id;
+ i2c_imx->adapter.dev.of_node= pdev->dev.of_node;
+ i2c_imx->base = base;
++ if (of_machine_is_compatible("gw,ventana") && phy_addr == 0x021a) {
++ dev_info(&pdev->dev, "Adding retries for Ventana GSC\n");
++ i2c_imx->adapter.retries = 3;
++ }
+
+ /* Get I2C clock */
+ i2c_imx->clk = devm_clk_get(&pdev->dev, NULL);
--
2.6.4
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 07/10] imx6: imx: thermal: use CPU temperature grade info for thresholds
This is a backport of a2291badc355d58ead5c19ae0609468947416040 from thermal-soc
accepted upstream.
The IMX6Q/IMX6DL SoC's have a 2-bit temperature grade stored in OTP. Instead
of assuming 85C for passive cooling threshold and 100C for critical base
these thresholds off the thermal gade max CPU temperature:
- passive threshold: max - 10C
- critical threshold: max - 5C
Signed-off-by: Tim Harvey
---
...l-use-cpu-temperature-grade-info-for-thresholds | 114 +
1 file changed, 114 insertions(+)
create mode 100644
target/linux/imx6/patches-4.3/045-imx-thermal-use-cpu-temperature-grade-info-for-thresholds
diff --git
a/target/linux/imx6/patches-4.3/045-imx-thermal-use-cpu-temperature-grade-info-for-thresholds
b/target/linux/imx6/patches-4.3/045-imx-thermal-use-cpu-temperature-grade-info-for-thresholds
new file mode 100644
index 000..9552477
--- /dev/null
+++
b/target/linux/imx6/patches-4.3/045-imx-thermal-use-cpu-temperature-grade-info-for-thresholds
@@ -0,0 +1,114 @@
+Index: linux-4.3/drivers/thermal/imx_thermal.c
+===
+--- linux-4.3.orig/drivers/thermal/imx_thermal.c 2015-11-01
16:05:25.0 -0800
linux-4.3/drivers/thermal/imx_thermal.c2015-12-18 10:39:44.915158318
-0800
+@@ -55,6 +55,7 @@
+ #define TEMPSENSE2_PANIC_VALUE_SHIFT 16
+ #define TEMPSENSE2_PANIC_VALUE_MASK 0xfff
+
++#define OCOTP_MEM00x0480
+ #define OCOTP_ANA10x04e0
+
+ /* The driver supports 1 passive trip point and 1 critical trip point */
+@@ -64,12 +65,6 @@
+ IMX_TRIP_NUM,
+ };
+
+-/*
+- * It defines the temperature in millicelsius for passive trip point
+- * that will trigger cooling action when crossed.
+- */
+-#define IMX_TEMP_PASSIVE 85000
+-
+ #define IMX_POLLING_DELAY 2000 /* millisecond */
+ #define IMX_PASSIVE_DELAY 1000
+
+@@ -100,12 +95,14 @@
+ u32 c1, c2; /* See formula in imx_get_sensor_data() */
+ int temp_passive;
+ int temp_critical;
++ unsigned long temp_max;
+ int alarm_temp;
+ int last_temp;
+ bool irq_enabled;
+ int irq;
+ struct clk *thermal_clk;
+ const struct thermal_soc_data *socdata;
++ const char *temp_grade;
+ };
+
+ static void imx_set_panic_temp(struct imx_thermal_data *data,
+@@ -285,10 +282,12 @@
+ {
+ struct imx_thermal_data *data = tz->devdata;
+
++ /* do not allow changing critical threshold */
+ if (trip == IMX_TRIP_CRITICAL)
+ return -EPERM;
+
+- if (temp > IMX_TEMP_PASSIVE)
++ /* do not allow passive to be set higher than critical */
++ if (temp < 0 || temp > data->temp_critical)
+ return -EINVAL;
+
+ data->temp_passive = temp;
+@@ -404,17 +403,39 @@
+ data->c1 = temp64;
+ data->c2 = n1 * data->c1 + 1000 * t1;
+
+- /*
+- * Set the default passive cooling trip point,
+- * can be changed from userspace.
+- */
+- data->temp_passive = IMX_TEMP_PASSIVE;
++ /* use OTP for thermal grade */
++ ret = regmap_read(map, OCOTP_MEM0, &val);
++ if (ret) {
++ dev_err(&pdev->dev, "failed to read temp grade: %d\n", ret);
++ return ret;
++ }
++
++ /* The maximum die temp is specified by the Temperature Grade */
++ switch ((val >> 6) & 0x3) {
++ case 0: /* Commercial (0 to 95C) */
++ data->temp_grade = "Commercial";
++ data->temp_max = 95000;
++ break;
++ case 1: /* Extended Commercial (-20 to 105C) */
++ data->temp_grade = "Extended Commercial";
++ data->temp_max = 105000;
++ break;
++ case 2: /* Industrial (-40 to 105C) */
++ data->temp_grade = "Industrial";
++ data->temp_max = 105000;
++ break;
++ case 3: /* Automotive (-40 to 125C) */
++ data->temp_grade = "Automotive";
++ data->temp_max = 125000;
++ break;
++ }
+
+ /*
+- * The maximum die temperature set to 20 C higher than
+- * IMX_TEMP_PASSIVE.
++ * Set the critical trip point at 5C under max
++ * Set the passive trip point at 10C under max (can change via sysfs)
+*/
+- data->temp_critical = 1000 * 20 + data->temp_passive;
++ data->temp_critical = data->temp_max - (1000 * 5);
++ data->temp_passive = data->temp_max - (1000 * 10);
+
+ return 0;
+ }
+@@ -559,6 +580,11 @@
+ return ret;
+ }
+
++ dev_info(&pdev->dev, "%s CPU temperature grade - max:%ldC"
++ " critical:%ldC passive:%ldC\n", data->temp_grade,
++ data->temp_max / 1000, data->temp_critical / 1000,
++ data->temp_passive / 1000);
++
+ /* Enable measurements at ~ 10 Hz */
+ regmap_write(map, TEMPSENSE1 + REG_CLR, TEMPSENSE1_MEASURE_FREQ);
+ measure_freq = DIV
[OpenWrt-Devel] [PATCH 05/10] imx6: add RS485 gpio-based txen support
Signed-off-by: Tim Harvey
---
.../300-imx-serial-rs485-gpio-txen-support.patch | 186 +
...1-imx-ventana-add-rs485-txen-gpio-support.patch | 60 +++
2 files changed, 246 insertions(+)
create mode 100644
target/linux/imx6/patches-4.3/300-imx-serial-rs485-gpio-txen-support.patch
create mode 100644
target/linux/imx6/patches-4.3/301-imx-ventana-add-rs485-txen-gpio-support.patch
diff --git
a/target/linux/imx6/patches-4.3/300-imx-serial-rs485-gpio-txen-support.patch
b/target/linux/imx6/patches-4.3/300-imx-serial-rs485-gpio-txen-support.patch
new file mode 100644
index 000..156cdd6
--- /dev/null
+++ b/target/linux/imx6/patches-4.3/300-imx-serial-rs485-gpio-txen-support.patch
@@ -0,0 +1,186 @@
+Index: linux-4.3/Documentation/devicetree/bindings/serial/fsl-imx-uart.txt
+===
+--- linux-4.3.orig/Documentation/devicetree/bindings/serial/fsl-imx-uart.txt
2015-11-01 16:05:25.0 -0800
linux-4.3/Documentation/devicetree/bindings/serial/fsl-imx-uart.txt
2015-12-18 10:39:45.103158319 -0800
+@@ -6,6 +6,7 @@
+ - interrupts : Should contain uart interrupt
+
+ Optional properties:
++- fsl,rs485-gpio-txen : Indicate a GPIO is used as TXEN instead of RTS
+ - fsl,uart-has-rtscts : Indicate the uart has rts and cts
+ - fsl,irda-mode : Indicate the uart supports irda mode
+ - fsl,dte-mode : Indicate the uart works in DTE mode. The uart works
+Index: linux-4.3/drivers/tty/serial/imx.c
+===
+--- linux-4.3.orig/drivers/tty/serial/imx.c2015-11-01 16:05:25.0
-0800
linux-4.3/drivers/tty/serial/imx.c 2015-12-18 10:39:45.103158319 -0800
+@@ -21,6 +21,7 @@
+ #define SUPPORT_SYSRQ
+ #endif
+
++#include
+ #include
+ #include
+ #include
+@@ -37,6 +38,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+ #include
+
+@@ -203,6 +205,7 @@
+ unsigned short trcv_delay; /* transceiver delay */
+ struct clk *clk_ipg;
+ struct clk *clk_per;
++ int txen_gpio;
+ const struct imx_uart_data *devdata;
+
+ /* DMA fields */
+@@ -373,13 +376,21 @@
+ /* in rs485 mode disable transmitter if shifter is empty */
+ if (port->rs485.flags & SER_RS485_ENABLED &&
+ readl(port->membase + USR2) & USR2_TXDC) {
+- temp = readl(port->membase + UCR2);
+- if (port->rs485.flags & SER_RS485_RTS_AFTER_SEND)
+- temp &= ~UCR2_CTS;
+- else
+- temp |= UCR2_CTS;
+- writel(temp, port->membase + UCR2);
++ if (sport->txen_gpio != -1) {
++ if (port->rs485.flags & SER_RS485_RTS_AFTER_SEND)
++ gpio_set_value(sport->txen_gpio, 1);
++ else
++ gpio_set_value(sport->txen_gpio, 0);
++ } else {
++ temp = readl(port->membase + UCR2);
++ if (port->rs485.flags & SER_RS485_RTS_AFTER_SEND)
++ temp &= ~UCR2_CTS;
++ else
++ temp |= UCR2_CTS;
++ writel(temp, port->membase + UCR2);
++ }
+
++ /* disable shifter empty irq */
+ temp = readl(port->membase + UCR4);
+ temp &= ~UCR4_TCEN;
+ writel(temp, port->membase + UCR4);
+@@ -578,14 +589,22 @@
+ unsigned long temp;
+
+ if (port->rs485.flags & SER_RS485_ENABLED) {
+- /* enable transmitter and shifter empty irq */
+- temp = readl(port->membase + UCR2);
+- if (port->rs485.flags & SER_RS485_RTS_ON_SEND)
+- temp &= ~UCR2_CTS;
+- else
+- temp |= UCR2_CTS;
+- writel(temp, port->membase + UCR2);
++ /* enable transmitter */
++ if (sport->txen_gpio != -1) {
++ if (port->rs485.flags & SER_RS485_RTS_ON_SEND)
++ gpio_set_value(sport->txen_gpio, 1);
++ else
++ gpio_set_value(sport->txen_gpio, 0);
++ } else {
++ temp = readl(port->membase + UCR2);
++ if (port->rs485.flags & SER_RS485_RTS_ON_SEND)
++ temp &= ~UCR2_CTS;
++ else
++ temp |= UCR2_CTS;
++ writel(temp, port->membase + UCR2);
++ }
+
++ /* enable shifter empty irq */
+ temp = readl(port->membase + UCR4);
+ temp |= UCR4_TCEN;
+ writel(temp, port->membase + UCR4);
+@@ -1303,7 +1322,9 @@
+ if (sport->have_rtscts) {
+ ucr2 &= ~UCR2_IRTS;
+
+-
[OpenWrt-Devel] [PATCH 06/10] imx6: Add pwm nodes
Upstream status: Accepted
Signed-off-by: Pushpal Sidhu
---
.../040-ARM-dts-imx-ventana-add-pwm-nodes.patch| 276 +
1 file changed, 276 insertions(+)
create mode 100644
target/linux/imx6/patches-4.3/040-ARM-dts-imx-ventana-add-pwm-nodes.patch
diff --git
a/target/linux/imx6/patches-4.3/040-ARM-dts-imx-ventana-add-pwm-nodes.patch
b/target/linux/imx6/patches-4.3/040-ARM-dts-imx-ventana-add-pwm-nodes.patch
new file mode 100644
index 000..221d950
--- /dev/null
+++ b/target/linux/imx6/patches-4.3/040-ARM-dts-imx-ventana-add-pwm-nodes.patch
@@ -0,0 +1,276 @@
+Index: linux-4.3/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi
+===
+--- linux-4.3.orig/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi 2015-11-01
16:05:25.0 -0800
linux-4.3/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi2015-12-18
10:43:27.0 -0800
+@@ -174,6 +174,24 @@
+ status = "okay";
+ };
+
++&pwm2 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_pwm2>; /* MX6_DIO1 */
++ status = "disabled";
++};
++
++&pwm3 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_pwm3>; /* MX6_DIO2 */
++ status = "disabled";
++};
++
++&pwm4 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_pwm4>; /* MX6_DIO3 */
++ status = "disabled";
++};
++
+ &uart1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_uart1>;
+@@ -294,6 +312,24 @@
+ >;
+ };
+
++ pinctrl_pwm2: pwm2grp {
++ fsl,pins = <
++ MX6QDL_PAD_SD1_DAT2__PWM2_OUT 0x1b0b1
++ >;
++ };
++
++ pinctrl_pwm3: pwm3grp {
++ fsl,pins = <
++ MX6QDL_PAD_SD4_DAT1__PWM3_OUT 0x1b0b1
++ >;
++ };
++
++ pinctrl_pwm4: pwm4grp {
++ fsl,pins = <
++ MX6QDL_PAD_SD4_DAT2__PWM4_OUT 0x1b0b1
++ >;
++ };
++
+ pinctrl_uart1: uart1grp {
+ fsl,pins = <
+ MX6QDL_PAD_SD3_DAT7__UART1_TX_DATA 0x1b0b1
+Index: linux-4.3/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
+===
+--- linux-4.3.orig/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi 2015-12-18
10:39:44.883158318 -0800
linux-4.3/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi2015-12-18
10:43:31.0 -0800
+@@ -282,6 +282,18 @@
+ status = "okay";
+ };
+
++&pwm2 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_pwm2>; /* MX6_DIO1 */
++ status = "disabled";
++};
++
++&pwm3 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_pwm3>; /* MX6_DIO2 */
++ status = "disabled";
++};
++
+ &pwm4 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_pwm4>;
+@@ -436,6 +448,18 @@
+ >;
+ };
+
++ pinctrl_pwm2: pwm2grp {
++ fsl,pins = <
++ MX6QDL_PAD_SD1_DAT2__PWM2_OUT 0x1b0b1
++ >;
++ };
++
++ pinctrl_pwm3: pwm3grp {
++ fsl,pins = <
++ MX6QDL_PAD_SD4_DAT1__PWM3_OUT 0x1b0b1
++ >;
++ };
++
+ pinctrl_pwm4: pwm4grp {
+ fsl,pins = <
+ MX6QDL_PAD_SD1_CMD__PWM4_OUT0x1b0b1
+Index: linux-4.3/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
+===
+--- linux-4.3.orig/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi 2015-12-18
10:39:44.883158318 -0800
linux-4.3/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi2015-12-18
10:43:27.0 -0800
+@@ -287,6 +287,18 @@
+ };
+ };
+
++&pwm2 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_pwm2>; /* MX6_DIO1 */
++ status = "disabled";
++};
++
++&pwm3 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_pwm3>; /* MX6_DIO2 */
++ status = "disabled";
++};
++
+ &pwm4 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_pwm4>;
+@@ -442,6 +454,18 @@
+ >;
+ };
+
++ pinctrl_pwm2: pwm2grp {
++ fsl,pins = <
++ MX6QDL_PAD_SD1_DAT2__PWM2_OUT 0x1b0b1
++ >;
++ };
++
++ pinctrl_pwm3: pwm3grp {
++ fsl,pins = <
++ MX6QDL_PAD_SD4_DAT1__PWM3_OUT 0x1b0b1
++ >;
++ };
++
+ pinctrl_pwm4: pwm4grp {
+ fsl,pins = <
+ MX6QDL_PAD_SD1_CMD__PWM4_OUT
[OpenWrt-Devel] [PATCH 04/10] imx6: Add gen2 disable patch
Disable pcie-gen2 in this kernel as the products meant to run it do not fall within specification for it. Instead, leave only Gen1 enabled. Signed-off-by: Tim Harvey Signed-off-by: Pushpal Sidhu --- .../linux/imx6/patches-4.3/210-disable_gen2.patch | 30 ++ 1 file changed, 30 insertions(+) create mode 100644 target/linux/imx6/patches-4.3/210-disable_gen2.patch diff --git a/target/linux/imx6/patches-4.3/210-disable_gen2.patch b/target/linux/imx6/patches-4.3/210-disable_gen2.patch new file mode 100644 index 000..8b3a010 --- /dev/null +++ b/target/linux/imx6/patches-4.3/210-disable_gen2.patch @@ -0,0 +1,30 @@ +Index: linux-4.3/drivers/pci/host/pci-imx6.c +=== +--- linux-4.3.orig/drivers/pci/host/pci-imx6.c 2015-11-01 16:05:25.0 -0800 linux-4.3/drivers/pci/host/pci-imx6.c 2015-12-18 10:39:45.015158318 -0800 +@@ -392,12 +392,15 @@ + if (ret) + return ret; + ++#if 0 /* Disable Gen2 */ + /* Allow Gen2 mode after the link is up. */ + tmp = readl(pp->dbi_base + PCIE_RC_LCR); + tmp &= ~PCIE_RC_LCR_MAX_LINK_SPEEDS_MASK; + tmp |= PCIE_RC_LCR_MAX_LINK_SPEEDS_GEN2; + writel(tmp, pp->dbi_base + PCIE_RC_LCR); +- ++#else ++ dev_info(pp->dev, "Link: Gen2 disabled\n"); ++#endif + /* +* Start Directed Speed Change so the best possible speed both link +* partners support can be negotiated. +@@ -420,7 +423,7 @@ + } + + tmp = readl(pp->dbi_base + PCIE_RC_LCSR); +- dev_dbg(pp->dev, "Link up, Gen=%i\n", (tmp >> 16) & 0xf); ++ dev_info(pp->dev, "Link up, Gen=%i\n", (tmp >> 16) & 0xf); + return 0; + } + -- 2.6.4 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 03/10] imx6: ventana: add ecspi3 host controller for GW52xx
Certain board revisions of the GW52xx support an SPI host controller with
a single chip-select going to an off board connector.
Signed-off-by: Tim Harvey
Signed-off-by: Pushpal Sidhu
---
...ts-imx-ventana-add-spi-support-for-gw52xx.patch | 35 ++
1 file changed, 35 insertions(+)
create mode 100644
target/linux/imx6/patches-4.3/041-ARM-dts-imx-ventana-add-spi-support-for-gw52xx.patch
diff --git
a/target/linux/imx6/patches-4.3/041-ARM-dts-imx-ventana-add-spi-support-for-gw52xx.patch
b/target/linux/imx6/patches-4.3/041-ARM-dts-imx-ventana-add-spi-support-for-gw52xx.patch
new file mode 100644
index 000..a0fb48e
--- /dev/null
+++
b/target/linux/imx6/patches-4.3/041-ARM-dts-imx-ventana-add-spi-support-for-gw52xx.patch
@@ -0,0 +1,35 @@
+Index: linux-4.3/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
+===
+--- linux-4.3.orig/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi 2015-12-18
10:39:44.899158318 -0800
linux-4.3/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi2015-12-18
10:43:27.0 -0800
+@@ -158,6 +158,14 @@
+ <&clks IMX6QDL_CLK_PLL3_USB_OTG>;
+ };
+
++&ecspi3 {
++ fsl,spi-num-chipselects = <1>;
++ cs-gpios = <&gpio4 24 GPIO_ACTIVE_HIGH>;
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_ecspi3>;
++ status = "okay";
++};
++
+ &fec {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_enet>;
+@@ -357,6 +365,15 @@
+ >;
+ };
+
++ pinctrl_ecspi3: escpi3grp {
++ fsl,pins = <
++ MX6QDL_PAD_DISP0_DAT0__ECSPI3_SCLK 0x100b1
++ MX6QDL_PAD_DISP0_DAT1__ECSPI3_MOSI 0x100b1
++ MX6QDL_PAD_DISP0_DAT2__ECSPI3_MISO 0x100b1
++ MX6QDL_PAD_DISP0_DAT3__GPIO4_IO24 0x100b1
++ >;
++ };
++
+ pinctrl_enet: enetgrp {
+ fsl,pins = <
+ MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b0b0
--
2.6.4
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 02/10] imx6: Add 4.3 support
Build and boot tested on the following hardware: * GW54xx * GW53xx * GW52xx * GW51xx * GW552x * GW551x Signed-off-by: Pushpal Sidhu --- target/linux/imx6/config-4.3 | 410 .../linux/imx6/files-4.3/drivers/net/phy/gw16083.c | 1046 .../linux/imx6/files-4.3/drivers/net/phy/gw16083.h | 123 +++ ...-ventana-set-GW54xx-PMIC-swbst-regulator-.patch | 28 + ...mx-ventana-fix-GW53xx-GW54xx-lvds-channel.patch | 37 + ...mx-ventana-fix-GW53xx-GW54xx-lvds-channel.patch | 76 ++ target/linux/imx6/patches-4.3/100-bootargs.patch | 13 + ...-add-i210-i211-support-for-phy-read-write.patch | 131 +++ ...-phy-read-write-functions-that-accept-phy.patch | 266 + ...egister-mii_bus-for-SerDes-w-external-phy.patch | 314 ++ ...ver-for-GW16083-Ethernet-Expansion-Mezzan.patch | 31 + ...-imx-ventana-added-GW16083-to-device-tree.patch | 64 ++ 12 files changed, 2539 insertions(+) create mode 100644 target/linux/imx6/config-4.3 create mode 100644 target/linux/imx6/files-4.3/drivers/net/phy/gw16083.c create mode 100644 target/linux/imx6/files-4.3/drivers/net/phy/gw16083.h create mode 100644 target/linux/imx6/patches-4.3/035-ARM-dts-imx-ventana-set-GW54xx-PMIC-swbst-regulator-.patch create mode 100644 target/linux/imx6/patches-4.3/036-ARM-dts-imx-ventana-fix-GW53xx-GW54xx-lvds-channel.patch create mode 100644 target/linux/imx6/patches-4.3/037-ARM-dts-imx-ventana-fix-GW53xx-GW54xx-lvds-channel.patch create mode 100644 target/linux/imx6/patches-4.3/100-bootargs.patch create mode 100644 target/linux/imx6/patches-4.3/202-net-igb-add-i210-i211-support-for-phy-read-write.patch create mode 100644 target/linux/imx6/patches-4.3/203-net-igb-add-phy-read-write-functions-that-accept-phy.patch create mode 100644 target/linux/imx6/patches-4.3/204-net-igb-register-mii_bus-for-SerDes-w-external-phy.patch create mode 100644 target/linux/imx6/patches-4.3/205-phy-add-driver-for-GW16083-Ethernet-Expansion-Mezzan.patch create mode 100644 target/linux/imx6/patches-4.3/206-ARM-imx-ventana-added-GW16083-to-device-tree.patch diff --git a/target/linux/imx6/config-4.3 b/target/linux/imx6/config-4.3 new file mode 100644 index 000..ae4f797 --- /dev/null +++ b/target/linux/imx6/config-4.3 @@ -0,0 +1,410 @@ +CONFIG_AHCI_IMX=y +CONFIG_ALIGNMENT_TRAP=y +CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y +CONFIG_ARCH_HAS_ELF_RANDOMIZE=y +CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y +CONFIG_ARCH_HAS_RESET_CONTROLLER=y +CONFIG_ARCH_HAS_SG_CHAIN=y +CONFIG_ARCH_HAS_TICK_BROADCAST=y +CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y +CONFIG_ARCH_MULTIPLATFORM=y +# CONFIG_ARCH_MULTI_CPU_AUTO is not set +CONFIG_ARCH_MULTI_V6_V7=y +CONFIG_ARCH_MULTI_V7=y +CONFIG_ARCH_MXC=y +CONFIG_ARCH_NR_GPIO=0 +CONFIG_ARCH_REQUIRE_GPIOLIB=y +# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set +# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set +CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y +CONFIG_ARCH_SUPPORTS_UPROBES=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_ARCH_USE_BUILTIN_BSWAP=y +CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y +CONFIG_ARCH_WANT_GENERAL_HUGETLB=y +CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y +CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y +CONFIG_ARM=y +# CONFIG_ARM_BIG_LITTLE_CPUFREQ is not set +# CONFIG_ARM_CCI500_PMU is not set +# CONFIG_ARM_CPU_SUSPEND is not set +CONFIG_ARM_ERRATA_754322=y +CONFIG_ARM_ERRATA_764369=y +CONFIG_ARM_ERRATA_775420=y +CONFIG_ARM_GIC=y +CONFIG_ARM_HAS_SG_CHAIN=y +CONFIG_ARM_HEAVY_MB=y +CONFIG_ARM_IMX6Q_CPUFREQ=y +CONFIG_ARM_L1_CACHE_SHIFT=6 +CONFIG_ARM_L1_CACHE_SHIFT_6=y +# CONFIG_ARM_LPAE is not set +CONFIG_ARM_PATCH_PHYS_VIRT=y +CONFIG_ARM_PMU=y +CONFIG_ARM_THUMB=y +# CONFIG_ARM_THUMBEE is not set +CONFIG_ARM_VIRT_EXT=y +CONFIG_ATA=y +CONFIG_ATAGS=y +# CONFIG_ATA_SFF is not set +CONFIG_AUTO_ZRELADDR=y +CONFIG_CACHE_L2X0=y +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_CLKDEV_LOOKUP=y +CONFIG_CLKSRC_IMX_GPT=y +CONFIG_CLKSRC_MMIO=y +CONFIG_CLKSRC_OF=y +CONFIG_CLONE_BACKWARDS=y +CONFIG_COMMON_CLK=y +CONFIG_CPUFREQ_DT=y +CONFIG_CPU_32v6K=y +CONFIG_CPU_32v7=y +CONFIG_CPU_ABRT_EV7=y +# CONFIG_CPU_BPREDICT_DISABLE is not set +CONFIG_CPU_CACHE_V7=y +CONFIG_CPU_CACHE_VIPT=y +CONFIG_CPU_COPY_V6=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y +CONFIG_CPU_FREQ=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set +CONFIG_CPU_FREQ_GOV_COMMON=y +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=y +CONFIG_CPU_FREQ_GOV_USERSPACE=y +CONFIG_CPU_FREQ_STAT=y +CONFIG_CPU_FREQ_STAT_DETAILS=y +CONFIG_CPU_HAS_ASID=y +# CONFIG_CPU_ICACHE_DISABLE is not set +CONFIG_CPU_PABRT_V7=y +CONFIG_CPU_RMAP=y +CONFIG_CPU_THERMAL=y +CONFIG_CPU_TLB_V7=y +CONFIG_CPU_V7=y +CONFIG_CRC16=y +CONFIG_CRYPTO_CRC32C=y +CONFIG_
[OpenWrt-Devel] Update imx6 kernel
Hi, Patch series aims to cleanup the imx6 target by removing dead/unused code (3.18 files), adding 4.3 support, adding 4.3 equivalent patches for currenly submitted imx6 patches to OpenWrt (currently submitted are to the 4.1 kernel), and finally switching to the 4.3 kernel to get upstream benefits. Patch 020-ARM-dts-Gateworks-GW5510-support-i.MX6.patch was accepted in mainline and is not ported forward to 4.3. These patches were tested against the following hardware: * GW54xx * GW53xx * GW52xx * GW51xx * GW552x * GW551x Pushpal Sidhu (10): imx6: drop lingering files imx6: Add 4.3 support imx6: ventana: add ecspi3 host controller for GW52xx imx6: Add gen2 disable patch imx6: add RS485 gpio-based txen support imx6: Add pwm nodes imx6: imx: thermal: use CPU temperature grade info for thresholds imx6: add i2c retries for Ventana /dev/i2c-0 imx6: fix device-tree mac address assignment for ventana sky2/eth1 imx6: Move to 4.3 kernel target/linux/imx6/Makefile |2 +- target/linux/imx6/config-4.3 | 410 +++ target/linux/imx6/files-3.18/drivers/net/phy/gw16083.c | 949 --- target/linux/imx6/files-3.18/drivers/net/phy/gw16083.h | 123 - target/linux/imx6/files-4.3/drivers/net/phy/gw16083.c | 1046 +++ target/linux/imx6/files-4.3/drivers/net/phy/gw16083.h | 123 + .../imx6/patches-4.3/035-ARM-dts-imx-ventana-set-GW54xx-PMIC-swbst-regulator-.patch | 28 ++ .../imx6/patches-4.3/036-ARM-dts-imx-ventana-fix-GW53xx-GW54xx-lvds-channel.patch | 37 ++ .../imx6/patches-4.3/037-ARM-dts-imx-ventana-fix-GW53xx-GW54xx-lvds-channel.patch | 76 +++ target/linux/imx6/patches-4.3/040-ARM-dts-imx-ventana-add-pwm-nodes.patch | 276 +++ .../linux/imx6/patches-4.3/041-ARM-dts-imx-ventana-add-spi-support-for-gw52xx.patch | 35 ++ .../imx6/patches-4.3/045-imx-thermal-use-cpu-temperature-grade-info-for-thresholds | 114 + target/linux/imx6/patches-4.3/100-bootargs.patch | 13 + .../imx6/patches-4.3/202-net-igb-add-i210-i211-support-for-phy-read-write.patch | 131 + .../imx6/patches-4.3/203-net-igb-add-phy-read-write-functions-that-accept-phy.patch | 266 ++ .../imx6/patches-4.3/204-net-igb-register-mii_bus-for-SerDes-w-external-phy.patch | 314 .../imx6/patches-4.3/205-phy-add-driver-for-GW16083-Ethernet-Expansion-Mezzan.patch | 31 ++ .../linux/imx6/patches-4.3/206-ARM-imx-ventana-added-GW16083-to-device-tree.patch | 64 +++ .../imx6/patches-4.3/207-i2c-imx-add-retries-for-NAK-s-on-ventana-boards.patch | 24 + target/linux/imx6/patches-4.3/208-sky2-allow-mac-to-come-from-dt.patch | 30 ++ target/linux/imx6/patches-4.3/209-ARM-imx-ventana-add-sky2-alias.patch | 24 + target/linux/imx6/patches-4.3/210-disable_gen2.patch | 30 ++ target/linux/imx6/patches-4.3/300-imx-serial-rs485-gpio-txen-support.patch | 186 +++ target/linux/imx6/patches-4.3/301-imx-ventana-add-rs485-txen-gpio-support.patch | 60 +++ 24 files changed, 3319 insertions(+), 1073 deletions(-) - Pushpal ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 01/10] imx6: drop lingering files
Since 3.18 kernel support was dropped, remove lingering files.
Signed-off-by: Pushpal Sidhu
---
.../imx6/files-3.18/drivers/net/phy/gw16083.c | 949 -
.../imx6/files-3.18/drivers/net/phy/gw16083.h | 123 ---
2 files changed, 1072 deletions(-)
delete mode 100644 target/linux/imx6/files-3.18/drivers/net/phy/gw16083.c
delete mode 100644 target/linux/imx6/files-3.18/drivers/net/phy/gw16083.h
diff --git a/target/linux/imx6/files-3.18/drivers/net/phy/gw16083.c
b/target/linux/imx6/files-3.18/drivers/net/phy/gw16083.c
deleted file mode 100644
index 66b5536..000
--- a/target/linux/imx6/files-3.18/drivers/net/phy/gw16083.c
+++ /dev/null
@@ -1,949 +0,0 @@
-/*
- * drivers/net/phy/gw16083.c
- *
- * Driver for GW16083 Ventana Ethernet Expansion Mezzanine
- *
- * Author: Tim Harvey
- *
- * Copyright (c) 2014 Tim Harvey
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- *
- */
-
-/*
- * The GW16083 interfaces with a Ventana baseboard via the PCIe bus, an i2c
- * bus (i2c2), and a couple of GPIO's. On the PCIe bus is an i210 GigE with
- * its MAC connected to Port4 of a Marvell MV88E6176 7-port GigE switch via
- * MDIO and RGMII. Ports 0-3 are standard copper RJ45 but Ports 5 and 6
- * connect to Marvell MV88E dual-mode Copper/Fiber PHY's over SGMII and
- * MDIO. The PHY's have both an RG45 for copper and an SFP module.
- */
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-#include
-#include
-
-#include "gw16083.h"
-
-#undef FAIL_ON_CHECKSUM_ERR/* fail to configure SFP if checksum bad */
-#define PORT_POWER_CONTROL /* ports can be enabled/disabled via sysfs */
-#define PORT_MODE_CONTROL /* ports 5/6 can have SFP/RJ45 mode forced */
-
-MODULE_DESCRIPTION("GW16083 driver");
-MODULE_AUTHOR("Tim Harvey");
-MODULE_LICENSE("GPL");
-
-struct mv88e_port_state {
- int port;
- bool present;
- bool serdes;
- bool sfp_signal;
- bool sfp_present;
- bool sfp_compat;
- bool sfp_enabled;
- char sfp_id[64];
-};
-
-struct mv88e_priv {
- struct phy_device *phydev;
- struct i2c_client *client;
- struct mv88e_port_state port5;
- struct mv88e_port_state port6;
- struct kobject *sysfs_kobj;
-};
-
-enum {
- mode_copper = 0,
- mode_serdes = 1,
-};
-
-static struct i2c_client *gw16083_client = NULL;
-
-static int gw16083_read_port_sfp(struct i2c_client *client,
-struct mv88e_port_state *state);
-
-/* read switch port register from port0-6 */
-u16 read_switch_port(struct phy_device *pdev, int port, u8 regaddr)
-{
- return pdev->bus->read(pdev->bus, MV_BASE + port, regaddr);
-}
-
-/* write switch port register to port0-6 */
-int write_switch_port(struct phy_device *pdev, int port, u8 regaddr, u16 val)
-{
- return pdev->bus->write(pdev->bus, MV_BASE + port, regaddr, val);
-}
-
-/*
- * read_switch_port_phy - write a register for a specific port on 88E6176
- * The 88E6176 PHY registers must be accessed thorugh the Global2 address
- * using the SMI_PHY_COMMAND_REG and SMI_PHY_DATA_REG.
- */
-int read_switch_port_phy(struct phy_device *pdev, int port, u8 regaddr)
-{
- u16 reg;
- int i;
-
- dev_dbg(&pdev->dev, "read_phy: port%d reg=0x%02x\n", port, regaddr);
- reg = SMIBUSY | SMIMODE22 | SMIOP_READ;
- reg |= port << DEVADDR;
- reg |= regaddr << REGADDR;
- pdev->bus->write(pdev->bus, MV_GLOBAL2, MV_SMI_PHY_COMMAND, reg);
- for (i = 0; i < 10; i++) {
- reg = pdev->bus->read(pdev->bus, MV_GLOBAL2,
- MV_SMI_PHY_COMMAND);
- if (!(reg & (1<<15)))
- break;
- mdelay(1);
- }
- /* timeout */
- if (i == 10)
- return 0x;
- reg = pdev->bus->read(pdev->bus, MV_GLOBAL2, MV_SMI_PHY_DATA);
- return reg;
-}
-
-/*
- * write_switch_port_phy - write a register for a specific port on 88E6176
- * The 88E6176 PHY registers must be accessed thorugh the Global2 address
- * using the SMI_PHY_COMMAND_REG and SMI_PHY_DATA_REG.
- */
-int write_switch_port_phy(struct phy_device *pdev, int port, u8 addr, u16 reg)
-{
- int i;
-
- dev_dbg(&pdev->dev, "write_phy: port%d reg=0x%02x val=0x%04x\n", port,
- addr, reg);
- pdev->bus->write(pdev->bus, MV_GLOBAL2, MV_SMI_PHY_DATA, reg);
- reg = SMIBUSY | SMIMODE22 | SMIOP_WRITE;
- reg |= port << DEVADDR;
- reg |= addr << REGADDR;
- pdev->bus-
[OpenWrt-Devel] tar: write: Broken pi
OpenWRT ChaosCalmer uses busybox 1.23.2. For many tar.gz files I receive errors like: user@MR3020:~/src$ wget http://tukaani.org/xz/xz-5.2.2.tar.gz user@MR3020:~/src$ tar -xzf xz-5.2.2.tar.gz tar: invalid tar magic user@MR3020:~/src$ tar: write: Broken pipe GNU tar on Debian Jessie amd64 has no problem with the same file. Best regards Heinrich Schuchardt ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 1/1] [package] GNU Make
OpenWRT provides gcc but lacks make. So building foreign software is difficult. This patch provides GNU Make 4.1. Built on Debian Jessie amd64. Tested on TP-Link MR3020 (ar71xx/generic). Signed-off-by: Heinrich Schuchardt --- package/devel/make/Makefile | 52 + 1 file changed, 52 insertions(+) create mode 100644 package/devel/make/Makefile diff --git a/package/devel/make/Makefile b/package/devel/make/Makefile new file mode 100644 index 000..7c938bd --- /dev/null +++ b/package/devel/make/Makefile @@ -0,0 +1,52 @@ +# +# Copyright (C) 2015 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=make +PKG_VERSION:=4.1 +PKG_RELEASE:=1 + +PKG_SOURCE_URL:=@GNU/make +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_VERSION:=$(PKG_VERSION) +PKG_MD5SUM:=654f9117957e6fa6a1c49a8f08270ec9 +PKG_MAINTAINER:=Heinrich Schuchardt +PKG_LICENSE:=GPL-3.0+ + +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/make + SECTION:=devel + CATEGORY:=Development + TITLE:=make + DEPENDS:= + URL:=https://www.gnu.org/software/make/ +endef + +define Package/make/description + The Make package contains a tool to create executables from source files. +endef + +TARGET_CFLAGS += $(FPIC) -Wno-unused-value + +CONFIGURE_ARGS += \ + --host=$(REAL_GNU_TARGET_NAME) \ + --target=$(REAL_GNU_TARGET_NAME) \ + --prefix=/usr + +define Package/make/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/make $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/usr/include + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ +endef + +$(eval $(call BuildPackage,make)) -- 2.1.4 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [for-15.05] ca-certificates: update to version 20151214
update to version 20151214 Signed-off-by: Christian Schoenebeck --- package/system/ca-certificates/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/system/ca-certificates/Makefile b/package/system/ca-certificates/Makefile index 9c50fef..18af018 100644 --- a/package/system/ca-certificates/Makefile +++ b/package/system/ca-certificates/Makefile @@ -7,11 +7,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ca-certificates -PKG_VERSION:=20150426 +PKG_VERSION:=20151214 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/c/ca-certificates -PKG_MD5SUM:=717455f13fb31fd014a11a468ea3895d +PKG_MD5SUM:=2233bfa64af6f58f5eca9735b6742818 +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) PKG_INSTALL:=1 -- ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] ca-certificates: update to version 20151214
update to version 20151214 Signed-off-by: Christian Schoenebeck --- package/system/ca-certificates/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/system/ca-certificates/Makefile b/package/system/ca-certificates/Makefile index 9c50fef..18af018 100644 --- a/package/system/ca-certificates/Makefile +++ b/package/system/ca-certificates/Makefile @@ -7,11 +7,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ca-certificates -PKG_VERSION:=20150426 +PKG_VERSION:=20151214 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/c/ca-certificates -PKG_MD5SUM:=717455f13fb31fd014a11a468ea3895d +PKG_MD5SUM:=2233bfa64af6f58f5eca9735b6742818 +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) PKG_INSTALL:=1 -- ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH v2] lantiq: base-files: use vdsl per default
Hi, sorry, missed that one since I wasn't CC'ed. On Fri, Dec 11, 2015 at 10:37 AM, John Crispin wrote: > On 07/12/2015 19:59, Andre Heider wrote: >> Since r43114 adsl will be used if annex is specified, so don't. > > if r43114 changed the default behaviour then we need to fix r43114 > rather than hide the regression by deleting code. Hm, but is that really a regression? There is no annex settings in vdsl, the current behavior is just to use vdsl if the uci annex setting is empty. Sounds okay to me. Sure, it could be done another way, but still, setting annex to 'a' while using a vdsl firmware doesn't make sense. Regards, Andre ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] gcc: remove v4.6 relicts
Fixes: commit f17e56eff5b9 ("gcc: remove version 4.6, it is no longer needed")
CC: Felix Fietkau
Signed-off-by: Sedat Dilek
---
toolchain/gcc/common.mk | 10 --
1 file changed, 10 deletions(-)
diff --git a/toolchain/gcc/common.mk b/toolchain/gcc/common.mk
index 3e4f3ee984f4..648cd2d5adcf 100644
--- a/toolchain/gcc/common.mk
+++ b/toolchain/gcc/common.mk
@@ -28,9 +28,6 @@ GCC_DIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_URL:=@GNU/gcc/gcc-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-ifeq ($(PKG_VERSION),4.6.3)
- PKG_MD5SUM:=773092fe5194353b02bb0110052a972e
-endif
ifeq ($(PKG_VERSION),4.8.0)
PKG_MD5SUM:=e6040024eb9e761c3bea348d1fa5abb0
endif
@@ -40,13 +37,6 @@ endif
ifeq ($(findstring linaro, $(CONFIG_GCC_VERSION)),linaro)
LINARO_RELEASE:=
-ifeq ($(CONFIG_GCC_VERSION),"4.6-linaro")
- PKG_REV:=4.6-2013.05
- PKG_VERSION:=4.6.4
- PKG_VERSION_MAJOR:=4.6
- PKG_MD5SUM:=26b48802ae1203cd99415026fbf56ed7
- PKG_COMP:=bz2
-endif
ifeq ($(CONFIG_GCC_VERSION),"4.8-linaro")
PKG_REV:=4.8-2014.04
PKG_VERSION:=4.8.3
--
2.6.4
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] openvpn: fix configure options
- eurephia: commit: Remove the --disable-eurephia configure option - fix option name: http proxy option is now called http-proxy (see configure.ac) fixes: configure: WARNING: unrecognized options: --disable-nls, --disable-eurephia, --enable-http Signed-off-by: Dirk Neukirchen --- package/network/services/openvpn/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/network/services/openvpn/Makefile b/package/network/services/openvpn/Makefile index a1784f4..5290b0f 100644 --- a/package/network/services/openvpn/Makefile +++ b/package/network/services/openvpn/Makefile @@ -72,7 +72,6 @@ define Build/Configure --disable-systemd \ --disable-plugins \ --disable-debug \ - --disable-eurephia \ --disable-pkcs11 \ --enable-password-save \ $(if $(CONFIG_OPENVPN_$(BUILD_VARIANT)_ENABLE_LZO),--enable,--disable)-lzo \ @@ -80,7 +79,7 @@ define Build/Configure $(if $(CONFIG_OPENVPN_$(BUILD_VARIANT)_ENABLE_SERVER),--enable,--disable)-server \ $(if $(CONFIG_OPENVPN_$(BUILD_VARIANT)_ENABLE_MANAGEMENT),--enable,--disable)-management \ $(if $(CONFIG_OPENVPN_$(BUILD_VARIANT)_ENABLE_SOCKS),--enable,--disable)-socks \ - $(if $(CONFIG_OPENVPN_$(BUILD_VARIANT)_ENABLE_HTTP),--enable,--disable)-http \ + $(if $(CONFIG_OPENVPN_$(BUILD_VARIANT)_ENABLE_HTTP),--enable,--disable)-http-proxy \ $(if $(CONFIG_OPENVPN_$(BUILD_VARIANT)_ENABLE_FRAGMENT),--enable,--disable)-fragment \ $(if $(CONFIG_OPENVPN_$(BUILD_VARIANT)_ENABLE_MULTIHOME),--enable,--disable)-multihome \ $(if $(CONFIG_OPENVPN_$(BUILD_VARIANT)_ENABLE_IPROUTE2),--enable,--disable)-iproute2 \ -- 2.6.4 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] tools/e2fsprogs: remove outdated configure args
removed upstream in 1.40.5: Don't build e2fsck statically by default anymore 7e8fe327b51051adcbb0d44169b1a933173ce1ff fixes: configure: WARNING: unrecognized options: --disable-shared, --enable-static, --enable-dynamic-e2fsck Signed-off-by: Dirk Neukirchen --- tools/e2fsprogs/Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/tools/e2fsprogs/Makefile b/tools/e2fsprogs/Makefile index 0ecd952..e102759 100644 --- a/tools/e2fsprogs/Makefile +++ b/tools/e2fsprogs/Makefile @@ -22,10 +22,7 @@ include $(INCLUDE_DIR)/host-build.mk HOST_CFLAGS += $(FPIC) HOST_CONFIGURE_ARGS += \ - --disable-shared \ --disable-elf-shlibs \ - --enable-static \ - --enable-dynamic-e2fsck \ --disable-tls \ --disable-nls -- 2.6.4 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] util-linux: remove outdated configure options
removed upstream in commit: - convert mount/ to module, rename to mount-deprecated/ - build-sys: remove deprecated-mount/ fixes log warning: compile.txt:configure: WARNING: unrecognized options: --enable-new-mount Signed-off-by: Dirk Neukirchen --- package/utils/util-linux/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/package/utils/util-linux/Makefile b/package/utils/util-linux/Makefile index f037e6a..eddbc2b 100644 --- a/package/utils/util-linux/Makefile +++ b/package/utils/util-linux/Makefile @@ -37,7 +37,6 @@ endef CONFIGURE_ARGS += \ --disable-rpath \ - --enable-new-mount \ --disable-tls \ --disable-sulogin \ --without-python\ -- 2.6.4 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
