pine64/common: use megi orange-pi-6.6 integration branch

Signed-off-by: Christian Stewart <christian@aperture.us>
skiffos · Sep 18, 2023 · 6e3c138 · 6e3c138
1 parent b39c816
commit 6e3c138
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -96,13 +96,13 @@ main SkiffOS repository:
 | [Pi 3] + 1, 2          | [pi/3]                 | N/A              | ✔ rpi-6.1.53    | ✔ Tested         |
 | [Pi 4]                 | [pi/4]                 | N/A              | ✔ rpi-6.1.53    | ✔ Tested         |
 | [Pi 4] (32bit mode)    | [pi/4x32]              | N/A              | ✔ rpi-6.1.53    |                  |
-| [Pine64 H64]           | [pine64/h64]           | ✔ U-Boot 2022.04 | ✔ megi-6.4.7    |                  |
-| [PineBook A64]         | [pine64/book_a64]      | ✔ U-Boot (bin)   | ✔ megi-6.4.7    | ⚠ Obsolete       |
-| [PineBook Pro]         | [pine64/book]          | ✔ U-Boot (bin)   | ✔ megi-6.4.7    |                  |
-| [PinePhone]            | [pine64/phone]         | ✔ U-Boot (bin)   | ✔ megi-6.4.7    |                  |
-| [PinePhone Pro]        | [pine64/phone_pro]     | ✔ U-Boot (bin)   | ✔ megi-6.4.7    | ⚠ Experimental   |
-| [Rock64] rk3328        | [pine64/rock64]        | ✔ U-Boot 2022.04 | ✔ megi-6.4.7    |                  |
-| [RockPro64]            | [pine64/rockpro64]     | ✔ U-Boot (bin)   | ✔ megi-6.4.7    | ✔ Tested         |
+| [Pine64 H64]           | [pine64/h64]           | ✔ U-Boot 2022.04 | ✔ megi-6.6-pre  |                  |
+| [PineBook A64]         | [pine64/book_a64]      | ✔ U-Boot (bin)   | ✔ megi-6.6-pre  | ⚠ Obsolete       |
+| [PineBook Pro]         | [pine64/book]          | ✔ U-Boot (bin)   | ✔ megi-6.6-pre  |                  |
+| [PinePhone]            | [pine64/phone]         | ✔ U-Boot (bin)   | ✔ megi-6.6-pre  |                  |
+| [PinePhone Pro]        | [pine64/phone_pro]     | ✔ U-Boot (bin)   | ✔ megi-6.6-pre  | ⚠ Experimental   |
+| [Rock64] rk3328        | [pine64/rock64]        | ✔ U-Boot 2022.04 | ✔ megi-6.6-pre  |                  |
+| [RockPro64]            | [pine64/rockpro64]     | ✔ U-Boot (bin)   | ✔ megi-6.6-pre  | ✔ Tested         |
 | [Sipeed LicheeRV]      | [allwinner/licheerv]   | ✔ U-Boot 2022.07 | ✔ sm-5.19-rc1   | RISC-V D1        |
 | [StarFive VisionFive]  | [starfive/visionfive]  | ✔ U-Boot 2021.04 | ✔ sv-5.19-rc3   | RISC-V           |
 | [StarFive VisionFive2] | [starfive/visionfive2] | ✔ U-Boot 2021.10 | ✔ s5-5.15.0     | RISC-V           |

diff --git a/configs/pine64/common/buildroot/kernel b/configs/pine64/common/buildroot/kernel
@@ -1,16 +1,11 @@
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 
-# branch: orange-pi-6.2
+# branch: orange-pi-6.6
 # megous kernel for pinephone, pinebook, orangepi
-# upstream: https://github.com/megous/linux/commits/orange-pi-6.2
-# BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,megous,linux,728106f66f837d9ee6edbd1b8074560302306d1b)/linux-megous-6.2.9-r1.tar.gz"
-# BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_2=y
-
-# branch: orange-pi-6.4
-# megous kernel for pinephone, pinebook, orangepi
-# upstream: https://github.com/megous/linux/commits/orange-pi-6.4
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,megous,linux,9eb125d93f953918035f1368ebfb4be19ee7d81f)/linux-megous-6.4.7-r1.tar.gz"
+# upstream: https://xff.cz/git/linux/log/?h=orange-pi-6.6
+# mirror: https://github.com/skiffos/linux/tree/megi-orange-pi-6.6
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,skiffos,linux,e3660cbc31a2b40ee875e169cba7637de43f8726)/linux-megous-6.6.0-pre-r1.tar.gz"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y
 
 BR2_KERNEL_HEADERS_AS_KERNEL=y