From 693472a85fe53fdb38edfc9e63149628af2fd0dd Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Wed, 18 Feb 2015 22:41:52 +0100 Subject: [PATCH] Peregrine: Move kernel config to device Titan doesn't use msm8226 common kernel so move config here. Change-Id: Ib690c876715b40193034b209c6d495eb7c623088 --- BoardConfig.mk | 1 + cm.dependencies | 4 ++++ device.mk | 4 +++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/BoardConfig.mk b/BoardConfig.mk index 6fb619b..913c072 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -26,6 +26,7 @@ TARGET_LIBINIT_DEFINES_FILE := device/motorola/peregrine/init/init_peregrine.c # Kernel BOARD_CUSTOM_BOOTIMG_MK := $(LOCAL_PATH)/mkbootimg.mk TARGET_KERNEL_CONFIG := peregrine_defconfig +TARGET_KERNEL_SOURCE := kernel/motorola/msm8226 # Partitions BOARD_BOOTIMAGE_PARTITION_SIZE := 10485760 diff --git a/cm.dependencies b/cm.dependencies index f8e8f73..06bb3a0 100644 --- a/cm.dependencies +++ b/cm.dependencies @@ -2,5 +2,9 @@ { "repository": "android_device_motorola_msm8226-common", "target_path": "device/motorola/msm8226-common" + }, + { + "repository": "android_kernel_motorola_msm8226", + "target_path": "kernel/motorola/msm8226" } ] diff --git a/device.mk b/device.mk index 2a71bd0..be24b1a 100644 --- a/device.mk +++ b/device.mk @@ -30,7 +30,9 @@ PRODUCT_PACKAGES += \ # Wifi PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/wifi/WCNSS_qcom_wlan_nv.bin:system/etc/firmware/wlan/prima/WCNSS_qcom_wlan_nv.bin + $(LOCAL_PATH)/wifi/WCNSS_qcom_wlan_nv.bin:system/etc/firmware/wlan/prima/WCNSS_qcom_wlan_nv.bin \ + kernel/motorola/msm8226/drivers/staging/prima/firmware_bin/WCNSS_cfg.dat:system/etc/firmware/wlan/prima/WCNSS_cfg.dat \ + kernel/motorola/msm8226/drivers/staging/prima/firmware_bin/WCNSS_qcom_cfg.ini:system/etc/firmware/wlan/prima/WCNSS_qcom_cfg.ini # Inherit from msm8226-common $(call inherit-product, device/motorola/msm8226-common/msm8226.mk)