196f3d586f
5.4.102 backported a lot of stuff that our WireGuard backport already did, in addition to other patches we had, so those patches were removed from that part of the series. In the process other patches were refreshed or reworked to account for upstream changes. This commit involved `update_kernel.sh -v -u 5.4`. Cc: John Audia <graysky@archlinux.us> Cc: David Bauer <mail@david-bauer.net> Cc: Petr Štetiar <ynezz@true.cz> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
47 lines
1.2 KiB
Diff
47 lines
1.2 KiB
Diff
From 7d87d3dafc4b1ea5659eb71ee6c5fd5308490d1f Mon Sep 17 00:00:00 2001
|
|
From: Oskari Lemmela <oskari@lemmela.net>
|
|
Date: Mon, 31 Dec 2018 07:44:49 +0200
|
|
Subject: [PATCH] arm64: allwinner: a64-sopine: Add Sopine flash partitions.
|
|
|
|
First 896kB to u-boot. Enough space for SPL, u-boot and ATF.
|
|
Next 128kB to u-boot environment and rest to firmware.
|
|
|
|
Firmware partition is compatible FIT image dynamic splitting.
|
|
|
|
Signed-off-by: Oskari Lemmela <oskari@lemmela.net>
|
|
---
|
|
.../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 22 +++++++++++++++++++
|
|
1 file changed, 22 insertions(+)
|
|
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi
|
|
@@ -81,6 +81,28 @@
|
|
compatible = "jedec,spi-nor";
|
|
reg = <0>;
|
|
spi-max-frequency = <40000000>;
|
|
+
|
|
+ partitions {
|
|
+ compatible = "fixed-partitions";
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <1>;
|
|
+
|
|
+ partition@0 {
|
|
+ label = "u-boot";
|
|
+ reg = <0x000000 0x0E0000>;
|
|
+ };
|
|
+
|
|
+ partition@e0000 {
|
|
+ label = "u-boot-env";
|
|
+ reg = <0x0E0000 0x020000>;
|
|
+ };
|
|
+
|
|
+ partition@100000 {
|
|
+ compatible = "denx,fit";
|
|
+ label = "firmware";
|
|
+ reg = <0x100000 0xF00000>;
|
|
+ };
|
|
+ };
|
|
};
|
|
};
|
|
|