[OpenWrt-Devel] [PATCH] libnl-tiny: include
Currently some libnl headers require application code to include dependencies on its own. E.g. a simple include of will trigger an error: /usr/include/libnl-tiny/linux/netlink.h:32:2: error: unknown type name 'sa_family_t' Similarly including causes: /usr/include/libnl-tiny/netlink/handlers.h:133:19: warning: 'struct ucred' declared inside parameter list [enabled by default] Fix it by including where needed in libnl headers. Signed-off-by: Rafał Miłecki --- package/libs/libnl-tiny/src/include/linux/netlink.h| 1 + package/libs/libnl-tiny/src/include/netlink/handlers.h | 1 + 2 files changed, 2 insertions(+) diff --git a/package/libs/libnl-tiny/src/include/linux/netlink.h b/package/libs/libnl-tiny/src/include/linux/netlink.h index d252103..3d6d367 100644 --- a/package/libs/libnl-tiny/src/include/linux/netlink.h +++ b/package/libs/libnl-tiny/src/include/linux/netlink.h @@ -3,6 +3,7 @@ #include /* for sa_family_t */ #include +#include /* for sa_family_t */ #define NETLINK_ROUTE 0 /* Routing/device hook */ #define NETLINK_UNUSED 1 /* Unused number */ diff --git a/package/libs/libnl-tiny/src/include/netlink/handlers.h b/package/libs/libnl-tiny/src/include/netlink/handlers.h index 7fb53b4..f5c933d 100644 --- a/package/libs/libnl-tiny/src/include/netlink/handlers.h +++ b/package/libs/libnl-tiny/src/include/netlink/handlers.h @@ -14,6 +14,7 @@ #include #include +#include #include #include #include -- 1.8.4.5 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] ramips: reset m25p80 when shutdown
2015-11-08 4:42 GMT+08:00 Shonn Lu :
> Signed-off-by: Shonn Lu
> ---
> .../0064-reset-m25p80-when-shutdown.patch | 24
> ++
> 1 file changed, 24 insertions(+)
> create mode 100644
> target/linux/ramips/patches-3.18/0064-reset-m25p80-when-shutdown.patch
>
> diff --git
> a/target/linux/ramips/patches-3.18/0064-reset-m25p80-when-shutdown.patch
> b/target/linux/ramips/patches-3.18/0064-reset-m25p80-when-shutdown.patch
> new file mode 100644
> index 000..76f916a
> --- /dev/null
> +++
> b/target/linux/ramips/patches-3.18/0064-reset-m25p80-when-shutdown.patch
> @@ -0,0 +1,24 @@
> +--- a/drivers/mtd/devices/m25p80.c
> b/drivers/mtd/devices/m25p80.c
> +@@ -319,6 +319,12 @@
> + {
> + struct m25p *flash = spi_get_drvdata(spi);
> +
> ++//play4fun: add spi flash reset code
> ++ flash->command[0] = 0x66;
> ++ spi_write(flash->spi, flash->command, 1);
> ++ flash->command[0] = 0x99;
> ++ spi_write(flash->spi, flash->command, 1);
> ++
> + /* Clean up MTD stuff. */
> + return mtd_device_unregister(&flash->mtd);
> + }
> +@@ -382,6 +388,8 @@
> + .id_table = m25p_ids,
> + .probe = m25p_probe,
> + .remove = m25p_remove,
> ++ // play4fun add shutdown method to reset spi flash
> ++ .shutdown = m25p_remove,
> +
> + /* REVISIT: many of these chips have deep power-down modes, which
> +* should clearly be entered on suspend() to minimize power use.
> --
> 1.9.1
> ___
> openwrt-devel mailing list
> openwrt-devel@lists.openwrt.org
> https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
This is not enough for w25q256.
The Extended Address Register (EAR) must be cleared, or the higher half
16MB may be accessed in 3-byte addressing mode, and this will cause a boot
failure.
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] ramips: reset m25p80 when shutdown
Citeren Weijie Gao :
2015-11-08 4:42 GMT+08:00 Shonn Lu :
Signed-off-by: Shonn Lu
---
.../0064-reset-m25p80-when-shutdown.patch | 24
++
1 file changed, 24 insertions(+)
create mode 100644
target/linux/ramips/patches-3.18/0064-reset-m25p80-when-shutdown.patch
diff --git
a/target/linux/ramips/patches-3.18/0064-reset-m25p80-when-shutdown.patch
b/target/linux/ramips/patches-3.18/0064-reset-m25p80-when-shutdown.patch
new file mode 100644
index 000..76f916a
--- /dev/null
+++
b/target/linux/ramips/patches-3.18/0064-reset-m25p80-when-shutdown.patch
@@ -0,0 +1,24 @@
+--- a/drivers/mtd/devices/m25p80.c
b/drivers/mtd/devices/m25p80.c
+@@ -319,6 +319,12 @@
+ {
+ struct m25p *flash = spi_get_drvdata(spi);
+
++//play4fun: add spi flash reset code
++ flash->command[0] = 0x66;
++ spi_write(flash->spi, flash->command, 1);
++ flash->command[0] = 0x99;
++ spi_write(flash->spi, flash->command, 1);
++
+ /* Clean up MTD stuff. */
+ return mtd_device_unregister(&flash->mtd);
+ }
+@@ -382,6 +388,8 @@
+ .id_table = m25p_ids,
+ .probe = m25p_probe,
+ .remove = m25p_remove,
++ // play4fun add shutdown method to reset spi flash
++ .shutdown = m25p_remove,
+
+ /* REVISIT: many of these chips have deep power-down modes, which
+* should clearly be entered on suspend() to minimize power use.
--
1.9.1
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
This is not enough for w25q256.
It is.
The Extended Address Register (EAR) must be cleared, or the higher half
16MB may be accessed in 3-byte addressing mode, and this will cause a boot
failure.
From the W25Q256FV datasheet (page 23):
"Upon power up or after the execution of a Software/Hardware
Reset, the Extended Address Register
values will be cleared to 0."
So sending the device a software reset, should be sufficient as the
EAR will be cleared.
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 2/2 v4] linux: add support of Synopsys ARC770-based boards
Hi Alexey,
On Tue, Nov 10, 2015 at 5:40 PM, Alexey Brodkin
wrote:
> Hi Jonas,
>
> On Tue, 2015-11-10 at 12:02 +0100, Jonas Gorski wrote:
>> Hi Alexey,
>>
>> On Sat, Nov 7, 2015 at 2:25 PM, Alexey Brodkin
>> wrote:
>> > This patch introduces support of new boards with ARC cores.
>> (snip)
>>
>> > diff --git a/target/linux/arc770/base-files/lib/arc.sh
>> > b/target/linux/arc770/base-files/lib/arc.sh
>> > new file mode 100644
>> > index 000..17ce657
>> > --- /dev/null
>> > +++ b/target/linux/arc770/base-files/lib/arc.sh
>> > @@ -0,0 +1,49 @@
>> > +#!/bin/sh
>> > +#
>> > +# Copyright (C) 2015 OpenWrt.org
>> > +#
>> > +
>> > +# defaults
>> > +ARC_BOARD_NAME="generic"
>> > +ARC_BOARD_MODEL="Generic ARC board"
>> > +
>> > +arc_board_detect() {
>> > + local board
>> > + local model
>> > +
>> > + [ -e "/tmp/sysinfo/" ] || mkdir -p "/tmp/sysinfo/"
>> > +
>> > + model="$( cat /proc/device-tree/model )"
>> > +
>> > + # Extract just one "compatible" value out of
>> > "snps,axs101snps,arc-sdp"
>> > + # which is a concatenation of "snps,axs101" and "snps,arc-sdp".
>> > + if cat /proc/device-tree/compatible | grep -q "snps,arc-sdp"; then
>> > + board="arc-sdp";
>> > + fi
>> > +
>> > + if cat /proc/device-tree/compatible | grep -q "snps,nsim"; then
>> > + board="nsim";
>> > + fi
>>
>> I guess I wasn't clear enough, the idea of using the model property is
>> so that you can then just do
>>
>> case "$model" in
>> "Synopsys AXS101 Development Board";)
>> board="arc-sdp";
>> ;;
>> "Synopsys ARC770 nSIM simulator")
>> board="nsim";
>> ;;
>> esac
>
> Well my implementation was intentional.
> See we have 2 flavors of ARC SDP board: AXS101 and AXS103.
> They have the same base-board (where all peripherals really reside)
> and different CPU-cards: AXS101 sports CPU-card with ARC770-based ASIC;
> AXS103 sports CPU-card with ARC HS38 in FPGA.
>
> So I wanted to detect existence of ARC SDP base-board and then set
> say network interfaces according to available devices.
>
> And difference in CPU type is not important here because it has
> no impact on the board behavior.
>
> Makes any sense?
I see what you want, but the way you are doing it is quite error prone
and inefficient. If you insist on using the compatible, i suggest:
1. Extract the first one instead of grepping through the full
compatible set, so you don't need to invoke grep for each comparison
(also dropping the misuse of cat ;p).
2. Do a full string comparison instead of grep, else you will have a
hard time telling apart "foo,bar" and "foo,bar-variant".
So then it would be
compatible = /* magic */;
case "$compatible" in
"snps,arc-sdp")
board="arc-sdp";
;;
"snps,nsim")
board="arc-nsim";
;;
esac
Jonas
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] ramips: reset m25p80 when shutdown
Hi!
On Wed, Nov 11, 2015 at 06:53:33PM +0800, Weijie Gao wrote:
> 2015-11-08 4:42 GMT+08:00 Shonn Lu :
>
> > Signed-off-by: Shonn Lu
> > ---
> > .../0064-reset-m25p80-when-shutdown.patch | 24
> > ++
> > 1 file changed, 24 insertions(+)
> > create mode 100644
> > target/linux/ramips/patches-3.18/0064-reset-m25p80-when-shutdown.patch
> >
> > diff --git
> > a/target/linux/ramips/patches-3.18/0064-reset-m25p80-when-shutdown.patch
> > b/target/linux/ramips/patches-3.18/0064-reset-m25p80-when-shutdown.patch
> > new file mode 100644
> > index 000..76f916a
> > --- /dev/null
> > +++
> > b/target/linux/ramips/patches-3.18/0064-reset-m25p80-when-shutdown.patch
> > @@ -0,0 +1,24 @@
> > +--- a/drivers/mtd/devices/m25p80.c
> > b/drivers/mtd/devices/m25p80.c
> > +@@ -319,6 +319,12 @@
> > + {
> > + struct m25p *flash = spi_get_drvdata(spi);
> > +
> > ++//play4fun: add spi flash reset code
> > ++ flash->command[0] = 0x66;
> > ++ spi_write(flash->spi, flash->command, 1);
> > ++ flash->command[0] = 0x99;
> > ++ spi_write(flash->spi, flash->command, 1);
> > ++
> > + /* Clean up MTD stuff. */
> > + return mtd_device_unregister(&flash->mtd);
> > + }
> > +@@ -382,6 +388,8 @@
> > + .id_table = m25p_ids,
> > + .probe = m25p_probe,
> > + .remove = m25p_remove,
> > ++ // play4fun add shutdown method to reset spi flash
> > ++ .shutdown = m25p_remove,
> > +
> > + /* REVISIT: many of these chips have deep power-down modes, which
> > +* should clearly be entered on suspend() to minimize power use.
> > --
> > 1.9.1
> > ___
> > openwrt-devel mailing list
> > openwrt-devel@lists.openwrt.org
> > https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
>
>
> This is not enough for w25q256.
> The Extended Address Register (EAR) must be cleared, or the higher half
> 16MB may be accessed in 3-byte addressing mode, and this will cause a boot
> failure.
At least on Macronix SPI chips, using 0x66, 0x99 to reset the chip is
not nough as that will not clear the adressing-mode bits.
Using 0xE9 (EX4B; exit 4-byte mode) instead fixes the issue eg. on
MX25L256.
Also note, that while it's helpful to find out the details by directly
writing values to the SPI bus, this is probably not acceptable
upstream.
I reckon we'll need a generic shutdown function in spi-nor.c calling
set_4byte(nor, info, 0)
We can then use that in m25p_remove.
Cheers
Daniel
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] update mtd-utils to 1.5.2 and fix build
On 2015-11-10 22:52, Sven Roederer wrote: > - update mtd-utils to 1.5.2 (git a494d30ab1ae40cb7665680cadf5af3ca3830a73) > - remove patches that came upstream > - fixes build from scratch as of broken patches > > Signed-off-by: Sven Roederer > --- Your patch is line wrapped, please resend. To avoid such issues in the future, I'd recommend using git send-email. - Felix ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] ramips: reset m25p80 when shutdown
Hi!
On 11/11/2015 12:26 PM, Daniel Golle wrote:
> Hi!
>
> On Wed, Nov 11, 2015 at 06:53:33PM +0800, Weijie Gao wrote:
>> 2015-11-08 4:42 GMT+08:00 Shonn Lu :
>>
>>> Signed-off-by: Shonn Lu
>>> ---
>>> .../0064-reset-m25p80-when-shutdown.patch | 24
>>> ++
>>> 1 file changed, 24 insertions(+)
>>> create mode 100644
>>> target/linux/ramips/patches-3.18/0064-reset-m25p80-when-shutdown.patch
>>>
>>> diff --git
>>> a/target/linux/ramips/patches-3.18/0064-reset-m25p80-when-shutdown.patch
>>> b/target/linux/ramips/patches-3.18/0064-reset-m25p80-when-shutdown.patch
>>> new file mode 100644
>>> index 000..76f916a
>>> --- /dev/null
>>> +++
>>> b/target/linux/ramips/patches-3.18/0064-reset-m25p80-when-shutdown.patch
>>> @@ -0,0 +1,24 @@
>>> +--- a/drivers/mtd/devices/m25p80.c
>>> b/drivers/mtd/devices/m25p80.c
>>> +@@ -319,6 +319,12 @@
>>> + {
>>> + struct m25p *flash = spi_get_drvdata(spi);
>>> +
>>> ++//play4fun: add spi flash reset code
>>> ++ flash->command[0] = 0x66;
>>> ++ spi_write(flash->spi, flash->command, 1);
>>> ++ flash->command[0] = 0x99;
>>> ++ spi_write(flash->spi, flash->command, 1);
>>> ++
>>> + /* Clean up MTD stuff. */
>>> + return mtd_device_unregister(&flash->mtd);
>>> + }
>>> +@@ -382,6 +388,8 @@
>>> + .id_table = m25p_ids,
>>> + .probe = m25p_probe,
>>> + .remove = m25p_remove,
>>> ++ // play4fun add shutdown method to reset spi flash
>>> ++ .shutdown = m25p_remove,
>>> +
>>> + /* REVISIT: many of these chips have deep power-down modes,
which
>>> +* should clearly be entered on suspend() to minimize power use.
>>> --
>>> 1.9.1
>>> ___
>>> openwrt-devel mailing list
>>> openwrt-devel@lists.openwrt.org
>>> https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
>>
>>
>> This is not enough for w25q256.
>> The Extended Address Register (EAR) must be cleared, or the higher half
>> 16MB may be accessed in 3-byte addressing mode, and this will cause a
boot
>> failure.
>
> At least on Macronix SPI chips, using 0x66, 0x99 to reset the chip is
> not nough as that will not clear the adressing-mode bits.
> Using 0xE9 (EX4B; exit 4-byte mode) instead fixes the issue eg. on
> MX25L256.
>
> Also note, that while it's helpful to find out the details by directly
> writing values to the SPI bus, this is probably not acceptable
> upstream.
>
> I reckon we'll need a generic shutdown function in spi-nor.c calling
> set_4byte(nor, info, 0)
> We can then use that in m25p_remove.
>
>
>
> Cheers
>
>
> Daniel
> ___
> openwrt-devel mailing list
> openwrt-devel@lists.openwrt.org
> https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Daniel is right. I had the reboot problem on the ALL5003 Module, RT5350
based and with Macronix MX25L25635E. Since Ralink U-Boot can only boot
in 24bit mode, the SPI Flash needs to be re-setted to 24bit mode from
32bit mode in order to be able to boot. Macronix has released an
application note called "MX25L25635E 256Mb Serial Flash Application in
System Reset" on their homepage, regarding exact this problem. There, in
the introduction, they wrote: "MX25L25635E provides 24-bit and 32-bit
address modes by command definition. Once the device enters 32-bit
address mode by B7 command, command E9 or power-off cycle is required to
exit the 32-bit address mode. After the flash switches to 32-bit address
mode and the system executes a warm boot (power is not off during the
system reset), the flash memory will remain in 32-bit address mode and
will not be able to boot by 24-bit addressing. "
In order to fix the problem, I used the patch from Shonn Lu, but
modified. Instead of writing 0x66 and 0x99, I just wrote 0xE9. After
this, the reboot worked like a charm. I don't know if writing just 0xE9
is enough in order to reset Winbond SPI flash. But I can confirm that
just writing an 0xE9 solves the reboot problem on Macronix 32MB SPI Flash.
I have some Winbond 25Q256FV chips here, but I need to find the time to
replace the macronix on my all5003 by a winbond in order to test the
patch. Maybe next week.
Cheers,
Dorian
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 1/2] uboot-envtools: kirkwood: fix EA35/4500 board names
Signed-off-by: Claudio Leite --- package/boot/uboot-envtools/files/kirkwood | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/boot/uboot-envtools/files/kirkwood b/package/boot/uboot-envtools/files/kirkwood index 1066371..35cbd84 100644 --- a/package/boot/uboot-envtools/files/kirkwood +++ b/package/boot/uboot-envtools/files/kirkwood @@ -14,17 +14,17 @@ touch /etc/config/ubootenv board=$(kirkwood_board_name) case "$board" in -"ea3500") - ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x4000" "0x4000" - ;; -"ea4500" | \ "guruplug-server-plus" | \ "ib62x0" | \ +"linksys-viper" | \ "pogo_e02" | \ "sheevaplug" | \ "sheevaplug-esata" ) ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x2" "0x2" ;; +"linksys-audi") + ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x4000" "0x4000" + ;; esac config_load ubootenv -- 2.1.4 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 2/2] kirkwood: add Linksys routers to default profile
Signed-off-by: Claudio Leite --- The idea here is to benefit from the daily snapshot builds. Since each device still has its own profile, interested users can still build the leanest possible build without the few extra packages. target/linux/kirkwood/image/Makefile | 4 ++-- target/linux/kirkwood/profiles/100-generic.mk | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/target/linux/kirkwood/image/Makefile b/target/linux/kirkwood/image/Makefile index 06b7224..3fc84aa 100644 --- a/target/linux/kirkwood/image/Makefile +++ b/target/linux/kirkwood/image/Makefile @@ -26,7 +26,7 @@ define Device/linksys-audi BLOCKSIZE := 16KiB KERNEL_SIZE := 2624k FILESYSTEMS := squashfs - PROFILES := AUDI + PROFILES := Generic AUDI IMAGES := factory.bin sysupgrade.tar IMAGE/factory.bin := append-kernel (KERNEL_SIZE) | append-ubi IMAGE/sysupgrade.tar := sysupgrade-nand @@ -39,7 +39,7 @@ define Device/linksys-viper BLOCKSIZE := 128KiB KERNEL_SIZE := 2688k FILESYSTEMS := squashfs - PROFILES := VIPER + PROFILES := Generic VIPER IMAGES := factory.bin sysupgrade.tar IMAGE/factory.bin := append-kernel (KERNEL_SIZE) | append-ubi IMAGE/sysupgrade.tar := sysupgrade-nand diff --git a/target/linux/kirkwood/profiles/100-generic.mk b/target/linux/kirkwood/profiles/100-generic.mk index 770bbae..f07cea8 100644 --- a/target/linux/kirkwood/profiles/100-generic.mk +++ b/target/linux/kirkwood/profiles/100-generic.mk @@ -11,7 +11,8 @@ define Profile/Generic kmod-mmc kmod-mvsdio kmod-usb2 kmod-usb-storage \ kmod-i2c-core kmod-i2c-mv64xxx \ kmod-ata-core kmod-ata-marvell-sata \ - kmod-rtc-marvell kmod-thermal-kirkwood + kmod-rtc-marvell kmod-thermal-kirkwood \ + kmod-mwl8k swconfig wpad-mini endef define Profile/Generic/Description -- 2.1.4 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] 回复： [PATCH] ramips: reset m25p80 when shutdown
I do not test this patch on all the 32MB spi flash except my Youku YK1 router.I am looking forward to a generic shutdown function which adapt to Macronix or Winbond. Cheers Shonn___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 2/2 v4] linux: add support of Synopsys ARC770-based boards
Hi Jonas, On Wed, 2015-11-11 at 12:19 +0100, Jonas Gorski wrote: > Hi Alexey, > > On Tue, Nov 10, 2015 at 5:40 PM, Alexey Brodkin > wrote: > > Hi Jonas, > > > > On Tue, 2015-11-10 at 12:02 +0100, Jonas Gorski wrote: > > > Hi Alexey, > I see what you want, but the way you are doing it is quite error prone > and inefficient. If you insist on using the compatible, i suggest: > > 1. Extract the first one instead of grepping through the full > compatible set, so you don't need to invoke grep for each comparison > (also dropping the misuse of cat ;p). The problem is how multientry compatible string is presented in /proc fs: >8 $ cat /proc/device-tree/compatible snps,axs101snps,arc-sdp >8 You see there's no delimiter between "snps,axs101" and "snps,arc-sdp". So how should I extract "snps,arc-sdp" from /proc/device-tree/compatible? -Alexey ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 2/2 v4] linux: add support of Synopsys ARC770-based boards
On Wed, Nov 11, 2015 at 1:38 PM, Alexey Brodkin wrote: > Hi Jonas, > > On Wed, 2015-11-11 at 12:19 +0100, Jonas Gorski wrote: >> Hi Alexey, >> >> On Tue, Nov 10, 2015 at 5:40 PM, Alexey Brodkin >> wrote: >> > Hi Jonas, >> > >> > On Tue, 2015-11-10 at 12:02 +0100, Jonas Gorski wrote: > >> > > Hi Alexey, >> I see what you want, but the way you are doing it is quite error prone >> and inefficient. If you insist on using the compatible, i suggest: >> >> 1. Extract the first one instead of grepping through the full >> compatible set, so you don't need to invoke grep for each comparison >> (also dropping the misuse of cat ;p). > > The problem is how multientry compatible string is presented in /proc fs: > >8 > $ cat /proc/device-tree/compatible > snps,axs101snps,arc-sdp > >8 > > You see there's no delimiter between "snps,axs101" and "snps,arc-sdp". > So how should I extract "snps,arc-sdp" from /proc/device-tree/compatible? Well, you want to use it, you figure it out ;p. This is mostly a display issue. If you look at the actual data with e.g. hexdump: 62 72 63 6d 2c 62 63 6d 39 36 33 32 38 61 76 6e |brcm,bcm96328avn| 67 00 62 72 63 6d 2c 62 63 6d 36 33 32 38 00 |g.brcm,bcm6328.| you will see that these are two properly null-terminated strings. It's just that printing to stdout swallows the terminators, but anything working with the data should properly see them as two distinct values. Jonas ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] 回复： [PATCH] ramips: reset m25p80 when shutdown
http://www.winbond.com.tw/resource-files/w25q256fv_revh_02112015.pdf The datasheet above shows that w25q256fv also use E9h to exit 4-Byte mode.___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH][RPCD] paths: substitute literal with macro
Signed-off-by: Javier Domingo Cansino
---
main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/main.c b/main.c
index 3b6841b..7c161b5 100644
--- a/main.c
+++ b/main.c
@@ -74,8 +74,8 @@ int main(int argc, char **argv)
}
}
- if (stat("/var/run/rpcd", &s))
- mkdir("/var/run/rpcd", 0700);
+ if (stat(RPC_UCI_DIR_PREFIX, &s))
+ mkdir(RPC_UCI_DIR_PREFIX, 0700);
umask(0077);
--
2.6.2
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] config/Config-images.in: Fix wrong handling of ROOTFS_INCLUDE default options
Signed-off-by: Petr Štetiar --- config/Config-images.in | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/config/Config-images.in b/config/Config-images.in index a60dd50..cdaf5e9 100644 --- a/config/Config-images.in +++ b/config/Config-images.in @@ -281,24 +281,24 @@ menu "Target Images" below /boot. config TARGET_ROOTFS_INCLUDE_UIMAGE - bool "include uImage" if TARGET_ROOTFS_INCLUDE_KERNEL - default y + bool "include uImage" + default y if TARGET_ROOTFS_INCLUDE_KERNEL help This option might not apply to all targets. Make sure to check target/linux//image/Makefile to see if this option will have any effect. config TARGET_ROOTFS_INCLUDE_ZIMAGE - bool "include zImage" if TARGET_ROOTFS_INCLUDE_KERNEL - default y + bool "include zImage" + default y if TARGET_ROOTFS_INCLUDE_KERNEL help This option might not apply to all targets. Make sure to check target/linux//image/Makefile to see if this option will have any effect. config TARGET_ROOTFS_INCLUDE_FIT - bool "include FIT" if TARGET_ROOTFS_INCLUDE_KERNEL - default y + bool "include FIT" + default y if TARGET_ROOTFS_INCLUDE_KERNEL help This option might not apply to all targets. Make sure to check target/linux//image/Makefile to -- 1.7.9.5 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] imx6: image: Make InstallKernel more generic
Signed-off-by: Petr Štetiar --- target/linux/imx6/image/Makefile |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target/linux/imx6/image/Makefile b/target/linux/imx6/image/Makefile index 9b9f948..d5bab30 100644 --- a/target/linux/imx6/image/Makefile +++ b/target/linux/imx6/image/Makefile @@ -40,9 +40,9 @@ endef define Image/InstallKernel/Template - ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_KERNEL)$(CONFIG_TARGET_imx6_VENTANA),) + ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_KERNEL)$(CONFIG_TARGET_imx6_$(PROFILE)),) $(INSTALL_DIR) $(TARGET_DIR)/boot - ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_UIMAGE)$(CONFIG_TARGET_imx6_VENTANA),) + ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_UIMAGE)$(CONFIG_TARGET_imx6_$(PROFILE)),) $(CP) $(BIN_DIR)/$(IMG_PREFIX)-uImage $(TARGET_DIR)/boot/ ln -sf $(IMG_PREFIX)-uImage $(TARGET_DIR)/boot/uImage endif @@ -57,7 +57,7 @@ define Image/InstallKernel/Template endif endif - ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_DTB)$(CONFIG_TARGET_imx6_VENTANA),) + ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_DTB)$(CONFIG_TARGET_imx6_$(PROFILE)),) $(INSTALL_DIR) $(TARGET_DIR)/boot $(foreach dts,$(shell echo $(1)), \ $(CP) $(BIN_DIR)/$(IMG_PREFIX)-$(dts).dtb $(TARGET_DIR)/boot/ ; \ -- 1.7.9.5 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] kernel/generic: 3.18, 4.y: Add support for Quectel EC20 Mini PCIe module
* both patches (qcserial/qmi_wwan) were submitted upstream[1,2]
* build tested on 3.18 and 4.1
* run tested on imx6 platform with 4.1
1. http://article.gmane.org/gmane.linux.usb.general/132998
2. http://article.gmane.org/gmane.linux.usb.general/133113
Signed-off-by: Petr Štetiar
---
...l-Add-support-for-Quectel-EC20-Mini-PCIe-.patch | 119
...n-Add-quirk-for-Quectel-EC20-Mini-PCIe-mo.patch | 101 +
...l-Add-support-for-Quectel-EC20-Mini-PCIe-.patch | 119
...n-Add-quirk-for-Quectel-EC20-Mini-PCIe-mo.patch | 101 +
...l-Add-support-for-Quectel-EC20-Mini-PCIe-.patch | 119
...n-Add-quirk-for-Quectel-EC20-Mini-PCIe-mo.patch | 101 +
...l-Add-support-for-Quectel-EC20-Mini-PCIe-.patch | 119
...n-Add-quirk-for-Quectel-EC20-Mini-PCIe-mo.patch | 101 +
8 files changed, 880 insertions(+)
create mode 100644
target/linux/generic/patches-3.18/192-USB-qcserial-Add-support-for-Quectel-EC20-Mini-PCIe-.patch
create mode 100644
target/linux/generic/patches-3.18/193-USB-qmi_wwan-Add-quirk-for-Quectel-EC20-Mini-PCIe-mo.patch
create mode 100644
target/linux/generic/patches-4.0/192-USB-qcserial-Add-support-for-Quectel-EC20-Mini-PCIe-.patch
create mode 100644
target/linux/generic/patches-4.0/193-USB-qmi_wwan-Add-quirk-for-Quectel-EC20-Mini-PCIe-mo.patch
create mode 100644
target/linux/generic/patches-4.1/192-USB-qcserial-Add-support-for-Quectel-EC20-Mini-PCIe-.patch
create mode 100644
target/linux/generic/patches-4.1/193-USB-qmi_wwan-Add-quirk-for-Quectel-EC20-Mini-PCIe-mo.patch
create mode 100644
target/linux/generic/patches-4.3/192-USB-qcserial-Add-support-for-Quectel-EC20-Mini-PCIe-.patch
create mode 100644
target/linux/generic/patches-4.3/193-USB-qmi_wwan-Add-quirk-for-Quectel-EC20-Mini-PCIe-mo.patch
diff --git
a/target/linux/generic/patches-3.18/192-USB-qcserial-Add-support-for-Quectel-EC20-Mini-PCIe-.patch
b/target/linux/generic/patches-3.18/192-USB-qcserial-Add-support-for-Quectel-EC20-Mini-PCIe-.patch
new file mode 100644
index 000..f56941c
--- /dev/null
+++
b/target/linux/generic/patches-3.18/192-USB-qcserial-Add-support-for-Quectel-EC20-Mini-PCIe-.patch
@@ -0,0 +1,119 @@
+From 128524b9db3e4f4245226852bee771bd03db75be Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20=C5=A0tetiar?=
+Date: Tue, 3 Nov 2015 11:01:42 +0100
+Subject: [PATCH 1/2] USB: qcserial: Add support for Quectel EC20 Mini PCIe
+ module
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+It seems like this device has same vendor and product IDs as G2K
+devices, but it has different number of interfaces(4 vs 5) and also
+different interface layout which makes it currently unusable:
+
+ usbcore: registered new interface driver qcserial
+ usbserial: USB Serial support registered for Qualcomm USB modem
+ usb 2-1.2: unknown number of interfaces: 5
+
+lsusb output:
+
+ Bus 002 Device 003: ID 05c6:9215 Qualcomm, Inc. Acer Gobi 2000 Wireless
+ Device Descriptor:
+ bLength18
+ bDescriptorType 1
+ bcdUSB 2.00
+ bDeviceClass0 (Defined at Interface level)
+ bDeviceSubClass 0
+ bDeviceProtocol 0
+ bMaxPacketSize064
+ idVendor 0x05c6 Qualcomm, Inc.
+ idProduct 0x9215 Acer Gobi 2000 Wireless Modem
+ bcdDevice2.32
+ iManufacturer 1 Quectel
+ iProduct2 Quectel LTE Module
+ iSerial 0
+ bNumConfigurations 1
+ Configuration Descriptor:
+ bLength 9
+ bDescriptorType 2
+ wTotalLength 209
+ bNumInterfaces 5
+ bConfigurationValue 1
+ iConfiguration 0
+ bmAttributes 0xa0
+ (Bus Powered)
+ Remote Wakeup
+ MaxPower 500mA
+
+Signed-off-by: Petr Štetiar
+---
+ drivers/usb/serial/qcserial.c | 39 +++
+ 1 file changed, 39 insertions(+)
+
+diff --git a/drivers/usb/serial/qcserial.c b/drivers/usb/serial/qcserial.c
+index ebcec8c..d462132 100644
+--- a/drivers/usb/serial/qcserial.c
b/drivers/usb/serial/qcserial.c
+@@ -22,6 +22,8 @@
+ #define DRIVER_AUTHOR "Qualcomm Inc"
+ #define DRIVER_DESC "Qualcomm USB Serial driver"
+
++#define QUECTEL_EC20_IDPRODUCT 0x9215
++
+ /* standard device layouts supported by this driver */
+ enum qcserial_layouts {
+ QCSERIAL_G2K = 0, /* Gobi 2000 */
+@@ -167,6 +169,38 @@ static const struct usb_device_id id_table[] = {
+ };
+ MODULE_DEVICE_TABLE(usb, id_table);
+
++static int handle_quectel_ec20(struct device *dev, int ifnum)
++{
++ int altsetting = 0;
++
++ /*
++ * Quectel EC20 Mini P
[OpenWrt-Devel] [PATCH 0/2] imx6: Add support for Toradex Apalis SoM modules
Hi, this patchset adds basic support for Toradex Apalis[1] SoM modules. I've tested it on Toradex Apalis iMX6 Quad 2GB IT V1.1A module on Ixora base board with Mikrotik R11e-2HnD and Quectel EC20 Mini PCIe modules. This patchset depends on "imx6: image: Make InstallKernel more generic"[2] patch. 1. https://www.toradex.com/computer-on-modules/apalis-arm-family/freescale-imx-6 2. https://patchwork.ozlabs.org/patch/542871/ Cc: Luka Perkov -- ynezz Petr Štetiar (2): imx6: kernel: Add support for Toradex Apalis modules imx6: base-files: Add support for Toradex Apalis on Ixora board target/linux/imx6/base-files/etc/diag.sh | 36 + .../imx6/base-files/etc/uci-defaults/02_network|1 + target/linux/imx6/base-files/lib/imx6.sh |4 + target/linux/imx6/image/Makefile |2 + ...6-Add-support-for-Toradex-Apalis-modules-.patch | 1996 ...dd-reset-function-for-reseting-downstream.patch | 79 + target/linux/imx6/profiles/130-toradex.mk | 27 + 7 files changed, 2145 insertions(+) create mode 100644 target/linux/imx6/base-files/etc/diag.sh create mode 100644 target/linux/imx6/patches-4.1/200-ARM-dts-imx6-Add-support-for-Toradex-Apalis-modules-.patch create mode 100644 target/linux/imx6/patches-4.1/300-pcie-imx6-add-reset-function-for-reseting-downstream.patch create mode 100644 target/linux/imx6/profiles/130-toradex.mk -- 1.7.9.5 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 2/2] imx6: base-files: Add support for Toradex Apalis on Ixora board
Signed-off-by: Petr Štetiar
---
target/linux/imx6/base-files/etc/diag.sh | 36
.../imx6/base-files/etc/uci-defaults/02_network|1 +
target/linux/imx6/base-files/lib/imx6.sh |4 +++
3 files changed, 41 insertions(+)
create mode 100644 target/linux/imx6/base-files/etc/diag.sh
diff --git a/target/linux/imx6/base-files/etc/diag.sh
b/target/linux/imx6/base-files/etc/diag.sh
new file mode 100644
index 000..6841e02
--- /dev/null
+++ b/target/linux/imx6/base-files/etc/diag.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+. /lib/functions/leds.sh
+. /lib/imx6.sh
+
+board=$(imx6_board_name)
+
+case "$board" in
+*apalis-ixora)
+ led_green='LED_5_GREEN'
+ led_red='LED_5_RED'
+ ;;
+*)
+ exit 0
+ ;;
+esac
+
+set_state() {
+ status_led=$led_red
+ case "$1" in
+ preinit)
+ status_led_set_timer 100 100
+ ;;
+ failsafe)
+ status_led_set_timer 50 50
+ ;;
+ preinit_regular)
+ status_led_blink_preinit_regular
+ ;;
+ done)
+ led_off $status_led
+ status_led=$led_green
+ status_led_set_heartbeat
+ ;;
+ esac
+}
diff --git a/target/linux/imx6/base-files/etc/uci-defaults/02_network
b/target/linux/imx6/base-files/etc/uci-defaults/02_network
index bf83063..aae2af2 100644
--- a/target/linux/imx6/base-files/etc/uci-defaults/02_network
+++ b/target/linux/imx6/base-files/etc/uci-defaults/02_network
@@ -24,6 +24,7 @@ case "$board" in
*gw552x)
ucidef_set_interfaces_lan_wan 'eth0' 'eth1'
;;
+*apalis-ixora |\
*wandboard)
ucidef_set_interface_wan 'eth0'
;;
diff --git a/target/linux/imx6/base-files/lib/imx6.sh
b/target/linux/imx6/base-files/lib/imx6.sh
index 360ec58..306077c 100755
--- a/target/linux/imx6/base-files/lib/imx6.sh
+++ b/target/linux/imx6/base-files/lib/imx6.sh
@@ -39,6 +39,10 @@ imx6_board_detect() {
name="gw552x"
;;
+ "Toradex Apalis iMX6Q on Apalis Ixora Board")
+ name="apalis-ixora"
+ ;;
+
"Wandboard i.MX6 Dual Lite Board")
name="wandboard"
;;
--
1.7.9.5
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 1/2] imx6: kernel: Add support for Toradex Apalis modules
Tested on Toradex Apalis iMX6 Quad 2GB IT V1.1A module on Ixora board
with Mikrotik R11e-2HnD and Quectel EC20 Mini PCIe modules.
Signed-off-by: Petr Štetiar
---
target/linux/imx6/image/Makefile |2 +
...6-Add-support-for-Toradex-Apalis-modules-.patch | 1996
...dd-reset-function-for-reseting-downstream.patch | 79 +
target/linux/imx6/profiles/130-toradex.mk | 27 +
4 files changed, 2104 insertions(+)
create mode 100644
target/linux/imx6/patches-4.1/200-ARM-dts-imx6-Add-support-for-Toradex-Apalis-modules-.patch
create mode 100644
target/linux/imx6/patches-4.1/300-pcie-imx6-add-reset-function-for-reseting-downstream.patch
create mode 100644 target/linux/imx6/profiles/130-toradex.mk
diff --git a/target/linux/imx6/image/Makefile b/target/linux/imx6/image/Makefile
index d5bab30..0dadf0b 100644
--- a/target/linux/imx6/image/Makefile
+++ b/target/linux/imx6/image/Makefile
@@ -110,6 +110,8 @@ Image/BuildKernel/Template/VENTANA=$(foreach dts,$(shell
echo $(VENTANA_DTS)),$(
Image/InstallKernel/Template/VENTANA=$(call
Image/InstallKernel/Template,$(VENTANA_DTS))
Image/ubifs/VENTANA=$(call ubifs_imx_gateworks_ventana)
+Image/BuildKernel/Template/APALIS=$(foreach dts,$(shell echo
$(APALIS_DTS)),$(call Image/BuildKernel/Template,$(dts)))
+Image/InstallKernel/Template/APALIS=$(call
Image/InstallKernel/Template,$(APALIS_DTS))
define Image/BuildKernel
$(call Image/BuildKernel/Template/$(PROFILE))
diff --git
a/target/linux/imx6/patches-4.1/200-ARM-dts-imx6-Add-support-for-Toradex-Apalis-modules-.patch
b/target/linux/imx6/patches-4.1/200-ARM-dts-imx6-Add-support-for-Toradex-Apalis-modules-.patch
new file mode 100644
index 000..74c2718
--- /dev/null
+++
b/target/linux/imx6/patches-4.1/200-ARM-dts-imx6-Add-support-for-Toradex-Apalis-modules-.patch
@@ -0,0 +1,1996 @@
+From a9b5bec66c768274493a4d583b7adba366c80470 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20=C5=A0tetiar?=
+Date: Wed, 14 Oct 2015 16:37:43 +0200
+Subject: [PATCH 1/3] ARM: dts: imx6: Add support for Toradex Apalis modules
+ and boards
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* includes support for Eval and Ixora boards
+* hand picked from toradex_imx_3.14.28_1.0.0_ga-next branch
+
+Signed-off-by: Petr Štetiar
+---
+ arch/arm/boot/dts/Makefile|4 +
+ arch/arm/boot/dts/imx6q-apalis-eval.dts | 25 +
+ arch/arm/boot/dts/imx6q-apalis-ixora.dts | 25 +
+ arch/arm/boot/dts/imx6q-apalis_v1_0-eval.dts | 29 +
+ arch/arm/boot/dts/imx6q-apalis_v1_0-ixora.dts | 29 +
+ arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi| 357
+ arch/arm/boot/dts/imx6qdl-apalis-ixora.dtsi | 333
+ arch/arm/boot/dts/imx6qdl-apalis.dtsi | 1107 +
+ 8 files changed, 1909 insertions(+)
+ create mode 100644 arch/arm/boot/dts/imx6q-apalis-eval.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-apalis-ixora.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-apalis_v1_0-eval.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-apalis_v1_0-ixora.dts
+ create mode 100644 arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6qdl-apalis-ixora.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6qdl-apalis.dtsi
+
+diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
+index 992736b..2a5aff2 100644
+--- a/arch/arm/boot/dts/Makefile
b/arch/arm/boot/dts/Makefile
+@@ -277,6 +277,10 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
+ imx6dl-udoo.dtb \
+ imx6dl-wandboard.dtb \
+ imx6dl-wandboard-revb1.dtb \
++ imx6q-apalis-eval.dtb \
++ imx6q-apalis_v1_0-eval.dtb \
++ imx6q-apalis-ixora.dtb \
++ imx6q-apalis_v1_0-ixora.dtb \
+ imx6q-arm2.dtb \
+ imx6q-cm-fx6.dtb \
+ imx6q-cubox-i.dtb \
+diff --git a/arch/arm/boot/dts/imx6q-apalis-eval.dts
b/arch/arm/boot/dts/imx6q-apalis-eval.dts
+new file mode 100644
+index 000..1f49c7a
+--- /dev/null
b/arch/arm/boot/dts/imx6q-apalis-eval.dts
+@@ -0,0 +1,25 @@
++/*
++ * Copyright 2014-2015 Toradex AG
++ * Copyright 2012 Freescale Semiconductor, Inc.
++ * Copyright 2011 Linaro Ltd.
++ *
++ * The code contained herein is licensed under the GNU General Public
++ * License. You may obtain a copy of the GNU General Public License
++ * Version 2 or later at the following locations:
++ *
++ * http://www.opensource.org/licenses/gpl-license.html
++ * http://www.gnu.org/copyleft/gpl.html
++ */
++
++/dts-v1/;
++
++#include
++#include
++#include "imx6q.dtsi"
++#include "imx6qdl-apalis.dtsi"
++#include "imx6qdl-apalis-eval.dtsi"
++
++/ {
++ model = "Toradex Apalis iMX6Q on Apalis Evaluation Board";
++ compatible = "toradex,apalis_imx6q-eval", "toradex,apalis_imx6q",
"fsl,imx6q";
++};
+diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts
b/arch/arm/boot/dts/imx6q-apalis-ixora.dts
+new file mode 100644
+index 000..cf1ef48
+--- /dev/null
b/arch/arm/b
Re: [OpenWrt-Devel] [PATCH] imx6: image: Make InstallKernel more generic
On 2015-11-11 14:15, Petr Štetiar wrote: > Signed-off-by: Petr Štetiar > --- > target/linux/imx6/image/Makefile |6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/target/linux/imx6/image/Makefile > b/target/linux/imx6/image/Makefile > index 9b9f948..d5bab30 100644 > --- a/target/linux/imx6/image/Makefile > +++ b/target/linux/imx6/image/Makefile > @@ -40,9 +40,9 @@ endef > > define Image/InstallKernel/Template > > - ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_KERNEL)$(CONFIG_TARGET_imx6_VENTANA),) > + ifneq > ($(CONFIG_TARGET_ROOTFS_INCLUDE_KERNEL)$(CONFIG_TARGET_imx6_$(PROFILE)),) No need for that. This crappy code is going to be replaced soon (patch has already been posted). - Felix ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] config/Config-images.in: Fix wrong handling of ROOTFS_INCLUDE default options
On 2015-11-11 14:14, Petr Štetiar wrote: > Signed-off-by: Petr Štetiar > --- > config/Config-images.in | 12 ++-- > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/config/Config-images.in b/config/Config-images.in > index a60dd50..cdaf5e9 100644 > --- a/config/Config-images.in > +++ b/config/Config-images.in > @@ -281,24 +281,24 @@ menu "Target Images" > below /boot. > > config TARGET_ROOTFS_INCLUDE_UIMAGE > - bool "include uImage" if TARGET_ROOTFS_INCLUDE_KERNEL > - default y > + bool "include uImage" > + default y if TARGET_ROOTFS_INCLUDE_KERNEL This is not wrong. TARGET_ROOTFS_INCLUDE_UIMAGE depends on TARGET_ROOTFS_INCLUDE_KERNEL, as it should. - Felix ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] config/Config-images.in: Fix wrong handling of ROOTFS_INCLUDE default options
Felix Fietkau [2015-11-11 14:48:33]: > This is not wrong. TARGET_ROOTFS_INCLUDE_UIMAGE depends on > TARGET_ROOTFS_INCLUDE_KERNEL, as it should. Maybe it's not correct fix, but in current state it's somehow broken. If I revert this patch, I can't include anything (kernels, DTBs) until I select ext4 filesystem. Once I deselect the ext4 it lefts my config in following state: # CONFIG_TARGET_ROOTFS_INCLUDE_KERNEL is not set CONFIG_TARGET_ROOTFS_INCLUDE_UIMAGE=y CONFIG_TARGET_ROOTFS_INCLUDE_ZIMAGE=y CONFIG_TARGET_ROOTFS_INCLUDE_FIT=y # CONFIG_TARGET_ROOTFS_INCLUDE_DTB is not set and I'm not able to remove the included images from menuconfig anymore. Thanks. -- ynezz ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] config/Config-images.in: Fix wrong handling of ROOTFS_INCLUDE default options
On 2015-11-11 14:56, Petr Štetiar wrote: > Felix Fietkau [2015-11-11 14:48:33]: > >> This is not wrong. TARGET_ROOTFS_INCLUDE_UIMAGE depends on >> TARGET_ROOTFS_INCLUDE_KERNEL, as it should. > > Maybe it's not correct fix, but in current state it's somehow broken. If I > revert this patch, I can't include anything (kernels, DTBs) until I select > ext4 filesystem. Once I deselect the ext4 it lefts my config in following > state: > > # CONFIG_TARGET_ROOTFS_INCLUDE_KERNEL is not set > CONFIG_TARGET_ROOTFS_INCLUDE_UIMAGE=y > CONFIG_TARGET_ROOTFS_INCLUDE_ZIMAGE=y > CONFIG_TARGET_ROOTFS_INCLUDE_FIT=y > # CONFIG_TARGET_ROOTFS_INCLUDE_DTB is not set > > and I'm not able to remove the included images from menuconfig anymore. This option is apparently supported for ext4 and ubifs only. Also, the code enabled by these options is one big design flaw, and I'd like to get rid of it as soon as possible by converting all devices that need it over to the new image building code. - Felix ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 1/2] imx6: kernel: Add support for Toradex Apalis modules
On 2015-11-11 14:28, Petr Štetiar wrote: > Tested on Toradex Apalis iMX6 Quad 2GB IT V1.1A module on Ixora board > with Mikrotik R11e-2HnD and Quectel EC20 Mini PCIe modules. > > Signed-off-by: Petr Štetiar > --- > target/linux/imx6/image/Makefile |2 + > ...6-Add-support-for-Toradex-Apalis-modules-.patch | 1996 > > ...dd-reset-function-for-reseting-downstream.patch | 79 + > target/linux/imx6/profiles/130-toradex.mk | 27 + > 4 files changed, 2104 insertions(+) > create mode 100644 > target/linux/imx6/patches-4.1/200-ARM-dts-imx6-Add-support-for-Toradex-Apalis-modules-.patch > create mode 100644 > target/linux/imx6/patches-4.1/300-pcie-imx6-add-reset-function-for-reseting-downstream.patch > create mode 100644 target/linux/imx6/profiles/130-toradex.mk > > diff --git a/target/linux/imx6/image/Makefile > b/target/linux/imx6/image/Makefile > index d5bab30..0dadf0b 100644 > --- a/target/linux/imx6/image/Makefile > +++ b/target/linux/imx6/image/Makefile > @@ -110,6 +110,8 @@ Image/BuildKernel/Template/VENTANA=$(foreach dts,$(shell > echo $(VENTANA_DTS)),$( > Image/InstallKernel/Template/VENTANA=$(call > Image/InstallKernel/Template,$(VENTANA_DTS)) > Image/ubifs/VENTANA=$(call ubifs_imx_gateworks_ventana) > > +Image/BuildKernel/Template/APALIS=$(foreach dts,$(shell echo > $(APALIS_DTS)),$(call Image/BuildKernel/Template,$(dts))) > +Image/InstallKernel/Template/APALIS=$(call > Image/InstallKernel/Template,$(APALIS_DTS)) > > define Image/BuildKernel > $(call Image/BuildKernel/Template/$(PROFILE)) This conflicts with Tim Harvey's work on converting imx6 image building code to over to the new infrastructure. Please make a new patch based on a tree with his patch applied. Also, since you implied in another email that you need kernel-in-rootfs support, please look into splitting the kernel image filesystem from the main openwrt root filesystem in order to support squashfs + ubifs overlay. You can find Tim's patches here: http://patchwork.ozlabs.org/patch/541142/ http://patchwork.ozlabs.org/patch/541143/ - Felix ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 1/2] imx6: kernel: Add support for Toradex Apalis modules
On Wed, Nov 11, 2015 at 5:28 AM, Petr Štetiar wrote: > Tested on Toradex Apalis iMX6 Quad 2GB IT V1.1A module on Ixora board > with Mikrotik R11e-2HnD and Quectel EC20 Mini PCIe modules. > > Signed-off-by: Petr Štetiar > --- > target/linux/imx6/image/Makefile |2 + > ...6-Add-support-for-Toradex-Apalis-modules-.patch | 1996 > > ...dd-reset-function-for-reseting-downstream.patch | 79 + > target/linux/imx6/profiles/130-toradex.mk | 27 + > 4 files changed, 2104 insertions(+) > create mode 100644 > target/linux/imx6/patches-4.1/200-ARM-dts-imx6-Add-support-for-Toradex-Apalis-modules-.patch > create mode 100644 > target/linux/imx6/patches-4.1/300-pcie-imx6-add-reset-function-for-reseting-downstream.patch > create mode 100644 target/linux/imx6/profiles/130-toradex.mk > > diff --git a/target/linux/imx6/image/Makefile > b/target/linux/imx6/image/Makefile > index d5bab30..0dadf0b 100644 > --- a/target/linux/imx6/image/Makefile > +++ b/target/linux/imx6/image/Makefile > @@ -110,6 +110,8 @@ Image/BuildKernel/Template/VENTANA=$(foreach dts,$(shell > echo $(VENTANA_DTS)),$( > Image/InstallKernel/Template/VENTANA=$(call > Image/InstallKernel/Template,$(VENTANA_DTS)) > Image/ubifs/VENTANA=$(call ubifs_imx_gateworks_ventana) > > +Image/BuildKernel/Template/APALIS=$(foreach dts,$(shell echo > $(APALIS_DTS)),$(call Image/BuildKernel/Template,$(dts))) > +Image/InstallKernel/Template/APALIS=$(call > Image/InstallKernel/Template,$(APALIS_DTS)) > > define Image/BuildKernel > $(call Image/BuildKernel/Template/$(PROFILE)) Hi Petr, As Felix mentioned, I've posted a couple of patches that re-write the imx6/image/Makefile using the newew TARGET_DEVICE notation which is much cleaner and easier to build off of. I expect those patches to be merged perhaps this week and I think you'll find it very easy to use the example of the Wandboard device there to create a device for your board that includes APALIS_DTS. > diff --git > a/target/linux/imx6/patches-4.1/200-ARM-dts-imx6-Add-support-for-Toradex-Apalis-modules-.patch > > b/target/linux/imx6/patches-4.1/200-ARM-dts-imx6-Add-support-for-Toradex-Apalis-modules-.patch > new file mode 100644 > index 000..74c2718 > --- /dev/null > +++ > b/target/linux/imx6/patches-4.1/200-ARM-dts-imx6-Add-support-for-Toradex-Apalis-modules-.patch > @@ -0,0 +1,1996 @@ > +From a9b5bec66c768274493a4d583b7adba366c80470 Mon Sep 17 00:00:00 2001 > +From: =?UTF-8?q?Petr=20=C5=A0tetiar?= > +Date: Wed, 14 Oct 2015 16:37:43 +0200 > +Subject: [PATCH 1/3] ARM: dts: imx6: Add support for Toradex Apalis modules > + and boards > +MIME-Version: 1.0 > +Content-Type: text/plain; charset=UTF-8 > +Content-Transfer-Encoding: 8bit > + > +* includes support for Eval and Ixora boards > +* hand picked from toradex_imx_3.14.28_1.0.0_ga-next branch > + > +Signed-off-by: Petr Štetiar > +--- > + arch/arm/boot/dts/Makefile|4 + > + arch/arm/boot/dts/imx6q-apalis-eval.dts | 25 + > + arch/arm/boot/dts/imx6q-apalis-ixora.dts | 25 + > + arch/arm/boot/dts/imx6q-apalis_v1_0-eval.dts | 29 + > + arch/arm/boot/dts/imx6q-apalis_v1_0-ixora.dts | 29 + > + arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi| 357 > + arch/arm/boot/dts/imx6qdl-apalis-ixora.dtsi | 333 > + arch/arm/boot/dts/imx6qdl-apalis.dtsi | 1107 > + > + 8 files changed, 1909 insertions(+) > + create mode 100644 arch/arm/boot/dts/imx6q-apalis-eval.dts > + create mode 100644 arch/arm/boot/dts/imx6q-apalis-ixora.dts > + create mode 100644 arch/arm/boot/dts/imx6q-apalis_v1_0-eval.dts > + create mode 100644 arch/arm/boot/dts/imx6q-apalis_v1_0-ixora.dts > + create mode 100644 arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi > + create mode 100644 arch/arm/boot/dts/imx6qdl-apalis-ixora.dtsi > + create mode 100644 arch/arm/boot/dts/imx6qdl-apalis.dtsi The OpenWrt tradition is to add a patch to add yoru dtb's to the Makefile (as you have done with archarm/boot/dts/Makefile but to put 'added' files into target/linux/imx6/files-4.1/ Also, I would recommend first posting your dts patches to the arm-linux maillist first to have them reviewed fully by the experts there before adding them to OpenWrt. The benefit other than being reviewed by the proper group is that they will also get mainlined and make future maintenance of the imx6 target much simpler. I've cc'd Luka so he can voice his opinion or desire as the imx6 maintainer as well. > diff --git > a/target/linux/imx6/patches-4.1/300-pcie-imx6-add-reset-function-for-reseting-downstream.patch > > b/target/linux/imx6/patches-4.1/300-pcie-imx6-add-reset-function-for-reseting-downstream.patch > new file mode 100644 > index 000..c1bbaa8 > --- /dev/null > +++ > b/target/linux/imx6/patches-4.1/300-pcie-imx6-add-reset-function-for-reseting-downstream.patch > @@ -0,0 +1,79 @@ > +From 37f31601d32cfec48c0b69bc6e08f2aff08d4c6a Mon Sep 17 00:00:00 2001 > +From: Ma
Re: [OpenWrt-Devel] [PATCH] config/Config-images.in: Fix wrong handling of ROOTFS_INCLUDE default options
Hello Felix, On 11.11.2015 15:00, Felix Fietkau wrote: > This option is apparently supported for ext4 and ubifs only. Also, the > code enabled by these options is one big design flaw, and I'd like to > get rid of it as soon as possible by converting all devices that need it > over to the new image building code. because I was planning to use these options for a new target, can you give me a hint what's now the correct way to create an image of ext4 FS with kernel included within it? Thanks Jan ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] UCI???
Hello Guys, i have a question about uci. How can i get the functions including in the script i.e. /lib/functions/olsrd.sh Is there a way without to read the sources? thanks sm ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 1/4] base-files: add DCCP to /etc/protocols
Fixes this conntrackd warning: WARNING: getprotobyname() cannot find protocol `DCCP' in /etc/protocols Signed-off-by: Stijn Tintel --- package/base-files/files/etc/protocols | 1 + 1 file changed, 1 insertion(+) diff --git a/package/base-files/files/etc/protocols b/package/base-files/files/etc/protocols index 53fecb6..26bc775 100644 --- a/package/base-files/files/etc/protocols +++ b/package/base-files/files/etc/protocols @@ -22,6 +22,7 @@ hmp 20 HMP # host monitoring protocol xns-idp22 XNS-IDP # Xerox NS IDP rdp27 RDP # "reliable datagram" protocol iso-tp429 ISO-TP4 # ISO Transport Protocol class 4 [RFC905] +dccp 33 DCCP# Datagram Congestion Control Protocol [RFC4340] xtp36 XTP # Xpress Transfer Protocol ddp37 DDP # Datagram Delivery Protocol idpr-cmtp 38 IDPR-CMTP # IDPR Control Message Transport -- 2.4.6 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 2/4] conntrack-tools: use INSTALL_DIR once
Signed-off-by: Stijn Tintel --- package/network/utils/conntrack-tools/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/network/utils/conntrack-tools/Makefile b/package/network/utils/conntrack-tools/Makefile index 7dd64b6..b931d85 100644 --- a/package/network/utils/conntrack-tools/Makefile +++ b/package/network/utils/conntrack-tools/Makefile @@ -68,9 +68,10 @@ define Package/conntrackd/description endef define Package/conntrackd/install - $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_DIR) \ + $(1)/etc/init.d \ + $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/conntrackd $(1)/usr/sbin/ - $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/conntrackd.init $(1)/etc/init.d/conntrackd endef -- 2.4.6 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 4/4] conntrack-tools: preserve /etc/conntrackd during upgrade
Signed-off-by: Stijn Tintel --- package/network/utils/conntrack-tools/Makefile | 2 ++ package/network/utils/conntrack-tools/files/conntrackd.upgrade | 1 + 2 files changed, 3 insertions(+) create mode 100644 package/network/utils/conntrack-tools/files/conntrackd.upgrade diff --git a/package/network/utils/conntrack-tools/Makefile b/package/network/utils/conntrack-tools/Makefile index 51d3c41..a7a28f2 100644 --- a/package/network/utils/conntrack-tools/Makefile +++ b/package/network/utils/conntrack-tools/Makefile @@ -71,9 +71,11 @@ define Package/conntrackd/install $(INSTALL_DIR) \ $(1)/etc/conntrackd \ $(1)/etc/init.d \ + $(1)/lib/upgrade/keep.d \ $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/conntrackd $(1)/usr/sbin/ $(INSTALL_BIN) ./files/conntrackd.init $(1)/etc/init.d/conntrackd + $(INSTALL_DATA) ./files/conntrackd.upgrade $(1)/lib/upgrade/keep.d/conntrackd endef $(eval $(call BuildPackage,conntrack)) diff --git a/package/network/utils/conntrack-tools/files/conntrackd.upgrade b/package/network/utils/conntrack-tools/files/conntrackd.upgrade new file mode 100644 index 000..bcff8a2 --- /dev/null +++ b/package/network/utils/conntrack-tools/files/conntrackd.upgrade @@ -0,0 +1 @@ +/etc/conntrackd/ -- 2.4.6 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 3/4] conntrack-tools: create /etc/conntrackd directory
Signed-off-by: Stijn Tintel --- package/network/utils/conntrack-tools/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/package/network/utils/conntrack-tools/Makefile b/package/network/utils/conntrack-tools/Makefile index b931d85..51d3c41 100644 --- a/package/network/utils/conntrack-tools/Makefile +++ b/package/network/utils/conntrack-tools/Makefile @@ -69,6 +69,7 @@ endef define Package/conntrackd/install $(INSTALL_DIR) \ + $(1)/etc/conntrackd \ $(1)/etc/init.d \ $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/conntrackd $(1)/usr/sbin/ -- 2.4.6 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] config/Config-images.in: Fix wrong handling of ROOTFS_INCLUDE default options
On 2015-11-11 16:04, Jan Čermák wrote: > Hello Felix, > > On 11.11.2015 15:00, Felix Fietkau wrote: >> This option is apparently supported for ext4 and ubifs only. Also, the >> code enabled by these options is one big design flaw, and I'd like to >> get rid of it as soon as possible by converting all devices that need it >> over to the new image building code. > > because I was planning to use these options for a new target, can you give me > a > hint what's now the correct way to create an image of ext4 FS with kernel > included within it? Do you need to keep the kernel in the same filesystem as the rest of the system, or can you make a small kernel partition and use the normal squashfs+jffs2 overlay, or does it use something else? - Felix ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 4/4] conntrack-tools: preserve /etc/conntrackd during upgrade
Hi, > + $(INSTALL_DATA) ./files/conntrackd.upgrade > $(1)/lib/upgrade/keep.d/conntrackd please don't ship keep.d files manually, use the define Package/.../conffile macro (yes it works for directories as well). ~ Jow signature.asc Description: OpenPGP digital signature ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] UCI???
* smile...@gmail.com [11.11.2015 20:11]: > How can i get the functions including in the script > i.e. /lib/functions/olsrd.sh > Is there a way without to read the sources? please use for external packages this tracker: https://github.com/openwrt/packages/ (olsr-package is maintained there) bye, bastian ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 02/10] kernel: add patch to fix prefsrc lookups
Signed-off-by: Stijn Tintel
---
.../patches-4.3/192-net-Fix-presrc-lookups.patch | 60 ++
1 file changed, 60 insertions(+)
create mode 100644
target/linux/generic/patches-4.3/192-net-Fix-presrc-lookups.patch
diff --git a/target/linux/generic/patches-4.3/192-net-Fix-presrc-lookups.patch
b/target/linux/generic/patches-4.3/192-net-Fix-presrc-lookups.patch
new file mode 100644
index 000..8a05083
--- /dev/null
+++ b/target/linux/generic/patches-4.3/192-net-Fix-presrc-lookups.patch
@@ -0,0 +1,60 @@
+From patchwork Tue Nov 3 23:59:28 2015
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: net: Fix prefsrc lookups
+From: David Ahern
+X-Patchwork-Id: 539645
+Message-Id: <1446595168-27323-1-git-send-email-...@cumulusnetworks.com>
+To: net...@vger.kernel.org
+Cc: vl...@aresgate.net, David Ahern
+Date: Tue, 3 Nov 2015 15:59:28 -0800
+
+A bug report (https://bugzilla.kernel.org/show_bug.cgi?id=107071) noted
+that the follwoing ip command is failing with v4.3:
+
+$ ip route add 10.248.5.0/24 dev bond0.250 table vlan_250 src 10.248.5.154
+RTNETLINK answers: Invalid argument
+
+021dd3b8a142d changed the lookup of the given preferred source address to
+use the table id passed in, but this assumes the local entries are in the
+given table which is not necessarily true for non-VRF use cases. When
+validating the preferred source fallback to the local table on failure.
+
+Fixes: 021dd3b8a142d ("net: Add routes to the table associated with the
device")
+Signed-off-by: David Ahern
+---
+This is needed in v4.3.
+
+ net/ipv4/fib_semantics.c | 13 ++---
+ 1 file changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
+index 064bd3caaa4f..aac966f6162f 100644
+--- a/net/ipv4/fib_semantics.c
b/net/ipv4/fib_semantics.c
+@@ -864,14 +864,21 @@ static bool fib_valid_prefsrc(struct fib_config *cfg,
__be32 fib_prefsrc)
+ if (cfg->fc_type != RTN_LOCAL || !cfg->fc_dst ||
+ fib_prefsrc != cfg->fc_dst) {
+ u32 tb_id = cfg->fc_table;
++ int rc;
+
+ if (tb_id == RT_TABLE_MAIN)
+ tb_id = RT_TABLE_LOCAL;
+
+- if (inet_addr_type_table(cfg->fc_nlinfo.nl_net,
+- fib_prefsrc, tb_id) != RTN_LOCAL) {
+- return false;
++ rc = inet_addr_type_table(cfg->fc_nlinfo.nl_net,
++fib_prefsrc, tb_id);
++
++ if (rc != RTN_LOCAL && tb_id != RT_TABLE_LOCAL) {
++ rc = inet_addr_type_table(cfg->fc_nlinfo.nl_net,
++fib_prefsrc, RT_TABLE_LOCAL);
+ }
++
++ if (rc != RTN_LOCAL)
++ return false;
+ }
+ return true;
+ }
--
2.4.6
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 01/10] xtables-addons: update to 2.9
Fixes compilation with Linux 4.3. Runtime tested on Ubiquiti EdgeRouter
Lite with Linux 3.18, 4.1 and 4.3.
Signed-off-by: Stijn Tintel
---
package/network/utils/xtables-addons/Makefile | 4 ++--
.../network/utils/xtables-addons/patches/100-add-rtsp-conntrack.patch | 2 +-
.../utils/xtables-addons/patches/200-add-lua-packetscript.patch | 2 +-
.../utils/xtables-addons/patches/201-fix-lua-packetscript.patch | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package/network/utils/xtables-addons/Makefile
b/package/network/utils/xtables-addons/Makefile
index ff6466f..5cfe7b5 100644
--- a/package/network/utils/xtables-addons/Makefile
+++ b/package/network/utils/xtables-addons/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=xtables-addons
-PKG_VERSION:=2.7
+PKG_VERSION:=2.9
PKG_RELEASE:=1
-PKG_MD5SUM:=81bd7ba82e5f7bfd1458fc97ddf72e1d
+PKG_MD5SUM:=87df49f3804036eccd4619f566d26bb3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@SF/xtables-addons
diff --git
a/package/network/utils/xtables-addons/patches/100-add-rtsp-conntrack.patch
b/package/network/utils/xtables-addons/patches/100-add-rtsp-conntrack.patch
index 6c169ee..bd49d92 100644
--- a/package/network/utils/xtables-addons/patches/100-add-rtsp-conntrack.patch
+++ b/package/network/utils/xtables-addons/patches/100-add-rtsp-conntrack.patch
@@ -1509,7 +1509,7 @@
+module_exit(fini);
--- a/extensions/Kbuild
+++ b/extensions/Kbuild
-@@ -28,6 +28,7 @@ obj-${build_lscan} += xt_lscan.o
+@@ -26,6 +26,7 @@ obj-${build_lscan} += xt_lscan.o
obj-${build_pknock} += pknock/
obj-${build_psd} += xt_psd.o
obj-${build_quota2} += xt_quota2.o
diff --git
a/package/network/utils/xtables-addons/patches/200-add-lua-packetscript.patch
b/package/network/utils/xtables-addons/patches/200-add-lua-packetscript.patch
index 8bc30a7..33d0d74 100644
---
a/package/network/utils/xtables-addons/patches/200-add-lua-packetscript.patch
+++
b/package/network/utils/xtables-addons/patches/200-add-lua-packetscript.patch
@@ -18134,7 +18134,7 @@
+
--- a/extensions/Kbuild
+++ b/extensions/Kbuild
-@@ -29,6 +29,7 @@ obj-${build_pknock} += pknock/
+@@ -27,6 +27,7 @@ obj-${build_pknock} += pknock/
obj-${build_psd} += xt_psd.o
obj-${build_quota2} += xt_quota2.o
obj-${build_rtsp}+= rtsp/
diff --git
a/package/network/utils/xtables-addons/patches/201-fix-lua-packetscript.patch
b/package/network/utils/xtables-addons/patches/201-fix-lua-packetscript.patch
index 966d29d..06a4a17 100644
---
a/package/network/utils/xtables-addons/patches/201-fix-lua-packetscript.patch
+++
b/package/network/utils/xtables-addons/patches/201-fix-lua-packetscript.patch
@@ -78,7 +78,7 @@
#define UCHAR_MAX 255
#define SHRT_MAX32767
#define BUFSIZ8192
-@@ -637,6 +641,8 @@ union luai_Cast { double l_d; long l_l;
+@@ -637,6 +641,8 @@ union luai_Cast { double l_d; long l_l;
*/
#if defined(__KERNEL__)
#undef LUA_USE_ULONGJMP
--
2.4.6
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 05/10] octeon: remove 3.18 support
Signed-off-by: Stijn Tintel --- target/linux/octeon/config-3.18| 250 --- .../100-ubnt_edgerouter2_support.patch | 31 - .../110-er200-ethernet_probe_order.patch | 34 - .../patches-3.18/120-octeon_platform_usb.patch | 20 - ...add-semaphore-to-serialize-bootbus-access.patch | 21 - ...N-Update-octeon-model.h-code-for-new-SoCs.patch | 103 -- ...add-host-driver-for-octeon-mmc-controller.patch | 1622 .../octeon/patches-3.18/160-cmdline-hack.patch | 47 - 8 files changed, 2128 deletions(-) delete mode 100644 target/linux/octeon/config-3.18 delete mode 100644 target/linux/octeon/patches-3.18/100-ubnt_edgerouter2_support.patch delete mode 100644 target/linux/octeon/patches-3.18/110-er200-ethernet_probe_order.patch delete mode 100644 target/linux/octeon/patches-3.18/120-octeon_platform_usb.patch delete mode 100644 target/linux/octeon/patches-3.18/130-MIPS-octeon-add-semaphore-to-serialize-bootbus-access.patch delete mode 100644 target/linux/octeon/patches-3.18/140-MIPS-OCTEON-Update-octeon-model.h-code-for-new-SoCs.patch delete mode 100644 target/linux/octeon/patches-3.18/150-mmc-octeon-add-host-driver-for-octeon-mmc-controller.patch delete mode 100644 target/linux/octeon/patches-3.18/160-cmdline-hack.patch diff --git a/target/linux/octeon/config-3.18 b/target/linux/octeon/config-3.18 deleted file mode 100644 index 44a154a..000 --- a/target/linux/octeon/config-3.18 +++ /dev/null @@ -1,250 +0,0 @@ -CONFIG_64BIT=y -CONFIG_64BIT_PHYS_ADDR=y -CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y -CONFIG_ARCH_DISCARD_MEMBLOCK=y -CONFIG_ARCH_DMA_ADDR_T_64BIT=y -CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y -# CONFIG_ARCH_HAS_SG_CHAIN is not set -CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y -CONFIG_ARCH_HIBERNATION_POSSIBLE=y -CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y -CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y -CONFIG_ARCH_PHYS_ADDR_T_64BIT=y -CONFIG_ARCH_REQUIRE_GPIOLIB=y -CONFIG_ARCH_SPARSEMEM_ENABLE=y -CONFIG_ARCH_SUSPEND_POSSIBLE=y -CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y -CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y -CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y -CONFIG_BINFMT_ELF32=y -CONFIG_BLK_DEV_SD=y -CONFIG_BLOCK_COMPAT=y -# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set -CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 -CONFIG_BUILTIN_DTB=y -# CONFIG_CAVIUM_CN63XXP1 is not set -# CONFIG_CAVIUM_OCTEON_2ND_KERNEL is not set -CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE=2 -CONFIG_CAVIUM_OCTEON_LOCK_L2=y -CONFIG_CAVIUM_OCTEON_LOCK_L2_EXCEPTION=y -CONFIG_CAVIUM_OCTEON_LOCK_L2_INTERRUPT=y -CONFIG_CAVIUM_OCTEON_LOCK_L2_LOW_LEVEL_INTERRUPT=y -CONFIG_CAVIUM_OCTEON_LOCK_L2_MEMCPY=y -CONFIG_CAVIUM_OCTEON_LOCK_L2_TLB=y -CONFIG_CAVIUM_OCTEON_SOC=y -CONFIG_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_CEVT_R4K=y -CONFIG_CLONE_BACKWARDS=y -CONFIG_COMPAT=y -CONFIG_COMPAT_BRK=y -CONFIG_COMPAT_NETLINK_MESSAGES=y -CONFIG_CPU_BIG_ENDIAN=y -CONFIG_CPU_CAVIUM_OCTEON=y -CONFIG_CPU_GENERIC_DUMP_TLB=y -CONFIG_CPU_HAS_PREFETCH=y -CONFIG_CPU_HAS_SYNC=y -CONFIG_CPU_MIPSR2=y -CONFIG_CPU_NEEDS_NO_SMARTMIPS_OR_MICROMIPS=y -CONFIG_CPU_RMAP=y -CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y -CONFIG_CPU_SUPPORTS_HIGHMEM=y -CONFIG_CPU_SUPPORTS_HUGEPAGES=y -CONFIG_CRAMFS=y -CONFIG_CRC16=y -CONFIG_CRYPTO_CRC32C=y -CONFIG_CRYPTO_HASH=y -CONFIG_CRYPTO_HASH2=y -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_SPINLOCK=y -CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 -CONFIG_DETECT_HUNG_TASK=y -CONFIG_DEVKMEM=y -CONFIG_DMA_COHERENT=y -CONFIG_DNOTIFY=y -CONFIG_DTC=y -CONFIG_EARLY_PRINTK=y -CONFIG_EDAC_SUPPORT=y -CONFIG_ENABLE_MUST_CHECK=y -CONFIG_EXT4_FS=y -CONFIG_FAT_FS=y -CONFIG_FRAME_WARN=2048 -CONFIG_FS_MBCACHE=y -CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_GENERIC_CLOCKEVENTS_BUILD=y -CONFIG_GENERIC_CMOS_UPDATE=y -CONFIG_GENERIC_IO=y -CONFIG_GENERIC_IRQ_SHOW=y -CONFIG_GENERIC_PCI_IOMAP=y -CONFIG_GENERIC_SMP_IDLE_THREAD=y -CONFIG_GPIOLIB=y -CONFIG_GPIO_DEVRES=y -CONFIG_GPIO_OCTEON=y -CONFIG_GPIO_SYSFS=y -CONFIG_HARDWARE_WATCHPOINTS=y -CONFIG_HAS_DMA=y -CONFIG_HAS_IOMEM=y -CONFIG_HAS_IOPORT_MAP=y -CONFIG_HAVE_64BIT_ALIGNED_ACCESS=y -CONFIG_HAVE_ARCH_JUMP_LABEL=y -CONFIG_HAVE_ARCH_KGDB=y -CONFIG_HAVE_ARCH_SECCOMP_FILTER=y -CONFIG_HAVE_ARCH_TRACEHOOK=y -CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y -# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set -CONFIG_HAVE_BPF_JIT=y -CONFIG_HAVE_CC_STACKPROTECTOR=y -CONFIG_HAVE_CONTEXT_TRACKING=y -CONFIG_HAVE_C_RECORDMCOUNT=y -CONFIG_HAVE_DEBUG_KMEMLEAK=y -CONFIG_HAVE_DEBUG_STACKOVERFLOW=y -CONFIG_HAVE_DMA_API_DEBUG=y -CONFIG_HAVE_DMA_ATTRS=y -CONFIG_HAVE_DMA_CONTIGUOUS=y -CONFIG_HAVE_DYNAMIC_FTRACE=y -CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y -CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y -CONFIG_HAVE_FUNCTION_TRACER=y -CONFIG_HAVE_GENERIC_DMA_COHERENT=y -CONFIG_HAVE_IDE=y -CONFIG_HAVE_MEMBLOCK=y -CONFIG_HAVE_MEMBLOCK_NODE_MAP=y -CONFIG_HAVE_MEMORY_PRESENT=y -CONFIG_HAVE_MOD_ARCH_SPECIFIC=y -CONFIG_HAVE_NET_DSA=y -CONFIG_HAVE_OPROFILE=y -CONFIG_HAVE_PERF_EVENTS=y -CONFIG_HAVE_SYSCALL_TRACEPOINTS=y -CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y -# CONFIG_HIGH_RES_TIMERS is not set
[OpenWrt-Devel] [PATCH 04/10] octeon: switch to 4.3
Signed-off-by: Stijn Tintel --- target/linux/octeon/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/octeon/Makefile b/target/linux/octeon/Makefile index e1739e7..a6707f0 100644 --- a/target/linux/octeon/Makefile +++ b/target/linux/octeon/Makefile @@ -14,7 +14,7 @@ CPU_TYPE:=octeon CPU_CFLAGS_octeon:=-march=octeon -mabi=64 MAINTAINER:=John Crispin -KERNEL_PATCHVER:=3.18 +KERNEL_PATCHVER:=4.3 include $(INCLUDE_DIR)/target.mk -- 2.4.6 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 06/10] kernel/modules: add OCTEON MD5 module
Signed-off-by: Stijn Tintel --- package/kernel/linux/modules/crypto.mk | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk index 20fc858..0981102 100644 --- a/package/kernel/linux/modules/crypto.mk +++ b/package/kernel/linux/modules/crypto.mk @@ -442,12 +442,19 @@ $(eval $(call KernelPackage,crypto-md4)) define KernelPackage/crypto-md5 TITLE:=MD5 digest CryptoAPI module DEPENDS:=+kmod-crypto-hash - KCONFIG:=CONFIG_CRYPTO_MD5 + KCONFIG:= \ + CONFIG_CRYPTO_MD5 \ + CONFIG_CRYPTO_MD5_OCTEON FILES:=$(LINUX_DIR)/crypto/md5.ko AUTOLOAD:=$(call AutoLoad,09,md5) $(call AddDepends/crypto) endef +define KernelPackage/crypto-md5/octeon + FILES+=$(LINUX_DIR)/arch/mips/cavium-octeon/crypto/octeon-md5.ko + AUTOLOAD:=$(call AutoLoad,09,octeon-md5) +endef + $(eval $(call KernelPackage,crypto-md5)) -- 2.4.6 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 07/10] kernel/modules: add OCTEON SHA1 module
Signed-off-by: Stijn Tintel --- package/kernel/linux/modules/crypto.mk | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk index 0981102..f5c5895 100644 --- a/package/kernel/linux/modules/crypto.mk +++ b/package/kernel/linux/modules/crypto.mk @@ -473,12 +473,19 @@ $(eval $(call KernelPackage,crypto-michael-mic)) define KernelPackage/crypto-sha1 TITLE:=SHA1 digest CryptoAPI module DEPENDS:=+kmod-crypto-hash - KCONFIG:=CONFIG_CRYPTO_SHA1 + KCONFIG:= \ + CONFIG_CRYPTO_SHA1 \ + CONFIG_CRYPTO_SHA1_OCTEON FILES:=$(LINUX_DIR)/crypto/sha1_generic.ko AUTOLOAD:=$(call AutoLoad,09,sha1_generic) $(call AddDepends/crypto) endef +define KernelPackage/crypto-sha1/octeon + FILES+=$(LINUX_DIR)/arch/mips/cavium-octeon/crypto/octeon-sha1.ko + AUTOLOAD:=$(call AutoLoad,09,octeon-sha1) +endef + $(eval $(call KernelPackage,crypto-sha1)) -- 2.4.6 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 03/10] octeon: add support for 4.3
Runtime tested on Ubiquiti EdgeRouter Lite. Signed-off-by: Stijn Tintel --- target/linux/octeon/config-4.3 | 280 .../patches-4.3/100-ubnt_edgerouter2_support.patch | 31 + .../110-er200-ethernet_probe_order.patch | 34 + ...add-host-driver-for-octeon-mmc-controller.patch | 1622 .../octeon/patches-4.3/160-cmdline-hack.patch | 47 + 5 files changed, 2014 insertions(+) create mode 100644 target/linux/octeon/config-4.3 create mode 100644 target/linux/octeon/patches-4.3/100-ubnt_edgerouter2_support.patch create mode 100644 target/linux/octeon/patches-4.3/110-er200-ethernet_probe_order.patch create mode 100644 target/linux/octeon/patches-4.3/150-mmc-octeon-add-host-driver-for-octeon-mmc-controller.patch create mode 100644 target/linux/octeon/patches-4.3/160-cmdline-hack.patch diff --git a/target/linux/octeon/config-4.3 b/target/linux/octeon/config-4.3 new file mode 100644 index 000..f8702f5 --- /dev/null +++ b/target/linux/octeon/config-4.3 @@ -0,0 +1,280 @@ +CONFIG_64BIT=y +CONFIG_ARCH_BINFMT_ELF_STATE=y +CONFIG_ARCH_DISCARD_MEMBLOCK=y +CONFIG_ARCH_DMA_ADDR_T_64BIT=y +CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y +CONFIG_ARCH_HAS_ELF_RANDOMIZE=y +# CONFIG_ARCH_HAS_GCOV_PROFILE_ALL is not set +# CONFIG_ARCH_HAS_SG_CHAIN is not set +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y +CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y +CONFIG_ARCH_PHYS_ADDR_T_64BIT=y +CONFIG_ARCH_REQUIRE_GPIOLIB=y +CONFIG_ARCH_SPARSEMEM_ENABLE=y +CONFIG_ARCH_SUPPORTS_UPROBES=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y +CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y +CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y +CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y +CONFIG_BINFMT_ELF32=y +CONFIG_BLK_DEV_SD=y +CONFIG_BLOCK_COMPAT=y +# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set +CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 +CONFIG_BUILTIN_DTB=y +# CONFIG_CAVIUM_CN63XXP1 is not set +# CONFIG_CAVIUM_OCTEON_2ND_KERNEL is not set +CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE=2 +CONFIG_CAVIUM_OCTEON_LOCK_L2=y +CONFIG_CAVIUM_OCTEON_LOCK_L2_EXCEPTION=y +CONFIG_CAVIUM_OCTEON_LOCK_L2_INTERRUPT=y +CONFIG_CAVIUM_OCTEON_LOCK_L2_LOW_LEVEL_INTERRUPT=y +CONFIG_CAVIUM_OCTEON_LOCK_L2_MEMCPY=y +CONFIG_CAVIUM_OCTEON_LOCK_L2_TLB=y +CONFIG_CAVIUM_OCTEON_SOC=y +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_CEVT_R4K=y +CONFIG_CLONE_BACKWARDS=y +CONFIG_COMPAT=y +CONFIG_COMPAT_BRK=y +CONFIG_COMPAT_NETLINK_MESSAGES=y +CONFIG_CPU_BIG_ENDIAN=y +CONFIG_CPU_CAVIUM_OCTEON=y +CONFIG_CPU_GENERIC_DUMP_TLB=y +CONFIG_CPU_HAS_PREFETCH=y +CONFIG_CPU_HAS_SYNC=y +# CONFIG_CPU_LITTLE_ENDIAN is not set +CONFIG_CPU_MIPSR2=y +CONFIG_CPU_NEEDS_NO_SMARTMIPS_OR_MICROMIPS=y +CONFIG_CPU_RMAP=y +CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y +CONFIG_CPU_SUPPORTS_HIGHMEM=y +CONFIG_CPU_SUPPORTS_HUGEPAGES=y +CONFIG_CRAMFS=y +CONFIG_CRC16=y +CONFIG_CRYPTO_CRC32C=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_HASH2=y +# CONFIG_CRYPTO_MD5_OCTEON is not set +CONFIG_CRYPTO_RNG2=y +# CONFIG_CRYPTO_SHA1_OCTEON is not set +# CONFIG_CRYPTO_SHA256_OCTEON is not set +# CONFIG_CRYPTO_SHA512_OCTEON is not set +CONFIG_CRYPTO_WORKQUEUE=y +CONFIG_DEBUG_INFO=y +CONFIG_DEBUG_SPINLOCK=y +CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 +CONFIG_DETECT_HUNG_TASK=y +CONFIG_DEVKMEM=y +CONFIG_DMA_COHERENT=y +CONFIG_DNOTIFY=y +CONFIG_DTC=y +CONFIG_EARLY_PRINTK=y +CONFIG_EDAC_ATOMIC_SCRUB=y +CONFIG_EDAC_SUPPORT=y +CONFIG_ENABLE_MUST_CHECK=y +CONFIG_EXT4_FS=y +CONFIG_FAT_FS=y +CONFIG_FRAME_WARN=2048 +CONFIG_FS_MBCACHE=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CMOS_UPDATE=y +CONFIG_GENERIC_IO=y +CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_PCI_IOMAP=y +CONFIG_GENERIC_SMP_IDLE_THREAD=y +CONFIG_GPIOLIB=y +CONFIG_GPIO_DEVRES=y +CONFIG_GPIO_OCTEON=y +CONFIG_GPIO_SYSFS=y +CONFIG_HARDWARE_WATCHPOINTS=y +CONFIG_HAS_DMA=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT_MAP=y +CONFIG_HAVE_64BIT_ALIGNED_ACCESS=y +# CONFIG_HAVE_ARCH_BITREVERSE is not set +CONFIG_HAVE_ARCH_JUMP_LABEL=y +CONFIG_HAVE_ARCH_KGDB=y +CONFIG_HAVE_ARCH_SECCOMP_FILTER=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y +# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set +CONFIG_HAVE_BPF_JIT=y +CONFIG_HAVE_CC_STACKPROTECTOR=y +CONFIG_HAVE_CONTEXT_TRACKING=y +CONFIG_HAVE_C_RECORDMCOUNT=y +CONFIG_HAVE_DEBUG_KMEMLEAK=y +CONFIG_HAVE_DEBUG_STACKOVERFLOW=y +CONFIG_HAVE_DMA_API_DEBUG=y +CONFIG_HAVE_DMA_ATTRS=y +CONFIG_HAVE_DMA_CONTIGUOUS=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_HAVE_IDE=y +CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y +CONFIG_HAVE_MEMBLOCK=y +CONFIG_HAVE_MEMBLOCK_NODE_MAP=y +CONFIG_HAVE_MEMORY_PRESENT=y +CONFIG_HAVE_MOD_ARCH_SPECIFIC=y +CONFIG_HAVE_NET_DSA=y +CONFIG_HAVE_OPROFILE=y +CONFIG_HAVE_PERF_EVENTS=y +CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y +# CONFIG_HIGH_RES_TIMERS is not set +CONFIG_HOLES_IN_ZONE=y +# CONFIG_HUGETLBFS is not set +CONFIG_HW_HA
[OpenWrt-Devel] [PATCH 08/10] kernel/modules: add OCTEON SHA256 module
Signed-off-by: Stijn Tintel --- package/kernel/linux/modules/crypto.mk | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk index f5c5895..2328fac 100644 --- a/package/kernel/linux/modules/crypto.mk +++ b/package/kernel/linux/modules/crypto.mk @@ -492,12 +492,19 @@ $(eval $(call KernelPackage,crypto-sha1)) define KernelPackage/crypto-sha256 TITLE:=SHA224 SHA256 digest CryptoAPI module DEPENDS:=+kmod-crypto-hash - KCONFIG:=CONFIG_CRYPTO_SHA256 + KCONFIG:= \ + CONFIG_CRYPTO_SHA256 \ + CONFIG_CRYPTO_SHA256_OCTEON FILES:=$(LINUX_DIR)/crypto/sha256_generic.ko AUTOLOAD:=$(call AutoLoad,09,sha256_generic) $(call AddDepends/crypto) endef +define KernelPackage/crypto-sha256/octeon + FILES+=$(LINUX_DIR)/arch/mips/cavium-octeon/crypto/octeon-sha256.ko + AUTOLOAD:=$(call AutoLoad,09,octeon-sha256) +endef + $(eval $(call KernelPackage,crypto-sha256)) -- 2.4.6 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 09/10] kernel/modules: move SHA512 to its own package
Signed-off-by: Stijn Tintel --- package/kernel/linux/modules/crypto.mk | 14 -- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk index 2328fac..ca36c2f 100644 --- a/package/kernel/linux/modules/crypto.mk +++ b/package/kernel/linux/modules/crypto.mk @@ -508,6 +508,18 @@ endef $(eval $(call KernelPackage,crypto-sha256)) +define KernelPackage/crypto-sha512 + TITLE:=SHA512 digest CryptoAPI module + DEPENDS:=+kmod-crypto-hash + KCONFIG:=CONFIG_CRYPTO_SHA512 + FILES:=$(LINUX_DIR)/crypto/sha512_generic.ko + AUTOLOAD:=$(call AutoLoad,09,sha512_generic) + $(call AddDepends/crypto) +endef + +$(eval $(call KernelPackage,crypto-sha512)) + + define KernelPackage/crypto-misc TITLE:=Other CryptoAPI modules DEPENDS:=+kmod-crypto-manager @@ -520,7 +532,6 @@ define KernelPackage/crypto-misc CONFIG_CRYPTO_FCRYPT \ CONFIG_CRYPTO_KHAZAD \ CONFIG_CRYPTO_SERPENT \ - CONFIG_CRYPTO_SHA512 \ CONFIG_CRYPTO_TEA \ CONFIG_CRYPTO_TGR192 \ CONFIG_CRYPTO_TWOFISH \ @@ -534,7 +545,6 @@ define KernelPackage/crypto-misc $(LINUX_DIR)/crypto/cast5_generic.ko \ $(LINUX_DIR)/crypto/cast6_generic.ko \ $(LINUX_DIR)/crypto/khazad.ko \ - $(LINUX_DIR)/crypto/sha512_generic.ko \ $(LINUX_DIR)/crypto/tea.ko \ $(LINUX_DIR)/crypto/tgr192.ko \ $(LINUX_DIR)/crypto/twofish_common.ko \ -- 2.4.6 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 10/10] kernel/modules: add OCTEON SHA512 module
Signed-off-by: Stijn Tintel --- package/kernel/linux/modules/crypto.mk | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk index ca36c2f..9626b21 100644 --- a/package/kernel/linux/modules/crypto.mk +++ b/package/kernel/linux/modules/crypto.mk @@ -511,12 +511,19 @@ $(eval $(call KernelPackage,crypto-sha256)) define KernelPackage/crypto-sha512 TITLE:=SHA512 digest CryptoAPI module DEPENDS:=+kmod-crypto-hash - KCONFIG:=CONFIG_CRYPTO_SHA512 + KCONFIG:= \ + CONFIG_CRYPTO_SHA512 \ + CONFIG_CRYPTO_SHA512_OCTEON FILES:=$(LINUX_DIR)/crypto/sha512_generic.ko AUTOLOAD:=$(call AutoLoad,09,sha512_generic) $(call AddDepends/crypto) endef +define KernelPackage/crypto-sha512/octeon + FILES+=$(LINUX_DIR)/arch/mips/cavium-octeon/crypto/octeon-sha512.ko + AUTOLOAD:=$(call AutoLoad,09,octeon-sha512) +endef + $(eval $(call KernelPackage,crypto-sha512)) -- 2.4.6 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 2/2 v4] linux: add support of Synopsys ARC770-based boards
Hi Jonas, On Wed, 2015-11-11 at 13:47 +0100, Jonas Gorski wrote: > On Wed, Nov 11, 2015 at 1:38 PM, Alexey Brodkin > wrote: > > Hi Jonas, > > > > On Wed, 2015-11-11 at 12:19 +0100, Jonas Gorski wrote: > > > Hi Alexey, > > > > > > On Tue, Nov 10, 2015 at 5:40 PM, Alexey Brodkin > > > wrote: > > > > Hi Jonas, > > > > > > > > On Tue, 2015-11-10 at 12:02 +0100, Jonas Gorski wrote: > > > > > > > Hi Alexey, > > > I see what you want, but the way you are doing it is quite error prone > > > and inefficient. If you insist on using the compatible, i suggest: > > > > > > 1. Extract the first one instead of grepping through the full > > > compatible set, so you don't need to invoke grep for each comparison > > > (also dropping the misuse of cat ;p). > > > > The problem is how multientry compatible string is presented in /proc fs: > > >8 > > $ cat /proc/device-tree/compatible > > snps,axs101snps,arc-sdp > > >8 > > > > You see there's no delimiter between "snps,axs101" and "snps,arc-sdp". > > So how should I extract "snps,arc-sdp" from /proc/device-tree/compatible? > > Well, you want to use it, you figure it out ;p. > > This is mostly a display issue. If you look at the actual data with > e.g. hexdump: > > 62 72 63 6d 2c 62 63 6d 39 36 33 32 38 61 76 6e |brcm,bcm96328avn| > 67 00 62 72 63 6d 2c 62 63 6d 36 33 32 38 00 |g.brcm,bcm6328.| > > you will see that these are two properly null-terminated strings. It's > just that printing to stdout swallows the terminators, but anything > working with the data should properly see them as two distinct values. Thanks for the hint. I do see now an example in bcm53xx/base-files/lib/upgrade/platform.sh. But again note that as of today we (ARC) have only one board (ARC SDP) which has "compatible" string that consists from 2 sub-strings. All other boards we have now in upstream have simple "compatible" sting. What worse ARC SDP's "compatible" property mentions its flavor "axs101" or "axs103" (we may even call this "model", right?) and only then there's "arc-sdp" - which is the name we want to use for peripherals setup. Checking for the 1-st sub-string in "compatible" property is not universal for ARC. For simple one-entry "compatible" property it will return that one entry which is fine, but for ARC SDP it will return 2 different values depending on CPU-card being used: * "snps,axs101" or * "snps,axs103". Checking for the 2nd entry in "compatible" property make no sense for all boards except ARC SDP. Checking for the last entry will work for all boards today, but I'm not sure that there will be no other board with for example 3 entries from which the one in the middle will make sense for OpenWRT. So maybe solution would be in checking for a full match and doing the same things for both "snps,axs101;snps,arc-sdp" and "snps,axs103;snps,arc-sdp"? I.e. something like this will work: >8--- compatible="$( cat /proc/device-tree/compatible )" case "$compatible" in "snps,axs101""snps,arc-sdp") board="arc-sdp"; ;; "snps,nsim") board="arc-nsim"; ;; esac >8--- Any thoughts? Note there's no "axs103" entry yet. I'll add it here in the following patch series that adds support of ARCv2 architecture. -Alexey ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 2/6] imx6: add Vetnana LVDS support
These patches have been submitted to upstream Linux and are pending acceptance.
Signed-off-by: Tim Harvey
---
...-ventana-set-GW54xx-PMIC-swbst-regulator-.patch | 31 +
...mx-ventana-fix-GW53xx-GW54xx-lvds-channel.patch | 40 +++
...mx-ventana-fix-GW53xx-GW54xx-lvds-channel.patch | 79 ++
3 files changed, 150 insertions(+)
create mode 100644
target/linux/imx6/patches-4.1/035-ARM-dts-imx-ventana-set-GW54xx-PMIC-swbst-regulator-.patch
create mode 100644
target/linux/imx6/patches-4.1/036-ARM-dts-imx-ventana-fix-GW53xx-GW54xx-lvds-channel.patch
create mode 100644
target/linux/imx6/patches-4.1/037-ARM-dts-imx-ventana-fix-GW53xx-GW54xx-lvds-channel.patch
diff --git
a/target/linux/imx6/patches-4.1/035-ARM-dts-imx-ventana-set-GW54xx-PMIC-swbst-regulator-.patch
b/target/linux/imx6/patches-4.1/035-ARM-dts-imx-ventana-set-GW54xx-PMIC-swbst-regulator-.patch
new file mode 100644
index 000..6454ab7
--- /dev/null
+++
b/target/linux/imx6/patches-4.1/035-ARM-dts-imx-ventana-set-GW54xx-PMIC-swbst-regulator-.patch
@@ -0,0 +1,31 @@
+From 57b82d9e79d77442bae3d2c13b98ceccb39fe5e2 Mon Sep 17 00:00:00 2001
+From: Tim Harvey
+Date: Thu, 5 Nov 2015 10:49:31 -0800
+Subject: [PATCH 1/3] ARM: dts: imx: ventana: set GW54xx PMIC swbst regulator
+ as always-on
+
+The GW54xx PMIC swbst regulator is used for LVDS power, CANbus xceiver
+and HDMI DDC and is enabled by the bootloader. Set the regulator to
+always-on so that Linux doesn't turn it off thinking its not needed.
+
+Signed-off-by: Tim Harvey
+---
+ arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
+index 31d86f7..2108d1c 100644
+--- a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
+@@ -265,6 +265,8 @@
+ swbst_reg: swbst {
+ regulator-min-microvolt = <500>;
+ regulator-max-microvolt = <515>;
++ regulator-boot-on;
++ regulator-always-on;
+ };
+
+ snvs_reg: vsnvs {
+--
+1.9.1
+
diff --git
a/target/linux/imx6/patches-4.1/036-ARM-dts-imx-ventana-fix-GW53xx-GW54xx-lvds-channel.patch
b/target/linux/imx6/patches-4.1/036-ARM-dts-imx-ventana-fix-GW53xx-GW54xx-lvds-channel.patch
new file mode 100644
index 000..645123d
--- /dev/null
+++
b/target/linux/imx6/patches-4.1/036-ARM-dts-imx-ventana-fix-GW53xx-GW54xx-lvds-channel.patch
@@ -0,0 +1,40 @@
+From 473d0353979db3673a7aa365265ba9b00decd414 Mon Sep 17 00:00:00 2001
+From: Tim Harvey
+Date: Thu, 5 Nov 2015 10:52:53 -0800
+Subject: [PATCH 2/3] ARM: dts: imx: ventana: fix GW53xx/GW54xx lvds channel
+
+Signed-off-by: Tim Harvey
+---
+ arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 2 +-
+ arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
b/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
+index 7c51839..5172de0 100644
+--- a/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
b/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
+@@ -247,7 +247,7 @@
+ &ldb {
+ status = "okay";
+
+- lvds-channel@1 {
++ lvds-channel@0 {
+ fsl,data-mapping = "spwg";
+ fsl,data-width = <18>;
+ status = "okay";
+diff --git a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
+index 2108d1c..77a56be 100644
+--- a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
+@@ -343,7 +343,7 @@
+ &ldb {
+ status = "okay";
+
+- lvds-channel@1 {
++ lvds-channel@0 {
+ fsl,data-mapping = "spwg";
+ fsl,data-width = <18>;
+ status = "okay";
+--
+1.9.1
+
diff --git
a/target/linux/imx6/patches-4.1/037-ARM-dts-imx-ventana-fix-GW53xx-GW54xx-lvds-channel.patch
b/target/linux/imx6/patches-4.1/037-ARM-dts-imx-ventana-fix-GW53xx-GW54xx-lvds-channel.patch
new file mode 100644
index 000..5c3731c
--- /dev/null
+++
b/target/linux/imx6/patches-4.1/037-ARM-dts-imx-ventana-fix-GW53xx-GW54xx-lvds-channel.patch
@@ -0,0 +1,79 @@
+From d86b202436b6f3111c4c37b8701daa0764d2ca55 Mon Sep 17 00:00:00 2001
+From: Tim Harvey
+Date: Thu, 5 Nov 2015 11:10:00 -0800
+Subject: [PATCH 3/3] ARM: dts: imx: ventana: Allow HDMI and LVDS to work
+ simultaneously
+
+Currently it is not possible to have HDMI and LVDS working simultaneously,
+because both ports try to use PLL5.
+
+Move the LVDS clock parent to PLL3_USB_OTG, so that HDMI and LVDS can be
+driven from independent sources.
+
+With this change the LDB pixel clock goes to 68.57 MHz, which is still
+within the valid range for the displays supported by the Ventana boards.
+
+Signed-off-by: Tim Harvey
+---
+ arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 7 +++
+ arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 7 +++
+ ar
[OpenWrt-Devel] [PATCH 1/6] imx6: ventana: fix GW16083 device-tree patch
The 206-ARM-imx-ventana-added-GW16083-to-device-tree.patch merged wrong in
the conversion from 3.18 to 4.1. This patch resolves that and puts the
device-tree nodes in the correct place.
Signed-off-by: Tim Harvey
---
...-imx-ventana-added-GW16083-to-device-tree.patch | 32 +++---
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git
a/target/linux/imx6/patches-4.1/206-ARM-imx-ventana-added-GW16083-to-device-tree.patch
b/target/linux/imx6/patches-4.1/206-ARM-imx-ventana-added-GW16083-to-device-tree.patch
index 6f31f95..a9214d5 100644
---
a/target/linux/imx6/patches-4.1/206-ARM-imx-ventana-added-GW16083-to-device-tree.patch
+++
b/target/linux/imx6/patches-4.1/206-ARM-imx-ventana-added-GW16083-to-device-tree.patch
@@ -1,9 +1,9 @@
--- a/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi
-@@ -89,6 +89,11 @@
- enable-active-high;
- };
- };
+@@ -158,6 +158,11 @@
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_i2c2>;
+ status = "okay";
+
+ gw16083: gw16083@52 {
+ compatible = "gateworks,gw16083";
@@ -11,13 +11,13 @@
+ };
};
- &fec {
+ &i2c3 {
--- a/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
-@@ -266,6 +266,11 @@
- };
- };
- };
+@@ -233,6 +233,11 @@
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_i2c2>;
+ status = "okay";
+
+ gw16083: gw16083@52 {
+ compatible = "gateworks,gw16083";
@@ -25,13 +25,13 @@
+ };
};
- &pcie {
+ &i2c3 {
--- a/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
-@@ -267,6 +267,11 @@
- };
- };
- };
+@@ -226,6 +226,11 @@
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_i2c2>;
+ status = "okay";
+
+ gw16083: gw16083@52 {
+ compatible = "gateworks,gw16083";
@@ -39,10 +39,10 @@
+ };
};
- &pcie {
+ &i2c3 {
--- a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
-@@ -308,6 +308,11 @@
+@@ -317,6 +317,11 @@
};
};
};
--
1.9.1
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 3/6] kernel: video: add fbcon support
Signed-off-by: Tim Harvey --- package/kernel/linux/modules/video.mk | 43 +++ 1 file changed, 43 insertions(+) diff --git a/package/kernel/linux/modules/video.mk b/package/kernel/linux/modules/video.mk index 3b06a14..c53f656 100644 --- a/package/kernel/linux/modules/video.mk +++ b/package/kernel/linux/modules/video.mk @@ -31,6 +31,49 @@ endef $(eval $(call KernelPackage,fb)) + +define KernelPackage/fbcon + SUBMENU:=$(VIDEO_MENU) + TITLE:=Framebuffer Console support + DEPENDS:=+kmod-fb + KCONFIG:= \ + CONFIG_FRAMEBUFFER_CONSOLE \ + CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y \ + CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y \ + CONFIG_FONTS=y \ + CONFIG_FONT_8x8=y \ + CONFIG_FONT_8x16=y \ + CONFIG_FONT_6x11=n \ + CONFIG_FONT_7x14=n \ + CONFIG_FONT_PEARL_8x8=n \ + CONFIG_FONT_ACORN_8x8=n \ + CONFIG_FONT_MINI_4x6=n \ + CONFIG_FONT_6x10=n \ + CONFIG_FONT_SUN8x16=n \ + CONFIG_FONT_SUN12x22=n \ + CONFIG_FONT_10x18=n \ + CONFIG_VT=y \ + CONFIG_CONSOLE_TRANSLATIONS=y \ + CONFIG_VT_CONSOLE=y \ + CONFIG_VT_HW_CONSOLE_BINDING=y + FILES:= \ + $(LINUX_DIR)/drivers/video/console/bitblit.ko \ + $(LINUX_DIR)/drivers/video/console/softcursor.ko \ + $(LINUX_DIR)/drivers/video/console/fbcon.ko \ + $(LINUX_DIR)/drivers/video/console/fbcon_rotate.ko \ + $(LINUX_DIR)/drivers/video/console/fbcon_cw.ko \ + $(LINUX_DIR)/drivers/video/console/fbcon_ud.ko \ + $(LINUX_DIR)/drivers/video/console/fbcon_ccw.ko \ + $(LINUX_DIR)/lib/fonts/font.ko + AUTOLOAD:=$(call AutoLoad,94,font softcursor tileblit fbcon_cw fbcon_ud fbcon_ccw fbcon_rotate bitblit fbcon) +endef + +define KernelPackage/fbcon/description + Kernel support for framebuffer console +endef + +$(eval $(call KernelPackage,fbcon)) + define KernelPackage/fb-cfb-fillrect SUBMENU:=$(VIDEO_MENU) TITLE:=Framebuffer software rectangle filling support -- 1.9.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 4/6] kernel: add backlight kernel module support
Signed-off-by: Tim Harvey --- package/kernel/linux/modules/backlight.mk | 48 +++ 1 file changed, 48 insertions(+) create mode 100644 package/kernel/linux/modules/backlight.mk diff --git a/package/kernel/linux/modules/backlight.mk b/package/kernel/linux/modules/backlight.mk new file mode 100644 index 000..5d3ca70 --- /dev/null +++ b/package/kernel/linux/modules/backlight.mk @@ -0,0 +1,48 @@ +# +# Copyright (C) 2015 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +BACKLIGHT_MENU:=Video Support + +define KernelPackage/backlight + SUBMENU:=$(BACKLIGHT_MENU) + TITLE:=Backlight support + KCONFIG:=CONFIG_BACKLIGHT_CLASS_DEVICE=m \ + CONFIG_BACKLIGHT_LCD_SUPPORT=y \ + CONFIG_LCD_CLASS_DEVICE=n \ + CONFIG_BACKLIGHT_PWM=n \ + CONFIG_BACKLIGHT_GENERIC=n \ + CONFIG_BACKLIGHT_ADP8860=n \ + CONFIG_BACKLIGHT_ADP8870 + FILES:=$(LINUX_DIR)/drivers/video/backlight/backlight.ko + AUTOLOAD:=$(call AutoProbe,video backlight) +endef + +define KernelPackage/backlight/description + Kernel module for Backlight support. +endef + +$(eval $(call KernelPackage,backlight)) + +define AddDepends/backlight + SUBMENU:=$(BACKLIGHT_MENU) + DEPENDS+=kmod-backlight $(1) +endef + +define KernelPackage/backlight-pwm + TITLE:=PWM Backlight support + DEPENDS:=+kmod-pwm + KCONFIG:=CONFIG_BACKLIGHT_PWM=m + FILES:=$(LINUX_DIR)/drivers/video/backlight/pwm_bl.ko + AUTOLOAD:=$(call AutoProbe,video pwm_bl) + $(call AddDepends/backlight) +endef + +define KernelPackage/backlight/backlight-pwm + Kernel module for PWM based Backlight support. +endef + +$(eval $(call KernelPackage,backlight-pwm)) -- 1.9.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 0/6] Add DRM video output support for IMX6
This series adds DRM based video output support for IMX6 HDMI and LVDS. The first patch fixes a Ventana device-tree issue caused by an invalid merge. The second patch adds some patches that are pending acceptance upstream that fix a couple of issues keeping LVDS/backlight working on various Ventana boards. The next few patches add fbcon, backlight, and pwm modules and can be stand-alone. The final patch adds drm core and drm-imx modules supporting LVDS/HDMI. These were tested on Gateworks Ventana boards, using the 4.1 kernel (which I believe is required), and using fbcon, psplash, and gstreamer1 with fbdevsink output. Tim Harvey (6): imx6: ventana: fix GW16083 device-tree patch imx6: add Vetnana LVDS support kernel: video: add fbcon support kernel: add backlight kernel module support kernel: other: add PWM controller support kernel: video: add DRM core and IMX DRM support for HDMI/LVDS package/kernel/linux/modules/backlight.mk | 48 ++ package/kernel/linux/modules/other.mk | 35 package/kernel/linux/modules/video.mk | 181 - ...-ventana-set-GW54xx-PMIC-swbst-regulator-.patch | 31 ...mx-ventana-fix-GW53xx-GW54xx-lvds-channel.patch | 40 + ...mx-ventana-fix-GW53xx-GW54xx-lvds-channel.patch | 79 + ...-imx-ventana-added-GW16083-to-device-tree.patch | 32 ++-- 7 files changed, 429 insertions(+), 17 deletions(-) create mode 100644 package/kernel/linux/modules/backlight.mk create mode 100644 target/linux/imx6/patches-4.1/035-ARM-dts-imx-ventana-set-GW54xx-PMIC-swbst-regulator-.patch create mode 100644 target/linux/imx6/patches-4.1/036-ARM-dts-imx-ventana-fix-GW53xx-GW54xx-lvds-channel.patch create mode 100644 target/linux/imx6/patches-4.1/037-ARM-dts-imx-ventana-fix-GW53xx-GW54xx-lvds-channel.patch -- 1.9.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 5/6] kernel: other: add PWM controller support
This adds basic PWM controller support and support for i.MX Signed-off-by: Tim Harvey --- package/kernel/linux/modules/other.mk | 35 +++ 1 file changed, 35 insertions(+) diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk index 55fb6f1..0885e0c 100644 --- a/package/kernel/linux/modules/other.mk +++ b/package/kernel/linux/modules/other.mk @@ -359,6 +359,41 @@ endef $(eval $(call KernelPackage,mmc)) +define KernelPackage/pwm + SUBMENU:=$(OTHER_MENU) + TITLE:=Pulse-Width Modulation support + KCONFIG:= \ + CONFIG_PWM=y \ + CONFIG_REGULATOR_PWM=n \ + CONFIG_PWM_FSL_FTM=n +endef + +define KernelPackage/pwm/description + Pulse Width Modulation subsystem. +endef + +$(eval $(call KernelPackage,pwm)) + +define AddDepends/pwm + SUBMENU:=$(OTHER_MENU) + DEPENDS+=kmod-pwm $(1) +endef + +define KernelPackage/pwm-imx + SUBMENU:=$(OTHER_MENU) + TITLE:=IMX Pulse-Width Modulation support + KCONFIG:=CONFIG_PWM_IMX + FILES:= $(LINUX_DIR)/drivers/pwm/pwm-imx.ko + AUTOLOAD:=$(call AutoProbe,pwm-imx) + $(call AddDepends/pwm) +endef + +define KernelPackage/pwm-imx/description + Freescale IMX Pulse Width Modulation support. +endef + +$(eval $(call KernelPackage,pwm-imx)) + define KernelPackage/sdhci SUBMENU:=$(OTHER_MENU) TITLE:=Secure Digital Host Controller Interface support -- 1.9.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 6/6] kernel: video: add IMX DRM support for HDMI/LVDS
Signed-off-by: Tim Harvey --- package/kernel/linux/modules/video.mk | 138 +- 1 file changed, 137 insertions(+), 1 deletion(-) diff --git a/package/kernel/linux/modules/video.mk b/package/kernel/linux/modules/video.mk index c53f656..cbace75 100644 --- a/package/kernel/linux/modules/video.mk +++ b/package/kernel/linux/modules/video.mk @@ -11,11 +11,17 @@ VIDEO_MENU:=Video Support V4L2_DIR=v4l2-core V4L2_USB_DIR=usb +# +# Video Display +# + define KernelPackage/fb SUBMENU:=$(VIDEO_MENU) TITLE:=Framebuffer support DEPENDS:=@DISPLAY_SUPPORT - KCONFIG:=CONFIG_FB + KCONFIG:=CONFIG_FB \ + CONFIG_FB_MXS=n \ + CONFIG_FB_SM750=n FILES:=$(LINUX_DIR)/drivers/video/fbdev/core/fb.ko AUTOLOAD:=$(call AutoLoad,06,fb) endef @@ -121,6 +127,136 @@ endef $(eval $(call KernelPackage,fb-cfb-imgblt)) +define KernelPackage/drm + SUBMENU:=$(VIDEO_MENU) + TITLE:=Direct Rendering Manager (DRM) support + KCONFIG:=CONFIG_DRM \ + CONFIG_DRM_LOAD_EDID_FIRMWARE=n \ + CONFIG_DRM_IMX=n \ + CONFIG_DRM_PTN3460=n \ + CONFIG_DRM_PS8622=n \ + CONFIG_DRM_TDFX=n \ + CONFIG_DRM_R128=n \ + CONFIG_DRM_RADEON=n \ + CONFIG_DRM_NOUVEAU=n \ + CONFIG_DRM_MGA=n \ + CONFIG_DRM_VIA=n \ + CONFIG_DRM_SAVAGE=n \ + CONFIG_DRM_VGEM=n \ + CONFIG_DRM_EXYNOS=n \ + CONFIG_DRM_VMWGFX=n \ + CONFIG_DRM_UDL=n \ + CONFIG_DRM_AST=n \ + CONFIG_DRM_MGAG200=n \ + CONFIG_DRM_CIRRUS_QEMU=n \ + CONFIG_DRM_ARMADA=n \ + CONFIG_DRM_TILCDC=n \ + CONFIG_DRM_QXL=n \ + CONFIG_DRM_BOCHS=n \ + CONFIG_DRM_STI=n \ + CONFIG_DRM_I2C_ADV7511=n \ + CONFIG_DRM_I2C_CH7006=n \ + CONFIG_DRM_I2C_SIL164=n \ + CONFIG_DRM_I2C_NXP_TDA998X=n + FILES:=$(LINUX_DIR)/drivers/gpu/drm/drm.ko + AUTOLOAD:=$(call AutoLoad,05,drm) +endef + +define KernelPackage/drm/description + Direct Rendering Manager (DRM) core support +endef + +$(eval $(call KernelPackage,drm)) + +define AddDepends/drm + SUBMENU:=$(VIDEO_MENU) + DEPENDS+=kmod-drm $(1) +endef + +define KernelPackage/drm-imx + TITLE:=Freescale i.MX DRM support + DEPENDS:=+kmod-fb + KCONFIG:=CONFIG_DRM_IMX=m \ + CONFIG_IMX_IPUV3_CORE=m \ + CONFIG_RESET_CONTROLLER=y \ + CONFIG_DRM_IMX_IPUV3 \ + CONFIG_IMX_IPUV3 \ + CONFIG_DRM_KMS_HELPER \ + CONFIG_FB_SYS_FILLRECT \ + CONFIG_FB_SYS_COPYAREA \ + CONFIG_FB_SYS_IMAGEBLIT \ + CONFIG_DRM_KMS_FB_HELPER=y \ + CONFIG_DRM_GEM_CMA_HELPER=y \ + CONFIG_DRM_KMS_CMA_HELPER=y \ + CONFIG_DRM_IMX_FB_HELPER \ + CONFIG_DRM_IMX_PARALLEL_DISPLAY=n \ + CONFIG_DRM_IMX_TVE=n \ + CONFIG_DRM_IMX_LDB=n \ + CONFIG_DRM_IMX_HDMI=n + FILES:= \ + $(LINUX_DIR)/drivers/gpu/drm/imx/imxdrm.ko \ + $(LINUX_DIR)/drivers/gpu/ipu-v3/imx-ipu-v3.ko \ + $(LINUX_DIR)/drivers/gpu/drm/imx/imx-ipuv3-crtc.ko \ + $(LINUX_DIR)/drivers/video/fbdev/core/syscopyarea.ko \ + $(LINUX_DIR)/drivers/video/fbdev/core/sysfillrect.ko \ + $(LINUX_DIR)/drivers/video/fbdev/core/sysimgblt.ko \ + $(LINUX_DIR)/drivers/gpu/drm/drm_kms_helper.ko + AUTOLOAD:=$(call AutoLoad,05,imxdrm imx-ipu-v3 imx-ipuv3-crtc) + $(call AddDepends/drm) +endef + +define KernelPackage/drm-imx/description + Direct Rendering Manager (DRM) support for Freescale i.MX +endef + +$(eval $(call KernelPackage,drm-imx)) + +define AddDepends/drm-imx + SUBMENU:=$(VIDEO_MENU) + DEPENDS+=kmod-drm-imx $(1) +endef + +define KernelPackage/drm-imx-hdmi + TITLE:=Freescale i.MX HDMI DRM support + KCONFIG:=CONFIG_DRM_IMX_HDMI=m + FILES:= \ + $(LINUX_DIR)/drivers/gpu/drm/bridge/dw_hdmi.ko \ + $(LINUX_DIR)/drivers/gpu/drm/imx/dw_hdmi-imx.ko + AUTOLOAD:=$(call AutoLoad,05,dw_hdmi-imx) + $(call AddDepends/drm-imx) +endef + +define KernelPackage/drm-imx-hdmi/description + Direct Rendering Manager (DRM) support for Freescale i.MX HDMI +endef + +$(eval $(call KernelPackage,drm-imx-hdmi)) + +define KernelPackage/drm-imx-ldb + TITLE:=Freescale i.MX LVDS DRM support + DEPENDS:=+kmod-backlight + KCONFIG:=CONFIG_DRM_IMX_LDB=m \ + CONFIG_DRM_PANEL_SIMPLE \ + CONFIG_DRM_PANEL=y \ + CONFIG_DRM_PANEL_LD9040=n \ + CONFIG_DRM_PANEL_S6E8AA0=n + FILES:=$(LINUX_DIR)/drivers/gpu/drm/imx/imx-ldb.ko \ + $(LINUX_DIR)/drivers/gpu/drm/panel/panel-simple.ko + AUTOLOAD:=$(call AutoLoad,05,imx-ldb) + $(call AddDepends/drm-imx) +endef + +define KernelPackage/drm-imx-ldb/description + Direct Rendering Manager (DRM) support for Freescale i.MX LVDS +endef + +$(eval $(call KernelPackage,drm-imx-ldb)) + + +# +# Video Capture +# + define KernelPackage/video-core SUBMENU:=$(VIDEO_MENU) TITLE=Video4Linux support -- 1.9.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] Email from dev.openwrt.org Trac broken?
Is there something messed up with the email delivery from the Trac system at dev.openwrt.org? I've been trying to verify my email address and have hit the "resend verification email" multiple times, but I never get anything. It's not going into the Gmail spam folder either. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH v2 4/4] conntrack-tools: preserve /etc/conntrackd during upgrade
Signed-off-by: Stijn Tintel --- package/network/utils/conntrack-tools/Makefile | 4 1 file changed, 4 insertions(+) diff --git a/package/network/utils/conntrack-tools/Makefile b/package/network/utils/conntrack-tools/Makefile index 51d3c41..fd13e22 100644 --- a/package/network/utils/conntrack-tools/Makefile +++ b/package/network/utils/conntrack-tools/Makefile @@ -61,6 +61,10 @@ $(call Package/conntrack-tools/default) TITLE:=Connection tracking daemon endef +define Package/conntrackd/conffiles +/etc/conntrackd/ +endef + define Package/conntrackd/description Conntrackd can replicate the status of the connections that are currently being processed by your stateful firewall based on Linux. -- 2.4.6 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
