Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35af4d41 authored by Bharath's avatar Bharath
Browse files

Merge branch 'lineage-21' into lineage-22.1 

* lineage-21:
  FP3: Bump firmware to FP3-6.A.031.5-gms-fa7632b5-user-fastbootimage
  FP3: Import firmware & sync extract scripts with templates

Change-Id: Ia5c472a233c3c32d2a0f208dcce47745066f41a7
parents 2cd1c134 98122c69

extract-files.sh

+48 −41
Original line number Diff line number Diff line 
#!/bin/bash

#

# SPDX-FileCopyrightText: 2018-2024 The LineageOS Project

# SPDX-FileCopyrightText: 2018-2025 The LineageOS Project

#

# SPDX-License-Identifier: Apache-2.0

#



set -e



# Required!

export DEVICE=FP3

export VENDOR=fairphone



export DEVICE_BRINGUP_YEAR=2020

DEVICE=FP3

VENDOR=fairphone



# Load extract_utils and do some sanity checks

MY_DIR="${BASH_SOURCE%/*}"
@@ -31,11 +28,16 @@ source "${HELPER}" 
# Default to sanitizing the vendor folder before extraction

CLEAN_VENDOR=true



SECTION=

ONLY_FIRMWARE=

KANG=

SECTION=

CARRIER_SKIP_FILES=()



while [ "${#}" -gt 0 ]; do

    case "${1}" in

        --only-firmware)

            ONLY_FIRMWARE=true

            ;;

        -n | --no-cleanup)

            CLEAN_VENDOR=false

            ;;
@@ -60,7 +62,6 @@ fi 


function blob_fixup() {

    case "${1}" in



        # Fix xml version

        product/etc/permissions/vendor.qti.hardware.data.connection-V1.0-java.xml | product/etc/permissions/vendor.qti.hardware.data.connection-V1.1-java.xml)

            [ "$2" = "" ] && return 0
@@ -89,9 +90,15 @@ 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"

proprietary-firmware.txt

0 → 100644
+14 −0
Original line number Diff line number Diff line 
# Firmware from FP3-6.A.031.5-gms-fa7632b5-user-fastbootimage



emmc_appsboot.mbn:aboot.img;AB

cmnlib_30.mbn:cmnlib.img;AB

cmnlib64_30.mbn:cmnlib64.img;AB

devcfg.mbn:devcfg.img;AB

adspso.bin:dsp.img;AB

km4.mbn:keymaster.img;AB

lksecapp.mbn:lksecapp.img;AB

mdtp.img:mdtp.img;AB

NON-HLOS.bin:modem.img;AB

rpm.mbn:rpm.img;AB

sbl1.mbn:sbl1.img;AB

tz.mbn:tz.img;AB

setup-makefiles.sh

+10 −13
Original line number Diff line number Diff line 
#!/bin/bash

#

# SPDX-FileCopyrightText: 2018-2024 The LineageOS Project

# SPDX-FileCopyrightText: 2018-2025 The LineageOS Project

#

# SPDX-License-Identifier: Apache-2.0

#



set -e



# Required!

export DEVICE=FP3

export VENDOR=fairphone



export DEVICE_BRINGUP_YEAR=2020

DEVICE=FP3

VENDOR=fairphone



# Load extract_utils and do some sanity checks

MY_DIR="${BASH_SOURCE%/*}"
@@ -28,15 +25,15 @@ if [ ! -f "${HELPER}" ]; then 
fi

source "${HELPER}"



# Initialize the helper for common

setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}" false

# Initialize the helper

setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}"



# Warning headers and guards

write_headers



# Copyright headers and guards

write_headers "FP3"

write_makefiles "${MY_DIR}/proprietary-files.txt"



# The standard common blobs

write_makefiles "${MY_DIR}/proprietary-files.txt" true

append_firmware_calls_to_makefiles "${MY_DIR}/proprietary-firmware.txt"



# Finish

write_footers