mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-10 06:52:53 +00:00
1d94f72439
Rebased patches:
* generic: 273-batman-adv-Convert-packet.h-to-uapi-header.patch
* ipq806x: 0065-arm-override-compiler-flags.patch
* mvebu: 513-arm64-dts-marvell-armada37xx-Add-emmc-sdio-pinctrl-d.patch
Removed patches:
Fixed upstream:
* ar71xx: 821-serial-core-add-support-for-boot-console-with-arbitr.patch
* ath79: 921-serial-core-add-support-for-boot-console-with-arbitr.patch
- in 4.14.256 via 9112e7ef87149b3d8093e7446d784117f6e18d69
* mvebu: 527-PCI-aardvark-allow-to-specify-link-capability.patch
- in 4.14.257 via 62a3dc9b65a2b24800fc4267b8cf590fad135034
* mvebu: 524-PCI-aardvark-set-host-and-device-to-the-same-MAX-payload-size.patch
- should be hopefully fixed by the bunch of changes in .256 and .257
Run tested on ipq40xx/glinet-b1300 and mvebu/turris-omnia.
Fixes: CVE-2021-3640
Signed-off-by: Petr Štetiar <ynezz@true.cz>
57 lines
1.5 KiB
Diff
57 lines
1.5 KiB
Diff
From bffed3d4abcd32ba6d492a9bd7ebe81dc92eaa9a Mon Sep 17 00:00:00 2001
|
|
From: Ellie Reeves <ellierevves@gmail.com>
|
|
Date: Sun, 25 Mar 2018 21:57:36 +0200
|
|
Subject: [PATCH] arm64: dts: armada-3720-espressobin: wire up spi flash
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
This is the storage the machine boots from by default. The partitioning
|
|
is taken from the U-Boot that is shipped with the board. There is some
|
|
more space on the flash that isn't used.
|
|
|
|
Tested-by: Gregory CLEMENT <gregory.clement@bootlin.com>
|
|
Signed-off-by: Ellie Reeves <ellierevves@gmail.com>
|
|
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
|
|
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
|
|
---
|
|
.../dts/marvell/armada-3720-espressobin.dts | 27 +++++++++++++++++++
|
|
1 file changed, 27 insertions(+)
|
|
|
|
--- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
|
|
+++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
|
|
@@ -103,6 +103,33 @@
|
|
status = "okay";
|
|
};
|
|
|
|
+&spi0 {
|
|
+ status = "okay";
|
|
+
|
|
+ flash@0 {
|
|
+ reg = <0>;
|
|
+ compatible = "winbond,w25q32dw", "jedec,spi-flash";
|
|
+ spi-max-frequency = <104000000>;
|
|
+ m25p,fast-read;
|
|
+
|
|
+ partitions {
|
|
+ compatible = "fixed-partitions";
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <1>;
|
|
+
|
|
+ partition@0 {
|
|
+ label = "uboot";
|
|
+ reg = <0 0x180000>;
|
|
+ };
|
|
+
|
|
+ partition@180000 {
|
|
+ label = "ubootenv";
|
|
+ reg = <0x180000 0x10000>;
|
|
+ };
|
|
+ };
|
|
+ };
|
|
+};
|
|
+
|
|
/* Exported on the micro USB connector J5 through an FTDI */
|
|
&uart0 {
|
|
status = "okay";
|