summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWalter Lozano <walter.lozano@collabora.com>2020-07-29 13:17:31 -0300
committerSimon Glass <sjg@chromium.org>2020-09-22 12:50:43 -0600
commitdc447b6b3fef1b145014519f607bb9722455bc16 (patch)
tree99098996a92f6fa563a97c30c872b02f1a0040be
parent2b522f1e79c358465886f90e2923764f58cca81d (diff)
downloadu-boot-dc447b6b3fef1b145014519f607bb9722455bc16.tar.gz
core: improve of_match_ptr with OF_PLATDATA
Currently of_match_ptr is used to avoid referencing compatible strings when OF_CONTROL is not enabled. This behaviour could be improved by taking into account also OF_PLATDATA, as when this configuration is enabled the compatible strings are not used at all. Signed-off-by: Walter Lozano <walter.lozano@collabora.com> Reviewed-by: Simon Glass <sjg@chromium.org>
-rw-r--r--include/dm/device.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/dm/device.h b/include/dm/device.h
index 953706cf52..ac3b6c1b8a 100644
--- a/include/dm/device.h
+++ b/include/dm/device.h
@@ -197,7 +197,7 @@ struct udevice_id {
ulong data;
};
-#if CONFIG_IS_ENABLED(OF_CONTROL)
+#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
#define of_match_ptr(_ptr) (_ptr)
#else
#define of_match_ptr(_ptr) NULL