From 4685664d07a9921a7f843e3fac64b569c612aa93 Mon Sep 17 00:00:00 2001
From: Hector Palacios <hector.palacios@digi.com>
Date: Thu, 29 Oct 2020 09:56:55 +0100
Subject: [PATCH] u-boot: boot script: allow to disable Wi-Fi/BT overlays
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Check a U-Boot env variable (disable_wifi/disable_bt) for easily
disabling Wi-Fi and/or Bluetooth overlays.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>ç

https://jira.digi.com/browse/DEL-7297
(cherry picked from commit b74a8cee54bbffd3e5ceb61f7e937a138727f946)
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
---
 .../recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt       | 4 ++--
 .../u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt            | 4 ++--
 .../recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/boot.txt    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt
index 413f0e3f5..78414f805 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt
@@ -24,11 +24,11 @@ if test -n "${module_ram}"; then
 	setexpr module_has_bt ${hwid_2} \& 20000
 	setexpr module_has_bt ${module_has_bt} / 20000
 
-	if test "${module_has_bt}" = "1"; then
+	if test "${module_has_bt}" = "1" && test -z "${disable_bt}"; then
 		setenv overlays _ov_som_bt_ccimx8mn.dtbo,${overlays}
 	fi
 
-	if test "${module_has_wifi}" = "1"; then
+	if test "${module_has_wifi}" = "1" && test -z "${disable_wifi}"; then
 		setenv overlays _ov_som_wifi_ccimx8mn.dtbo,${overlays}
 	fi
 
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt
index 875d874de..278914bcd 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt
@@ -20,11 +20,11 @@ if test -n "${module_ram}"; then
 	setexpr module_has_bt ${hwid_3} \& 2
 	setexpr module_has_bt ${module_has_bt} / 2
 
-	if test "${module_has_bt}" = "1"; then
+	if test "${module_has_bt}" = "1" && test -z "${disable_bt}"; then
 		setenv overlays _ov_som_bt_ccimx8x.dtbo,${overlays}
 	fi
 
-	if test "${module_has_wifi}" = "1"; then
+	if test "${module_has_wifi}" = "1" && test -z "${disable_wifi}"; then
 		setenv overlays _ov_som_wifi_ccimx8x.dtbo,${overlays}
 	fi
 else
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/boot.txt
index eb6de7f06..481c8cc2d 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/boot.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/boot.txt
@@ -20,11 +20,11 @@ if test -n "${module_ram}"; then
 	setexpr module_has_bt ${hwid_3} \& 2
 	setexpr module_has_bt ${module_has_bt} / 2
 
-	if test "${module_has_bt}" = "1"; then
+	if test "${module_has_bt}" = "1" && test -z "${disable_bt}"; then
 		setenv overlays _ov_som_bt_ccimx8x.dtbo,${overlays}
 	fi
 
-	if test "${module_has_wifi}" = "1"; then
+	if test "${module_has_wifi}" = "1" && test -z "${disable_wifi}"; then
 		setenv overlays _ov_som_wifi_ccimx8x.dtbo,${overlays}
 	fi
 else