From d84dcba587d1f86ac671d9d71f88129c0d2d04e8 Mon Sep 17 00:00:00 2001
From: Jason Kridner <jkridner@beagleboard.org>
Date: Fri, 16 Dec 2022 00:38:16 -0500
Subject: [PATCH] sensortest: make subghz the default

An overlay to enable 2.4GHz will be needed until this issue is fixed:

https://github.com/zephyrproject-rtos/zephyr/issues/29750
---
 .../sensortest/overlay-subghz.conf                  |  4 ----
 .../beagleconnect_freedom/sensortest/prj.conf       |  9 ++++++---
 .../beagleconnect_freedom/sensortest/subghz.overlay | 13 -------------
 3 files changed, 6 insertions(+), 20 deletions(-)
 delete mode 100644 samples/boards/beagleconnect_freedom/sensortest/overlay-subghz.conf
 delete mode 100644 samples/boards/beagleconnect_freedom/sensortest/subghz.overlay

diff --git a/samples/boards/beagleconnect_freedom/sensortest/overlay-subghz.conf b/samples/boards/beagleconnect_freedom/sensortest/overlay-subghz.conf
deleted file mode 100644
index b28b7c9a5aea..000000000000
--- a/samples/boards/beagleconnect_freedom/sensortest/overlay-subghz.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG_IEEE802154_CC13XX_CC26XX=n
-CONFIG_IEEE802154_CC13XX_CC26XX_SUB_GHZ=y
-CONFIG_NET_CONFIG_IEEE802154_CHANNEL=1
-CONFIG_IEEE802154_CC13XX_CC26XX_SUB_GHZ_NUM_RX_BUF=6
diff --git a/samples/boards/beagleconnect_freedom/sensortest/prj.conf b/samples/boards/beagleconnect_freedom/sensortest/prj.conf
index 6da771bcab3e..e0b74a5c29ca 100644
--- a/samples/boards/beagleconnect_freedom/sensortest/prj.conf
+++ b/samples/boards/beagleconnect_freedom/sensortest/prj.conf
@@ -13,6 +13,7 @@ CONFIG_NET_ICMPV6_LOG_LEVEL_DBG=y
 CONFIG_NET_HOSTNAME_ENABLE=y
 CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=3
 CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=4
+CONFIG_NET_IF_MAX_IPV6_COUNT=2
 CONFIG_NET_SHELL=y
 CONFIG_NET_TCP=y
 CONFIG_NET_MAX_CONN=8
@@ -40,10 +41,12 @@ CONFIG_NET_L2_IEEE802154=y
 CONFIG_NET_L2_IEEE802154_SHELL=y
 CONFIG_NET_L2_IEEE802154_LOG_LEVEL_INF=y
 
-CONFIG_IEEE802154_CC13XX_CC26XX=y
-CONFIG_IEEE802154_CC13XX_CC26XX_SUB_GHZ=n
-CONFIG_NET_CONFIG_IEEE802154_CHANNEL=26
+CONFIG_IEEE802154_CC13XX_CC26XX=n
+CONFIG_IEEE802154_CC13XX_CC26XX_SUB_GHZ=y
+CONFIG_NET_CONFIG_IEEE802154_CHANNEL=1
+CONFIG_NET_CONFIG_IEEE802154_PAN_ID=0xabcd
 CONFIG_NET_CONFIG_IEEE802154_RADIO_TX_POWER=20
+CONFIG_IEEE802154_CC13XX_CC26XX_SUB_GHZ_NUM_RX_BUF=6
 
 # Hacks
 CONFIG_NEWLIB_LIBC=y
diff --git a/samples/boards/beagleconnect_freedom/sensortest/subghz.overlay b/samples/boards/beagleconnect_freedom/sensortest/subghz.overlay
deleted file mode 100644
index 007daab257f2..000000000000
--- a/samples/boards/beagleconnect_freedom/sensortest/subghz.overlay
+++ /dev/null
@@ -1,13 +0,0 @@
-/ {
-    chosen {
-		zephyr,ieee802154 = &ieee802154g;
-    };
-};
-
-&ieee802154 {
-	status = "disabled";
-};
-
-&ieee802154g {
-	status = "okay";
-};