kernelscripts: Rename modules.blacklist to modules.blocklist

As modprobe utility now uses modules.blocklist file to find the list of
modules not to insert into the kernel, rename the modules.blacklist file
to modules.blocklist. Replace all blacklist to blocklist in the
modules.blocklist file.

Change-Id: I9205b4f41149c60a8c2d06e329d34d61f46780a1
Signed-off-by: Prakruthi Deepak Heragu <pheragu@codeaurora.org>

2 files changed, 74 insertions, 74 deletions

diff --git a/buildkernel.sh b/buildkernel.sh
index f5e8e0a..6020ec6 100755
--- a/buildkernel.sh
+++ b/buildkernel.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -xE
 
-# Copyright (c) 2019 The Linux Foundation. All rights reserved.
+# Copyright (c) 2019-2020 The Linux Foundation. All rights reserved.
 # Not a Contribution.
 #
 # Copyright (C) 2019 The Android Open Source Project
@@ -128,14 +128,14 @@ archive_kernel_modules()
 	echo "Archiving vendor kernel modules: "
 	echo ${VENDOR_KERNEL_MODULES}
 
-	# Also package the modules.blacklist file
+	# Also package the modules.blocklist file
 	set -x
-	BLACKLIST_FILE=""
-	if [ -f "modules.blacklist" ]; then
-		BLACKLIST_FILE="modules.blacklist"
+	BLOCKLIST_FILE=""
+	if [ -f "modules.blocklist" ]; then
+		BLOCKLIST_FILE="modules.blocklist"
 	fi
 
-	zip -rq ${VENDOR_KERNEL_MODULES_ARCHIVE} ${VENDOR_KERNEL_MODULES} ${BLACKLIST_FILE}
+	zip -rq ${VENDOR_KERNEL_MODULES_ARCHIVE} ${VENDOR_KERNEL_MODULES} ${BLOCKLIST_FILE}
 	set +x
 
 	popd
@@ -172,11 +172,11 @@ copy_modules_to_prebuilt()
 	fi
 	cp -p ${OUT_DIR}/certs/*.*  ${PREBUILT_OUT}/certs/
 
-	# Copy the modules.blacklist file
+	# Copy the modules.blocklist file
 	set -x
-	BLACKLIST_FILE=${PWD}/device/qcom/kernelscripts/modules_blacklist/modules.blacklist.${TARGET_PRODUCT}
-	if [ -f "${BLACKLIST_FILE}" ]; then
-		cp ${BLACKLIST_FILE} ${KERNEL_MODULES_OUT}/modules.blacklist
+	BLOCKLIST_FILE=${PWD}/device/qcom/kernelscripts/modules_blocklist/modules.blocklist.${TARGET_PRODUCT}
+	if [ -f "${BLOCKLIST_FILE}" ]; then
+		cp ${BLOCKLIST_FILE} ${KERNEL_MODULES_OUT}/modules.blocklist
 	fi
 	set +x
 }
diff --git a/modules_blacklist/modules.blacklist.lahaina b/modules_blocklist/modules.blocklist.lahaina
index bac378e..751d4dd 100644
--- a/modules_blacklist/modules.blacklist.lahaina
+++ b/modules_blocklist/modules.blocklist.lahaina
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, The Linux Foundation. All rights reserved.
+# Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
@@ -25,66 +25,66 @@
 # OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-blacklist 8250_of
-blacklist dummy_hcd
-blacklist llcc_perfmon
-blacklist tda18250
-blacklist tda9887
-blacklist tuner-simple
-blacklist mt2266
-blacklist tea5767
-blacklist xc5000
-blacklist mt2131
-blacklist qt1010
-blacklist tuner-types
-blacklist tua9001
-blacklist m88rs6000t
-blacklist tda18218
-blacklist mxl5007t
-blacklist fc2580
-blacklist r820t
-blacklist mc44s803
-blacklist fc0012
-blacklist si2157
-blacklist tda827x
-blacklist tuner-xc2028
-blacklist mt2060
-blacklist qm1d1b0004
-blacklist qm1d1c0042
-blacklist tda18212
-blacklist fc0013
-blacklist msi001
-blacklist fc0011
-blacklist tda8290
-blacklist max2165
-blacklist xc4000
-blacklist it913x
-blacklist mt20xx
-blacklist mxl301rf
-blacklist mt2063
-blacklist e4000
-blacklist tea5761
-blacklist tda18271
-blacklist mxl5005s
-blacklist radio-i2c-rtc6226-qca
-blacklist dummy-cpufreq
-blacklist dummy_hcd
-blacklist kheaders
-blacklist atomic64_test
-blacklist test_user_copy
-blacklist lkdtm
-blacklist net_failover
-blacklist adc-tm
-blacklist rtc-test
-blacklist can-bcm
-blacklist can-gw
-blacklist can-raw
-blacklist failover
-blacklist vmw_vsock_virtio_transport
-blacklist vmw_vsock_virtio_transport_common
-blacklist vsock_diag
-blacklist vsock
-blacklist qca_cld3_wlan
-blacklist torture
-blacklist locktorture
-blacklist rcutorture
+blocklist 8250_of
+blocklist dummy_hcd
+blocklist llcc_perfmon
+blocklist tda18250
+blocklist tda9887
+blocklist tuner-simple
+blocklist mt2266
+blocklist tea5767
+blocklist xc5000
+blocklist mt2131
+blocklist qt1010
+blocklist tuner-types
+blocklist tua9001
+blocklist m88rs6000t
+blocklist tda18218
+blocklist mxl5007t
+blocklist fc2580
+blocklist r820t
+blocklist mc44s803
+blocklist fc0012
+blocklist si2157
+blocklist tda827x
+blocklist tuner-xc2028
+blocklist mt2060
+blocklist qm1d1b0004
+blocklist qm1d1c0042
+blocklist tda18212
+blocklist fc0013
+blocklist msi001
+blocklist fc0011
+blocklist tda8290
+blocklist max2165
+blocklist xc4000
+blocklist it913x
+blocklist mt20xx
+blocklist mxl301rf
+blocklist mt2063
+blocklist e4000
+blocklist tea5761
+blocklist tda18271
+blocklist mxl5005s
+blocklist radio-i2c-rtc6226-qca
+blocklist dummy-cpufreq
+blocklist dummy_hcd
+blocklist kheaders
+blocklist atomic64_test
+blocklist test_user_copy
+blocklist lkdtm
+blocklist net_failover
+blocklist adc-tm
+blocklist rtc-test
+blocklist can-bcm
+blocklist can-gw
+blocklist can-raw
+blocklist failover
+blocklist vmw_vsock_virtio_transport
+blocklist vmw_vsock_virtio_transport_common
+blocklist vsock_diag
+blocklist vsock
+blocklist qca_cld3_wlan
+blocklist torture
+blocklist locktorture
+blocklist rcutorture