From 885cf39341c5a29c31293ded7b9c5034c3c595f0 Mon Sep 17 00:00:00 2001
From: j4nn <531585+j4nn@users.noreply.github.com>
Date: Thu, 31 Jul 2025 00:32:04 +0200
Subject: [PATCH] yoshino-common: update for twrp-3.7.1_12-0

start in mtp,adb mode on usb (seems to be more reliable)
use legacy battery services
build kernel from sources instead of prebuilt one
enable reboot to edl mode (needs a kernel patch too) for experimenting
enable real sd card as we actually have it
---
 BoardConfigPlatform.mk        | 12 ++++++++----
 recovery/init.recovery.usb.rc |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/BoardConfigPlatform.mk b/BoardConfigPlatform.mk
index 94918a02a224..cd3f9e2afe2d 100644
--- a/BoardConfigPlatform.mk
+++ b/BoardConfigPlatform.mk
@@ -38,6 +38,9 @@ TARGET_2ND_CPU_VARIANT := generic
 TARGET_2ND_CPU_VARIANT_RUNTIME := cortex-a73
 
 ### KERNEL
+TARGET_KERNEL_SOURCE  := kernel/sony/msm8998
+TARGET_KERNEL_VERSION := 4.4
+
 BOARD_KERNEL_CMDLINE += user_debug=31
 BOARD_KERNEL_CMDLINE += ehci-hcd.park=3
 BOARD_KERNEL_CMDLINE += lpm_levels.sleep_disabled=1
@@ -54,6 +57,8 @@ BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive
 BOARD_KERNEL_BASE        := 0x00000000
 BOARD_KERNEL_PAGESIZE    := 4096
 
+BOARD_KERNEL_IMAGE_NAME := Image.gz-dtb
+
 ### PARTITIONS
 # See also /proc/partitions on the devices
 BOARD_BOOTIMAGE_PARTITION_SIZE := 67108864
@@ -84,9 +89,6 @@ PLATFORM_VERSION := 99.87.36
 PLATFORM_VERSION_LAST_STABLE := $(PLATFORM_VERSION)
 PLATFORM_SECURITY_PATCH := 2099-12-31
 TW_INCLUDE_CRYPTO := true
-ifneq ($(filter maple maple_dsds, $(TARGET_DEVICE)),)
-TW_INCLUDE_RESETPROP := true
-endif
 
 # QSEECOMD DEPENDENCIES
 TARGET_RECOVERY_DEVICE_MODULES      += libxml2
@@ -125,7 +127,7 @@ TW_MAX_BRIGHTNESS := 4095
 TW_DEFAULT_BRIGHTNESS := 1600
 
 ## SDCARD PARTITIONING DISABLED
-BOARD_HAS_NO_REAL_SDCARD := true
+#BOARD_HAS_NO_REAL_SDCARD := true
 
 ## TOOLBOX
 TW_USE_TOOLBOX := true
@@ -134,6 +136,8 @@ TW_USE_TOOLBOX := true
 TW_EXCLUDE_SUPERSU := true
 TW_EXCLUDE_TWRPAPP := true
 TW_EXTRA_LANGUAGES := true
+TW_HAS_EDL_MODE := true
+TW_USE_LEGACY_BATTERY_SERVICES := true
 TW_THEME := portrait_hdpi
 
 ### USB
diff --git a/recovery/init.recovery.usb.rc b/recovery/init.recovery.usb.rc
index 7b4a9acf7101..640fc469e2a9 100644
--- a/recovery/init.recovery.usb.rc
+++ b/recovery/init.recovery.usb.rc
@@ -50,7 +50,7 @@ on boot
     setprop vendor.usb.rndis.func.name "rndis_bam"
     setprop vendor.usb.rmnet.func.name "rmnet_bam"
 
-    setprop sys.usb.config adb
+    setprop sys.usb.config mtp,adb
 
 # USB compositions
 on property:sys.usb.config=none