diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2019-03-25 14:51:27 +1100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2020-03-02 07:52:19 +0100 |
| commit | 3d75d7c3cf00a50288aded978c2f189917105b12 (patch) | |
| tree | be1ea1bd701696ac8aad67a6ad53aca49864a84d /cpukit | |
| parent | libfdt: Add phandle generation helper (diff) | |
| download | rtems-3d75d7c3cf00a50288aded978c2f189917105b12.tar.bz2 | |
Revert "libfdt: Add phandle generation helper"
This reverts commit 54ea41c22415cb0e283d22faf71202051c89400c.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/dtc/libfdt/fdt_ro.c | 31 | ||||
| -rw-r--r-- | cpukit/include/libfdt.h | 19 | ||||
| -rw-r--r-- | cpukit/include/libfdt_env.h | 1 |
3 files changed, 0 insertions, 51 deletions
diff --git a/cpukit/dtc/libfdt/fdt_ro.c b/cpukit/dtc/libfdt/fdt_ro.c index 97cdcda0db..eafc142828 100644 --- a/cpukit/dtc/libfdt/fdt_ro.c +++ b/cpukit/dtc/libfdt/fdt_ro.c @@ -170,37 +170,6 @@ uint32_t fdt_get_max_phandle(const void *fdt) return 0; } -int fdt_generate_phandle(const void *fdt, uint32_t *phandle) -{ - uint32_t max = 0; - int offset = -1; - - while (true) { - uint32_t value; - - offset = fdt_next_node(fdt, offset, NULL); - if (offset < 0) { - if (offset == -FDT_ERR_NOTFOUND) - break; - - return offset; - } - - value = fdt_get_phandle(fdt, offset); - - if (value > max) - max = value; - } - - if (max == FDT_MAX_PHANDLE) - return -FDT_ERR_NOPHANDLES; - - if (phandle) - *phandle = max + 1; - - return 0; -} - static const struct fdt_reserve_entry *fdt_mem_rsv(const void *fdt, int n) { int offset = n * sizeof(struct fdt_reserve_entry); diff --git a/cpukit/include/libfdt.h b/cpukit/include/libfdt.h index 7e102d188e..a470d1df6d 100644 --- a/cpukit/include/libfdt.h +++ b/cpukit/include/libfdt.h @@ -140,10 +140,6 @@ #define FDT_ERR_MAX 17 -/* constants */ -#define FDT_MAX_PHANDLE 0xfffffffe - /* Valid values for phandles range from 1 to 2^32-2. */ - /**********************************************************************/ /* Low-level functions (you probably don't need these) */ /**********************************************************************/ @@ -381,21 +377,6 @@ const char *fdt_string(const void *fdt, int stroffset); uint32_t fdt_get_max_phandle(const void *fdt); /** - * fdt_generate_phandle - return a new, unused phandle for a device tree blob - * @fdt: pointer to the device tree blob - * @phandle: return location for the new phandle - * - * Walks the device tree blob and looks for the highest phandle value. On - * success, the new, unused phandle value (one higher than the previously - * highest phandle value in the device tree blob) will be returned in the - * @phandle parameter. - * - * Returns: - * 0 on success or a negative error-code on failure - */ -int fdt_generate_phandle(const void *fdt, uint32_t *phandle); - -/** * fdt_num_mem_rsv - retrieve the number of memory reserve map entries * @fdt: pointer to the device tree blob * diff --git a/cpukit/include/libfdt_env.h b/cpukit/include/libfdt_env.h index 4d1cdfa585..eb2053845c 100644 --- a/cpukit/include/libfdt_env.h +++ b/cpukit/include/libfdt_env.h @@ -52,7 +52,6 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <stdbool.h> #include <stddef.h> #include <stdint.h> #include <stdlib.h> |