summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorBin Meng <bmeng.cn@gmail.com>2015-12-07 01:39:47 -0800
committerBin Meng <bmeng.cn@gmail.com>2015-12-09 17:44:36 +0800
commita0ae380b3c32254a6462674cfbfdd763d10bca41 (patch)
tree2b1c1926d46bc4fdfdfec75707d55fb701a63a1e /common
parent8555dd88cd1a7b5dd1e76c111fe635a92223b98b (diff)
downloadblackbird-obmc-uboot-a0ae380b3c32254a6462674cfbfdd763d10bca41.tar.gz
blackbird-obmc-uboot-a0ae380b3c32254a6462674cfbfdd763d10bca41.zip
fdt: Change OF_BAD_ADDR to FDT_ADDR_T_NONE
Currently OF_BAD_ADDR is always -1ULL. When using OF_BAD_ADDR as the return value of dev_get_addr(), it creates potential size mismatch as dev_get_addr() uses FDT_ADDR_T_NONE as the return value which can be either -1U or -1ULL depending on CONFIG_PHYS_64BIT. Now we change OF_BAD_ADDR to FDT_ADDR_T_NONE to avoid such case. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Acked-by: Simon Glass <sjg@chromium.org> Reviewed-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'common')
-rw-r--r--common/fdt_support.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/common/fdt_support.c b/common/fdt_support.c
index a7ff2dfb81..66464dbfd8 100644
--- a/common/fdt_support.c
+++ b/common/fdt_support.c
@@ -16,6 +16,7 @@
#include <libfdt.h>
#include <fdt_support.h>
#include <exports.h>
+#include <fdtdec.h>
/**
* fdt_getprop_u32_default_node - Return a node's property or a default
@@ -950,7 +951,7 @@ 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 ((u64)-1)
+#define OF_BAD_ADDR FDT_ADDR_T_NONE
#define OF_CHECK_COUNTS(na, ns) ((na) > 0 && (na) <= OF_MAX_ADDR_CELLS && \
(ns) > 0)
OpenPOWER on IntegriCloud