From 2beb9186ac52b13de8d23d83d40aafdafa78ebeb Mon Sep 17 00:00:00 2001 From: merothh Date: Tue, 14 Jun 2022 15:37:43 +0530 Subject: [PATCH 1/3] FP3: Prebuilt Kernel --- BoardConfig.mk | 1 + device.mk | 3 +++ 2 files changed, 4 insertions(+) diff --git a/BoardConfig.mk b/BoardConfig.mk index 2cba0a00..243a7b71 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -66,6 +66,7 @@ TARGET_FS_CONFIG_GEN += \ $(DEVICE_PATH)/config.fs # Kernel +include device/fairphone/FP3-kernel/BoardConfigKernel.mk BOARD_KERNEL_BASE := 0x80000000 BOARD_KERNEL_PAGESIZE := 2048 BOARD_KERNEL_OFFSET := 0x00008000 diff --git a/device.mk b/device.mk index 9f87cb2c..213f727d 100644 --- a/device.mk +++ b/device.mk @@ -17,6 +17,9 @@ # Vendor blobs $(call inherit-product-if-exists, vendor/fairphone/FP3/FP3-vendor.mk) +# Kernel +$(call inherit-product, device/fairphone/FP3-kernel/kernel.mk) + # Installs gsi keys into ramdisk, to boot a GSI with verified boot. $(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_keys.mk) -- GitLab From da7d315f9ae3b46689cb7c9e042458264f32e8a1 Mon Sep 17 00:00:00 2001 From: merothh Date: Thu, 16 Jun 2022 01:45:42 +0530 Subject: [PATCH 2/3] FP3: Adapt wifi driver board flags --- BoardConfig.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/BoardConfig.mk b/BoardConfig.mk index 243a7b71..b6df8c32 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -278,9 +278,8 @@ BOARD_WPA_SUPPLICANT_DRIVER := NL80211 BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE) BOARD_HOSTAPD_DRIVER := NL80211 BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE) -WIFI_DRIVER_FW_PATH_STA := "sta" -WIFI_DRIVER_FW_PATH_AP := "ap" -WIFI_DRIVER_FW_PATH_P2P := "p2p" +WIFI_DRIVER_MODULE_PATH := "/system/vendor/lib/modules/pronto_wlan.ko" +WIFI_DRIVER_MODULE_NAME := "wlan" TARGET_USES_QCOM_WCNSS_QMI := true PRODUCT_VENDOR_MOVE_ENABLED := true -- GitLab From 6d5231eaa7d9c78e83c220a796f187d20d6f6b0c Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Fri, 17 Jun 2022 16:42:54 +0000 Subject: [PATCH 3/3] Modify the prebuilt project path --- BoardConfig.mk | 2 +- device.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/BoardConfig.mk b/BoardConfig.mk index b6df8c32..427e82c8 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -66,7 +66,7 @@ TARGET_FS_CONFIG_GEN += \ $(DEVICE_PATH)/config.fs # Kernel -include device/fairphone/FP3-kernel/BoardConfigKernel.mk +include kernel/fairphone/sdm632-prebuilt/BoardConfigKernel.mk BOARD_KERNEL_BASE := 0x80000000 BOARD_KERNEL_PAGESIZE := 2048 BOARD_KERNEL_OFFSET := 0x00008000 diff --git a/device.mk b/device.mk index 213f727d..ea4e73c1 100644 --- a/device.mk +++ b/device.mk @@ -18,7 +18,7 @@ $(call inherit-product-if-exists, vendor/fairphone/FP3/FP3-vendor.mk) # Kernel -$(call inherit-product, device/fairphone/FP3-kernel/kernel.mk) +$(call inherit-product, kernel/fairphone/sdm632-prebuilt/kernel.mk) # Installs gsi keys into ramdisk, to boot a GSI with verified boot. $(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_keys.mk) -- GitLab