diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2011-06-03 11:11:11 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2011-06-03 11:11:11 -0700 |
| commit | 08a6b240c5c99dad34a4fb4dd673536e9c5ab9f7 (patch) | |
| tree | ba1cf4d6269b09f5f021537e17a39af19edad34f | |
| parent | b11634b6f66e5ae56fe2212bd5d648157541c6e6 (diff) | |
| download | hardware_broadcom_wlan-08a6b240c5c99dad34a4fb4dd673536e9c5ab9f7.zip hardware_broadcom_wlan-08a6b240c5c99dad34a4fb4dd673536e9c5ab9f7.tar.gz hardware_broadcom_wlan-08a6b240c5c99dad34a4fb4dd673536e9c5ab9f7.tar.bz2 | |
bcmdhd: Use PRODUCT_COPY_FILES to copy wlan FW
Change-Id: Iced1c0f3c02c83fc5d18a0f92e19c4086b47015a
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| -rw-r--r-- | bcmdhd/firmware/Android.mk | 2 | ||||
| -rw-r--r-- | bcmdhd/firmware/bcm4330/device-bcm.mk (renamed from bcmdhd/firmware/bcm4330/Android.mk) | 24 |
2 files changed, 5 insertions, 21 deletions
diff --git a/bcmdhd/firmware/Android.mk b/bcmdhd/firmware/Android.mk index 128945c..d5028cc 100644 --- a/bcmdhd/firmware/Android.mk +++ b/bcmdhd/firmware/Android.mk @@ -1,6 +1,4 @@ LOCAL_PATH := $(call my-dir) ifeq ($(BOARD_WLAN_DEVICE_REV),bcm4329) include $(LOCAL_PATH)/bcm4329/Android.mk -else - include $(LOCAL_PATH)/bcm4330/Android.mk endif diff --git a/bcmdhd/firmware/bcm4330/Android.mk b/bcmdhd/firmware/bcm4330/device-bcm.mk index de416cd..11a135c 100644 --- a/bcmdhd/firmware/bcm4330/Android.mk +++ b/bcmdhd/firmware/bcm4330/device-bcm.mk @@ -13,30 +13,16 @@ # See the License for the specific language governing permissions and # limitations under the License. # -LOCAL_PATH := $(call my-dir) ######################## -include $(CLEAR_VARS) -LOCAL_MODULE := fw_bcmdhd.bin -LOCAL_MODULE_CLASS := ETC -#LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/firmware -LOCAL_MODULE_PATH := $(TARGET_OUT)/vendor/firmware -LOCAL_MODULE_TAGS := optional -ifeq ($(BOARD_WLAN_DEVICE_REV),bcm4330b1) -LOCAL_SRC_FILES := fw_bcm4330_b1.bin +ifeq ($(BOARD_WLAN_DEVICE_REV),bcm4330_b1) +BCM_FW_SRC_FILES := fw_bcm4330_b1.bin else -LOCAL_SRC_FILES := fw_bcm4330_b2.bin +BCM_FW_SRC_FILES := fw_bcm4330_b2.bin endif -include $(BUILD_PREBUILT) -######################## - -#include $(CLEAR_VARS) -#LOCAL_MODULE := fw_bcmdhd_apsta.bin -#LOCAL_MODULE_CLASS := ETC -#LOCAL_MODULE_PATH := $(TARGET_OUT)/vendor/firmware -#LOCAL_SRC_FILES := $(LOCAL_MODULE) -#include $(BUILD_PREBUILT) +PRODUCT_COPY_FILES += \ + hardware/broadcom/wlan/bcmdhd/firmware/bcm4330/$(BCM_FW_SRC_FILES):system/vendor/firmware/fw_bcmdhd.bin ######################## |