mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 00:41:17 +00:00
7f257296ec
Remove the following patches: 100-ARM-dts-turris-omnia-configure-LED-0-pin-function-to [1] 101-ARM-dts-turris-omnia-enable-LED-controller-node [2] 702-net-next-ethernet-marvell-mvnetaMQPrioOffload [3] 703-net-next-ethernet-marvell-mvnetaMQPrioFlag [4] 704-net-next-ethernet-marvell-mvnetaMQPrioQueue [5] 705-net-next-ethernet-marvell-mvnetaMQPrioTCOffload [6] 710-v6.2-phy-marvell-phy-mvebu-a3700-comphy-Reset-COMPHY-regi [7] Manually rebased: 902-drivers-mfd-Add-a-driver-for-IEI-WT61P803-PUZZLE-MCU All other patches automatically rebased [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=94a29bffdd59498382131fd428fed221f5c96def [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=40624346b7ae0c2b1209fc9993ea30699e512c50 [3] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=75fa71e3acadbb4ab5eda18505277eb9a1f69b23 [4] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=e7ca75fe6662f78bfeb0112671c812e4c7b8e214 [5] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=e9f7099d0730341b24c057acbf545dd019581db6 [6] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=2551dc9e398c37a15e52122d385c29a8b06be45f [7] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=cd1e1735aeab49abc679218a79ee764c0d394880 Signed-off-by: Stefan Kalscheuer <stefan@stklcode.de>
36 lines
895 B
Diff
36 lines
895 B
Diff
From 9861f93a59142a3131870df2521eb2deb73026d7 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime.ripard@free-electrons.com>
|
|
Date: Tue, 13 Jan 2015 11:14:09 +0100
|
|
Subject: [PATCH 2/2] ARM: mvebu: 385-ap: Add partitions
|
|
|
|
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
|
---
|
|
arch/arm/boot/dts/armada-385-db-ap.dts | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
--- a/arch/arm/boot/dts/armada-385-db-ap.dts
|
|
+++ b/arch/arm/boot/dts/armada-385-db-ap.dts
|
|
@@ -218,19 +218,19 @@
|
|
#size-cells = <1>;
|
|
|
|
partition@0 {
|
|
- label = "U-Boot";
|
|
+ label = "u-boot";
|
|
reg = <0x00000000 0x00800000>;
|
|
read-only;
|
|
};
|
|
|
|
partition@800000 {
|
|
- label = "uImage";
|
|
+ label = "kernel";
|
|
reg = <0x00800000 0x00400000>;
|
|
read-only;
|
|
};
|
|
|
|
partition@c00000 {
|
|
- label = "Root";
|
|
+ label = "ubi";
|
|
reg = <0x00c00000 0x3f400000>;
|
|
};
|
|
};
|