From e00746f9b3de387810aee45d9aef573ed8dd65bd Mon Sep 17 00:00:00 2001 From: Flavio Ceolin Date: Thu, 8 Aug 2024 13:12:07 -0700 Subject: [PATCH] scripts: hardenconfig: Improve deprecated and experimental detection Gets experimental and deprecated symbols directly from Kconfig instead of rely on hardened.csv. This way we keep the tool consistent with Zephyr's code. Signed-off-by: Flavio Ceolin --- scripts/kconfig/hardenconfig.py | 7 ++- scripts/kconfig/hardened.csv | 78 --------------------------------- 2 files changed, 6 insertions(+), 79 deletions(-) diff --git a/scripts/kconfig/hardenconfig.py b/scripts/kconfig/hardenconfig.py index cf42074ea7c..3bad4d3e611 100755 --- a/scripts/kconfig/hardenconfig.py +++ b/scripts/kconfig/hardenconfig.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# Copyright (c) 2019 Intel Corporation +# Copyright (c) 2019-2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 import csv @@ -53,6 +53,11 @@ def compare_with_hardened_conf(kconf, hardened_kconf_filename): current = None options.append(Option(name=name, current=current, recommended=recommended, symbol=symbol)) + for node in kconf.node_iter(): + for select in node.selects: + if kconf.syms["EXPERIMENTAL"] in select or kconf.syms["DEPRECATED"] in select: + options.append(Option(name=node.item.name, current=node.item.str_value, recommended='n', symbol=node.item)) + return options diff --git a/scripts/kconfig/hardened.csv b/scripts/kconfig/hardened.csv index 84d24dd1000..d91029a046d 100644 --- a/scripts/kconfig/hardened.csv +++ b/scripts/kconfig/hardened.csv @@ -47,84 +47,6 @@ TRACING,n X86_MMU,y ZTEST,n -# Experimental options - -BT_A2DP,n,experimental -BT_AUDIO,n,experimental -BT_AVDTP,n,experimental -BT_CLASSIC,n,experimental -BT_CTLR_ADV_DATA_CHAIN,n,experimental -BT_CTLR_DTM_HCI_DF_IQ_REPORT,n,experimental -BT_CTLR_SET_HOST_FEATURE,n,experimental -BT_DF,n,experimental -BT_EAD,n,experimental -BT_EATT,n,experimental -BT_H5,n,experimental, -BT_HFP_HF,n,experimental -BT_IAS,n,experimental -BT_IAS_CLIENT,n,experimental -BT_ISO_BROADCASTER,n,experimental -BT_ISO_PERIPHERAL,n,experimental -BT_ISO_SYNC_RECEIVER,n,experimental -BT_MESH_USES_MBEDTLS_PSA,n,experimental -BT_MESH_V1d1,n,experimental -BT_OTS,n,experimental -BT_OTS_CLIENT,n,experimental -BT_PASSKEY_KEYPRESS,n,experimental -BT_PER_ADV_RSP,n,experimental -BT_PER_ADV_SYNC_RSP,n,experimental -BT_RFCOMM,n,experimental -CAN_NET,n,experimental -CRYPTO_MBEDTLS_SHIM,n,experimental -CRYPTO_TINYCRYPT_SHIM,n,experimental -DEMAND_PAGING,n,experimental -ETH_E1000_PTP_CLOCK,n,experimental -GPIO_ENABLE_DISABLE_INTERRUPT,n,experimental -GPIO_GET_CONFIG,n,experimental -GPIO_GET_DIRECTION,n,experimental -HTTP_CLIENT,n,experimental -HTTP_SERVER,n,experimental -ICE40_FPGA,n,experimental -ISOTP,n,experimental -LOG_BACKEND_BLE,n,experimental -LORA,n,experimental -LORAWAN,n,experimental -LWM2M_FIRMWARE_UPDATE_OBJ_SUPPORT_MULTIPLE,n,experimental -LWM2M_GATEWAY_OBJ_SUPPORT,n,experimental -MEMC,n,experimental -MIPI_DSI,n,experimental -MM_DRV,n,experimental -MODEM_CONTEXT,n,experimental -MQTT_SN_LIB,n,experimental -NET_BUF_VARIABLE_DATA_SIZE,n,experimental -NET_CONNECTION_MANAGER,n,experimental -NET_GPTP,n,experimental -NET_IPV4_AUTO,n,experimental -NET_L2_IEEE802154_SECURITY,n,experimental -NET_PROMISCUOUS_MODE,n,experimental -NET_SOCKETS_CAN,n,experimental -NET_SOCKETS_ENABLE_DTLS,n,experimental -NET_SOCKETS_NET_MGMT,n,experimental -NET_SOCKETS_SOCKOPT_TLS,n,experimental -NET_TC_THREAD_PREEMPTIVE,n,experimental -OPENTHREAD_MLE_LONG_ROUTES,n,experimental -SHELL_TELNET_SUPPORT_COMMAND,n,experimental -SPI_EXTENDED_MODES,n,experimental -SPI_RTIO,n,experimental -SPI_SLAVE,n,experimental -STM32_LPTIM_TIMER,n,experimental -TFTP_LIB,n,experimental -THRIFT,n,experimental -UART_EMUL,n,experimental -UDC_DRIVER,n,experimental -UHC_DRIVER,n,experimental -USBD_CDC_ACM_CLASS,n,experimental -USBD_MSC_CLASS,n,experimental -USB_DEVICE_AUDIO,n,experimental -USB_DEVICE_STACK_NEXT,n,experimental -USB_HOST_STACK,n,experimental -WEBSOCKET_CLIENT,n,experimental - # Debug options ASSERT,n