diff mbox series

[v3,15/23] m53menlo: define ft_board_setup only if CONFIG_IS_ENABLED(OF_LIBFDT)

Message ID 20230313213146.1775650-16-troykiskyboundary@gmail.com
State Accepted
Commit e775fc676aafada90e6513c240b23cf06e11afc1
Delegated to: Tom Rini
Headers show
Series CONFIG_IS_ENABLED vs IS_ENABLED | expand

Commit Message

Troy Kisky March 13, 2023, 9:31 p.m. UTC 
The function ft_board_setup calls do_fixup_by_path_string
which is only available on CONFIG_IS_ENABLED(OF_LIBFDT).
This prepares for the conversion.

ft_board_setup is only called from image-fdt which is linked by
obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += image-fdt.o

Signed-off-by: Troy Kisky <troykiskyboundary@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

(no changes since v1)

 board/menlo/m53menlo/m53menlo.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Tom Rini May 11, 2023, 7:31 p.m. UTC | #1 
On Mon, Mar 13, 2023 at 02:31:37PM -0700, Troy Kisky wrote:

> The function ft_board_setup calls do_fixup_by_path_string
> which is only available on CONFIG_IS_ENABLED(OF_LIBFDT).
> This prepares for the conversion.
> 
> ft_board_setup is only called from image-fdt which is linked by
> obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += image-fdt.o
> 
> Signed-off-by: Troy Kisky <troykiskyboundary@gmail.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>

Applied to u-boot/next, thanks!
diff mbox series

Patch

diff --git a/board/menlo/m53menlo/m53menlo.c b/board/menlo/m53menlo/m53menlo.c
index 14324c7087d..ca3b81c57ff 100644
--- a/board/menlo/m53menlo/m53menlo.c
+++ b/board/menlo/m53menlo/m53menlo.c
@@ -264,6 +264,7 @@  void board_preboot_os(void)
 	gpio_direction_output(IMX_GPIO_NR(6, 0), 0);
 }
 
+#if CONFIG_IS_ENABLED(OF_LIBFDT)
 int ft_board_setup(void *blob, struct bd_info *bd)
 {
 	if (lvds_compat_string)
@@ -272,6 +273,7 @@  int ft_board_setup(void *blob, struct bd_info *bd)
 
 	return 0;
 }
+#endif
 
 struct display_info_t const displays[] = {
 	{