bartoszek/zephyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

devicetree: remove deprecated DT_CHOSEN_*_LABEL macros

Browse Source 
DT_CHOSEN_ZEPHYR_FLASH_CONTROLLER_LABEL and
DT_CHOSEN_ZEPHYR_ENTROPY_LABEL were deprecated a couple of releases ago,
so it is time to remove them. Note that the zephyr/devicetree/zephyr.h
is also removed, since both macros were its last content.

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
This commit is contained in:
Gerard Marull-Paretas 2022-11-10 15:37:14 +01:00 committed by Carles Cufí
parent f7d24f78a2
commit 8d0eb6ce10
3 changed files with 0 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/build/dts/api/api.rst vendored
View File

@ -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
****************************

1
include/zephyr/devicetree.h
View File

@ -3928,7 +3928,6 @@
#include <zephyr/devicetree/dma.h>
#include <zephyr/devicetree/pwms.h>
#include <zephyr/devicetree/fixed-partitions.h>
#include <zephyr/devicetree/zephyr.h>
#include <zephyr/devicetree/ordinals.h>
#include <zephyr/devicetree/pinctrl.h>
#include <zephyr/devicetree/can.h>

70
include/zephyr/devicetree/zephyr.h
View File

@ -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 <zephyr/toolchain.h>
/**
* @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