From: Michael Walle Date: Mon, 1 Jun 2020 23:47:08 +0000 (+0200) Subject: dm: core: fix dev_read_alias_highest_id() without libfdt X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0a6b75f7d8cbf7edc62c7d132b521703f1e2a53d;p=oweals%2Fu-boot.git dm: core: fix dev_read_alias_highest_id() without libfdt If CONFIG_DM_DEV_READ_INLINE is set, dev_read_alias_highest_id() calls libfdt_get_highest_id(). But this function is only available if we have libfdt compiled in. If its not available return -1, which matches the return code for no alias found. This fixes the following error on omapl138_lcdk: arm-linux-gnueabi-ld.bfd: drivers/built-in.o: in function `dev_read_alias_highest_id': /home/mw/repo/u-boot/include/dm/read.h:986: undefined reference to `fdtdec_get_alias_highest_id' Signed-off-by: Michael Walle Reviewed-by: Simon Glass --- diff --git a/include/dm/read.h b/include/dm/read.h index b952551d55..1c1bc3702f 100644 --- a/include/dm/read.h +++ b/include/dm/read.h @@ -983,6 +983,8 @@ static inline u64 dev_translate_dma_address(const struct udevice *dev, static inline int dev_read_alias_highest_id(const char *stem) { + if (!CONFIG_IS_ENABLED(OF_LIBFDT)) + return -1; return fdtdec_get_alias_highest_id(gd->fdt_blob, stem); }