From b29513315815c7839fedc3452c915cb2ee1259fc Mon Sep 17 00:00:00 2001
From: Viktor <35473052+viktorxda@users.noreply.github.com>
Date: Wed, 6 Mar 2024 13:09:08 +0100
Subject: [PATCH] [no ci] General: minor refactoring

---
 general/overlay/etc/wireless/usb      | 28 +++++++++++++--------------
 general/package/Config.in             |  2 +-
 general/package/atbm60xx/Config.in    | 10 +---------
 general/package/atbm6441/Config.in    |  5 -----
 general/package/ingenic-pwm/Config.in |  1 -
 5 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/general/overlay/etc/wireless/usb b/general/overlay/etc/wireless/usb
index 597b7595..f0e3646d 100755
--- a/general/overlay/etc/wireless/usb
+++ b/general/overlay/etc/wireless/usb
@@ -5,12 +5,6 @@ set_gpio() {
 	sleep 1
 }
 
-# Generic ATBM603x USB
-if [ "$1" = "atbm603x-generic-usb" ]; then
-	modprobe atbm603x_wifi_usb
-	exit 0
-fi
-
 # Generic MT7601U
 if [ "$1" = "mt7601u-generic" ]; then
 	modprobe mt7601u
@@ -35,6 +29,12 @@ if [ "$1" = "rtl8733bu-generic" ]; then
 	exit 0
 fi
 
+# Generic ATBM603x
+if [ "$1" = "atbm603x-generic-usb" ]; then
+	modprobe atbm603x_wifi_usb
+	exit 0
+fi
+
 # GK7205V200 CamHi
 if [ "$1" = "mt7601u-gk7205v200-camhi" ]; then
 	set_gpio 9 0
@@ -113,7 +113,14 @@ if [ "$1" = "rtl8188fu-ssc325de-imou-c22ep-s2" ]; then
 	exit 0
 fi
 
-# SSC3333 Meari Speed 6S
+# SSC333 Babysense See HD IP206
+if [ "$1" = "rtl8188fu-babysense-see-hd-ip206" ]; then
+	set_gpio 14 1
+	modprobe 8188fu
+	exit 0
+fi
+
+# SSC333 Meari Speed 6S
 if [ "$1" = "rtl8188fu-ssc333-meari-speed-6s" ]; then
 	set_gpio 14 1
 	modprobe 8188fu
@@ -210,11 +217,4 @@ if [ "$1" = "atbm603x-t31-zte-k540" ]; then
 	exit 0
 fi
 
-# SSC333 Babysense See HD IP206
-if [ "$1" = "rtl8188fu-babysense-see-hd-ip206" ]; then
-	set_gpio 14 1
-	modprobe 8188fu
-	exit 0
-fi
-
 exit 1
diff --git a/general/package/Config.in b/general/package/Config.in
index 1c1121f6..64052b0b 100644
--- a/general/package/Config.in
+++ b/general/package/Config.in
@@ -89,6 +89,7 @@ source "$BR2_EXTERNAL_GENERAL_PATH/package/rtl8192eu-openipc/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/rtl8733bu-openipc/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/rtl8812au-openipc/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/rtw-hostapd/Config.in"
+source "$BR2_EXTERNAL_GENERAL_PATH/package/rubyfpv/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/sigmastar-motors/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/sigmastar-osdrv-infinity6/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/sigmastar-osdrv-infinity6b0/Config.in"
@@ -112,4 +113,3 @@ source "$BR2_EXTERNAL_GENERAL_PATH/package/xiongmai-osdrv-xm530/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/xmdp/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/yaml-cli/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/zerotier-one/Config.in"
-source "$BR2_EXTERNAL_GENERAL_PATH/package/rubyfpv/Config.in"
diff --git a/general/package/atbm60xx/Config.in b/general/package/atbm60xx/Config.in
index c18c241c..00182107 100644
--- a/general/package/atbm60xx/Config.in
+++ b/general/package/atbm60xx/Config.in
@@ -2,12 +2,9 @@ config BR2_PACKAGE_ATBM60XX
 	bool "atbm60xx"
 	depends on BR2_LINUX_KERNEL
 	help
-	Wireless driver atbm60xx.
-
-	ALTOBEAM atbm60xx WiFi driver
+	  Wireless driver atbm60xx
 
 if BR2_PACKAGE_ATBM60XX
-
 choice
 	prompt "ATBM60XX Model"
 	help
@@ -28,7 +25,6 @@ config BR2_PACKAGE_ATBM60XX_MODEL_6041
 endchoice
 
 if BR2_PACKAGE_ATBM60XX_MODEL_601X || BR2_PACKAGE_ATBM60XX_MODEL_602X || BR2_PACKAGE_ATBM60XX_MODEL_603X || BR2_PACKAGE_ATBM60XX_MODEL_6041
-
 choice
 	prompt "Interface type for selected ATBM60XX model"
 	help
@@ -43,8 +39,4 @@ config BR2_PACKAGE_ATBM60XX_INTERFACE_SDIO
 endchoice
 
 endif
-
 endif
-
-comment "ATBM60XX needs a Linux kernel to be built"
-	depends on !BR2_LINUX_KERNEL
diff --git a/general/package/atbm6441/Config.in b/general/package/atbm6441/Config.in
index 22c30e2e..086ed245 100644
--- a/general/package/atbm6441/Config.in
+++ b/general/package/atbm6441/Config.in
@@ -3,8 +3,3 @@ config BR2_PACKAGE_ATBM6441
 	depends on BR2_LINUX_KERNEL
 	help
 	  Wireless driver atbm6441
-
-	  altobeam hare atbm6441 WiFi driver
-
-comment "ATBM6441 needs a Linux kernel to be built"
-	depends on !BR2_LINUX_KERNEL
diff --git a/general/package/ingenic-pwm/Config.in b/general/package/ingenic-pwm/Config.in
index c757b6d2..81e36570 100644
--- a/general/package/ingenic-pwm/Config.in
+++ b/general/package/ingenic-pwm/Config.in
@@ -1,5 +1,4 @@
 config BR2_PACKAGE_INGENIC_PWM
 	bool "ingenic-pwm"
-	select BR2_PACKAGE_INGENIC_LIBIMP_CONTROL if BR2_OPENIPC_SOC_VENDOR="ingenic"
 	help
 	  Userspace program for controlling PWM channels on the Ingenic platform