diff --git a/doc/build/dts/api/api.rst b/doc/build/dts/api/api.rst index 92f6621f9ed..ee982e2156f 100644 --- a/doc/build/dts/api/api.rst +++ b/doc/build/dts/api/api.rst @@ -359,12 +359,6 @@ identifier for a chosen node. .. doxygengroup:: devicetree-generic-chosen :project: Zephyr -There are also conveniences for commonly used zephyr-specific properties of the -``/chosen`` node. - -.. doxygengroup:: devicetree-zephyr - :project: Zephyr - Zephyr-specific chosen nodes **************************** diff --git a/include/zephyr/devicetree.h b/include/zephyr/devicetree.h index 84122168bc8..6acfc019790 100644 --- a/include/zephyr/devicetree.h +++ b/include/zephyr/devicetree.h @@ -3928,7 +3928,6 @@ #include #include #include -#include #include #include #include diff --git a/include/zephyr/devicetree/zephyr.h b/include/zephyr/devicetree/zephyr.h deleted file mode 100644 index 11cf06f2ae5..00000000000 --- a/include/zephyr/devicetree/zephyr.h +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright (c) 2020 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: Apache-2.0 - */ - -/** - * @file - * @brief Zephyr-specific devicetree /chosen properties - */ - -#ifndef ZEPHYR_INCLUDE_DEVICETREE_ZEPHYR_H_ -#define ZEPHYR_INCLUDE_DEVICETREE_ZEPHYR_H_ - -#include - -/** - * @defgroup devicetree-zephyr Zephyr's /chosen nodes - * @ingroup devicetree - * @{ - */ - -/* - * This file is currently deliberately not defining macros for some - * existing zephyr,foo chosen nodes, such as zephyr,sram, until there - * are users for them. Feel free to extend it as needed. - * - * Getting doxygen to play along with all the dts-specific ifdeffery - * proved too complex for DT_CHOSEN_ZEPHYR_ENTROPY_LABEL, so we document - * everything under a DT_DOXYGEN define. - */ - -#ifdef DT_DOXYGEN -/** - * @deprecated Use @c DT_LABEL(DT_CHOSEN(zephyr_entropy)) instead. If used to - * to obtain a device instance with device_get_binding(), consider using - * @c DEVICE_DT_GET(DT_CHOSEN(zephyr_entropy)). - * - * @brief If there is a chosen node zephyr,entropy property which has - * a label property, that property's value. Undefined otherwise. - */ -#define DT_CHOSEN_ZEPHYR_ENTROPY_LABEL "" - -/** - * @deprecated Use @c DT_LABEL(DT_CHOSEN(zephyr_flash_controller)) instead. If - * used to to obtain a device instance with device_get_binding(), consider using - * @c DEVICE_DT_GET(DT_CHOSEN(zephyr_flash_controller)). - * - * @brief If there is a chosen node zephyr,flash-controller property which has - * a label property, that property's value. Undefined otherwise. - */ -#define DT_CHOSEN_ZEPHYR_FLASH_CONTROLLER_LABEL "" - -#endif /* DT_DOXYGEN */ - -#if DT_NODE_HAS_PROP(DT_CHOSEN(zephyr_entropy), label) -#define DT_CHOSEN_ZEPHYR_ENTROPY_LABEL \ - __DEPRECATED_MACRO DT_LABEL(DT_CHOSEN(zephyr_entropy)) -#endif - -#if DT_NODE_HAS_PROP(DT_CHOSEN(zephyr_flash_controller), label) -#define DT_CHOSEN_ZEPHYR_FLASH_CONTROLLER_LABEL \ - __DEPRECATED_MACRO DT_LABEL(DT_CHOSEN(zephyr_flash_controller)) -#endif - -/** - * @} - */ - -#endif