From 88de97a9265eb1ae92ddb4603f88db9cdaad3c07 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Tue, 22 Oct 2019 17:43:42 -0600
Subject: [PATCH] drivers/usbhost:  Remove all traces of support for the
 installable GPL RTL8187 USB host driver.

---
 README.txt                         |  5 -----
 drivers/usbhost/.gitignore         |  4 ----
 drivers/usbhost/Kconfig            | 21 ---------------------
 drivers/usbhost/Make.defs          |  9 ---------
 drivers/wireless/ieee80211/Kconfig |  4 ++--
 5 files changed, 2 insertions(+), 41 deletions(-)
 delete mode 100644 drivers/usbhost/.gitignore

diff --git a/README.txt b/README.txt
index 6fb8d585d3..d52643e992 100644
--- a/README.txt
+++ b/README.txt
@@ -555,11 +555,6 @@ Related Repositories
     There are snapshots of some tools here that you will need to work with
     NuttX:  kconfig-frontends, genromfs, and others.
 
-  * https://bitbucket.org/nuttx/nonbsd
-
-    A few drivers that are not integrated into the main NuttX source tree due
-    to licensing issues.
-
   * https://bitbucket.org/nuttx/pascal
 
     Yes, this really is a Pascal compiler.  The Pascal p-code run-time and
diff --git a/drivers/usbhost/.gitignore b/drivers/usbhost/.gitignore
deleted file mode 100644
index dbf816c668..0000000000
--- a/drivers/usbhost/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-rtl8187x.c
-rtl8187x.h
-
-
diff --git a/drivers/usbhost/Kconfig b/drivers/usbhost/Kconfig
index 8598087115..cdceb0af16 100644
--- a/drivers/usbhost/Kconfig
+++ b/drivers/usbhost/Kconfig
@@ -498,27 +498,6 @@ config HIDMOUSE_WTHRESH
 endif # MOUSE_WHEEL
 endif # USBHOST_HIDMOUSE
 
-config USBHOST_RTL8187
-	bool "RTL8187-based wireless LAN"
-	default n
-	depends on NET
-
-if USBHOST_RTL8187
-
-config RTL8187B
-	bool "RTL8187B chip"
-	default y
-
-config RTL8187_VID
-	hex "RTL8187 VID"
-	default 0x0bda
-
-config RTL8187_PID
-	hex "RTL8187 PID"
-	default 0x8189
-
-endif # USBHOST_RTL8187
-
 config USBHOST_XBOXCONTROLLER
 	bool "Xbox Controller Support"
 	default n
diff --git a/drivers/usbhost/Make.defs b/drivers/usbhost/Make.defs
index 6295ae2f96..020523d2f8 100644
--- a/drivers/usbhost/Make.defs
+++ b/drivers/usbhost/Make.defs
@@ -84,15 +84,6 @@ CSRCS += usbhost_trace.c
 endif
 endif
 
-# Include add-on USB host driver logic if present and selected (available in
-# the NuttX drivers GIT repository)
-
-ifeq ($(CONFIG_USBHOST_RTL8187),y)
-  RTL8187_CSRC := ${shell if [ -f usbhost$(DELIM)rtl8187x.c ]; then echo "rtl8187x.c"; fi}
-  CSRCS += $(RTL8187_CSRC)
-endif
-endif
-
 # Include USB host driver build logic
 
 DEPPATH += --dep-path usbhost
diff --git a/drivers/wireless/ieee80211/Kconfig b/drivers/wireless/ieee80211/Kconfig
index f500621778..cd7b100ac8 100644
--- a/drivers/wireless/ieee80211/Kconfig
+++ b/drivers/wireless/ieee80211/Kconfig
@@ -33,8 +33,8 @@ config IEEE80211_BROADCOM_FWFILES
 		This selection enables an option to load the firmware and CLM
 		files from a mounted file system.
 
-		A snapshot of file for the BCM43362 are available in the nonbsd
-		repository:  https://bitbucket.org/nuttx/nonbsd/src/master/bcm43438/
+		A snapshot of file for the BCM43362 are available in the tools` 
+		repository:  https://bitbucket.org/nuttx/tools/src/master/bcm43438/
 
 		The latest files from Cypress are available in the Linux kernel:
 		https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/tree/brcm