Re: [meta-arago] [meta-arago PATCH] iproute2: update recipe for prp and supervision vlan support
Denys, On 7/8/20 11:28 AM, Denys Dmytriyenko wrote: On Tue, Jul 07, 2020 at 01:44:02PM -0400, Murali Karicheri wrote: This recipe includes the patches required in iproute2 to add PRP ip link support as well as allow use of VLAN for supervision frames. What is the Upstream-status for both of these patches? RFC patch send to upstream and can be viewed at https://www.spinics.net/lists/netdev/msg650413.html Signed-off-by: Murali Karicheri --- ...upport-for-creating-PRP-device-simil.patch | 109 ++ ...dd-support-for-vlan-tagged-supervisi.patch | 108 + .../iproute2/iproute2_5.5.0.bbappend | 8 ++ 3 files changed, 225 insertions(+) create mode 100644 meta-arago-distro/recipes-connectivity/iproute2/iproute2/0013-iplink-hsr-add-support-for-creating-PRP-device-simil.patch create mode 100644 meta-arago-distro/recipes-connectivity/iproute2/iproute2/0014-iplink-hsr-prp-add-support-for-vlan-tagged-supervisi.patch create mode 100644 meta-arago-distro/recipes-connectivity/iproute2/iproute2_5.5.0.bbappend diff --git a/meta-arago-distro/recipes-connectivity/iproute2/iproute2/0013-iplink-hsr-add-support-for-creating-PRP-device-simil.patch b/meta-arago-distro/recipes-connectivity/iproute2/iproute2/0013-iplink-hsr-add-support-for-creating-PRP-device-simil.patch new file mode 100644 index ..dfeaeb01b485 --- /dev/null +++ b/meta-arago-distro/recipes-connectivity/iproute2/iproute2/0013-iplink-hsr-add-support-for-creating-PRP-device-simil.patch @@ -0,0 +1,109 @@ +From e3aa94814e9467af5829a04c335a615c0082a362 Mon Sep 17 00:00:00 2001 +From: Murali Karicheri +Date: Fri, 5 Jun 2020 11:02:05 -0400 +Subject: [PATCH 1/2] iplink: hsr: add support for creating PRP device similar + to HSR + +This patch enhances the iplink command to add a proto parameters to +create PRP device/interface similar to HSR. Both protocols are +quite similar and requires a pair of Ethernet interfaces. So re-use +the existing HSR iplink command to create PRP device/interface as +well. Use proto parameter to differentiate the two protocols. + +Signed-off-by: Murali Karicheri +--- + include/uapi/linux/if_link.h | 12 +++- + ip/iplink_hsr.c | 19 +-- + 2 files changed, 28 insertions(+), 3 deletions(-) + +diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h +index 1c49f436424d..de08704c5862 100644 +--- a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h +@@ -881,7 +881,14 @@ enum { + #define IFLA_IPOIB_MAX (__IFLA_IPOIB_MAX - 1) + + +-/* HSR section */ ++/* HSR/PRP section, both uses same interface */ ++ ++/* Different redundancy protocols for hsr device */ ++enum { ++ HSR_PROTOCOL_HSR, ++ HSR_PROTOCOL_PRP, ++ HSR_PROTOCOL_MAX, ++}; + + enum { + IFLA_HSR_UNSPEC, +@@ -891,6 +898,9 @@ enum { + IFLA_HSR_SUPERVISION_ADDR, /* Supervision frame multicast addr */ + IFLA_HSR_SEQ_NR, + IFLA_HSR_VERSION, /* HSR version */ ++ IFLA_HSR_PROTOCOL, /* Indicate different protocol than ++ * HSR. For example PRP. ++ */ + __IFLA_HSR_MAX, + }; + +diff --git a/ip/iplink_hsr.c b/ip/iplink_hsr.c +index 7d9167d4e6a3..6ea138a23cbc 100644 +--- a/ip/iplink_hsr.c b/ip/iplink_hsr.c +@@ -25,7 +25,7 @@ static void print_usage(FILE *f) + { + fprintf(f, + "Usage:\tip link add name NAME type hsr slave1 SLAVE1-IF slave2 SLAVE2-IF\n" +- "\t[ supervision ADDR-BYTE ] [version VERSION]\n" ++ "\t[ supervision ADDR-BYTE ] [version VERSION] [proto PROTOCOL]\n" + "\n" + "NAME\n" + " name of new hsr device (e.g. hsr0)\n" +@@ -35,7 +35,9 @@ static void print_usage(FILE *f) + " 0-255; the last byte of the multicast address used for HSR supervision\n" + " frames (default = 0)\n" + "VERSION\n" +- " 0,1; the protocol version to be used. (default = 0)\n"); ++ " 0,1; the protocol version to be used. (default = 0)\n" ++ "PROTOCOL\n" ++ " 0 - HSR, 1 - PRP. (default = 0 - HSR)\n"); + } + + static void usage(void) +@@ -49,6 +51,7 @@ static int hsr_parse_opt(struct link_util *lu, int argc, char **argv, + int ifindex; + unsigned char multicast_spec; + unsigned char protocol_version; ++ unsigned char protocol = HSR_PROTOCOL_HSR; + + while (argc > 0) { + if (matches(*argv, "supervision") == 0) { +@@ -64,6 +67,13 @@ static int hsr_parse_opt(struct link_util *lu, int argc, char **argv, + invarg("version is invalid", *argv); + addattr_l(n, 1024, IFLA_HSR_VERSION, + _version, 1); ++ } else if (matches(*argv, "proto") == 0) { ++ NEXT_ARG(); ++
Re: [meta-arago] [meta-arago PATCH] iproute2: update recipe for prp and supervision vlan support
On Tue, Jul 07, 2020 at 01:44:02PM -0400, Murali Karicheri wrote: > This recipe includes the patches required in iproute2 to add > PRP ip link support as well as allow use of VLAN for supervision > frames. What is the Upstream-status for both of these patches? > Signed-off-by: Murali Karicheri > --- > ...upport-for-creating-PRP-device-simil.patch | 109 ++ > ...dd-support-for-vlan-tagged-supervisi.patch | 108 + > .../iproute2/iproute2_5.5.0.bbappend | 8 ++ > 3 files changed, 225 insertions(+) > create mode 100644 > meta-arago-distro/recipes-connectivity/iproute2/iproute2/0013-iplink-hsr-add-support-for-creating-PRP-device-simil.patch > create mode 100644 > meta-arago-distro/recipes-connectivity/iproute2/iproute2/0014-iplink-hsr-prp-add-support-for-vlan-tagged-supervisi.patch > create mode 100644 > meta-arago-distro/recipes-connectivity/iproute2/iproute2_5.5.0.bbappend > > diff --git > a/meta-arago-distro/recipes-connectivity/iproute2/iproute2/0013-iplink-hsr-add-support-for-creating-PRP-device-simil.patch > > b/meta-arago-distro/recipes-connectivity/iproute2/iproute2/0013-iplink-hsr-add-support-for-creating-PRP-device-simil.patch > new file mode 100644 > index ..dfeaeb01b485 > --- /dev/null > +++ > b/meta-arago-distro/recipes-connectivity/iproute2/iproute2/0013-iplink-hsr-add-support-for-creating-PRP-device-simil.patch > @@ -0,0 +1,109 @@ > +From e3aa94814e9467af5829a04c335a615c0082a362 Mon Sep 17 00:00:00 2001 > +From: Murali Karicheri > +Date: Fri, 5 Jun 2020 11:02:05 -0400 > +Subject: [PATCH 1/2] iplink: hsr: add support for creating PRP device similar > + to HSR > + > +This patch enhances the iplink command to add a proto parameters to > +create PRP device/interface similar to HSR. Both protocols are > +quite similar and requires a pair of Ethernet interfaces. So re-use > +the existing HSR iplink command to create PRP device/interface as > +well. Use proto parameter to differentiate the two protocols. > + > +Signed-off-by: Murali Karicheri > +--- > + include/uapi/linux/if_link.h | 12 +++- > + ip/iplink_hsr.c | 19 +-- > + 2 files changed, 28 insertions(+), 3 deletions(-) > + > +diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h > +index 1c49f436424d..de08704c5862 100644 > +--- a/include/uapi/linux/if_link.h > b/include/uapi/linux/if_link.h > +@@ -881,7 +881,14 @@ enum { > + #define IFLA_IPOIB_MAX (__IFLA_IPOIB_MAX - 1) > + > + > +-/* HSR section */ > ++/* HSR/PRP section, both uses same interface */ > ++ > ++/* Different redundancy protocols for hsr device */ > ++enum { > ++HSR_PROTOCOL_HSR, > ++HSR_PROTOCOL_PRP, > ++HSR_PROTOCOL_MAX, > ++}; > + > + enum { > + IFLA_HSR_UNSPEC, > +@@ -891,6 +898,9 @@ enum { > + IFLA_HSR_SUPERVISION_ADDR, /* Supervision frame multicast addr */ > + IFLA_HSR_SEQ_NR, > + IFLA_HSR_VERSION, /* HSR version */ > ++IFLA_HSR_PROTOCOL, /* Indicate different protocol than > ++ * HSR. For example PRP. > ++ */ > + __IFLA_HSR_MAX, > + }; > + > +diff --git a/ip/iplink_hsr.c b/ip/iplink_hsr.c > +index 7d9167d4e6a3..6ea138a23cbc 100644 > +--- a/ip/iplink_hsr.c > b/ip/iplink_hsr.c > +@@ -25,7 +25,7 @@ static void print_usage(FILE *f) > + { > + fprintf(f, > + "Usage:\tip link add name NAME type hsr slave1 SLAVE1-IF slave2 > SLAVE2-IF\n" > +-"\t[ supervision ADDR-BYTE ] [version VERSION]\n" > ++"\t[ supervision ADDR-BYTE ] [version VERSION] [proto > PROTOCOL]\n" > + "\n" > + "NAME\n" > + " name of new hsr device (e.g. hsr0)\n" > +@@ -35,7 +35,9 @@ static void print_usage(FILE *f) > + " 0-255; the last byte of the multicast address used for > HSR supervision\n" > + " frames (default = 0)\n" > + "VERSION\n" > +-" 0,1; the protocol version to be used. (default = 0)\n"); > ++" 0,1; the protocol version to be used. (default = 0)\n" > ++"PROTOCOL\n" > ++" 0 - HSR, 1 - PRP. (default = 0 - HSR)\n"); > + } > + > + static void usage(void) > +@@ -49,6 +51,7 @@ static int hsr_parse_opt(struct link_util *lu, int argc, > char **argv, > + int ifindex; > + unsigned char multicast_spec; > + unsigned char protocol_version; > ++unsigned char protocol = HSR_PROTOCOL_HSR; > + > + while (argc > 0) { > + if (matches(*argv, "supervision") == 0) { > +@@ -64,6 +67,13 @@ static int hsr_parse_opt(struct link_util *lu, int argc, > char **argv, > + invarg("version is invalid", *argv); > + addattr_l(n, 1024, IFLA_HSR_VERSION, > + _version, 1); > ++} else if (matches(*argv, "proto") == 0) { > ++
[meta-arago] [master/dunfell][PATCH 1/2] tisdk-uenv: deploy for wic images
Signed-off-by: Jacob Stiffler --- meta-arago-distro/recipes-tisdk/tisdk-uenv/tisdk-uenv.bb | 8 1 file changed, 8 insertions(+) diff --git a/meta-arago-distro/recipes-tisdk/tisdk-uenv/tisdk-uenv.bb b/meta-arago-distro/recipes-tisdk/tisdk-uenv/tisdk-uenv.bb index a08f24b..442e067 100644 --- a/meta-arago-distro/recipes-tisdk/tisdk-uenv/tisdk-uenv.bb +++ b/meta-arago-distro/recipes-tisdk/tisdk-uenv/tisdk-uenv.bb @@ -20,3 +20,11 @@ do_install () { } FILES_${PN} += "board-support/*" + +# deploy files for wic image +inherit deploy +do_deploy() { +install -d ${DEPLOYDIR} +install -m 0644 ${S}/uEnv.txt ${DEPLOYDIR} +} +addtask deploy before do_build after do_unpack -- 2.7.4 ___ meta-arago mailing list meta-arago@arago-project.org http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
[meta-arago] [master/dunfell][PATCH 2/2] arago: add uEnv.txt to wic images
Signed-off-by: Jacob Stiffler --- meta-arago-distro/conf/distro/arago.conf | 4 1 file changed, 4 insertions(+) diff --git a/meta-arago-distro/conf/distro/arago.conf b/meta-arago-distro/conf/distro/arago.conf index bc786a7..1e8d66f 100644 --- a/meta-arago-distro/conf/distro/arago.conf +++ b/meta-arago-distro/conf/distro/arago.conf @@ -70,6 +70,10 @@ KERNEL_IMAGETYPES_k2l-hs-evm = "zImage fitImage" INITRAMFS_IMAGE_k2l-hs-evm = "k2-fw-initrd" INITRAMFS_FSTYPES_k2l-hs-evm = "cpio.gz" +# Extra boot files for WIC images +do_image_wic[depends] += "tisdk-uenv:do_deploy" +IMAGE_BOOT_FILES += "uEnv.txt" + # Mask any broken recipes (currently none) #BBMASK = "" -- 2.7.4 ___ meta-arago mailing list meta-arago@arago-project.org http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago