Skip to content

Commit e00746f

Browse files
Flavio Ceolinaescolar
authored andcommitted
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 <[email protected]>
1 parent 9aa2f5f commit e00746f

File tree

2 files changed

+6
-79
lines changed

2 files changed

+6
-79
lines changed

scripts/kconfig/hardenconfig.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env python3
22

3-
# Copyright (c) 2019 Intel Corporation
3+
# Copyright (c) 2019-2024 Intel Corporation
44
# SPDX-License-Identifier: Apache-2.0
55

66
import csv
@@ -53,6 +53,11 @@ def compare_with_hardened_conf(kconf, hardened_kconf_filename):
5353
current = None
5454
options.append(Option(name=name, current=current,
5555
recommended=recommended, symbol=symbol))
56+
for node in kconf.node_iter():
57+
for select in node.selects:
58+
if kconf.syms["EXPERIMENTAL"] in select or kconf.syms["DEPRECATED"] in select:
59+
options.append(Option(name=node.item.name, current=node.item.str_value, recommended='n', symbol=node.item))
60+
5661
return options
5762

5863

scripts/kconfig/hardened.csv

Lines changed: 0 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -47,84 +47,6 @@ TRACING,n
4747
X86_MMU,y
4848
ZTEST,n
4949

50-
# Experimental options
51-
52-
BT_A2DP,n,experimental
53-
BT_AUDIO,n,experimental
54-
BT_AVDTP,n,experimental
55-
BT_CLASSIC,n,experimental
56-
BT_CTLR_ADV_DATA_CHAIN,n,experimental
57-
BT_CTLR_DTM_HCI_DF_IQ_REPORT,n,experimental
58-
BT_CTLR_SET_HOST_FEATURE,n,experimental
59-
BT_DF,n,experimental
60-
BT_EAD,n,experimental
61-
BT_EATT,n,experimental
62-
BT_H5,n,experimental,
63-
BT_HFP_HF,n,experimental
64-
BT_IAS,n,experimental
65-
BT_IAS_CLIENT,n,experimental
66-
BT_ISO_BROADCASTER,n,experimental
67-
BT_ISO_PERIPHERAL,n,experimental
68-
BT_ISO_SYNC_RECEIVER,n,experimental
69-
BT_MESH_USES_MBEDTLS_PSA,n,experimental
70-
BT_MESH_V1d1,n,experimental
71-
BT_OTS,n,experimental
72-
BT_OTS_CLIENT,n,experimental
73-
BT_PASSKEY_KEYPRESS,n,experimental
74-
BT_PER_ADV_RSP,n,experimental
75-
BT_PER_ADV_SYNC_RSP,n,experimental
76-
BT_RFCOMM,n,experimental
77-
CAN_NET,n,experimental
78-
CRYPTO_MBEDTLS_SHIM,n,experimental
79-
CRYPTO_TINYCRYPT_SHIM,n,experimental
80-
DEMAND_PAGING,n,experimental
81-
ETH_E1000_PTP_CLOCK,n,experimental
82-
GPIO_ENABLE_DISABLE_INTERRUPT,n,experimental
83-
GPIO_GET_CONFIG,n,experimental
84-
GPIO_GET_DIRECTION,n,experimental
85-
HTTP_CLIENT,n,experimental
86-
HTTP_SERVER,n,experimental
87-
ICE40_FPGA,n,experimental
88-
ISOTP,n,experimental
89-
LOG_BACKEND_BLE,n,experimental
90-
LORA,n,experimental
91-
LORAWAN,n,experimental
92-
LWM2M_FIRMWARE_UPDATE_OBJ_SUPPORT_MULTIPLE,n,experimental
93-
LWM2M_GATEWAY_OBJ_SUPPORT,n,experimental
94-
MEMC,n,experimental
95-
MIPI_DSI,n,experimental
96-
MM_DRV,n,experimental
97-
MODEM_CONTEXT,n,experimental
98-
MQTT_SN_LIB,n,experimental
99-
NET_BUF_VARIABLE_DATA_SIZE,n,experimental
100-
NET_CONNECTION_MANAGER,n,experimental
101-
NET_GPTP,n,experimental
102-
NET_IPV4_AUTO,n,experimental
103-
NET_L2_IEEE802154_SECURITY,n,experimental
104-
NET_PROMISCUOUS_MODE,n,experimental
105-
NET_SOCKETS_CAN,n,experimental
106-
NET_SOCKETS_ENABLE_DTLS,n,experimental
107-
NET_SOCKETS_NET_MGMT,n,experimental
108-
NET_SOCKETS_SOCKOPT_TLS,n,experimental
109-
NET_TC_THREAD_PREEMPTIVE,n,experimental
110-
OPENTHREAD_MLE_LONG_ROUTES,n,experimental
111-
SHELL_TELNET_SUPPORT_COMMAND,n,experimental
112-
SPI_EXTENDED_MODES,n,experimental
113-
SPI_RTIO,n,experimental
114-
SPI_SLAVE,n,experimental
115-
STM32_LPTIM_TIMER,n,experimental
116-
TFTP_LIB,n,experimental
117-
THRIFT,n,experimental
118-
UART_EMUL,n,experimental
119-
UDC_DRIVER,n,experimental
120-
UHC_DRIVER,n,experimental
121-
USBD_CDC_ACM_CLASS,n,experimental
122-
USBD_MSC_CLASS,n,experimental
123-
USB_DEVICE_AUDIO,n,experimental
124-
USB_DEVICE_STACK_NEXT,n,experimental
125-
USB_HOST_STACK,n,experimental
126-
WEBSOCKET_CLIENT,n,experimental
127-
12850
# Debug options
12951

13052
ASSERT,n

0 commit comments

Comments
 (0)