mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 15:02:32 +00:00
b04f245c39
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.23 Removed upstreamed: pending-6.6/735-net-mediatek-mtk_eth_soc-release-MAC_MCR_FORCE_LINK-.patch[1] pending-6.6/736-net-ethernet-mtk_eth_soc-fix-PPE-hanging-issue.patch[2] mediatek/patches-6.6/232-clk-mediatek-mt7981-topckgen-flag-SGM_REG_SEL-as-cri.patch[3] Manually rebased: mediatek/patches-6.6/100-dts-update-mt7622-rfb1.patch Added: generic/backports-6.6/981-mtd-spinand-Add-support-for-5-byte-IDs.patch[4] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.23&id=1f32abb474c1c9bdb21d9eda74c325a0b3a162e5 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.23&id=943c14ece95eb1cf98d477462aebcbfdfd714633 3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.23&id=6ff01b314149d1cf59caebc29384f0beed21cba4 4. See comments in https://github.com/openwrt/openwrt/pull/14992 regarding broken flogic/xiaomi_redmi-router-ax6000-ubootmod Build system: x86/64 Build-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, flogic/glinet_gl-mt6000 Run-tested: x86/64/AMD Cezannei, flogic/xiaomi_redmi-router-ax6000-ubootmod, flogic/glinet_gl-mt6000 Signed-off-by: John Audia <therealgraysky@proton.me>
106 lines
2.1 KiB
Diff
106 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 {
|
|
@@ -234,6 +237,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 {
|
|
@@ -282,15 +325,30 @@
|
|
read-only;
|
|
};
|
|
|
|
- partition@80000 {
|
|
- label = "fip";
|
|
- reg = <0x80000 0x200000>;
|
|
- read-only;
|
|
- };
|
|
-
|
|
- ubi: partition@280000 {
|
|
+ ubi: partition@80000 {
|
|
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";
|
|
+ };
|
|
+ };
|
|
};
|
|
};
|
|
};
|