From 8bc9f7151908f69c05aab985af2d0eed7e09b667 Mon Sep 17 00:00:00 2001 From: Marc Bourgoin Date: Fri, 31 Mar 2023 05:28:54 -0600 Subject: [PATCH] xpeng: Use vendor repo for copying touch firmware to recovery Unfortunately, the method used by berlna is not compatible for VAB devices, so let's swap to using vendor repo to copy the touchscreen firmware. Change-Id: Idc93f41f4295511ee8b568a463881c92ca21584c --- AndroidBoard.mk | 20 -------------------- proprietary-files.txt | 4 ++++ 2 files changed, 4 insertions(+), 20 deletions(-) delete mode 100644 AndroidBoard.mk diff --git a/AndroidBoard.mk b/AndroidBoard.mk deleted file mode 100644 index fa77ca9..0000000 --- a/AndroidBoard.mk +++ /dev/null @@ -1,20 +0,0 @@ -# -# Copyright (C) 2017-2023 The LineageOS Project -# -# SPDX-License-Identifier: Apache-2.0 -# - -INSTALLED_KERNEL_TARGET := $(PRODUCT_OUT)/kernel -recovery_uncompressed_ramdisk := $(PRODUCT_OUT)/ramdisk-recovery.cpio - -RECOVERY_FIRMWARE_TARGETS := \ - mp_novatek_ts-NT36675-21101302-6044-xpeng.bin \ - novatek_ts-NT36675-21101302-6044-xpeng.bin - -INSTALLED_RECOVERY_FIRMWARE_TARGETS := $(RECOVERY_FIRMWARE_TARGETS:%=$(TARGET_RECOVERY_ROOT_OUT)/vendor/firmware/%) -$(INSTALLED_RECOVERY_FIRMWARE_TARGETS): $(INSTALLED_KERNEL_TARGET) - echo -e ${CL_GRN}"Copying firmware to recovery"${CL_RST} - @mkdir -p $(dir $@) - cp $(@F:%=$(TARGET_OUT_VENDOR)/firmware/%) $(TARGET_RECOVERY_ROOT_OUT)/vendor/firmware/ - -$(recovery_uncompressed_ramdisk): $(INSTALLED_RECOVERY_FIRMWARE_TARGETS) diff --git a/proprietary-files.txt b/proprietary-files.txt index 75cda6f..7caadd6 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -663,3 +663,7 @@ vendor/etc/thermal-engine.conf vendor/firmware/NT36xxx_MP_Setting_Criteria_6044.csv vendor/firmware/mp_novatek_ts-NT36675-21101302-6044-xpeng.bin vendor/firmware/novatek_ts-NT36675-21101302-6044-xpeng.bin + +# Touchscreen firmware (for recovery) +vendor/firmware/mp_novatek_ts-NT36675-21101302-6044-xpeng.bin:recovery/root/vendor/firmware/mp_novatek_ts-NT36675-21101302-6044-xpeng.bin +vendor/firmware/novatek_ts-NT36675-21101302-6044-xpeng.bin:recovery/root/vendor/firmware/novatek_ts-NT36675-21101302-6044-xpeng.bin