diff options
| author | Tom Rini <trini@konsulko.com> | 2021-05-12 10:07:21 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-05-12 10:07:21 -0400 |
| commit | ea184cbff99ea1d82dcf94c95afe054e95da5069 (patch) | |
| tree | 48553e6cf25f0b5f34483c3fddafdebbbc240b55 /common/fdt_support.c | |
| parent | 59a2b9e605c5a5e2dff35506a13b51f33d3051b4 (diff) | |
| parent | bbc9da58b332bd44e51ac5579040ea984b2f963b (diff) | |
Merge tag 'ti-v2021.07-rc3' of https://source.denx.de/u-boot/custodians/u-boot-ti
- Initial support for AM64 EVM and SK
- K3 DDR driver unification for J7 and AM64 platforms.
- Minor fixes for TI clock driver
Diffstat (limited to 'common/fdt_support.c')
| -rw-r--r-- | common/fdt_support.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/common/fdt_support.c b/common/fdt_support.c index 7eb5ba3bb28..695d8e134aa 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -20,8 +20,6 @@ #include <exports.h> #include <fdtdec.h> -DECLARE_GLOBAL_DATA_PTR; - /** * fdt_getprop_u32_default_node - Return a node's property or a default * @@ -1001,8 +999,8 @@ void fdt_del_node_and_alias(void *blob, const char *alias) /* Max address size we deal with */ #define OF_MAX_ADDR_CELLS 4 #define OF_BAD_ADDR FDT_ADDR_T_NONE -#define OF_CHECK_COUNTS(na, ns) (((na) > 0 && (na) <= OF_MAX_ADDR_CELLS) && \ - ((ns) > 0 || gd_size_cells_0())) +#define OF_CHECK_COUNTS(na, ns) ((na) > 0 && (na) <= OF_MAX_ADDR_CELLS && \ + (ns) > 0) /* Debug utility */ #ifdef DEBUG |