From 0563179e982728fc04d042283a0ccd5337780967 Mon Sep 17 00:00:00 2001 From: Luca Stefani Date: Tue, 17 Jan 2017 17:16:47 +0100 Subject: [PATCH] msm8976-common: Update symlinks --- Android.mk | 44 +++++++++++++++++++++++++++++++----- tftp.mk | 66 ------------------------------------------------------ 2 files changed, 38 insertions(+), 72 deletions(-) delete mode 100644 tftp.mk diff --git a/Android.mk b/Android.mk index a3f0a5b..5fcaea2 100644 --- a/Android.mk +++ b/Android.mk @@ -31,12 +31,44 @@ include $(call all-makefiles-under,$(LOCAL_PATH)) include $(CLEAR_VARS) -# Create a link for the WCNSS config file, which ends up as a writable -# version in /data/misc/wifi -$(shell mkdir -p $(TARGET_OUT)/etc/firmware/wlan/prima; \ - ln -sf /data/misc/wifi/WCNSS_qcom_cfg.ini \ - $(TARGET_OUT)/etc/firmware/wlan/prima/WCNSS_qcom_cfg.ini) +RFS_MSM_ADSP_SYMLINKS := $(TARGET_OUT)/rfs/msm/adsp/ +$(RFS_MSM_ADSP_SYMLINKS): $(LOCAL_INSTALLED_MODULE) + @echo "Creating RFS MSM ADSP folder structure: $@" + @rm -rf $@/* + @mkdir -p $(dir $@)/readonly + $(hide) ln -sf /data/tombstones/lpass $@/ramdumps + $(hide) ln -sf /persist/rfs/msm/adsp $@/readwrite + $(hide) ln -sf /persist/rfs/shared $@/shared + $(hide) ln -sf /persist/hlos_rfs/shared $@/hlos + $(hide) ln -sf /firmware $@/readonly/firmware -include device/samsung/msm8976-common/tftp.mk +RFS_MSM_MPSS_SYMLINKS := $(TARGET_OUT)/rfs/msm/mpss/ +$(RFS_MSM_MPSS_SYMLINKS): $(LOCAL_INSTALLED_MODULE) + @echo "Creating RFS MSM MPSS folder structure: $@" + @rm -rf $@/* + @mkdir -p $(dir $@)/readonly + $(hide) ln -sf /data/tombstones/modem $@/ramdumps + $(hide) ln -sf /persist/rfs/msm/mpss $@/readwrite + $(hide) ln -sf /persist/rfs/shared $@/shared + $(hide) ln -sf /persist/hlos_rfs/shared $@/hlos + $(hide) ln -sf /firmware $@/readonly/firmware + +ALL_DEFAULT_INSTALLED_MODULES += $(RFS_MSM_ADSP_SYMLINKS) $(RFS_MSM_MPSS_SYMLINKS) + +WCNSS_INI_SYMLINK := $(TARGET_OUT_ETC)/firmware/wlan/qca_cld/WCNSS_qcom_cfg.ini +$(WCNSS_INI_SYMLINK): $(LOCAL_INSTALLED_MODULE) + @echo "WCNSS config ini link: $@" + @mkdir -p $(dir $@) + @rm -rf $@ + $(hide) ln -sf /system/etc/wifi/$(notdir $@) $@ + +WCNSS_MAC_SYMLINK := $(TARGET_OUT_ETC)/firmware/wlan/qca_cld/wlan_mac.bin +$(WCNSS_MAC_SYMLINK): $(LOCAL_INSTALLED_MODULE) + @echo "WCNSS MAC bin link: $@" + @mkdir -p $(dir $@) + @rm -rf $@ + $(hide) ln -sf /persist/$(notdir $@) $@ + +ALL_DEFAULT_INSTALLED_MODULES += $(WCNSS_INI_SYMLINK) $(WCNSS_MAC_SYMLINK) endif diff --git a/tftp.mk b/tftp.mk deleted file mode 100644 index 568f0fa..0000000 --- a/tftp.mk +++ /dev/null @@ -1,66 +0,0 @@ -######################################################################### -# Create Folder Structure -######################################################################### - -$(shell rm -rf $(TARGET_OUT)/rfs/) - -#To be enabled when prepopulation support is needed for the read_write folder -# $(shell rm -rf $(TARGET_OUT_DATA)/rfs/) -# $(shell mkdir -p $(TARGET_OUT_DATA)/rfs/msm/mpss/) -# $(shell mkdir -p $(TARGET_OUT_DATA)/rfs/msm/adsp/) -# $(shell mkdir -p $(TARGET_OUT_DATA)/rfs/mdm/mpss/) -# $(shell mkdir -p $(TARGET_OUT_DATA)/rfs/mdm/adsp/) - -######################################################################### -# MSM Folders -######################################################################### -$(shell mkdir -p $(TARGET_OUT)/rfs/msm/mpss/readonly) -$(shell mkdir -p $(TARGET_OUT)/rfs/msm/adsp/readonly) - -$(shell ln -s /data/tombstones/modem $(TARGET_OUT)/rfs/msm/mpss/ramdumps) -$(shell ln -s /persist/rfs/msm/mpss $(TARGET_OUT)/rfs/msm/mpss/readwrite) -$(shell ln -s /persist/rfs/shared $(TARGET_OUT)/rfs/msm/mpss/shared) -$(shell ln -s /persist/hlos_rfs/shared $(TARGET_OUT)/rfs/msm/mpss/hlos) -$(shell ln -s /firmware $(TARGET_OUT)/rfs/msm/mpss/readonly/firmware) - -$(shell ln -s /data/tombstones/lpass $(TARGET_OUT)/rfs/msm/adsp/ramdumps) -$(shell ln -s /persist/rfs/msm/adsp $(TARGET_OUT)/rfs/msm/adsp/readwrite) -$(shell ln -s /persist/rfs/shared $(TARGET_OUT)/rfs/msm/adsp/shared) -$(shell ln -s /persist/hlos_rfs/shared $(TARGET_OUT)/rfs/msm/adsp/hlos) -$(shell ln -s /firmware $(TARGET_OUT)/rfs/msm/adsp/readonly/firmware) - -######################################################################### -# MDM Folders -######################################################################### -$(shell mkdir -p $(TARGET_OUT)/rfs/mdm/mpss/readonly) -$(shell mkdir -p $(TARGET_OUT)/rfs/mdm/adsp/readonly) -$(shell mkdir -p $(TARGET_OUT)/rfs/mdm/sparrow/readonly) - -$(shell ln -s /data/tombstones/modem $(TARGET_OUT)/rfs/mdm/mpss/ramdumps) -$(shell ln -s /persist/rfs/mdm/mpss $(TARGET_OUT)/rfs/mdm/mpss/readwrite) -$(shell ln -s /persist/rfs/shared $(TARGET_OUT)/rfs/mdm/mpss/shared) -$(shell ln -s /persist/hlos_rfs/shared $(TARGET_OUT)/rfs/mdm/mpss/hlos) -$(shell ln -s /firmware $(TARGET_OUT)/rfs/mdm/mpss/readonly/firmware) - -$(shell ln -s /data/tombstones/lpass $(TARGET_OUT)/rfs/mdm/adsp/ramdumps) -$(shell ln -s /persist/rfs/mdm/adsp $(TARGET_OUT)/rfs/mdm/adsp/readwrite) -$(shell ln -s /persist/rfs/shared $(TARGET_OUT)/rfs/mdm/adsp/shared) -$(shell ln -s /persist/hlos_rfs/shared $(TARGET_OUT)/rfs/mdm/adsp/hlos) -$(shell ln -s /firmware $(TARGET_OUT)/rfs/mdm/adsp/readonly/firmware) - -$(shell ln -s /data/tombstones/sparrow $(TARGET_OUT)/rfs/mdm/sparrow/ramdumps) -$(shell ln -s /persist/rfs/mdm/sparrow $(TARGET_OUT)/rfs/mdm/sparrow/readwrite) -$(shell ln -s /persist/rfs/shared $(TARGET_OUT)/rfs/mdm/sparrow/shared) -$(shell ln -s /persist/hlos_rfs/shared $(TARGET_OUT)/rfs/mdm/sparrow/hlos) -$(shell ln -s /firmware $(TARGET_OUT)/rfs/mdm/sparrow/readonly/firmware) - -######################################################################### -# APQ Folders -######################################################################### -$(shell mkdir -p $(TARGET_OUT)/rfs/apq/gnss/readonly) - -$(shell ln -s /data/tombstones/modem $(TARGET_OUT)/rfs/apq/gnss/ramdumps) -$(shell ln -s /persist/rfs/apq/gnss $(TARGET_OUT)/rfs/apq/gnss/readwrite) -$(shell ln -s /persist/rfs/shared $(TARGET_OUT)/rfs/apq/gnss/shared) -$(shell ln -s /persist/hlos_rfs/shared $(TARGET_OUT)/rfs/apq/gnss/hlos) -$(shell ln -s /firmware $(TARGET_OUT)/rfs/apq/gnss/readonly/firmware)