mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 00:41:17 +00:00
7c468e5e64
Rename kernel patches accepted upstream to indicate at which version they have been accepted, replacing downstream variants which what was accepted upstream. Note that some of them are fixes which will find their way to older kernel versions as well via linux-stable. No functional changes. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
104 lines
2.1 KiB
Diff
104 lines
2.1 KiB
Diff
--- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
|
|
+++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
|
|
@@ -32,6 +32,9 @@
|
|
chosen {
|
|
stdout-path = "serial0:115200n8";
|
|
bootargs = "earlycon=uart8250,mmio32,0x11002000 console=ttyS0,115200n1 swiotlb=512";
|
|
+ rootdisk-emmc = <&emmc_rootfs>;
|
|
+ rootdisk-sd = <&sd_rootfs>;
|
|
+ rootdisk-snfi = <&ubi_rootfs>;
|
|
};
|
|
|
|
cpus {
|
|
@@ -233,6 +236,26 @@
|
|
assigned-clocks = <&topckgen CLK_TOP_MSDC30_0_SEL>;
|
|
assigned-clock-parents = <&topckgen CLK_TOP_UNIV48M>;
|
|
non-removable;
|
|
+
|
|
+ card@0 {
|
|
+ compatible = "mmc-card";
|
|
+ reg = <0>;
|
|
+
|
|
+ block {
|
|
+ compatible = "block-device";
|
|
+ partitions {
|
|
+ block-partition-env {
|
|
+ partname = "ubootenv";
|
|
+ nvmem-layout {
|
|
+ compatible = "u-boot,env-layout";
|
|
+ };
|
|
+ };
|
|
+ emmc_rootfs: block-partition-production {
|
|
+ partname = "production";
|
|
+ };
|
|
+ };
|
|
+ };
|
|
+ };
|
|
};
|
|
|
|
&mmc1 {
|
|
@@ -249,6 +272,26 @@
|
|
vqmmc-supply = <®_3p3v>;
|
|
assigned-clocks = <&topckgen CLK_TOP_MSDC30_1_SEL>;
|
|
assigned-clock-parents = <&topckgen CLK_TOP_UNIV48M>;
|
|
+
|
|
+ card@0 {
|
|
+ compatible = "mmc-card";
|
|
+ reg = <0>;
|
|
+
|
|
+ block {
|
|
+ compatible = "block-device";
|
|
+ partitions {
|
|
+ block-partition-env {
|
|
+ partname = "ubootenv";
|
|
+ nvmem-layout {
|
|
+ compatible = "u-boot,env-layout";
|
|
+ };
|
|
+ };
|
|
+ sd_rootfs: block-partition-production {
|
|
+ partname = "production";
|
|
+ };
|
|
+ };
|
|
+ };
|
|
+ };
|
|
};
|
|
|
|
&nandc {
|
|
@@ -283,14 +326,29 @@
|
|
};
|
|
|
|
partition@80000 {
|
|
- label = "fip";
|
|
- reg = <0x80000 0x200000>;
|
|
- read-only;
|
|
- };
|
|
-
|
|
- ubi: partition@280000 {
|
|
label = "ubi";
|
|
- reg = <0x280000 0x7d80000>;
|
|
+ reg = <0x80000 0x7f80000>;
|
|
+ compatible = "linux,ubi";
|
|
+
|
|
+ volumes {
|
|
+ ubi-volume-ubootenv {
|
|
+ volname = "ubootenv";
|
|
+ nvmem-layout {
|
|
+ compatible = "u-boot,env-redundant-bool-layout";
|
|
+ };
|
|
+ };
|
|
+
|
|
+ ubi-volume-ubootenv2 {
|
|
+ volname = "ubootenv2";
|
|
+ nvmem-layout {
|
|
+ compatible = "u-boot,env-redundant-bool-layout";
|
|
+ };
|
|
+ };
|
|
+
|
|
+ ubi_rootfs: ubi-volume-fit {
|
|
+ volname = "fit";
|
|
+ };
|
|
+ };
|
|
};
|
|
};
|
|
};
|