summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrint E. Kriebel <bkriebel@vmware.com>2012-04-03 13:23:15 -0600
committerBrint E. Kriebel <bkriebel@vmware.com>2012-04-04 11:17:49 -0600
commit0e1c160dbfdfd48514006e8aab3d1a0595b208c3 (patch)
tree1d65ad2433566f7d4e529df4e0d4793dead68d8f
parentd733e00d8013bb299609cab89b14d5bde60f74ac (diff)
downloaddevice_samsung_crespo-0e1c160dbfdfd48514006e8aab3d1a0595b208c3.zip
device_samsung_crespo-0e1c160dbfdfd48514006e8aab3d1a0595b208c3.tar.gz
device_samsung_crespo-0e1c160dbfdfd48514006e8aab3d1a0595b208c3.tar.bz2
crespo: Re-implement the use of module location variables
In commit c2667b3120212ef9b9eb76e3c04371452df5b73c the ability to override the wifi kernel module location was removed. Add the ability to pass the location of the wifi and scsi_wait_scan module. Change-Id: I93c9ea93f7e789d849a6f8341257bf1a7cb0bc48
-rw-r--r--KernelModules.mk4
-rw-r--r--device_base.mk12
2 files changed, 11 insertions, 5 deletions
diff --git a/KernelModules.mk b/KernelModules.mk
deleted file mode 100644
index 680f2d3..0000000
--- a/KernelModules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Kernel Modules TO BE COPIED
-PRODUCT_COPY_FILES += \
- device/samsung/crespo/bcm4329.ko:system/modules/bcm4329.ko \
- device/samsung/crespo/scsi_wait_scan.ko:system/modules/scsi_wait_scan.ko
diff --git a/device_base.mk b/device_base.mk
index 5a31c4a..7c9d5e0 100644
--- a/device_base.mk
+++ b/device_base.mk
@@ -1,3 +1,4 @@
+# Portions Copyright (C) 2012 VMware, Inc. All Rights Reserved.
# Copyright (C) 2010 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -214,13 +215,22 @@ PRODUCT_TAGS += dalvik.gc.type-precise
# Screen size is "normal", density is "hdpi"
PRODUCT_AAPT_CONFIG := normal hdpi
+# Kernel Modules to be copied
ifeq ($(TARGET_PREBUILT_WIFI_MODULE),)
LOCAL_WIFI_MODULE := device/samsung/crespo/bcm4329.ko
else
LOCAL_WIFI_MODULE := $(TARGET_PREBUILT_WIFI_MODULE)
endif
-include device/samsung/crespo/KernelModules.mk
+ifeq ($(TARGET_PREBUILT_SCSI_MODULE),)
+LOCAL_SCSI_MODULE := device/samsung/crespo/scsi_wait_scan.ko
+else
+LOCAL_SCSI_MODULE := $(TARGET_PREBUILT_SCSI_MODULE)
+endif
+
+PRODUCT_COPY_FILES += \
+ $(LOCAL_WIFI_MODULE):system/modules/bcm4329.ko \
+ $(LOCAL_SCSI_MODULE):system/modules/scsi_wait_scan.ko
ifeq ($(TARGET_PREBUILT_KERNEL),)
LOCAL_KERNEL := device/samsung/crespo/kernel