From 8301e44e7324a5f44aaaade0fe42abaab8eef102 Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Sat, 14 Mar 2015 21:58:30 +0100 Subject: [PATCH] Revert "Peregrine: Move kernel config to device" This reverts commit 693472a85fe53fdb38edfc9e63149628af2fd0dd. Change-Id: Ief74fcdfa691e7cc4825caf9bc3d424b4441bfb0 --- BoardConfig.mk | 1 - cm.dependencies | 4 ---- device.mk | 4 +--- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/BoardConfig.mk b/BoardConfig.mk index 913c072..6fb619b 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -26,7 +26,6 @@ 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 06bb3a0..f8e8f73 100644 --- a/cm.dependencies +++ b/cm.dependencies @@ -2,9 +2,5 @@ { "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 be24b1a..2a71bd0 100644 --- a/device.mk +++ b/device.mk @@ -30,9 +30,7 @@ PRODUCT_PACKAGES += \ # Wifi PRODUCT_COPY_FILES += \ - $(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 + $(LOCAL_PATH)/wifi/WCNSS_qcom_wlan_nv.bin:system/etc/firmware/wlan/prima/WCNSS_qcom_wlan_nv.bin # Inherit from msm8226-common $(call inherit-product, device/motorola/msm8226-common/msm8226.mk)