From 8b5fa8284fcec31e8a44d410a45bd39d0c68f10e Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Tue, 27 Aug 2024 22:51:30 +0300 Subject: [PATCH 1/2] FP4: Sync extract scripts with templates Change-Id: I98a36854c5a0c0390592911bb2558b34eff77efc --- extract-files.sh | 66 ++++++++++++++++++++++++++++++++++------------ setup-makefiles.sh | 7 ++--- 2 files changed, 53 insertions(+), 20 deletions(-) diff --git a/extract-files.sh b/extract-files.sh index b23028b..b83624a 100644 --- a/extract-files.sh +++ b/extract-files.sh @@ -1,8 +1,7 @@ #!/bin/bash # -# Copyright (C) 2016 The CyanogenMod Project -# Copyright (C) 2017-2020 The LineageOS Project -# +# SPDX-FileCopyrightText: 2016 The CyanogenMod Project +# SPDX-FileCopyrightText: 2017-2024 The LineageOS Project # SPDX-License-Identifier: Apache-2.0 # @@ -17,6 +16,10 @@ if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi ANDROID_ROOT="${MY_DIR}/../../.." +# If XML files don't have comments before the XML header, use this flag +# Can still be used with broken XML files by using blob_fixup +export TARGET_DISABLE_XML_FIXING=true + HELPER="${ANDROID_ROOT}/tools/extract-utils/extract_utils.sh" if [ ! -f "${HELPER}" ]; then echo "Unable to find helper script at ${HELPER}" @@ -27,24 +30,29 @@ source "${HELPER}" # Default to sanitizing the vendor folder before extraction CLEAN_VENDOR=true +ONLY_FIRMWARE= KANG= SECTION= while [ "${#}" -gt 0 ]; do case "${1}" in - -n | --no-cleanup ) - CLEAN_VENDOR=false - ;; - -k | --kang ) - KANG="--kang" - ;; - -s | --section ) - SECTION="${2}"; shift - CLEAN_VENDOR=false - ;; - * ) - SRC="${1}" - ;; + --only-firmware) + ONLY_FIRMWARE=true + ;; + -n | --no-cleanup) + CLEAN_VENDOR=false + ;; + -k | --kang) + KANG="--kang" + ;; + -s | --section) + SECTION="${2}" + shift + CLEAN_VENDOR=false + ;; + *) + SRC="${1}" + ;; esac shift done @@ -56,35 +64,59 @@ fi function blob_fixup() { case "${1}" in system_ext/lib64/libwfdnative.so) + [ "$2" = "" ] && return 0 sed -i "s/android.hidl.base@1.0.so/libhidlbase.so\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00/" "${2}" ;; vendor/etc/libnfc-hal-st.conf) + [ "$2" = "" ] && return 0 sed -i 's|STNFC_HAL_LOGLEVEL=.*|STNFC_HAL_LOGLEVEL=0x12|g' "${2}" ;; vendor/lib64/vendor.qti.hardware.camera.postproc@1.0-service-impl.bitra.so) + [ "$2" = "" ] && return 0 "${SIGSCAN}" -p "13 0a 00 94" -P "1F 20 03 D5" -f "${2}" ;; vendor/lib64/camera/components/com.qti.node.gpu.so) + [ "$2" = "" ] && return 0 sed -i 's|vendor.debug.camera.pkgname|debug.camera.packagename\x00\x00\x00|g' "${2}" ;; vendor/lib64/hw/camera.qcom.so) + [ "$2" = "" ] && return 0 sed -i 's|vendor.debug.camera.pkgname|debug.camera.packagename\x00\x00\x00|g' "${2}" ;; vendor/lib64/hw/com.qti.chi.override.bitra.so) + [ "$2" = "" ] && return 0 sed -i 's|vendor.debug.camera.pkgname|debug.camera.packagename\x00\x00\x00|g' "${2}" ;; vendor/lib64/hw/com.qti.chi.override.so) + [ "$2" = "" ] && return 0 sed -i 's|vendor.debug.camera.pkgname|debug.camera.packagename\x00\x00\x00|g' "${2}" ;; vendor/lib64/hw/fingerprint.lito.so) + [ "$2" = "" ] && return 0 sed -i 's|fpsensor_fingerprint\x00|fingerprint\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00|g' "${2}" ;; + *) + return 1 + ;; esac + + return 0 +} + +function blob_fixup_dry() { + blob_fixup "$1" "" } # Initialize the helper setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}" false "${CLEAN_VENDOR}" -extract "${MY_DIR}/proprietary-files.txt" "${SRC}" "${KANG}" --section "${SECTION}" +if [ -z "${ONLY_FIRMWARE}" ]; then + extract "${MY_DIR}/proprietary-files.txt" "${SRC}" "${KANG}" --section "${SECTION}" +fi + + +if [ -z "${SECTION}" ]; then + extract_firmware "${MY_DIR}/proprietary-firmware.txt" "${SRC}" +fi "${MY_DIR}/setup-makefiles.sh" diff --git a/setup-makefiles.sh b/setup-makefiles.sh index ca2586a..eb3694c 100755 --- a/setup-makefiles.sh +++ b/setup-makefiles.sh @@ -1,8 +1,7 @@ #!/bin/bash # -# Copyright (C) 2016 The CyanogenMod Project -# Copyright (C) 2017-2020 The LineageOS Project -# +# SPDX-FileCopyrightText: 2016 The CyanogenMod Project +# SPDX-FileCopyrightText: 2017-2024 The LineageOS Project # SPDX-License-Identifier: Apache-2.0 # @@ -32,5 +31,7 @@ write_headers write_makefiles "${MY_DIR}/proprietary-files.txt" true +append_firmware_calls_to_makefiles "${MY_DIR}/proprietary-firmware.txt" + # Finish write_footers -- GitLab From 5f23267ab3c68947a265987a7fc23cdf42769b4d Mon Sep 17 00:00:00 2001 From: Rohit Sekhar Date: Tue, 21 Jan 2025 22:32:39 +0530 Subject: [PATCH 2/2] FP4: Import radio files from FP4-TP2I-factory --- proprietary-firmware.txt | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 proprietary-firmware.txt diff --git a/proprietary-firmware.txt b/proprietary-firmware.txt new file mode 100644 index 0000000..174b858 --- /dev/null +++ b/proprietary-firmware.txt @@ -0,0 +1,19 @@ +# Firmware from Fairphone/FP4eea/FP4:12/SKQ1.220201.001/TP2I:user/release-keys + +abl_ecc.elf:abl.img;AB +aop.mbn:aop.img;AB +BTFM.bin:bluetooth.img;AB +Core_NON-HLOS.bin:core_nhlos.img;AB +devcfg.mbn:devcfg.img;AB +dspso.bin:dsp.img;AB +featenabler.mbn:featenabler.img;AB +hyp.mbn:hyp.img;AB +imagefv.elf:imagefv.img;AB +km41.mbn:keymaster.img;AB +NON-HLOS.bin:modem.img;AB +multi_image.mbn:multiimgoem.img;AB +qupv3fw.elf:qupfw.img;AB +tz.mbn:tz.img;AB +uefi_sec.mbn:uefisecapp.img;AB +xbl.elf:xbl.img;AB +xbl_config.elf:xbl_config.img;AB -- GitLab