diff --git a/doc/releases/release-notes-4.0.rst b/doc/releases/release-notes-4.0.rst index a18f9dd9e9cf2..1b90f284de358 100644 --- a/doc/releases/release-notes-4.0.rst +++ b/doc/releases/release-notes-4.0.rst @@ -47,6 +47,8 @@ Removed APIs in this release * Macro ``K_THREAD_STACK_MEMBER``, deprecated since v3.5.0, has been removed. Use :c:macro:`K_KERNEL_STACK_MEMBER` instead. * ``CBPRINTF_PACKAGE_COPY_*`` macros, deprecated since Zephyr 3.5.0, have been removed. +* ``_ENUM_TOKEN`` and ``_ENUM_UPPER_TOKEN`` macros, deprecated since Zephyr 2.7.0, + are no longer generated. Deprecated in this release ========================== diff --git a/include/zephyr/devicetree.h b/include/zephyr/devicetree.h index aba28c0ab6325..57bcb0dd427e5 100644 --- a/include/zephyr/devicetree.h +++ b/include/zephyr/devicetree.h @@ -47,10 +47,6 @@ * * _ENUM_IDX: property's value as an index into bindings enum * _ENUM_VAL__EXISTS property's value as a token exists - * _ENUM_TOKEN: property's value as a token into bindings enum (string - * enum values are identifiers) [deprecated, use _STRING_TOKEN] - * _ENUM_UPPER_TOKEN: like _ENUM_TOKEN, but uppercased [deprecated, use - * _STRING_UPPER_TOKEN] * _EXISTS: property is defined * _FOREACH_PROP_ELEM: helper for "iterating" over values in the property * _FOREACH_PROP_ELEM_VARGS: foreach functions with variable number of arguments diff --git a/scripts/dts/gen_defines.py b/scripts/dts/gen_defines.py index 3a8fa7aaedd55..9fdb3cda5778c 100755 --- a/scripts/dts/gen_defines.py +++ b/scripts/dts/gen_defines.py @@ -672,14 +672,6 @@ def enum_macros(prop: edtlib.Property, macro: str): ret[macro + f"_IDX_{i}_EXISTS"] = 1 # DT_N__P__IDX__ENUM_VAL__EXISTS 1 ret[macro + f"_IDX_{i}_ENUM_VAL_{subval}_EXISTS"] = 1 - if not spec.enum_tokenizable: - continue - - # DT_N__P__IDX__ENUM_TOKEN - ret[macro + f"_IDX_{i}_ENUM_TOKEN"] = subval - if spec.enum_upper_tokenizable: - # DT_N__P__IDX__ENUM_UPPER_TOKEN - ret[macro + f"_IDX_{i}_ENUM_UPPER_TOKEN"] = subval.upper() return ret