196-dts-mt7986a-bpi-r3-use-all-ubi-nand-layout.patch 2.5 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131
  1. --- a/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-emmc.dtso
  2. +++ b/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-emmc.dtso
  3. @@ -23,7 +23,27 @@
  4. no-sd;
  5. no-sdio;
  6. status = "okay";
  7. +
  8. + card@0 {
  9. + compatible = "mmc-card";
  10. + reg = <0>;
  11. +
  12. + block {
  13. + compatible = "block-device";
  14. + partitions {
  15. + emmc_rootdisk: block-partition-production {
  16. + partname = "production";
  17. + };
  18. + };
  19. + };
  20. + };
  21. };
  22. };
  23. -};
  24. + fragment@1 {
  25. + target-path = "/chosen";
  26. + __overlay__ {
  27. + rootdisk-emmc = <&emmc_rootdisk>;
  28. + };
  29. + };
  30. +};
  31. --- a/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nand.dtso
  32. +++ b/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nand.dtso
  33. @@ -29,27 +29,30 @@
  34. partition@0 {
  35. label = "bl2";
  36. - reg = <0x0 0x100000>;
  37. + reg = <0x0 0x200000>;
  38. read-only;
  39. };
  40. - partition@100000 {
  41. - label = "reserved";
  42. - reg = <0x100000 0x280000>;
  43. - };
  44. -
  45. - partition@380000 {
  46. - label = "fip";
  47. - reg = <0x380000 0x200000>;
  48. - read-only;
  49. - };
  50. -
  51. - partition@580000 {
  52. + partition@200000 {
  53. label = "ubi";
  54. - reg = <0x580000 0x7a80000>;
  55. + reg = <0x200000 0x7e00000>;
  56. + compatible = "linux,ubi";
  57. +
  58. + volumes {
  59. + nand_rootdisk: ubi-volume-fit {
  60. + volname = "fit";
  61. + };
  62. + };
  63. };
  64. };
  65. };
  66. };
  67. };
  68. +
  69. + fragment@1 {
  70. + target-path = "/chosen";
  71. + __overlay__ {
  72. + rootdisk-spim-nand = <&nand_rootdisk>;
  73. + };
  74. + };
  75. };
  76. --- a/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dtso
  77. +++ b/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dtso
  78. @@ -52,7 +52,7 @@
  79. reg = <0x180000 0xa80000>;
  80. };
  81. - partition@c00000 {
  82. + nor_rootdisk: partition@c00000 {
  83. label = "fit";
  84. reg = <0xc00000 0x1400000>;
  85. compatible = "denx,fit";
  86. @@ -61,4 +61,11 @@
  87. };
  88. };
  89. };
  90. +
  91. + fragment@1 {
  92. + target-path = "/chosen";
  93. + __overlay__ {
  94. + rootdisk-nor = <&nor_rootdisk>;
  95. + };
  96. + };
  97. };
  98. --- a/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-sd.dtso
  99. +++ b/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-sd.dtso
  100. @@ -17,6 +17,27 @@
  101. max-frequency = <52000000>;
  102. cap-sd-highspeed;
  103. status = "okay";
  104. +
  105. + card@0 {
  106. + compatible = "mmc-card";
  107. + reg = <0>;
  108. +
  109. + block {
  110. + compatible = "block-device";
  111. + partitions {
  112. + sd_rootdisk: block-partition-production {
  113. + partname = "production";
  114. + };
  115. + };
  116. + };
  117. + };
  118. + };
  119. + };
  120. +
  121. + fragment@1 {
  122. + target-path = "/chosen";
  123. + __overlay__ {
  124. + rootdisk-sd = <&sd_rootdisk>;
  125. };
  126. };
  127. };