Add complete recovery configuration and fix major bugs

Co-authored-by: Eduardob3677 <212653915+Eduardob3677@users.noreply.github.com>

.gitignore

@@ -0,0 +1,39 @@
+# Build artifacts
+*.o
+*.a
+*.so
+*.ko
+*.img
+*.tar
+*.tar.gz
+*.zip
+
+# Generated files
+out/
+obj/
+.config
+.tmp_versions/
+
+# IDE files
+.vscode/
+.idea/
+*.swp
+*.swo
+*~
+
+# OS files
+.DS_Store
+Thumbs.db
+
+# Log files
+*.log
+
+# Android build files
+*.odex
+*.vdex
+*.art
+*.oat
+
+# Recovery specific
+recovery.img
+boot.img

Android.mk

@@ -11,3 +11,10 @@ ifeq ($(TARGET_SM8550_COMMON),true)
 include $(call all-makefiles-under,$(LOCAL_PATH))
 
 endif
+
+# Also check for device variants  
+ifneq ($(filter dm1q dm2q dm3q b5q q5q gts9 gts9wifi gts9p gts9pwifi gts9u gts9uwifi,$(TARGET_DEVICE)),)
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
+
+endif

BoardConfigCommon.mk

@@ -0,0 +1,113 @@
+#
+# Copyright (C) 2025 The Android Open Source Project
+# Copyright (C) 2025 The TWRP Open Source Project
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+COMMON_PATH := device/samsung/sm8550-common
+
+# Architecture
+TARGET_ARCH := arm64
+TARGET_ARCH_VARIANT := armv8-2a
+TARGET_CPU_ABI := arm64-v8a
+TARGET_CPU_ABI2 :=
+TARGET_CPU_VARIANT := cortex-a78
+
+TARGET_2ND_ARCH := arm
+TARGET_2ND_ARCH_VARIANT := armv8-2a
+TARGET_2ND_CPU_ABI := armeabi-v7a
+TARGET_2ND_CPU_ABI2 := armeabi
+TARGET_2ND_CPU_VARIANT := cortex-a78
+
+# Platform
+TARGET_BOARD_PLATFORM := kalama
+TARGET_BOOTLOADER_BOARD_NAME := kalama
+
+# Kernel
+BOARD_KERNEL_CMDLINE += console=null
+BOARD_KERNEL_CMDLINE += androidboot.hardware=qcom
+BOARD_KERNEL_CMDLINE += androidboot.memcg=1
+BOARD_KERNEL_CMDLINE += lpm_levels.sleep_disabled=1
+BOARD_KERNEL_CMDLINE += video=vfb:640x400,bpp=32,memsize=3072000
+BOARD_KERNEL_CMDLINE += msm_rtb.filter=0x237
+BOARD_KERNEL_CMDLINE += service_locator.enable=1
+BOARD_KERNEL_CMDLINE += androidboot.usbcontroller=a600000.dwc3
+BOARD_KERNEL_CMDLINE += swiotlb=0
+BOARD_KERNEL_CMDLINE += loop.max_part=7
+BOARD_KERNEL_CMDLINE += cgroup.memory=nokmem,nosocket
+BOARD_KERNEL_CMDLINE += printk.devkmsg=on
+
+BOARD_KERNEL_BASE := 0x00000000
+BOARD_KERNEL_PAGESIZE := 4096
+BOARD_KERNEL_OFFSET := 0x00008000
+BOARD_RAMDISK_OFFSET := 0x02000000
+BOARD_KERNEL_TAGS_OFFSET := 0x01e00000
+BOARD_DTB_OFFSET := 0x01f00000
+
+BOARD_KERNEL_IMAGE_NAME := Image
+BOARD_INCLUDE_DTB_IN_BOOTIMG := true
+BOARD_MKBOOTIMG_ARGS += --dtb_offset $(BOARD_DTB_OFFSET)
+
+# Dynamic Partitions
+BOARD_SUPER_PARTITION_SIZE := 12884901888
+BOARD_SUPER_PARTITION_GROUPS := qti_dynamic_partitions
+BOARD_QTI_DYNAMIC_PARTITIONS_SIZE := 6442450944
+BOARD_QTI_DYNAMIC_PARTITIONS_PARTITION_LIST := system system_ext product vendor vendor_dlkm
+
+# Partitions
+BOARD_FLASH_BLOCK_SIZE := 262144
+BOARD_BOOTIMAGE_PARTITION_SIZE := 100663296
+BOARD_RECOVERYIMAGE_PARTITION_SIZE := 104857600
+
+# AVB
+BOARD_AVB_ENABLE := true
+BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --flags 3
+BOARD_AVB_RECOVERY_KEY_PATH := external/avb/test/data/testkey_rsa4096.pem
+BOARD_AVB_RECOVERY_ALGORITHM := SHA256_RSA4096
+BOARD_AVB_RECOVERY_ROLLBACK_INDEX := 1
+BOARD_AVB_RECOVERY_ROLLBACK_INDEX_LOCATION := 1
+
+# Recovery
+TARGET_RECOVERY_PIXEL_FORMAT := RGBX_8888
+TARGET_USERIMAGES_USE_EXT4 := true
+TARGET_USERIMAGES_USE_F2FS := true
+
+# TWRP Configuration
+TW_THEME := portrait_hdpi
+TW_BRIGHTNESS_PATH := "/sys/class/backlight/panel0-backlight/brightness"
+TW_MAX_BRIGHTNESS := 255
+TW_DEFAULT_BRIGHTNESS := 128
+
+# Crypto
+TW_INCLUDE_CRYPTO := true
+TW_INCLUDE_CRYPTO_FBE := true
+BOARD_USES_METADATA_PARTITION := true
+
+# Display
+TW_SCREEN_BLANK_ON_BOOT := true
+TW_NO_SCREEN_BLANK := true
+
+# Storage
+TW_HAS_DOWNLOAD_MODE := true
+TW_INCLUDE_FASTBOOTD := true
+TW_NO_USB_STORAGE := true
+RECOVERY_SDCARD_ON_DATA := true
+
+# Security
+TW_EXCLUDE_ENCRYPTED_BACKUPS := true
+
+# OrangeFox
+OF_MAINTAINER := Eduardob3677
+OF_DEVICE_WITHOUT_PERSIST := 1
+OF_SUPPORT_PRE_FLASH_SCRIPT := 1
+OF_NO_TREBLE_COMPATIBILITY_CHECK := 1
+OF_FIX_OTA_UPDATE_MANUAL_FLASH_ERROR := 1
+OF_SKIP_MULTIUSER_FOLDERS_BACKUP := 1
+
+# SELinux
+BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive
+BOARD_SEPOLICY_DIRS += $(COMMON_PATH)/sepolicy
+
+# Build
+include $(COMMON_PATH)/mkboot/bootimg.mk

mkboot/avb_digest_patch.py

@@ -39,12 +39,19 @@ image = FILE.read()
 # Get location of avb image
 avb_header = b'AVB0'
 find_avb_str = image.find(avb_header)
+
+if find_avb_str == -1:
+    print("ERROR: AVB header not found in image")
+    FILE.close()
+    exit(1)
+
 offset = FILE.seek(find_avb_str + 972)
 
 # Generating random 64 bit bytes to replace AVB Digest
 random = os.urandom(64)
 
 FILE.write(random)
+FILE.close()
 
 # Print
 print("AVB HEADER OFFSET: ", find_avb_str)

mkboot/bootimg.mk

@@ -15,5 +15,9 @@ $(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTIMG) $(recovery_ramdisk) $(recovery_k
 	$(hide) echo -n "SEANDROIDENFORCE" >> $@
 	$(hide) $(call assert-max-image-size,$@,$(BOARD_RECOVERYIMAGE_PARTITION_SIZE),raw)
 	$(hide) $(AVBTOOL) add_hash_footer --image $@ --partition_size $(BOARD_RECOVERYIMAGE_PARTITION_SIZE) --partition_name recovery --algorithm $(BOARD_AVB_RECOVERY_ALGORITHM) --key $(BOARD_AVB_RECOVERY_KEY_PATH)
-	$(hide) python3 $(PATCH_AVB) --img $(PRODUCT_OUT)/recovery.img
-	@echo "Made recovery image: $@"	
+	$(hide) if [ -f "$(PATCH_AVB)" ]; then \
+		python3 $(PATCH_AVB) --img $(PRODUCT_OUT)/recovery.img || echo "Warning: AVB patch failed, continuing..."; \
+	else \
+		echo "Warning: AVB patch script not found at $(PATCH_AVB)"; \
+	fi
+	@echo "Made recovery image: $@"

recovery/root/init.recovery.samsung.rc

@@ -4,5 +4,20 @@ on init
     mkdir /efs
     mkdir /sec_efs
 
- #to cut charging battery path
-    write /sys/class/power_supply/battery/siop_level 0
+    # Power management setup
+    write /sys/class/power_supply/battery/siop_level 0
+    
+    # Handle PMIC/power supply issues gracefully
+    write /proc/sys/kernel/printk "1 1 1 1"
+    
+    # Set permissions for power supply nodes
+    chmod 644 /sys/class/power_supply/*/online
+    chmod 644 /sys/class/power_supply/*/present
+    chmod 644 /sys/class/power_supply/*/capacity
+    chmod 644 /sys/class/power_supply/*/status
+    
+    # Handle SPMI issues
+    setprop ro.boot.spmi.debug 0
+    
+    # Disable problematic thermal alarms during recovery
+    write /sys/class/thermal/thermal_zone*/mode disabled

recovery/root/prop.default

@@ -0,0 +1,26 @@
+# Samsung SM8550 Common device properties
+ro.product.board=kalama
+ro.board.platform=kalama
+ro.boot.bootdevice=1d84000.ufshc
+ro.boot.dynamic_partitions=true
+
+# USB controller
+sys.usb.controller=a600000.dwc3
+
+# Recovery specific properties
+ro.recovery.android_version=13
+ro.recovery.api_level=33
+
+# TWRP specific properties
+ro.twrp.boot=1
+ro.twrp.version=3.7.0
+
+# Device codenames supported
+ro.twrp.device.codenames=dm1q,dm2q,dm3q,b5q,q5q,gts9,gts9wifi,gts9p,gts9pwifi,gts9u,gts9uwifi
+
+# Handle PMIC issues
+ro.vendor.pmic.ignore_errors=1
+
+# Reduce kernel log verbosity for SPMI issues
+ro.boot.spmi.debug=0
+ro.boot.thermal.debug=0

recovery/root/system/bin/dfe

@@ -19,16 +19,30 @@ if ! echo "$VALID_DEVICES" | grep -w "$DEVICE_NAME" > /dev/null; then
     exit 1
 fi
 
+# Check if tools directory exists
+if [ ! -d "$TOOLSDIR" ]; then
+    echo "Warning: Tools directory '$TOOLSDIR' not found. Creating directory..."
+    mkdir -p "$TOOLSDIR"
+fi
+
 # Install Disable Force Encryption patch:
-if ! twrp install "$TOOLSDIR/dfe-neo-v2.zip"; then
-    echo "Error: Failed to install dfe-neo-v2.zip"
-    exit 1
+if [ -f "$TOOLSDIR/dfe-neo-v2.zip" ]; then
+    if ! twrp install "$TOOLSDIR/dfe-neo-v2.zip"; then
+        echo "Error: Failed to install dfe-neo-v2.zip"
+        exit 1
+    fi
+else
+    echo "Warning: dfe-neo-v2.zip not found in $TOOLSDIR, skipping DFE patch installation"
 fi
 
 # Install Boot repack patch:
-if ! twrp install "$TOOLSDIR/boot_repack.zip"; then
-    echo "Error: Failed to install boot_repack.zip"
-    exit 1
+if [ -f "$TOOLSDIR/boot_repack.zip" ]; then
+    if ! twrp install "$TOOLSDIR/boot_repack.zip"; then
+        echo "Error: Failed to install boot_repack.zip"
+        exit 1
+    fi
+else
+    echo "Warning: boot_repack.zip not found in $TOOLSDIR, skipping boot repack installation"
 fi
 
 # Wipe Dalvik/ART cache:

recovery/root/system/etc/recovery.fstab

@@ -0,0 +1,26 @@
+# Android fstab file for Samsung Galaxy S23 series and related devices
+# The filesystem that contains the filesystem checker binary (typically /system) cannot
+# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
+
+# Recovery partition mapping
+/dev/block/by-name/boot              /boot              emmc    defaults    recoveryonly
+/dev/block/by-name/recovery          /recovery          emmc    defaults    recoveryonly
+
+# Main partitions - dynamic partitions in super
+system                               /system            ext4    ro,barrier=1    wait,logical,first_stage_mount
+system_ext                           /system_ext        ext4    ro,barrier=1    wait,logical,first_stage_mount
+product                              /product           ext4    ro,barrier=1    wait,logical,first_stage_mount
+vendor                               /vendor            ext4    ro,barrier=1    wait,logical,first_stage_mount
+vendor_dlkm                          /vendor_dlkm       ext4    ro,barrier=1    wait,logical,first_stage_mount
+odm                                  /odm               ext4    ro,barrier=1    wait,logical,first_stage_mount
+
+# Other important partitions
+/dev/block/by-name/metadata          /metadata          ext4    noatime,nosuid,nodev,discard                           wait,formattable,first_stage_mount
+/dev/block/by-name/userdata          /data              f2fs    noatime,nosuid,nodev,discard,usrquota,grpquota,fsync_mode=nobarrier,reserve_root=32768,resgid=5678    latemount,wait,check,formattable,fileencryption=aes-256-xts:aes-256-cts:v2+inlinecrypt_optimized,keydirectory=/metadata/vold/metadata_encryption,quota,reservedsize=128M,checkpoint=fs
+/dev/block/by-name/cache             /cache             ext4    noatime,nosuid,nodev,noauto_da_alloc,discard           wait
+/dev/block/by-name/efs               /efs               ext4    noatime,nosuid,nodev,noauto_da_alloc,discard           wait
+/dev/block/by-name/cpefs             /cpefs             ext4    noatime,nosuid,nodev,noauto_da_alloc,discard           wait
+
+# External storage
+/devices/platform/soc/1da4000.ufshc/host*    auto    auto    defaults    voldmanaged=sdcard0:auto
+/devices/platform/soc/a600000.dwc3/xhci-hcd.0.auto*    auto    auto    defaults    voldmanaged=usb:auto

recovery/root/system/etc/twrp.conf

@@ -0,0 +1,21 @@
+# Recovery backup configuration
+# Prevent backup failures by excluding problematic paths
+
+# Exclude system apps that cause backup issues
+tw_exclude_paths += /data/user_de/*/com.sec.app.RilErrorNotifier
+tw_exclude_paths += /data/app/*/com.sec.app.RilErrorNotifier*
+
+# Exclude OpenGL shader caches that can cause access issues
+tw_exclude_paths += /data/user_de/*/cache/com.android.opengl.shaders_cache
+
+# Exclude temporary and cache directories that don't need backup
+tw_exclude_paths += /data/*/cache
+tw_exclude_paths += /data/*/code_cache  
+tw_exclude_paths += /data/*/app_webview
+tw_exclude_paths += /data/*/app_chrome
+tw_exclude_paths += /data/*/tmp
+
+# Improve backup reliability
+backup_methods := tar
+allow_backup_cancel := true
+enable_backup_compression := true

recovery/root/system/etc/twrp.flags

@@ -0,0 +1,37 @@
+# TWRP fstab configuration for Samsung Galaxy S23 series (SM8550)
+
+# Main partitions
+/boot              emmc    /dev/block/bootdevice/by-name/boot              flags=display="Boot";backup=1;flashimg=1
+/recovery          emmc    /dev/block/bootdevice/by-name/recovery          flags=display="Recovery";backup=1;flashimg=1
+/data              f2fs    /dev/block/bootdevice/by-name/userdata          flags=display="Data";backup=1;fileencryption=aes-256-xts:aes-256-cts:v2+inlinecrypt_optimized
+/system_root       ext4    /dev/block/bootdevice/by-name/system            flags=display="System";backup=1;wipeingui
+/vendor            ext4    /dev/block/bootdevice/by-name/vendor            flags=display="Vendor";backup=1;wipeingui
+/product           ext4    /dev/block/bootdevice/by-name/product           flags=display="Product";backup=1;wipeingui
+/system_ext        ext4    /dev/block/bootdevice/by-name/system_ext        flags=display="System_ext";backup=1;wipeingui
+/vendor_dlkm       ext4    /dev/block/bootdevice/by-name/vendor_dlkm       flags=display="Vendor_DLKM";backup=1;wipeingui
+/odm               ext4    /dev/block/bootdevice/by-name/odm               flags=display="ODM";backup=1;wipeingui
+
+# Important partitions
+/cache             ext4    /dev/block/bootdevice/by-name/cache             flags=display="Cache";backup=1;wipeingui;wipeduringfactoryreset
+/efs               ext4    /dev/block/bootdevice/by-name/efs               flags=display="EFS";backup=1
+/cpefs             ext4    /dev/block/bootdevice/by-name/cpefs             flags=display="CP_EFS";backup=1
+/metadata          ext4    /dev/block/bootdevice/by-name/metadata          flags=display="Metadata";backup=1
+
+# Firmware partitions
+/abl               emmc    /dev/block/bootdevice/by-name/abl               flags=display="ABL";backup=1;flashimg=1
+/aop               emmc    /dev/block/bootdevice/by-name/aop               flags=display="AOP";backup=1;flashimg=1
+/devcfg            emmc    /dev/block/bootdevice/by-name/devcfg            flags=display="Devcfg";backup=1;flashimg=1
+/dsp               emmc    /dev/block/bootdevice/by-name/dsp               flags=display="DSP";backup=1;flashimg=1
+/hyp               emmc    /dev/block/bootdevice/by-name/hyp               flags=display="HYP";backup=1;flashimg=1
+/keymaster         emmc    /dev/block/bootdevice/by-name/keymaster         flags=display="Keymaster";backup=1;flashimg=1
+/modem             emmc    /dev/block/bootdevice/by-name/modem             flags=display="Modem";backup=1;flashimg=1
+/optics            emmc    /dev/block/bootdevice/by-name/optics            flags=display="Optics";backup=1;flashimg=1
+/prism             emmc    /dev/block/bootdevice/by-name/prism             flags=display="Prism";backup=1;flashimg=1
+/tz                emmc    /dev/block/bootdevice/by-name/tz                flags=display="TZ";backup=1;flashimg=1
+/uefisecapp        emmc    /dev/block/bootdevice/by-name/uefisecapp        flags=display="UEFI Sec App";backup=1;flashimg=1
+/vbmeta            emmc    /dev/block/bootdevice/by-name/vbmeta            flags=display="VBMeta";backup=1;flashimg=1
+/vbmeta_system     emmc    /dev/block/bootdevice/by-name/vbmeta_system     flags=display="VBMeta System";backup=1;flashimg=1
+
+# External storage
+/external_sd       auto    /dev/block/mmcblk1p1                            flags=display="External SDCard";storage;wipeingui;removable
+/usb_otg           auto    /dev/block/sda1                                 flags=display="USB OTG";storage;wipeingui;removable

sepolicy/recovery.te

@@ -0,0 +1,24 @@
+# Recovery SELinux Policy
+# Allow recovery to access app data files for backup operations
+
+allow recovery app_data_file:dir { getattr read open search };
+allow recovery app_data_file:file { getattr read open };
+allow recovery media_rw_data_file:dir { getattr read open search };
+allow recovery media_rw_data_file:file { getattr read open };
+
+# Allow recovery to access system app data
+allow recovery system_app_data_file:dir { getattr read open search };
+allow recovery system_app_data_file:file { getattr read open };
+
+# Allow recovery to access platform app data
+allow recovery platform_app_data_file:dir { getattr read open search };
+allow recovery platform_app_data_file:file { getattr read open };
+
+# Allow recovery to access user data directories
+allow recovery system_data_file:dir { getattr read open search };
+allow recovery system_data_file:file { getattr read open };
+
+# Allow recovery to create backup files
+allow recovery media_rw_data_file:file { create write };
+allow recovery sdcard_type:dir { create write add_name };
+allow recovery sdcard_type:file { create write };