From 67a2e624f5495ec43788e9d95b2b831fa1f0e58c Mon Sep 17 00:00:00 2001 From: Velsoth Date: Fri, 15 Nov 2019 05:08:40 +0000 Subject: [PATCH] Move all blobs to system/ Signed-off-by: Velsoth --- smdk4412-common/common-vendor-blobs.mk | 30 +++++++++--------- .../firmware => system/bin}/bcm4334.hcd | Bin .../bin}/bcm4334_murata.hcd | Bin .../firmware => system/bin}/bcm4334_semco.hcd | Bin .../bin}/bcm4334_semcosh.hcd | Bin .../etc/wifi}/bcmdhd_apsta.bin_b2 | Bin .../etc/wifi}/bcmdhd_mfg.bin_b2 | Bin .../etc/wifi}/bcmdhd_p2p.bin_b2 | Bin .../etc/wifi}/bcmdhd_sta.bin_b2 | Bin .../etc/wifi}/nvram_mfg.txt | 0 .../etc/wifi}/nvram_mfg.txt_murata | 0 .../etc/wifi}/nvram_mfg.txt_semcosh | 0 .../etc/wifi}/nvram_net.txt | 0 .../etc/wifi}/nvram_net.txt_murata | 0 .../etc/wifi}/nvram_net.txt_semcosh | 0 .../{ => system}/vendor/firmware/mfc_fw.bin | Bin 16 files changed, 15 insertions(+), 15 deletions(-) rename smdk4412-common/proprietary/{vendor/firmware => system/bin}/bcm4334.hcd (100%) rename smdk4412-common/proprietary/{vendor/firmware => system/bin}/bcm4334_murata.hcd (100%) rename smdk4412-common/proprietary/{vendor/firmware => system/bin}/bcm4334_semco.hcd (100%) rename smdk4412-common/proprietary/{vendor/firmware => system/bin}/bcm4334_semcosh.hcd (100%) rename smdk4412-common/proprietary/{vendor/firmware => system/etc/wifi}/bcmdhd_apsta.bin_b2 (100%) rename smdk4412-common/proprietary/{vendor/firmware => system/etc/wifi}/bcmdhd_mfg.bin_b2 (100%) rename smdk4412-common/proprietary/{vendor/firmware => system/etc/wifi}/bcmdhd_p2p.bin_b2 (100%) rename smdk4412-common/proprietary/{vendor/firmware => system/etc/wifi}/bcmdhd_sta.bin_b2 (100%) rename smdk4412-common/proprietary/{vendor/firmware => system/etc/wifi}/nvram_mfg.txt (100%) rename smdk4412-common/proprietary/{vendor/firmware => system/etc/wifi}/nvram_mfg.txt_murata (100%) rename smdk4412-common/proprietary/{vendor/firmware => system/etc/wifi}/nvram_mfg.txt_semcosh (100%) rename smdk4412-common/proprietary/{vendor/firmware => system/etc/wifi}/nvram_net.txt (100%) rename smdk4412-common/proprietary/{vendor/firmware => system/etc/wifi}/nvram_net.txt_murata (100%) rename smdk4412-common/proprietary/{vendor/firmware => system/etc/wifi}/nvram_net.txt_semcosh (100%) rename smdk4412-common/proprietary/{ => system}/vendor/firmware/mfc_fw.bin (100%) diff --git a/smdk4412-common/common-vendor-blobs.mk b/smdk4412-common/common-vendor-blobs.mk index b26deff..c058b48 100644 --- a/smdk4412-common/common-vendor-blobs.mk +++ b/smdk4412-common/common-vendor-blobs.mk @@ -15,18 +15,18 @@ LOCAL_PATH := vendor/samsung/smdk4412-common PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/proprietary/vendor/firmware/bcm4334.hcd:vendor/firmware/bcm4334.hcd \ - $(LOCAL_PATH)/proprietary/vendor/firmware/bcm4334_murata.hcd:vendor/firmware/bcm4334_murata.hcd \ - $(LOCAL_PATH)/proprietary/vendor/firmware/bcm4334_semco.hcd:vendor/firmware/bcm4334_semco.hcd \ - $(LOCAL_PATH)/proprietary/vendor/firmware/bcm4334_semcosh.hcd:vendor/firmware/bcm4334_semcosh.hcd \ - $(LOCAL_PATH)/proprietary/vendor/firmware/bcmdhd_apsta.bin_b2:vendor/firmware/bcmdhd_apsta.bin_b2 \ - $(LOCAL_PATH)/proprietary/vendor/firmware/bcmdhd_mfg.bin_b2:vendor/firmware/bcmdhd_mfg.bin_b2 \ - $(LOCAL_PATH)/proprietary/vendor/firmware/bcmdhd_p2p.bin_b2:vendor/firmware/bcmdhd_p2p.bin_b2 \ - $(LOCAL_PATH)/proprietary/vendor/firmware/bcmdhd_sta.bin_b2:vendor/firmware/bcmdhd_sta.bin_b2 \ - $(LOCAL_PATH)/proprietary/vendor/firmware/mfc_fw.bin:vendor/firmware/mfc_fw.bin \ - $(LOCAL_PATH)/proprietary/vendor/firmware/nvram_mfg.txt_murata:vendor/firmware/nvram_mfg.txt_murata \ - $(LOCAL_PATH)/proprietary/vendor/firmware/nvram_mfg.txt_semcosh:vendor/firmware/nvram_mfg.txt_semcosh \ - $(LOCAL_PATH)/proprietary/vendor/firmware/nvram_mfg.txt:vendor/firmware/nvram_mfg.txt \ - $(LOCAL_PATH)/proprietary/vendor/firmware/nvram_net.txt_murata:vendor/firmware/nvram_net.txt_murata \ - $(LOCAL_PATH)/proprietary/vendor/firmware/nvram_net.txt_semcosh:vendor/firmware/nvram_net.txt_semcosh \ - $(LOCAL_PATH)/proprietary/vendor/firmware/nvram_net.txt:vendor/firmware/nvram_net.txt + $(LOCAL_PATH)/proprietary/system/bin/bcm4334.hcd:system/bin/bcm4334.hcd \ + $(LOCAL_PATH)/proprietary/system/bin/bcm4334_murata.hcd:system/bin/bcm4334_murata.hcd \ + $(LOCAL_PATH)/proprietary/system/bin/bcm4334_semco.hcd:system/bin/bcm4334_semco.hcd \ + $(LOCAL_PATH)/proprietary/system/bin/bcm4334_semcosh.hcd:system/bin/bcm4334_semcosh.hcd \ + $(LOCAL_PATH)/proprietary/system/etc/wifi/bcmdhd_apsta.bin_b2:system/etc/wifi/bcmdhd_apsta.bin_b2 \ + $(LOCAL_PATH)/proprietary/system/etc/wifi/bcmdhd_mfg.bin_b2:system/etc/wifi/bcmdhd_mfg.bin_b2 \ + $(LOCAL_PATH)/proprietary/system/etc/wifi/bcmdhd_p2p.bin_b2:system/etc/wifi/bcmdhd_p2p.bin_b2 \ + $(LOCAL_PATH)/proprietary/system/etc/wifi/bcmdhd_sta.bin_b2:system/etc/wifi/bcmdhd_sta.bin_b2 \ + $(LOCAL_PATH)/proprietary/system/etc/wifi/nvram_mfg.txt_murata:system/etc/wifi/nvram_mfg.txt_murata \ + $(LOCAL_PATH)/proprietary/system/etc/wifi/nvram_mfg.txt_semcosh:system/etc/wifi/nvram_mfg.txt_semcosh \ + $(LOCAL_PATH)/proprietary/system/etc/wifi/nvram_mfg.txt:system/etc/wifi/nvram_mfg.txt \ + $(LOCAL_PATH)/proprietary/system/etc/wifi/nvram_net.txt_murata:system/etc/wifi/nvram_net.txt_murata \ + $(LOCAL_PATH)/proprietary/system/etc/wifi/nvram_net.txt_semcosh:system/etc/wifi/nvram_net.txt_semcosh \ + $(LOCAL_PATH)/proprietary/system/etc/wifi/nvram_net.txt:system/etc/wifi/nvram_net.txt \ + $(LOCAL_PATH)/proprietary/system/vendor/firmware/mfc_fw.bin:system/vendor/firmware/mfc_fw.bin diff --git a/smdk4412-common/proprietary/vendor/firmware/bcm4334.hcd b/smdk4412-common/proprietary/system/bin/bcm4334.hcd similarity index 100% rename from smdk4412-common/proprietary/vendor/firmware/bcm4334.hcd rename to smdk4412-common/proprietary/system/bin/bcm4334.hcd diff --git a/smdk4412-common/proprietary/vendor/firmware/bcm4334_murata.hcd b/smdk4412-common/proprietary/system/bin/bcm4334_murata.hcd similarity index 100% rename from smdk4412-common/proprietary/vendor/firmware/bcm4334_murata.hcd rename to smdk4412-common/proprietary/system/bin/bcm4334_murata.hcd diff --git a/smdk4412-common/proprietary/vendor/firmware/bcm4334_semco.hcd b/smdk4412-common/proprietary/system/bin/bcm4334_semco.hcd similarity index 100% rename from smdk4412-common/proprietary/vendor/firmware/bcm4334_semco.hcd rename to smdk4412-common/proprietary/system/bin/bcm4334_semco.hcd diff --git a/smdk4412-common/proprietary/vendor/firmware/bcm4334_semcosh.hcd b/smdk4412-common/proprietary/system/bin/bcm4334_semcosh.hcd similarity index 100% rename from smdk4412-common/proprietary/vendor/firmware/bcm4334_semcosh.hcd rename to smdk4412-common/proprietary/system/bin/bcm4334_semcosh.hcd diff --git a/smdk4412-common/proprietary/vendor/firmware/bcmdhd_apsta.bin_b2 b/smdk4412-common/proprietary/system/etc/wifi/bcmdhd_apsta.bin_b2 similarity index 100% rename from smdk4412-common/proprietary/vendor/firmware/bcmdhd_apsta.bin_b2 rename to smdk4412-common/proprietary/system/etc/wifi/bcmdhd_apsta.bin_b2 diff --git a/smdk4412-common/proprietary/vendor/firmware/bcmdhd_mfg.bin_b2 b/smdk4412-common/proprietary/system/etc/wifi/bcmdhd_mfg.bin_b2 similarity index 100% rename from smdk4412-common/proprietary/vendor/firmware/bcmdhd_mfg.bin_b2 rename to smdk4412-common/proprietary/system/etc/wifi/bcmdhd_mfg.bin_b2 diff --git a/smdk4412-common/proprietary/vendor/firmware/bcmdhd_p2p.bin_b2 b/smdk4412-common/proprietary/system/etc/wifi/bcmdhd_p2p.bin_b2 similarity index 100% rename from smdk4412-common/proprietary/vendor/firmware/bcmdhd_p2p.bin_b2 rename to smdk4412-common/proprietary/system/etc/wifi/bcmdhd_p2p.bin_b2 diff --git a/smdk4412-common/proprietary/vendor/firmware/bcmdhd_sta.bin_b2 b/smdk4412-common/proprietary/system/etc/wifi/bcmdhd_sta.bin_b2 similarity index 100% rename from smdk4412-common/proprietary/vendor/firmware/bcmdhd_sta.bin_b2 rename to smdk4412-common/proprietary/system/etc/wifi/bcmdhd_sta.bin_b2 diff --git a/smdk4412-common/proprietary/vendor/firmware/nvram_mfg.txt b/smdk4412-common/proprietary/system/etc/wifi/nvram_mfg.txt similarity index 100% rename from smdk4412-common/proprietary/vendor/firmware/nvram_mfg.txt rename to smdk4412-common/proprietary/system/etc/wifi/nvram_mfg.txt diff --git a/smdk4412-common/proprietary/vendor/firmware/nvram_mfg.txt_murata b/smdk4412-common/proprietary/system/etc/wifi/nvram_mfg.txt_murata similarity index 100% rename from smdk4412-common/proprietary/vendor/firmware/nvram_mfg.txt_murata rename to smdk4412-common/proprietary/system/etc/wifi/nvram_mfg.txt_murata diff --git a/smdk4412-common/proprietary/vendor/firmware/nvram_mfg.txt_semcosh b/smdk4412-common/proprietary/system/etc/wifi/nvram_mfg.txt_semcosh similarity index 100% rename from smdk4412-common/proprietary/vendor/firmware/nvram_mfg.txt_semcosh rename to smdk4412-common/proprietary/system/etc/wifi/nvram_mfg.txt_semcosh diff --git a/smdk4412-common/proprietary/vendor/firmware/nvram_net.txt b/smdk4412-common/proprietary/system/etc/wifi/nvram_net.txt similarity index 100% rename from smdk4412-common/proprietary/vendor/firmware/nvram_net.txt rename to smdk4412-common/proprietary/system/etc/wifi/nvram_net.txt diff --git a/smdk4412-common/proprietary/vendor/firmware/nvram_net.txt_murata b/smdk4412-common/proprietary/system/etc/wifi/nvram_net.txt_murata similarity index 100% rename from smdk4412-common/proprietary/vendor/firmware/nvram_net.txt_murata rename to smdk4412-common/proprietary/system/etc/wifi/nvram_net.txt_murata diff --git a/smdk4412-common/proprietary/vendor/firmware/nvram_net.txt_semcosh b/smdk4412-common/proprietary/system/etc/wifi/nvram_net.txt_semcosh similarity index 100% rename from smdk4412-common/proprietary/vendor/firmware/nvram_net.txt_semcosh rename to smdk4412-common/proprietary/system/etc/wifi/nvram_net.txt_semcosh diff --git a/smdk4412-common/proprietary/vendor/firmware/mfc_fw.bin b/smdk4412-common/proprietary/system/vendor/firmware/mfc_fw.bin similarity index 100% rename from smdk4412-common/proprietary/vendor/firmware/mfc_fw.bin rename to smdk4412-common/proprietary/system/vendor/firmware/mfc_fw.bin