From 4f687403e4badf23f896ea119db5ccbadf92d2ab Mon Sep 17 00:00:00 2001
From: methanal <13671494-methanal@users.noreply.gitlab.com>
Date: Mon, 11 Sep 2023 17:38:17 +0000
Subject: [PATCH] linux-samsung-on7xelte: change downstream kernel to a recent
 release (MR 4394)

---
 device/testing/linux-samsung-on7xelte/APKBUILD       | 11 +++++------
 .../generate-device-dtbs.patch                       | 12 ------------
 2 files changed, 5 insertions(+), 18 deletions(-)
 delete mode 100644 device/testing/linux-samsung-on7xelte/generate-device-dtbs.patch

diff --git a/device/testing/linux-samsung-on7xelte/APKBUILD b/device/testing/linux-samsung-on7xelte/APKBUILD
index c10845316..b0af46544 100644
--- a/device/testing/linux-samsung-on7xelte/APKBUILD
+++ b/device/testing/linux-samsung-on7xelte/APKBUILD
@@ -33,16 +33,15 @@ if [ "${CC:0:5}" != "gcc4-" ]; then
 fi
 
 # Source
-_repository="linux-downstream-on7xelte"
-_commit="9932b75127e6363e40a00b6bc6f5ec71ac7fea32"
+_repository="on7xelte"
+_commit="dc426ce2d91179926c0fd9ab7d2404fbac4a55d0"
 _config="config-$_flavor.$arch"
 source="
-	$pkgname-$_commit.tar.gz::https://gitlab.com/linuxforexynos/$_repository/-/archive/$_commit/$_repository-$_commit.tar.gz
+	$pkgname-$_commit.tar.gz::https://gitlab.com/exynos7870-mainline/downstream/$_repository/-/archive/$_commit/$_repository-$_commit.tar.gz
 	$_config
 	gcc10-extern_YYLOC_global_declaration.patch
 	gcc7-give-up-on-ilog2-const-optimizations.patch
 	gcc8-fix-put-user.patch
-	generate-device-dtbs.patch
 	disable-fimc-is2.patch
 	fix-usb-gadget-random-mac.patch
 	disable-charging-bootmode.patch
@@ -52,6 +51,7 @@ builddir="$srcdir/$_repository-$_commit"
 _outdir="out"
 
 prepare() {
+	export ANDROID_MAJOR_VERSION=o
 	default_prepare
 	. downstreamkernel_prepare
 }
@@ -88,12 +88,11 @@ nonfree_firmware() {
 }
 
 sha512sums="
-a988ccbd860dfc0147387ca1f2045534d9ccc82d94213abc586b9556c93c99025ed3d7e0658d41ac2bc4803093cd9352f98611c9a08438fae16a2139e799ec47  linux-samsung-on7xelte-9932b75127e6363e40a00b6bc6f5ec71ac7fea32.tar.gz
+88cad50360ca1687067e8adba0a5c2d023ddeb20fdf8e7752d626b7173e20b1ee8532265ea3a3395506ed9464379d8039c70e8721ba3f86b70ec44860b01bb96  linux-samsung-on7xelte-dc426ce2d91179926c0fd9ab7d2404fbac4a55d0.tar.gz
 96360349f21f39ffdfd05d5f8d16daf067941b66e412b4d4366ac5c79746e06d2a4abf68b9b1d4031e78e06f5dcc9d40972dfbb6186dc1d693dd2f607668a422  config-samsung-on7xelte.aarch64
 2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb  gcc10-extern_YYLOC_global_declaration.patch
 77eba606a71eafb36c32e9c5fe5e77f5e4746caac292440d9fb720763d766074a964db1c12bc76fe583c5d1a5c864219c59941f5e53adad182dbc70bf2bc14a7  gcc7-give-up-on-ilog2-const-optimizations.patch
 197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967  gcc8-fix-put-user.patch
-ecfdee788bdfd5bf7c6a740f06a0f43b485e6b4d839f821082e5c734b97ca57396498f7467533afb10c2c32f86c217ec23772845d1dfed36c7d05b57b1f9131d  generate-device-dtbs.patch
 f429f40a8195e81d1c3ef86a5736bb29e09f3daaa2f415b9a992fb4dc8011c961c7b48fc97e08c3180ebacf8c2b97a5560022a9340eb44464e8ef98f3758e19e  disable-fimc-is2.patch
 0d56ba508408dc31961ad688f7fd960b0008851fd5729088658095417781b99962740e0c64d162a26f8389e4b4dc88e291252e7935e896fc70bf73c23150caea  fix-usb-gadget-random-mac.patch
 32e51c6171bcb72b15f5f11a9c9b3279e03e630f2ea6d14b66fbfdd8a8c1587bdb7e88698197e9a81e05c47dba08d13c1ff4a5e4692d14b042f07dd2006c1cc0  disable-charging-bootmode.patch
diff --git a/device/testing/linux-samsung-on7xelte/generate-device-dtbs.patch b/device/testing/linux-samsung-on7xelte/generate-device-dtbs.patch
deleted file mode 100644
index 595666d6e..000000000
--- a/device/testing/linux-samsung-on7xelte/generate-device-dtbs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/arch/arm64/boot/dts/Makefile b/arch/arm64/boot/dts/Makefile
-index b45f462b..f0031b4a 100644
---- a/arch/arm64/boot/dts/Makefile
-+++ b/arch/arm64/boot/dts/Makefile
-@@ -4,6 +4,7 @@ dtb-$(CONFIG_ARCH_XGENE) += apm-mustang.dtb
- dtb-$(CONFIG_SOC_EXYNOS8890) += exynos8890-espresso8890.dtb exynos8890-espresso8890_rev01.dtb exynos8890-universal8890.dtb exynos8890-smdk8890.dtb
- dtb-$(CONFIG_SOC_EXYNOS8890) += exynos8890-evt1-smdk8890.dtb
- dtb-$(CONFIG_SOC_EXYNOS7870) += exynos7870-smdk7870.dtb exynos7870-universal7870.dtb exynos7870-universal7870_rev01.dtb exynos7870-universal7870_rev01_treble_off.dtb
-+dtb-$(CONFIG_SOC_EXYNOS7870) += exynos7870-on7xelte_swa_open_00.dtb exynos7870-on7xelte_swa_open_01.dtb exynos7870-on7xelte_swa_open_02.dtb
- 
- targets += dtbs
-