Mathias Kresin [Thu, 30 Aug 2018 17:16:53 +0000 (19:16 +0200)]
ramips: drop obsolete sd card driver code
The pinmux for all SoCs using this driver is now set via the pinmux. It
makes this code obsolete.
Some of the code targeting the mt76x8 SoCs is still required. The sd
card pins share the pads with the EPHY. These pads need to be switched
to digital mode if the pins are used for sd cards.
The eMMC 8-bit mode has to be enabled via pinmux instead of a kernel
option. The uart2 group need to be set to function "sdxc d5 d4", pwm1
to "sdxc d6" and pwm0 to "sdxc d7" to do so. It can't be done by as
part of a default pinmux, as it would break the normal operation of
uart2.
Signed-off-by: Mathias Kresin <dev@kresin.me>
(backported from
287b7aa583584262a68fcebc3786779b2ab14307)
Mathias Kresin [Thu, 30 Aug 2018 17:13:20 +0000 (19:13 +0200)]
ramips: add mt7620/1 sdhci pinmux
Set the pins to the required mode via the pinmux driver. It allows to
get rid of the pinmux related code in the sd card driver.
Signed-off-by: Mathias Kresin <dev@kresin.me>
(backported from
563a5b5f94b2fb36dce36f39bf6515e5bbb31245)
Mathias Kresin [Fri, 31 Aug 2018 05:53:42 +0000 (07:53 +0200)]
ramips: fix mt7620a ND/SD pins pinmuxes
Drop the nd_sd gpio pinmux in case sdcard is used. They're mutually
exclusive and for most of the boards not even used as GPIOs.
If the pins are in sdcard mode, the pins ND_WE_N and ND_CS_N are still
GPIOs (#45 and #46).
Signed-off-by: Mathias Kresin <dev@kresin.me>
(backported from
a14097e8e0eef8f7ee5e1e773defee83366a10a4)
Mathias Kresin [Fri, 31 Aug 2018 07:01:34 +0000 (09:01 +0200)]
ramips: reference node by label
Reference the HC5661A sdhci node by label instead of by the full path.
Signed-off-by: Mathias Kresin <dev@kresin.me>
(backported from
2cc7980dcb5261561de32b719ada919ca3882faa)
Mathias Kresin [Wed, 22 Aug 2018 06:02:20 +0000 (08:02 +0200)]
ramips: add rt3352 SPI_CS1 pinmux
The rt3352 has a pin that can be used as second spi chip select,
watchdog reset or GPIO. The pinmux setup was missing the definition of
said pin but it is already used in the SoC dtsi.
Signed-off-by: Mathias Kresin <dev@kresin.me>
(backported from
1d08951628ace1d3c3d2bced6aea582e5ca3fe79)
(rebased patches)
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Felix Fietkau [Wed, 5 Sep 2018 07:56:52 +0000 (09:56 +0200)]
imx6: use BUILD_DEVICES in uboot-imx6 for mx6cuboxi
Fixes build with the default profile
Signed-off-by: Felix Fietkau <nbd@nbd.name>
(backported from
36c6ba3735f06f435af66175ace0dd192601ac85)
Felix Fietkau [Wed, 5 Sep 2018 07:52:57 +0000 (09:52 +0200)]
imx6: rename Generic profile to Default, fixes u-boot image build issue
u-boot.mk checks for the Default profile to build images for all targets.
This brings the target default profile in sync with other targets
Signed-off-by: Felix Fietkau <nbd@nbd.name>
(backported from
b9f926e15146bcb3688d66562fd0f1a3e79ca747)
Felix Fietkau [Sun, 26 Aug 2018 18:04:08 +0000 (20:04 +0200)]
imx6: extend cubox support to hummingboard, add support for building full images
Signed-off-by: Felix Fietkau <nbd@nbd.name>
(backported from
ded905ce431bfdb4809124e0f0a587013f980b07)
Felix Fietkau [Sun, 26 Aug 2018 18:03:00 +0000 (20:03 +0200)]
imx6: enable f2fs and loopback support in preparation for squashfs with overlay support
Signed-off-by: Felix Fietkau <nbd@nbd.name>
(backported from
8c41f1f81cde0712e90019c868f89192fdddf5bb)
Felix Fietkau [Sun, 26 Aug 2018 17:34:41 +0000 (19:34 +0200)]
uboot-imx6: fall back to MMC for SPL if boot mode is invalid
Fixes boot on Hummingboard
Signed-off-by: Felix Fietkau <nbd@nbd.name>
(backported from
7165378d19a8a76b3182b95681af61d2bc93a74c)
Felix Fietkau [Sun, 26 Aug 2018 17:34:17 +0000 (19:34 +0200)]
uboot-imx6: remove obsolete patch
Signed-off-by: Felix Fietkau <nbd@nbd.name>
(backported from
aa3efca8d92f3a81e90006983304ee48a1184551)
Felix Fietkau [Sun, 26 Aug 2018 11:47:23 +0000 (13:47 +0200)]
uboot-imx6: install images into STAGING_DIR_IMAGE
Will be used by a new combined image for cubox
Signed-off-by: Felix Fietkau <nbd@nbd.name>
(backported from
eab7bcc8e1e321ecd43ec4af69207e7f53c53837)
Felix Fietkau [Sun, 22 Jul 2018 11:07:29 +0000 (13:07 +0200)]
ramips: ethernet: unify tx descriptor buffer splitting
A buffer is split into multiple descriptors if it exceeds 16 KB.
Apply the same split for the skb head as well (to deal with corner cases
on fraglist support)
Signed-off-by: Felix Fietkau <nbd@nbd.name>
(backported from
b605a84a74170d2a07f53512cd57cd564db77249)
Hans Dedecker [Mon, 3 Sep 2018 08:29:56 +0000 (10:29 +0200)]
nghttp2: bump to 1.33.0
9d843334 Update bash_completion
23cb3f38 Update manual pages
1d682dcd Bump up version number to 1.33.0, LT revision to 31:0:17
601fbbb4 Update doc
f44aa246 Update AUTHORS
dd74a6dd Update manual pages
e959e733 src: Refactor utos
fb9a204d nghttpx: Fix compile error without mruby
cd096802 Update doc
7417fd71 nghttpx: Per-pattern not per-backend
2d1a981c Merge branch 'akonskarm-master'
45acc922 clang-format
214d0899 Merge branch 'master' of https://github.com/akonskarm/nghttp2 into akonskarm-master
31fd707d nghttpx: Fix broken healthmon frontend
9a2e38e0 fix code for reuse addr on asio client
d24527e7 Bump up LT revision due to v1.32.1 release
6195d747 nghttpx: Share mruby context if it is compiled from same file
fb97f596 nghttpx: Allocate mruby file because fopen requires NULL terminated string
0ccc7a77 nghttpx: Move blocked request data to request buffer for API request
32826466 nghttpx: Fix crash with API request
0422f8a8 nghttpx: Fix worker process crash with neverbleed write error
e329479a Merge pull request #1215 from nghttp2/mruby-per-backend
f80a7873 Merge branch 'akonskarm-reuse_addr'
866ac6ab add option reuse addr in local endpoint configuration of asio client
b574ae6a nghttpx: Support per-backend mruby script
de4fd7cd doc: Update doc
32d7883c nghttpx: Downstream::request_buf_full: take into account blocked_request_buf_
9b24e197 nghttpx: Choose h1 protocol if headers have been sent to backend on retry
13ffece1 Merge pull request #1214 from nghttp2/fix-rst-without-dconn
9d5b781d Fix stream reset if data from client is arrived before dconn is attached
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
(backported from
17c9b72046d79a8696b23a91df5c7571a2c12490)
Kevin Darbyshire-Bryant [Mon, 27 Aug 2018 08:52:55 +0000 (15:52 +0700)]
iproute2: update cake man page
CAKE supports overriding of its internal classification of
packets through the tc filter mechanism.
Update the man page in our package, even though we don't
build them. Someone may find the documentation useful.
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit
30598a05385b0ac2380dd4f30037a9f9d0318cf2)
(backported from
dc9388ac5506f2d0ea0fee6967c003b9129c8ca5)
Jo-Philipp Wich [Thu, 30 Aug 2018 11:19:18 +0000 (13:19 +0200)]
Revert "ramips: mmc: Fix init for MT7628AN"
This reverts commit
3a8efaef00d6b7317c46fe6b7e923912d8bf3500.
The change reportedly breaks UART2 on some boards. Furthermore it uses
bitwise logic on an uninitialized variable and fails to explain what it
is fixing exactly.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from
4302c917cc4dc244c007c6c1902b8e138a74ed0e)
Mathias Kresin [Wed, 22 Aug 2018 05:40:17 +0000 (07:40 +0200)]
ramips: fix rt3883 pinmux for second SPI
The rt3883 doesn't have a pinmux group named spi_cs1. The cs1 is part
of the pci group. The function pci-func enables the second chip select.
Signed-off-by: Mathias Kresin <dev@kresin.me>
(backported from
a6e11ccb136fd87efd2757a2959b8d9510534501)
Mathias Kresin [Wed, 22 Aug 2018 05:26:39 +0000 (07:26 +0200)]
ramips: fix rt3883 pci pinmux
The PCI pins need to be set to "PCI Host support one device" to allow
the use of one PCI device and flash memory.
The pci-fnc function is intended to be used if no PCI is used but
flash, nand or the codec functionality is.
Signed-off-by: Mathias Kresin <dev@kresin.me>
(backported from
dcdc6d9dadf2f97253f7891dacdd5b581d7914b4)
Mathias Kresin [Sat, 18 Aug 2018 10:07:08 +0000 (12:07 +0200)]
ramips: drop pointless default led definitions
The LEDs should be triggered/lit by any kind of state change instead of
turned on/off unconditional.
If LEDs really need to be turned off by default, it should be done via
the default-state devicetree led property.
The handling of the wndr3700v5 and wt3020 power led is at least
strange. Something is for sure wrong with them. Either the leds are
misnamed, the default off trigger is a typo or the polarity of the
gpios is wrong. Drop the power led from userspace and wait for someone
with access to the hardware to fix it properly.
Signed-off-by: Mathias Kresin <dev@kresin.me>
(backported from
c134210b8f7e18b43641b6c2176e7a3e6baed030)
Mathias Kresin [Sat, 18 Aug 2018 09:42:50 +0000 (11:42 +0200)]
ramips: add missing zbt-cpe102 diag led
Based on the userspace led configuration it's quite obvious that the
4g-0 led should be used for boot status indication.
Signed-off-by: Mathias Kresin <dev@kresin.me>
(backported from
43df31f64dfc68374093142cd51808655d6e8d50)
Mathias Kresin [Sat, 18 Aug 2018 09:38:13 +0000 (11:38 +0200)]
ramips: express diag led handling via devicetree
Use the default-state property to express the desired led handling in
the devicetree source file instead of the userspace.
Signed-off-by: Mathias Kresin <dev@kresin.me>
(backported from
99045dfc5989e732f671de5d145532f0fe8c0ce1)
Mathias Kresin [Sat, 18 Aug 2018 09:09:29 +0000 (11:09 +0200)]
ramips: remove default on userspace trigger for diag leds
All the LEDs are turned on by diag.sh at the end of the boot process.
No need to do the same via userspace configuration again.
Signed-off-by: Mathias Kresin <dev@kresin.me>
(backported from
111907e8d319eb05e7a5ef7a0cc6ec55cb069242)
Mathias Kresin [Sat, 18 Aug 2018 10:22:25 +0000 (12:22 +0200)]
ramips: fix multi colour led handling
All boards either have a multi colour led or a single lightpipe. It
makes it impossible to handle the LEDs individual. Change the LED
config for these boards to take it into account.
Signed-off-by: Mathias Kresin <dev@kresin.me>
(backported from
56e6ebdea42aab76d6ef54e0296c6bf946956684)
Mathias Kresin [Wed, 29 Aug 2018 06:59:46 +0000 (08:59 +0200)]
ramips: rt-n12p: use the boardname helper variable
Use the helper variable for the Asus RT-N12P as it is done by all
boards.
Signed-off-by: Mathias Kresin <dev@kresin.me>
(backported from
fe1e90deb4cacbac4841507b9bf2a85eb275a823)
Koen Vandeputte [Tue, 28 Aug 2018 11:28:45 +0000 (13:28 +0200)]
mediatek: remove duplicate RPS patch
Commit
7af1fb9faafb ("kernel: add a RPS balancer") introduces a RPS balancer
for all targets.
In the past however, this patch was already introduced for target "mediatek"
in commit
7762c07c8898 ("mediatek: bump to v4.14")
Remove the separate copy of the patch within the mediatek target,
which otherwise is applied twice and results in a build error.
Fixes: 7af1fb9faafb ("kernel: add a RPS balancer")
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
(backported from
23366b6dc6bb81c9c0e0bd7c91832a5bf0e5dbc2)
John Crispin [Mon, 13 Aug 2018 15:00:14 +0000 (17:00 +0200)]
generic: add flow_offload accounting
This patch makes the flow offloading layer account for the traffic inside
the conntack entries.
Signed-off-by: John Crispin <john@phrozen.org>
(backported from
1d4d156a7ce67988f922c470f622f6dd2a5c161b)
John Crispin [Mon, 13 Aug 2018 14:24:17 +0000 (16:24 +0200)]
kernel: add a RPS balancer
By default the RPS delegation will happen by masking the last few bits of
skb->hash. This patch adds an inermediate hash bucket that maps the masked
hash to a RPS core. This makes RPS results much more deterministic on SMP
systems.
Signed-off-by: John Crispin <john@phrozen.org>
(backported from
7af1fb9faafbc842fc727c49108f5fc4edc08601)
(rebased patches)
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
David Bauer [Wed, 22 Aug 2018 15:30:44 +0000 (17:30 +0200)]
build: add mkrasimage
The current make-ras.sh image generation script for the ZyXEL NBG6617
has portability issues with bash. Because of this, factory images are
currently not built correctly by the OpenWRT buildbots.
This commit replaces the make-ras.sh by C-written mkrasimage.
The new mkrasimage is also compatible with other ZyXEL devices using
the ras image-format.
This is not tested with the NBG6616 but it correctly builds the
header for ZyXEL factory image.
Signed-off-by: David Bauer <mail@david-bauer.net>
(backported from
8e9a59a6b924469c0061d4bd945ae0c6dbfdecfe)
Hauke Mehrtens [Sat, 25 Aug 2018 12:32:08 +0000 (14:32 +0200)]
strace: update strace to version 4.24
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
(backported from
af6e901ae8449bba62697ef676c651b2e0bfea01)
Mathias Kresin [Wed, 22 Aug 2018 05:30:36 +0000 (07:30 +0200)]
ramips: fix mt7620 pinmux for second SPI
The mt7620 doesn't have a pinmux group named spi_cs1. The cs1 is part
of the "spi refclk" group. The function "spi refclk" enables the second
chip select.
On reset, the pins of the "spi refclk" group are used as reference
clock and GPIO.
Signed-off-by: Mathias Kresin <dev@kresin.me>
(backported from
3601c3de23f15e2735adc4becdca14c803b6b1a5)
Hauke Mehrtens [Mon, 27 Aug 2018 16:10:14 +0000 (18:10 +0200)]
linux-firmware: realtek: Add FW for rtl8192eu, rtl8723au and rtl8723bu
These devices are more or less supported by the kmod-rtl8xxxu driver.
Fixes: FS#1789
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
(backported from
a2488f3a243b60ac05b3a3ae492145d564fc6f6e)
Hans Dedecker [Mon, 27 Aug 2018 08:02:10 +0000 (10:02 +0200)]
nghttp2: bump to 1.32.1
4c76aaee Update manual pages
2b51ad67 Bump up version number to 1.32.1, LT revision to 30:3:16
708379dc Tweak nghttp2_session_set_stream_user_data
73106b0d Compile with clang-6.0
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
(backported from
6caa8e09aa72de45b632666ddb914aceca8ac831)
Stijn Tintel [Sun, 26 Aug 2018 15:57:42 +0000 (17:57 +0200)]
ath10k-firmware: update both QCA988X CT variants
This fixes slow performance with 802.11w enabled.
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
(backported from
2c01425d2de01f087a90ee6b4499b0b68f7a6964)
Stijn Tintel [Thu, 23 Aug 2018 13:46:23 +0000 (16:46 +0300)]
ath10k-ct: bump to git HEAD
e0d2ce0 ath10k: Support setting tx_antenna in descriptor field.
29c644f Update to latest 4.13 and 4.16 ath10k-ct drivers.
20db9db ath10k: Support vdev stats for 4.9, 4.16 kernel
fd92066 ath10k: Support 'ct-sta-mode' for 9984 firmware that supports it.
34954f0 ath10k: get_tsf, PMF
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
(backported from
616b9729207b0b10985b591d6c47a4b1ffdd225e)
Hans Dedecker [Thu, 23 Aug 2018 19:58:14 +0000 (21:58 +0200)]
iproute2: update to 4.18.0
Update to the latest version of iproute2; see https://lwn.net/Articles/762515/
for a full overview of the changes in 4.18.
Remove upstream patch 001-rdma-sync-some-IP-headers-with-glibc
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
(backported from
8fd8e791437a94a486409ab7141ebbba9a82abf8)
Felix Fietkau [Mon, 20 Aug 2018 09:40:48 +0000 (11:40 +0200)]
ath9k: fix setting up tx99 with a monitor mode interface
Signed-off-by: Felix Fietkau <nbd@nbd.name>
(backported from
d9792152fdc7f18229274b82b5d8664d22b36d2c)
Felix Fietkau [Mon, 20 Aug 2018 09:10:27 +0000 (11:10 +0200)]
kernel: make mtd mac address increment more flexible
Allow selecting the byte on which the increment should be added.
Signed-off-by: Felix Fietkau <nbd@nbd.name>
(backported from
a1f4ebcc874f8414ef551d653363eb0ef95d553c)
Vladimir Vid [Mon, 9 Jul 2018 09:09:53 +0000 (11:09 +0200)]
imx6: Initial support for SolidRun CuBox-i devices based on i.MX6 processors (i1, i2, i2eX, and i4Pro).
- Specifications -
CuBox i1:
- SoC: i.MX6 Solo
- Cores: 1
- Memory Size: 512MB
- GPU: GC880
- Wifi/Bluetooth: Optional
- USB 2.0 ports: 2
- Ethernet: 10/100/1000 Mbps
CuBox i2 | i2eX:
- SoC: i.MX6 Dual Lite
- Cores: 2
- Memory Size: 1GB
- GPU: GC2000
- Wifi/Bluetooth: Optional
- USB 2.0 ports: 2
- Ethernet: 10/100/1000 Mbps
CuBox i4Pro | i4x4:
- SoC: i.MX6 Quad
- Cores: 4
- Memory Size: 2/4 GB
- GPU: GC2000
- Wifi/Bluetooth: Build In
- USB 2.0 ports: 2
- Ethernet: 10/100/1000 Mbps
Built-in u-boot requires SPL (secondary program loader) to be present on the SD-card regardless of the image type which will be loaded.
SPL is generated by the u-boot-mx6cuboxi package which is preselected by the target device and can be found in bin/u-boot-mx6cuboxi directory.
Flashing the SPL:
dd if=/dev/zero of=/dev/mmcblk0 bs=1M count=4
dd if=bin/targets/imx6/generic/u-boot-mx6cuboxi/SPL of=/dev/mmcblk0 bs=1K seek=1
Preparing the firmware on the SD-card:
(echo o; echo n; echo p; echo 1; echo ''; echo ''; echo w) | fdisk /dev/mmcblk0
mkfs.ext4 /dev/mmcblk0p1
mount /dev/mmcblk0p1 /mnt
tar -xzf bin/targets/imx6/generic/openwrt-imx6-device-cubox-i-rootfs.tar.gz -C /mnt/
mkdir -p /mnt/boot
cp bin/targets/imx6/generic/{*-uImage,*.dtb,*.scr} /mnt/boot/
Generated u-boot.img needs to be placed on the first partition:
cp bin/targets/imx6/generic/u-boot-mx6cuboxi/u-boot.img /mnt/
To boot from the SD card:
Boot script which sets mmc/dtb parameters and boots the board is automatically sourced.
If this does not work for any reason:
mmc dev 0; load mmc 0:1 $scriptaddr boot/boot.scr; source $scriptaddr
Currently imx6dl-cubox-i.dtb (Dual Lite) and imx6q-cubox-i.dtb (Quad) device trees are available.
Tested on i4Pro, MMC, USB (+ HiD), HDMI and ethernet ports are working.
Wireless and bluetooth are broken ATM. According to SolidRun forums, BCM4329/BCM4330 firmware is used which works fine on older kernels.
Signed-off-by: Vladimir Vid <vladimir.vid@sartura.hr>
(backported from
6cda4f68619ec139be7897ea61b7f22c72c38b59)
Luis Araneda [Fri, 24 Aug 2018 03:40:25 +0000 (00:40 -0300)]
uboot-zynq: add support for the zybo z7 board
Backport board support from the upcoming v2018.09 release,
and add an additional patch to read the MAC address
from flash memory
Signed-off-by: Luis Araneda <luaraneda@gmail.com>
(backported from
43dedd0661e3f83405c71b80e1f8d4b4a1e7ac00)
Rosen Penev [Fri, 17 Aug 2018 20:31:48 +0000 (13:31 -0700)]
libevent2: Switch to using release tarball
Starting with version 2.1.8, a release tarball is available.
Simplifies the Makefile slightly.
Updated the project URL. HTTPS is broken. Issue has been reported upstream
Adjusted patches. CMake support is not present in the tarball. It's made
for Windows anyway.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
(backported from
3ccc2ebe01c179cb48b04e812ff15d16fdaf711b)
(rebased patches)
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Thibaut VARÈNE [Sat, 4 Aug 2018 13:44:26 +0000 (15:44 +0200)]
ramips: fix RBM11G partitioning
This patch improves
faf64056ddd46992a75b1e277d94541c7251035c by correcting
the partition scheme for the "RouterBoot" section of the flash.
The partition scheme initially submitted is incorrect and does not reflect
the actual flash structure.
The "RouterBoot" section (name matching OEM) is subdivided in several
static segments, as they are on ar71xx RB devices albeit with different
offsets and sizes.
The naming convention from ar71xx has been preserved, except for the
bootloaders which are named "bootloader1" and "bootloader2" to avoid
confusion with the master "RouterBoot" partition.
The preferred 'fixed-partitions' DTS node syntax is used, with nesting
support as introduced in
2a598bbaa3.
"partition" is used for node names, with associated "label" to match
policy set by
6dd94c2781.
Leave a note in DTS to explain how the original author selected the SPI speed.
Tested-by: Tobias Schramm <tobleminer@gmail.com>
Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org>
Reviewed-by: Rafał Miłecki <rafal@milecki.pl>
(backported from
bbe2cf657ca72119288a441ca3337a503aa17f80)
Thibaut VARÈNE [Sat, 4 Aug 2018 13:44:25 +0000 (15:44 +0200)]
ramips: fix RBM33G partitioning
This patch improves
5684d087418d176cfdef4e045e1950ca7ba3b09f by correcting
the partition scheme for the "RouterBoot" section of the flash.
The partition scheme initially submitted is incorrect and does not reflect
the actual flash structure.
The "RouterBoot" section (name matching OEM) is subdivided in several
static segments, as they are on ar71xx RB devices albeit with different
offsets and sizes.
The naming convention from ar71xx has been preserved, except for the
bootloaders which are named "bootloader1" and "bootloader2" to avoid
confusion with the master "RouterBoot" partition.
The preferred 'fixed-partitions' DTS node syntax is used, with nesting
support as introduced in
2a598bbaa3.
"partition" is used for node names, with associated "label" to match
policy set by
6dd94c2781.
The OEM source code also define a "RouterBootFake" partition at the
beginning of the secondary flash chip: to avoid trouble if OEM ever makes
use of that space, it is also defined here.
The resulting partition scheme looks like this:
[ 10.114241] m25p80 spi0.0: w25x40 (512 Kbytes)
[ 10.118708] 1 fixed-partitions partitions found on MTD device spi0.0
[ 10.125049] Creating 1 MTD partitions on "spi0.0":
[ 10.129824] 0x000000000000-0x000000040000 : "RouterBoot"
[ 10.136215] 5 fixed-partitions partitions found on MTD device RouterBoot
[ 10.142894] Creating 5 MTD partitions on "RouterBoot":
[ 10.148032] 0x000000000000-0x00000000f000 : "bootloader1"
[ 10.154336] 0x00000000f000-0x000000010000 : "hard_config"
[ 10.160665] 0x000000010000-0x00000001f000 : "bootloader2"
[ 10.167046] 0x000000020000-0x000000021000 : "soft_config"
[ 10.173461] 0x000000030000-0x000000031000 : "bios"
[ 10.190191] m25p80 spi0.1: w25q128 (16384 Kbytes)
[ 10.194950] 2 fixed-partitions partitions found on MTD device spi0.1
[ 10.201271] Creating 2 MTD partitions on "spi0.1":
[ 10.206071] 0x000000000000-0x000000040000 : "RouterBootFake"
[ 10.212746] 0x000000040000-0x000001000000 : "firmware"
[ 10.307216] 2 minor-fw partitions found on MTD device firmware
[ 10.313044] 0x000000040000-0x000000220000 : "kernel"
[ 10.319002] 0x000000220000-0x000001000000 : "rootfs"
[ 10.324906] mtd: device 9 (rootfs) set to be root filesystem
[ 10.330678] 1 squashfs-split partitions found on MTD device rootfs
[ 10.336886] 0x000000b40000-0x000001000000 : "rootfs_data"
Leave a note in DTS to explain how the original author selected the SPI speed.
Tested-by: Tobias Schramm <tobleminer@gmail.com>
Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org>
Reviewed-by: Rafał Miłecki <rafal@milecki.pl>
[rmilecki: dropped "RouterBootFake" partition]
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(backported from
b90cad2c2e61720b72a9cdd6317474cabc4962ec)
Koen Vandeputte [Fri, 24 Aug 2018 07:10:29 +0000 (09:10 +0200)]
ar71xx: fix typo in rb91x nand source
Fixes: 3b1ea0996f83 ("ar71xx: fix build error due to bad include")
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
(backported from
6100655c8ce29cd789da8e03b184da2ddb1008f5)
NOGUCHI Hiroshi [Sat, 18 Aug 2018 23:05:15 +0000 (08:05 +0900)]
ramips: add support for ELECOM WRC-1900GST
ELECOM WRC-1900GST is a wireless router, based on Mediatek MT7621A.
This is almost same as WRC-2533GST except wireless specs.
Specifications:
- SoC : MT7621A (four logical CPU cores)
- RAM : 128MiB
- ROM : 16MiB of SPI NOR-FLASH
- wireless :
5GHz : 3T3R up to 1300Mbps/11ac with MT7615
2.4GHz : 3T3R up to 600Mbps/11n with MT7615
- Ethernet : 5 ports, all ports is capable of 1000base-T
- Ether switch : MT7530 (MT7621A built-in)
- LEDs : 4 LEDs
- buttons : 2 buttons and 1 slide-switch
- UART : header is on PCB, 57600bps
Flash instruction using factory image:
1. Connect the computer to the LAN port of WRC-1900GST
2. Connect power cable to WRC-1900GST and turn on it
3. Access to "https://192.168.2.1/" and open firmware update
page ("ファームウェア更新")
4. Select the OpenWrt factory image and click apply ("適用")
button
5. Wait ~150 seconds to complete flashing
Signed-off-by: NOGUCHI Hiroshi <drvlabo@gmail.com>
(backported from
ad10e71becfb36d36c81c5b0e898c4ea7912d778)
Koen Vandeputte [Wed, 22 Aug 2018 11:00:22 +0000 (13:00 +0200)]
ar71xx: fix build error due to bad include
While "rawnand.h" is available in kernel 4.14,
the default for this target is kernel 4.9 in which "nand.h" should be used.
Add an extra check to include the correct file depending on kernel version
Fixes these build errors:
drivers/mtd/nand/ar934x_nfc.c:16:10: fatal error: linux/mtd/rawnand.h: No such file or directory
#include <linux/mtd/rawnand.h>
^~~~~~~~~~~~~~~~~~~~~
compilation terminated.
Fixes: 318e19ba6755 ("ar71xx: add v4.14 support")
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
(backported from
3b1ea0996f83690695e06d11e0214110b6f7201f)
Koen Vandeputte [Wed, 22 Aug 2018 11:00:21 +0000 (13:00 +0200)]
ar71xx: add missing include for checking kernel version
Fixes these build errors:
arch/mips/ath79/mach-rb2011.c:20:5: error: "LINUX_VERSION_CODE" is not defined, evaluates to 0 [-Werror=undef]
#if LINUX_VERSION_CODE < KERNEL_VERSION(4,14,0)
^~~~~~~~~~~~~~~~~~
arch/mips/ath79/mach-rb2011.c:20:26: error: "KERNEL_VERSION" is not defined, evaluates to 0 [-Werror=undef]
#if LINUX_VERSION_CODE < KERNEL_VERSION(4,14,0)
^~~~~~~~~~~~~~
arch/mips/ath79/mach-rb2011.c:20:40: error: missing binary operator before token "("
#if LINUX_VERSION_CODE < KERNEL_VERSION(4,14,0)
^
Fixes: 318e19ba6755 ("ar71xx: add v4.14 support")
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
(backported from
743654f30dde7659d11280e9cd34da2f1ddad0bc)
Rosen Penev [Fri, 17 Aug 2018 02:38:58 +0000 (19:38 -0700)]
yamonenv: Remove dead URLs
uscan errors on the URL as it is no longer available.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
(backported from
7961009346cbfb44702cd87ffba0be2069c4b773)
Rosen Penev [Fri, 17 Aug 2018 02:38:57 +0000 (19:38 -0700)]
fconfig: Remove dead URLs
uscan errors on the URL as it is no longer available.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
(backported from
f5098a69ed5ea2062a098aa7a652d7af83cba2ea)
Rosen Penev [Fri, 17 Aug 2018 02:38:56 +0000 (19:38 -0700)]
apex: Remove dead URL.
uscan errors on the URL as it is no longer available.
Also switched the download URL to HTTPS.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
(backported from
f2e1fd0f358cba7f75eb4dc90621c3e77f74927d)
John Crispin [Thu, 9 Aug 2018 13:59:41 +0000 (15:59 +0200)]
ar71xx: add v4.14 support
adds v4.14 patches for testing but leaves v4.9 as default for now.
Signed-off-by: John Crispin <john@phrozen.org>
(backported from
318e19ba6755105bb6cc19937d8fff26cbd2cc6f)
(rebased patches)
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Jo-Philipp Wich [Wed, 22 Aug 2018 05:12:47 +0000 (07:12 +0200)]
iptables: make iptables-mod-conntrack-extra depend on kmod-ipt-raw
Since kernel 4.14 there is no auto assignment of conntrack helpers anymore
so fw3 needs raw table support in order to stage ct helper assignment rules.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from
e5f56c07d7fab9a6f2201f4100b593349b8ef67d)
Yury Shvedov [Mon, 16 Jul 2018 12:15:10 +0000 (15:15 +0300)]
hostapd: process all CSA parameters
This adds processing of all CSA arguments from ubus switch_chan request
in the same manner as in the control interface API.
Signed-off-by: Yury Shvedov <yshvedov@wimarksystems.com>
(backported from
cad9519ebaf88cb4f3669ca1a04f04eb5d096311)
Syrone Wong [Fri, 27 Jul 2018 10:32:03 +0000 (18:32 +0800)]
toolchain/gcc: update 8.x to 8.2.0
This release fixes LTO link-time performance problems and C++ bug introduced in GCC 8.1
Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
(backported from
2fb95f71425cc1b3cc9424bb2922fd296e4e05bf)
Syrone Wong [Thu, 26 Jul 2018 14:38:57 +0000 (22:38 +0800)]
toolchain/gcc: add config symbol to determine how to apply path remapping
Added boolean symbol for GCC 8 and higher, when we add newer GCC, we don't have
to modify rules.mk to keep things consistant.
Fixes: da9d760 ("rules.mk: replace iremap when using GCC 8")
Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
(backported from
713cee6463a8b654d2c72e469112130373c1336b)
Daniel Engberg [Sun, 19 Aug 2018 06:14:50 +0000 (08:14 +0200)]
target.mk: Remove obsolete octeon CPU_CFLAGS
As of commit
c6e02b49f65cb4eff624a0831d3db265b3fadd2a the octeon target
uses octeonplus instead of octeon
Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
(backported from
fc9cbf3bc0673c97e31693ea45fad1798346c2cd)
Daniel Engberg [Sun, 12 Aug 2018 22:01:56 +0000 (00:01 +0200)]
util-linux: Update to 2.32.1
Update util-linux to 2.32.1
For release notes see https://lwn.net/Articles/759922/
Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
(backported from
d1ea8ac3b476e1e552f42dbf1042b521c57a0df4)
Mathias Kresin [Wed, 15 Aug 2018 18:18:26 +0000 (20:18 +0200)]
lantiq: add support for upgrade led
Indicate a (sys)upgrade via leds as well. It brings the lantiq diag.sh
script en par with the other implementations using devicetree aliases
to define multiple leds for boot status indication.
By default, use the boot finished led to indicate an upgrade for now.
Signed-off-by: Mathias Kresin <dev@kresin.me>
(backported from
c9e9a787343fb9190b5491188025bcfdebc94beb)
Mathias Kresin [Wed, 15 Aug 2018 17:23:44 +0000 (19:23 +0200)]
treewide: drop unused get_status_led functions
The function isn't used for targets getting the status leds from the
devicetree.
Signed-off-by: Mathias Kresin <dev@kresin.me>
(backported from
be06c726c4f7275325dd380ca151963dd7597638)
Mathias Kresin [Wed, 15 Aug 2018 16:55:01 +0000 (18:55 +0200)]
treewide: consolidate upgrade state set
Set the (sys)upgrade state when sourcing the stage2 script instead of
setting the state for each target individual.
This change fixes the, due to a missing state set, not working upgrade
led on ath79 and apm821xx.
Signed-off-by: Mathias Kresin <dev@kresin.me>
(backported from
56b8ac1e86eb5b0c500cbf8db60ce00aff01bcec)
Mathias Kresin [Wed, 15 Aug 2018 16:34:57 +0000 (18:34 +0200)]
ramips: mt7620: fix bad indent
Fix the indent to make the make it obvious which condition is the
parent of the loop.
Signed-off-by: Mathias Kresin <dev@kresin.me>
(backported from
1ea1f3a223d7a56f96de00001f59b077a6c4d237)
Cezary Jackiewicz [Thu, 19 Apr 2018 17:34:22 +0000 (19:34 +0200)]
ramips: add support for D-Link DWR-118-A2
The DWR-118-A2 Wireless Router is based on the MT7620A SoC.
Specification:
- MediaTek MT7620A (580 Mhz)
- 128 MB of RAM
- 16 MB of FLASH
- 1x 802.11bgn radio
- 1x 802.11ac radio (MT7612EN)
- 4x 10/100 Mbps Ethernet (1 WAN and 3 LAN)
- 1x 10/100/1000 Mbps Marvell Ethernet PHY (1 LAN)
- 2x external, non-detachable antennas
- 1x USB 2.0
- UART (J1) header on PCB (57600 8n1)
- 7x LED (5x GPIO-controlled), 2x button
- JBOOT bootloader
Known issues:
- GELAN not working
- flash is very slow
The status led has been assigned to the dwr-118-a2:green:internet led.
At the end of the boot it is switched off and is available for other
operation. Work correctly also during sysupgrade operation.
Installation:
Apply factory image via http web-gui or JBOOT recovery page
How to revert to OEM firmware:
- push the reset button and turn on the power. Wait until LED start
blinking (~10sec.)
- upload original factory image via JBOOT http (IP: 192.168.123.254)
Signed-off-by: Cezary Jackiewicz <cezary@eko.one.pl>
Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
(backported from
37af596593b0e84d0a076ab8f173066e3d7bc810)
Pawel Dembicki [Wed, 18 Jul 2018 04:31:36 +0000 (04:31 +0000)]
ramips: mt7620: enable all ports unconditionally
This patch make all mt7620 ephy ports turned on.
It is necessary for some JBOOT devices.
Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
(backported from
4877ad44c718debfa75533aedaaf3dfd0faeb6f0)
Deng Qingfang [Thu, 9 Aug 2018 17:22:46 +0000 (01:22 +0800)]
ramips: add support for HiWiFi HC5861B
HiWiFi "Gee Enjoy1200" HC5861B is a dual-band router based on MediaTek MT7628AN
https://www.hiwifi.com/enjoy-view
Specifications:
- MediaTek MT7628AN 580MHz
- 128 MB DDR2 RAM
- 16 MB SPI Flash
- 2.4G MT7628AN 802.11bgn 2T2R 300Mbps
- 5G MT7612EN 802.11ac 2T2R 867Mbps
- 5x 10/100 Mbps Ethernet
Flash instruction:
1. Get SSH access to the router
2. SSH to router with `ssh -p 1022 root@192.168.199.1`, The SSH password is the same as the webconfig one
3. Upload OpenWrt sysupgrade firmware into the router's `/tmp` folder with SCP
4. Run `mtd write /tmp/<filename> firmware`
5. reboot
Everything is working
Signed-off-by: Deng Qingfang <dengqf6@mail2.sysu.edu.cn>
(backported from
d20f4fc628e9e3c1e1d4063a0798e4097ffb3c4a)
Ryan Mounce [Tue, 14 Aug 2018 04:49:29 +0000 (14:19 +0930)]
firmware-utils/mksercommfw: fix build with clang/macOS
fixes error: non-void function 'main' should return a value
Fixes: FS#1770
Signed-off-by: Ryan Mounce <ryan@mounce.com.au>
(backported from
9c6c7d11c795cd632c4d736577d7bb65ed35d729)
Andy Walsh [Mon, 13 Aug 2018 12:33:39 +0000 (14:33 +0200)]
firmware-utils/mksercommfw: fix musl build
* add missing <sys/types.h> for musl
Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com>
(backported from
22b8237ba1acb90caaf867bf657f7ed7497bbeb6)
Daniel Engberg [Sun, 12 Aug 2018 11:53:59 +0000 (13:53 +0200)]
tools/cmake: Update to 3.12.1
Update cmake to 3.12.1
Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
(backported from
0578993a41fed9855a5e8ff3ce7dca7530c69fd7)
Christian Lamparter [Fri, 10 Aug 2018 21:24:45 +0000 (23:24 +0200)]
packages: nvram: make it possible to include it for ath79 targets
The WD My Net Range Extender stores the MAC addresses inside the
nvram partition. This utility can extract it, but it's currently
not avilable on the ath79 target. Hence, this patch adds the
necessary target declaration, so it can be built.
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
(backported from
7b1b49bd32199e8d0469efc8c02050dd740b744d)
Luis Araneda [Sat, 11 Aug 2018 20:01:56 +0000 (16:01 -0400)]
uboot-zynq: update to 2018.07
Signed-off-by: Luis Araneda <luaraneda@gmail.com>
(backported from
09ac4aa86b889446969df10e397798c7fe961515)
(rebased patches)
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Daniel Gimpelevich [Mon, 6 Aug 2018 17:52:28 +0000 (10:52 -0700)]
ramips: fix BR-6478ACv2 support
The wholesale changes introduced in commit
f9b8328 missed this DTS file
because it hadn't been merged yet. This patch brings it in line to match
the other mt7620a devices' DTS files.
Additionally, the Internet LED is now labeled correctly and set to unused
by default, since the WAN interface is not known in every configuration.
Using sysupgrade between images before and after this commit will require
the -F flag.
Tested-by: Rohan Murch <rohan.murch@gmail.com>
Signed-off-by: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
[drop internet led default setting]
Signed-off-by: Mathias Kresin <dev@kresin.me>
(backported from
1d3ea7874df420ab8d3acbddf5ec9251bf79ed9b)
Ludwig Thomeczek [Tue, 12 Jun 2018 19:17:23 +0000 (21:17 +0200)]
ramips: add support for Netgear R6120
This patch adds support for the Netgear R6120, aka Netgear AC1200.
Specification:
- SoC: MediaTek MT7628 (580 MHz)
- Flash: 16 MiB
- RAM: 64 MiB
- Wireless: 2.4Ghz(builtin) and 5Ghz (MT7612E)
- LAN speed: 10/100
- LAN ports: 4
- WAN speed: 10/100
- WAN ports: 1
- Serial baud rate of Bootloader and factory firmware: 57600
To flash use nmrpflash with the provided factory.img.
Flashing via webinterface will not work, for now.
Signed-off-by: Ludwig Thomeczek <ledesrc@wxorx.net>
(backported from
5543d63fc84e64be83afaa4241369a07797f041b)
Ludwig Thomeczek [Tue, 12 Jun 2018 19:16:40 +0000 (21:16 +0200)]
firmware-utils: add sercomm/netgear tool
This adds a tool to generate a firmware file accepted
by Netgear or sercomm devices.
They use a zip-packed rootfs with header and a custom
checksum. The generated Image can be flashed via the
nmrpflash tool or the webinterface of the router.
Signed-off-by: Ludwig Thomeczek <ledesrc@wxorx.net>
(backported from
e5b802b9c2711316e26402669bee9349f4c6ec65)
Hans Dedecker [Thu, 9 Aug 2018 15:42:35 +0000 (17:42 +0200)]
iproute2: remove libutil from InstallDev section
Commit
4d961538f6 added libutil to the iproute2 InstallDev section
but lead to compile issues with packages picking up the wrong libutil
since libutil is quite a generic name ...
Further libutil is rather meant for internal usage in iproute2 than a
public API; therefore let's remove it from the InstallDev section together
with ll_map.h
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
(backported from
e0fbf62821eb2d06badf393ac2c62570aaf85ccd)
Antonio Silverio [Mon, 30 Jul 2018 10:26:07 +0000 (12:26 +0200)]
sunxi: change Orange Pi PC2 MUSB/power button
Changed default role of Orange Pi PC2 MSUB port to host (in dts)
Changed default function of Orange Pi PC2 power button to PWR_BTN
Signed-off-by: Antonio Silverio <menion@gmail.com>
(backported from
5f4502998a5846146a428e9cfa3f0bbc4c145bb1)
Antonio Silverio [Mon, 30 Jul 2018 09:33:03 +0000 (11:33 +0200)]
sunxi: Added support for Xunlong Orange Pi PC2
CPU: H5 High Performance Quad-core 64-bit Cortex-A53
GPU: Mali450 OpenGL ES 2.0/1.1/1.0, OpenVG 1.1, EGL
Memory: 1GB DDR3 (shared with GPU)
Onboard Storage: TF card (Max. 32GB) / NOR flash(2MB)
Onboard Network: 1000M/100M Ethernet RJ45
USB 2.0 Ports: Three USB 2.0 HOST, one USB 2.0 OTG, HOST mode
role by default in DTS
Buttons: Power Button(SW4) Debug TTL
UART: ..DC-IN..
>[GND][RX][TX] ..HDMI..
Signed-off-by: Antonio Silverio <menion@gmail.com>
(backported from
e2e39328d53c0af473df0c7aad908cff4abf3dfa)
Rob Mosher [Wed, 8 Aug 2018 07:13:14 +0000 (03:13 -0400)]
busybox: prevent compile hang with bzip2 enabled
The BZIP2_SMALL option was not being exposed via Config.in which
caused the build to fail as 'yes' is piped to the config during
build. As it's expecting a number, it gets stuck in a loop.
Signed-off-by: Rob Mosher <nyt-openwrt@countercultured.net>
(backported from
8a3582fa8ae9a894a299ef28d0aceac1a8c4272b)
Jo-Philipp Wich [Wed, 8 Aug 2018 17:52:13 +0000 (19:52 +0200)]
ucert: update to lastest git HEAD
Update to latest HEAD in order to fix a stack memory corruption issue:
1056e73 Change the sigb buffer to be the same size as the fread
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from
cc21dab6cc164ba0bc18505f241edfbae8cb53ec)
Koen Vandeputte [Wed, 8 Aug 2018 10:40:29 +0000 (12:40 +0200)]
cns3xxx: correct size specifier in watchdog init print
fix compiler warnings
Fixes: 84acff286566 ("cns3xxx: fix mpcore watchdog")
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
(backported from
915b0ba69427f1c605d8a976f19d4e88b6aa2ca0)
Koen Vandeputte [Wed, 8 Aug 2018 10:37:27 +0000 (12:37 +0200)]
cns3xxx: delete invalid snip in patch
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
(backported from
85a0bca7cffc7b8d26ed5fa33673188ac9fc89d0)
David Bauer [Mon, 6 Aug 2018 14:21:03 +0000 (16:21 +0200)]
kernel: allow device-tree configuration of at803x
This commit adds the ability to configure specific functions of the
at803x series ethernet-PHYs, which were previously configured
exclusively with the help of platform-data, via device-tree.
This is needed to fully support existing boards of the ar71xx platform.
Signed-off-by: David Bauer <mail@david-bauer.net>
(backported from
fbe17867daddf76ec26be7dbf6b9af3cfad4a54f)
(rebased patches)
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Hans Dedecker [Wed, 8 Aug 2018 12:22:11 +0000 (14:22 +0200)]
iproute2: add libutil to InstallDev section
In iproute2 v4.17 ll_map has been moved from the libnetlink to the libutil
library; add libutil as well to the staging dir in order to keep support
for ll_map
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
(backported from
4d961538f6617a6a58f9688c7bca7bf47ae1da42)
David Bauer [Mon, 6 Aug 2018 14:21:01 +0000 (16:21 +0200)]
uboot-envtools: add ath79 target
This adds uci entries for all ath79 devices for which this already was
the case on ar71xx. Additionally we add the OCEDO Koala as there was no
support in OpenWRT yet.
Signed-off-by: David Bauer <mail@david-bauer.net>
(backported from
5107ba23744989fd9ed68f40ed7e0ded5966e3b7)
Mathias Kresin [Mon, 6 Aug 2018 18:02:00 +0000 (20:02 +0200)]
ramips: use #include syntax for dtsi files
Use the same syntax for including dtsi for all dts files.
Signed-off-by: Mathias Kresin <dev@kresin.me>
(backported from
3b1213a377d9015028eac5fac3b5d94daecdc84e)
Daniel Golle [Tue, 7 Aug 2018 22:47:12 +0000 (00:47 +0200)]
image: fix build without ucert
Make sure the Shell-expression returns true also in case of
key-build.ucert being absent.
Fixes commit
848b455d2e ("image: use ucert to append signature")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
(backported from
ec78f03de589adc9bd47a02d723d7054510601dd)
Daniel Golle [Mon, 6 Aug 2018 19:20:57 +0000 (21:20 +0200)]
image: use ucert to append signature
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
(backported from
848b455d2e9441361f6e010f9b95ab8a7dccbae1)
Daniel Golle [Mon, 6 Aug 2018 16:00:45 +0000 (18:00 +0200)]
ucert: update source
ad816fc set rpath to make bundle-libraries.sh happy
63ad591 blob_buf needs to be zero'd
Now that libubox, libjson-c and libblobms_json are installed into
STAGING_DIR_HOST we can properly bundle ucert in the ImageBuilder.
Follow-up commits will make use of it to include a signature-chain in
sysupgrade images using fwtool.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
(backported from
7a52ce3fafab59a17f692a3a24717c8b0f358407)
Koen Vandeputte [Tue, 7 Aug 2018 09:44:36 +0000 (11:44 +0200)]
cns3xxx: ethernet: use circular queue checks consistently
Use the same method for setting queue index pointers consistenly
throughout the source file.
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
(backported from
0d283c0180a22610ed5bee988902525dee90cc71)
Koen Vandeputte [Tue, 7 Aug 2018 09:18:08 +0000 (11:18 +0200)]
cns3xxx: ethernet: cleanup code
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
(backported from
06beefd6d54c9491c93f03dfdd6174fd29dd3ad8)
Koen Vandeputte [Tue, 7 Aug 2018 08:52:53 +0000 (10:52 +0200)]
cns3xxx: ethernet: fix signed/unsigned comparison
Fixes a compiler warning
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
(backported from
23cdbf2644dcbb3538b5e3341122a83603afeb3f)
Koen Vandeputte [Tue, 7 Aug 2018 10:43:53 +0000 (12:43 +0200)]
cns3xxx: add myself as maintainer
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
(backported from
d1aa6bd69889f03bc4642e52be724a199057c91f)
Hans Dedecker [Mon, 6 Aug 2018 20:19:12 +0000 (22:19 +0200)]
procd: update to latest git HEAD
e29966f Allow disabling seccomp or changing the whitelist
5f57223 trace: Use properly sized type for PTRACE_GETEVENTMSG
747efb6 procd: fix ustream deadlock when there are 0 bytes or no newlines
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
(backported from
9537c1a153591d2f6082a797d1d088c5d921e9cc)
Jo-Philipp Wich [Mon, 6 Aug 2018 17:46:31 +0000 (19:46 +0200)]
Revert "netfilter: separate IPv6 relevant kernel modules from IPv4"
This reverts commit
42a3c6465a230a4e03f2a185f4db5ac57b89f673.
The change was apparently never build-tested with all kmods enabled. I took
a brief look but found no simple way to untangle this, so revert it.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from
93ac8b03b04e8b414e5aea0ac4e986585931c1fe)
Rosy Song [Sat, 4 Aug 2018 02:25:54 +0000 (10:25 +0800)]
netfilter: separate IPv6 relevant kernel modules from IPv4
Signed-off-by: Rosy Song <rosysong@rosinson.com>
(backported from
42a3c6465a230a4e03f2a185f4db5ac57b89f673)
Christian Lamparter [Fri, 3 Aug 2018 21:49:22 +0000 (23:49 +0200)]
kernel: modules: fix kmod-regmap redux
Jonas Gorski commented on the previous patch:
|This is actually the wrong fix and papers over an issue in one of our
|local patches.
|
|We intentionally allow regmap to be built as a module, see
|
|/target/linux/generic/hack-4.14/259-regmap_dynamic.patch
|[...]
|[The regulator code] optionally supports regmap thanks to the stubs
|provided if regmap is disabled - which breaks if you compile regmap
|as a module.
In order to mitigate this issue, this patch reverts the previous patch
and replaces the existing IS_ENABLED(CONFIG_REGMAP) with
IS_REACHABLE(CONFIG_REGMAP). This solves this particular issue as the
regulator code will now automatically fallback to the regmap stubs in
case the kmod-regmap module is enabled, but nothing else sets
CONFIG_REGMAP=y.
Note: There's still a potential issue that this patch doesn't solve:
If someone ever wants to make a OpenWrt kernel package for a
regulator module that requires the REGMAP feature for a target that
doesn't set CONFIG_REGMAP=y but has CONFIG_REGULATOR=y, the resulting
kmod-regulator-xyz package will not work on the target.
Luckily, there aren't any in-tree OpenWrt kernel module packages for
regulators at the moment. On the bright side: regmap is a critical
part nowadays and all new and upcoming architectures require it by
default. This will likely only ever be a problem for legacy targets
and devices that cannot afford to enable REGMAP.
Cc: Jonas Gorski <jonas.gorski@gmail.com>
Cc: John Crispin <john@phrozen.org>
Fixes: d00913d1215b ("kernel: modules: fix kmod-regmap")
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
(backported from
3fce12568a5c38fe0361b433902a1321d34f93d7)
Chen Minqiang [Fri, 3 Aug 2018 17:14:07 +0000 (01:14 +0800)]
mt7620: gsw: make IntPHY and ExtPHY share mdio addr 4 possible
To share mdio addr for IntPHY and ExtPHY,
as described in the documentation (MT7620_ProgrammingGuide.pdf).
(refer: http://download.villagetelco.org/hardware/MT7620/MT7620_ProgrammingGuide.pdf)
when port4 setup to work as gmac mode, dts like:
&gsw {
mediatek,port4 = "gmac";
};
we should set SYSCFG1.GE2_MODE==0x0 (RGMII).
but SYSCFG1.GE2_MODE may have been set to 3(RJ-45) by uboot/default
so we need to re-set it to 0x0
before this changes:
gsw: 4FE + 2GE may not work correctly and MDIO addr 4 cannot be used by ExtPHY
after this changes:
gsw: 4FE + 2GE works and MDIO addr 4 can be used by ExtPHY
Signed-off-by: Chen Minqiang <ptpt52@gmail.com>
(backported from
f6d81e2fa1f110d8025eaa434d67d0014aca1d42)
Daniel Gimpelevich [Wed, 1 Aug 2018 14:44:20 +0000 (07:44 -0700)]
ramips: remove superfluous & confusing DT binding
Mediatek has a reference platform that pairs an MT7620A with an MT7530W,
where the latter responds on MDIO address 0x1f while both chips respond on
0x0 to 0x4. The driver special-cases this arrangement to make sure it's
talking to the right chip, but two different ways in two different places.
This patch consolidates the detection without the current requirement of
both tests to be separately satisfied in the DTS.
Signed-off-by: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
(backported from
5a6229a93df8a3f292094012a43410c6a24c210e)
Daniel Gimpelevich [Mon, 16 Jul 2018 14:19:19 +0000 (07:19 -0700)]
ramips: add support for Edimax BR-6478AC v2
Roll-up of patches by Rohan Murch, Hans Ulli Kroll, and James McKenzie.
Taken from https://forum.openwrt.org/viewtopic.php?id=67192 and updated.
Specification:
- System-On-Chip: MT7620A
- CPU/Speed: 580 MHz
- Flash-Chip: Macronix MX25L6405D
- Flash size: 8192 KiB
- RAM: 64 MiB
- Wireless No1: SoC-integrated: MT7620A 2.4GHz 802.11bgn
- Wireless No2: On-board chip: MT7612E 5GHz 802.11ac
- Switch: Mediatek MT7530W Gigabit Switch
- USB: Yes 1 x 2.0
Installation:
1. Download sysupgrade.bin
2. Open vendor web interface
3. Choose to upgrade firmware
4. After reboot connect via ethernet at 192.168.1.1
Signed-off-by: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
(backported from
f72fa883b324311c1972c39ed521e536b25d674c)
Alex Maclean [Wed, 1 Aug 2018 20:32:34 +0000 (21:32 +0100)]
ramips: move partitions into partition table node
Starting with kernel 4.4, the use of partitions as direct subnodes of the
mtd device is discouraged and only supported for backward compatiblity
reasons.
Signed-off-by: Alex Maclean <monkeh@monkeh.net>
(backported from
6031ab345df86c285ea55d6523d6888cc596f63d)
Mathias Kresin [Fri, 3 Aug 2018 18:14:49 +0000 (20:14 +0200)]
ramips: unify partition node names in dts files
Use partition@ as name for all partition nodes. Add a label where
necessary.
Signed-off-by: Mathias Kresin <dev@kresin.me>
(backported from
6dd94c2781b79ffd20f1a57a48fa2314d67ee190)
Mathias Kresin [Sun, 22 Jul 2018 08:33:42 +0000 (10:33 +0200)]
ramips: fix whitespace and comment issues in dts
Fix space vs. tabs issue and trainling whitespaces. Use C style
comments or drop the comments if they explain what is already to see in
the devicetree parameters.
Signed-off-by: Mathias Kresin <dev@kresin.me>
(backported from
bfd65fc4ab71b9504a9280e91a67698ac4e1e06d)
Mathias Kresin [Sat, 21 Jul 2018 21:00:20 +0000 (23:00 +0200)]
ramips: fix dtc warnings
Fix individual boards dtc warnings or obvious mistakes.
Signed-off-by: Mathias Kresin <dev@kresin.me>
(backported from
53624c1702e6aad5b3e5e442c064dd30f81db2e4)