Revert "applications: nrf_desktop: Add BLE addr derived HWINFO for HW…

… ID module" This reverts commit a98e782. The workaround with the alternative implementation for the HWinfo driver is no longer needed as the driver is support for the nRF54H20 DK target. Ref: NCSDK-21888 Signed-off-by: Kamil Piszczek <[email protected]>
nrfconnect · Aug 30, 2024 · 3fce606 · 3fce606
1 parent 17a4653
commit 3fce606
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 53 deletions.
diff --git a/applications/nrf_desktop/src/util/CMakeLists.txt b/applications/nrf_desktop/src/util/CMakeLists.txt
@@ -10,17 +10,6 @@ target_sources_ifdef(CONFIG_DESKTOP_HID_REPORTQ
 target_sources_ifdef(CONFIG_DESKTOP_HWID
 		     app PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/hwid.c)
 
-if(CONFIG_DESKTOP_HWINFO_BLE_ADDRESS_FICR)
-         message(WARNING
-           "CONFIG_DESKTOP_HWINFO_BLE_ADDRESS_FICR is enabled. "
-           "Devices with this HWINFO driver are using BLE address from the FICR register "
-           "expanded with a value defined in the CONFIG_DESKTOP_HWINFO_BLE_ADDRESS_FICR_POSTFIX "
-           "Kconfig option. If this register is not populated, "
-           "you can use the postfix to ensure unique HW IDs for your devices. "
-           "Otherwise, all devices will have the same HW ID.")
-           target_sources(app PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/hwinfo_ble_addr_ficr.c)
-endif()
-
 target_sources_ifdef(CONFIG_DESKTOP_ADV_PROV_UUID16_ALL
 		     app PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/bt_le_adv_prov_uuid16.c)
 

diff --git a/applications/nrf_desktop/src/util/Kconfig b/applications/nrf_desktop/src/util/Kconfig
@@ -50,19 +50,6 @@ config DESKTOP_HWID
 	  Enable nRF Desktop hardware ID utility. The hardware ID is obtained
 	  from Zephyr hwinfo driver.
 
-config DESKTOP_HWINFO_BLE_ADDRESS_FICR
-	bool
-	default y
-	depends on BOARD_NRF54H20DK_NRF54H20_CPUAPP
-
-config DESKTOP_HWINFO_BLE_ADDRESS_FICR_POSTFIX
-	hex "Postfix for HW ID derived from BLE address"
-	range 0x0000 0xffff
-	default 0x0b1e
-	depends on DESKTOP_HWINFO_BLE_ADDRESS_FICR
-	help
-	  Postfix appended in big-endian to the HW ID derived from the BLE address.
-
 config DESKTOP_ADV_PROV_UUID16_ALL
 	bool "UUID16 advertising provider"
 	depends on BT_ADV_PROV

diff --git a/applications/nrf_desktop/src/util/hwinfo_ble_addr_ficr.c b/applications/nrf_desktop/src/util/hwinfo_ble_addr_ficr.c