From d5819fe53b4487d4aa58220a69bdd8447f511877 Mon Sep 17 00:00:00 2001
From: Ray Sollium <120764243+RaySollium99@users.noreply.github.com>
Date: Sat, 12 Jul 2025 15:08:05 -0300
Subject: [PATCH 01/17] Update and rename full_on5xelte.mk to
 lineage_on5xelte.mk

---
 full_on5xelte.mk => lineage_on5xelte.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename full_on5xelte.mk => lineage_on5xelte.mk (91%)

diff --git a/full_on5xelte.mk b/lineage_on5xelte.mk
similarity index 91%
rename from full_on5xelte.mk
rename to lineage_on5xelte.mk
index 9e177af..d08262a 100644
--- a/full_on5xelte.mk
+++ b/lineage_on5xelte.mk
@@ -11,8 +11,8 @@ $(call inherit-product, device/samsung/on5xelte/device.mk)
 
 # Device identifier. This must come after all inclusions
 PRODUCT_DEVICE := on5xelte
-PRODUCT_NAME := full_on5xelte
-PRODUCT_MODEL := SM-G570F
+PRODUCT_NAME := lineage_on5xelte
+PRODUCT_MODEL := SM-G570M
 PRODUCT_BRAND := samsung
 PRODUCT_MANUFACTURER := samsung
 PRODUCT_GMS_CLIENTID_BASE := android-samsung

From 86d6b5254942a54c7e2d2566a9b3f8f613572024 Mon Sep 17 00:00:00 2001
From: Ray Sollium <120764243+RaySollium99@users.noreply.github.com>
Date: Sat, 12 Jul 2025 15:16:31 -0300
Subject: [PATCH 02/17] Update lineage.mk

---
 lineage.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lineage.mk b/lineage.mk
index 32c620c..1dcc75d 100644
--- a/lineage.mk
+++ b/lineage.mk
@@ -1,7 +1,7 @@
 # Copyright (C) 2018 The LineageOS Project
 # SPDX-License-Identifier: Apache-2.0
 
-$(call inherit-product, device/samsung/on5xelte/full_on5xelte.mk)
+$(call inherit-product, device/samsung/on5xelte/lineage_on5xelte.mk)
 
 # Inherit some common Lineage stuff.
 $(call inherit-product, vendor/lineage/config/common_full_phone.mk)

From 8846db90b15447de23743bc68c65a104d70770bc Mon Sep 17 00:00:00 2001
From: Ray Sollium <120764243+RaySollium99@users.noreply.github.com>
Date: Sat, 12 Jul 2025 15:29:01 -0300
Subject: [PATCH 03/17] Update and rename lineage_on5xelte.mk to on5xelte.mk

---
 lineage_on5xelte.mk => on5xelte.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename lineage_on5xelte.mk => on5xelte.mk (95%)

diff --git a/lineage_on5xelte.mk b/on5xelte.mk
similarity index 95%
rename from lineage_on5xelte.mk
rename to on5xelte.mk
index d08262a..3c5d479 100644
--- a/lineage_on5xelte.mk
+++ b/on5xelte.mk
@@ -11,7 +11,7 @@ $(call inherit-product, device/samsung/on5xelte/device.mk)
 
 # Device identifier. This must come after all inclusions
 PRODUCT_DEVICE := on5xelte
-PRODUCT_NAME := lineage_on5xelte
+PRODUCT_NAME := on5xelte
 PRODUCT_MODEL := SM-G570M
 PRODUCT_BRAND := samsung
 PRODUCT_MANUFACTURER := samsung

From 656a5801c189ac1ff183e7ca6ae934c1ace0516f Mon Sep 17 00:00:00 2001
From: Ray Sollium <120764243+RaySollium99@users.noreply.github.com>
Date: Sat, 12 Jul 2025 15:29:19 -0300
Subject: [PATCH 04/17] Update lineage.mk

---
 lineage.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lineage.mk b/lineage.mk
index 1dcc75d..0815213 100644
--- a/lineage.mk
+++ b/lineage.mk
@@ -1,7 +1,7 @@
 # Copyright (C) 2018 The LineageOS Project
 # SPDX-License-Identifier: Apache-2.0
 
-$(call inherit-product, device/samsung/on5xelte/lineage_on5xelte.mk)
+$(call inherit-product, device/samsung/on5xelte/on5xelte.mk)
 
 # Inherit some common Lineage stuff.
 $(call inherit-product, vendor/lineage/config/common_full_phone.mk)

From 96619c4c9fc133a75e1f26e5d68c2f19d7b1baca Mon Sep 17 00:00:00 2001
From: Ray Sollium <120764243+RaySollium99@users.noreply.github.com>
Date: Sat, 12 Jul 2025 15:35:48 -0300
Subject: [PATCH 05/17] Update BoardConfig.mk

---
 BoardConfig.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 9af3088..e45f04d 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 DEVICE_PATH := device/samsung/on5xelte
-
+TARGET_ARCH := arm
 # Assert
 TARGET_OTA_ASSERT_DEVICE := on5xeltexx,on5xelteks,on5xelte
 

From 81f8f96a4a462d1e451dfa42092d27c893a25c17 Mon Sep 17 00:00:00 2001
From: Ray Sollium <120764243+RaySollium99@users.noreply.github.com>
Date: Sat, 12 Jul 2025 15:37:55 -0300
Subject: [PATCH 06/17] Update BoardConfig.mk

---
 BoardConfig.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/BoardConfig.mk b/BoardConfig.mk
index e45f04d..ae801b3 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -2,7 +2,15 @@
 # SPDX-License-Identifier: Apache-2.0
 
 DEVICE_PATH := device/samsung/on5xelte
+
+# Architecture
 TARGET_ARCH := arm
+TARGET_ARCH_VARIANT := armv8-a
+TARGET_CPU_ABI := armeabi-v7a
+TARGET_CPU_ABI2 := armeabi
+TARGET_CPU_VARIANT := cortex-a53
+TARGET_CPU_VARIANT_RUNTIME := cortex-a53
+
 # Assert
 TARGET_OTA_ASSERT_DEVICE := on5xeltexx,on5xelteks,on5xelte
 

From 64bc5b1fc3bd8a68c6c4957d9506c4830f94c269 Mon Sep 17 00:00:00 2001
From: Ray Sollium <120764243+RaySollium99@users.noreply.github.com>
Date: Sat, 12 Jul 2025 15:46:24 -0300
Subject: [PATCH 07/17] Update BoardConfig.mk

---
 BoardConfig.mk | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/BoardConfig.mk b/BoardConfig.mk
index ae801b3..9af3088 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -3,14 +3,6 @@
 
 DEVICE_PATH := device/samsung/on5xelte
 
-# Architecture
-TARGET_ARCH := arm
-TARGET_ARCH_VARIANT := armv8-a
-TARGET_CPU_ABI := armeabi-v7a
-TARGET_CPU_ABI2 := armeabi
-TARGET_CPU_VARIANT := cortex-a53
-TARGET_CPU_VARIANT_RUNTIME := cortex-a53
-
 # Assert
 TARGET_OTA_ASSERT_DEVICE := on5xeltexx,on5xelteks,on5xelte
 

From 9aa8b5a2471dc6e795497855bf67dee88ed6e3fc Mon Sep 17 00:00:00 2001
From: Ray Sollium <120764243+RaySollium99@users.noreply.github.com>
Date: Sat, 12 Jul 2025 15:47:36 -0300
Subject: [PATCH 08/17] Update device.mk

---
 device.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device.mk b/device.mk
index 0d808f4..1641fa7 100644
--- a/device.mk
+++ b/device.mk
@@ -7,4 +7,4 @@ DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
 -include $(LOCAL_PATH)/system_prop.mk
 
 # Inherit common device configuration
-$(call inherit-product, device/samsung/universal7570-common/universal7570-common.mk)
+$(call inherit-product, device/samsung/universal7570-common/device-common.mk)

From 9768b96d99a293d18eefe00ecf7bcfbb866cc14c Mon Sep 17 00:00:00 2001
From: Ray Sollium <120764243+RaySollium99@users.noreply.github.com>
Date: Sat, 12 Jul 2025 16:08:55 -0300
Subject: [PATCH 09/17] Update BoardConfig.mk

---
 BoardConfig.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 9af3088..721423e 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -16,3 +16,4 @@ BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(DEVICE_PATH)/bluetooth
 
 # Inherit common board flags
 include device/samsung/universal7570-common/BoardConfigCommon.mk
+include vendor/samsung/BoardConfigVendor.mk

From 2a22cc8fb2279abf82ecc0a69260e9b59eb51435 Mon Sep 17 00:00:00 2001
From: Ray Sollium <120764243+RaySollium99@users.noreply.github.com>
Date: Sat, 12 Jul 2025 16:10:06 -0300
Subject: [PATCH 10/17] Update device.mk

---
 device.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/device.mk b/device.mk
index 1641fa7..f34e77d 100644
--- a/device.mk
+++ b/device.mk
@@ -7,4 +7,5 @@ DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
 -include $(LOCAL_PATH)/system_prop.mk
 
 # Inherit common device configuration
-$(call inherit-product, device/samsung/universal7570-common/device-common.mk)
+$(call inherit-product, vendor/samsung/universal7570-common.mk)
+$(call inherit-product, device/samsung/device-common.mk)

From e6b7670aa8a5f68c9e707feb5ab296105ac4f048 Mon Sep 17 00:00:00 2001
From: Ray Sollium <120764243+RaySollium99@users.noreply.github.com>
Date: Sat, 12 Jul 2025 16:11:58 -0300
Subject: [PATCH 11/17] Update device.mk

---
 device.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device.mk b/device.mk
index f34e77d..b35c134 100644
--- a/device.mk
+++ b/device.mk
@@ -8,4 +8,4 @@ DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
 
 # Inherit common device configuration
 $(call inherit-product, vendor/samsung/universal7570-common.mk)
-$(call inherit-product, device/samsung/device-common.mk)
+$(call inherit-product, device/samsung/universal7570-common/device-common.mk)

From 407390c280f61ea8f528cd934cd6877fed605ac7 Mon Sep 17 00:00:00 2001
From: Ray Sollium <120764243+RaySollium99@users.noreply.github.com>
Date: Sat, 12 Jul 2025 16:28:00 -0300
Subject: [PATCH 12/17] Update lineage.mk

---
 lineage.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lineage.mk b/lineage.mk
index 0815213..8d929ea 100644
--- a/lineage.mk
+++ b/lineage.mk
@@ -2,6 +2,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 $(call inherit-product, device/samsung/on5xelte/on5xelte.mk)
+$(call inherit-product, device/samsung/universal7570-common/device-common.mk)
+$(call inherit-product, vendor/samsung/universal7570-common-vendor.mk)
 
 # Inherit some common Lineage stuff.
 $(call inherit-product, vendor/lineage/config/common_full_phone.mk)

From 2515f5935bb4c11382854e34676127d72b94594b Mon Sep 17 00:00:00 2001
From: Ray Sollium <120764243+RaySollium99@users.noreply.github.com>
Date: Sat, 12 Jul 2025 16:28:58 -0300
Subject: [PATCH 13/17] Update device.mk

---
 device.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device.mk b/device.mk
index b35c134..df16bcd 100644
--- a/device.mk
+++ b/device.mk
@@ -7,5 +7,5 @@ DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
 -include $(LOCAL_PATH)/system_prop.mk
 
 # Inherit common device configuration
-$(call inherit-product, vendor/samsung/universal7570-common.mk)
 $(call inherit-product, device/samsung/universal7570-common/device-common.mk)
+$(call inherit-product, vendor/samsung/universal7570-common-vendor.mk)

From 688f7d68bcac78725dbf246685b74143cf47937b Mon Sep 17 00:00:00 2001
From: Ray Sollium <120764243+RaySollium99@users.noreply.github.com>
Date: Sat, 12 Jul 2025 16:30:00 -0300
Subject: [PATCH 14/17] Update lineage.mk

---
 lineage.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lineage.mk b/lineage.mk
index 8d929ea..0815213 100644
--- a/lineage.mk
+++ b/lineage.mk
@@ -2,8 +2,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 $(call inherit-product, device/samsung/on5xelte/on5xelte.mk)
-$(call inherit-product, device/samsung/universal7570-common/device-common.mk)
-$(call inherit-product, vendor/samsung/universal7570-common-vendor.mk)
 
 # Inherit some common Lineage stuff.
 $(call inherit-product, vendor/lineage/config/common_full_phone.mk)

From 45dd8e6cc057594a3ea9e26c7ea2a8c445304d4f Mon Sep 17 00:00:00 2001
From: Ray Sollium <120764243+RaySollium99@users.noreply.github.com>
Date: Sat, 12 Jul 2025 16:30:37 -0300
Subject: [PATCH 15/17] Update device.mk

---
 device.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device.mk b/device.mk
index df16bcd..dcf4f96 100644
--- a/device.mk
+++ b/device.mk
@@ -8,4 +8,4 @@ DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
 
 # Inherit common device configuration
 $(call inherit-product, device/samsung/universal7570-common/device-common.mk)
-$(call inherit-product, vendor/samsung/universal7570-common-vendor.mk)
+$(call inherit-product, vendor/samsung/universal7570-common/universal7570-common-vendor.mk)

From 66a777e8c00e9ff82f86780399a41a72ef253b85 Mon Sep 17 00:00:00 2001
From: Ray Sollium <120764243+RaySollium99@users.noreply.github.com>
Date: Sat, 12 Jul 2025 16:40:26 -0300
Subject: [PATCH 16/17] Update BoardConfig.mk

---
 BoardConfig.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 721423e..3012a89 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -16,4 +16,4 @@ BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(DEVICE_PATH)/bluetooth
 
 # Inherit common board flags
 include device/samsung/universal7570-common/BoardConfigCommon.mk
-include vendor/samsung/BoardConfigVendor.mk
+include vendor/samsung/universal7570-common/BoardConfigVendor.mk

From 0af3a3743e867582071f4adcdabdbf3986831e99 Mon Sep 17 00:00:00 2001
From: Ray Sollium <120764243+RaySollium99@users.noreply.github.com>
Date: Sat, 12 Jul 2025 17:24:34 -0300
Subject: [PATCH 17/17] Update BoardConfig.mk

---
 BoardConfig.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 3012a89..23203b2 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -7,8 +7,8 @@ DEVICE_PATH := device/samsung/on5xelte
 TARGET_OTA_ASSERT_DEVICE := on5xeltexx,on5xelteks,on5xelte
 
 # Kernel
-TARGET_KERNEL_CONFIG := on5xelte_00_defconfig
-TARGET_KERNEL_CUSTOM_TOOLCHAIN := /home/nick/android/lineage/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin/aarch64-linux-android-
+TARGET_KERNEL_CONFIG := exynos7570-on5xelte_mea_defconfig
+TARGET_KERNEL_CUSTOM_TOOLCHAIN := prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin/aarch64-linux-android-
 BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive
 
 # Bluetooth