Move fdt_simplefb to boot/

This relates to booting, so move it there. Create a new Kconfig menu for
things related to devicetree fixup.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/boot/Kconfig b/boot/Kconfig
index 0a98f1e22207fb635947e9377ef42a64c9433eef..39c51e9e2fe8ec845bb7946f4b047b1808cc4824 100644 (file)
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -1538,6 +1538,22 @@ config SPL_IMAGE_PRE_LOAD_SIG
 
 endmenu
 
+if OF_LIBFDT
+
+menu "Devicetree fixup"
+
+config FDT_SIMPLEFB
+       bool "FDT tools for simplefb support"
+       help
+         Enable the fdt tools to manage the simple fb nodes in device tree.
+         These functions can be used by board to indicate to the OS
+         the presence of the simple frame buffer with associated reserved
+         memory
+
+endmenu
+
+endif # OF_LIBFDT
+
 config USE_BOOTARGS
        bool "Enable boot arguments"
        help

diff --git a/boot/Makefile b/boot/Makefile
index f15a161614ffb45baa16719a27e0c17bbb83f8d7..6ce983b83fa4dccf8ba0748611b7dc763255f642 100644 (file)
--- a/boot/Makefile
+++ b/boot/Makefile
@@ -39,6 +39,7 @@ obj-$(CONFIG_$(SPL_TPL_)CEDIT) += cedit.o
 endif
 
 obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o
+obj-$(CONFIG_$(SPL_TPL_)FDT_SIMPLEFB) += fdt_simplefb.o
 
 obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += image-fdt.o
 obj-$(CONFIG_$(SPL_TPL_)FIT_SIGNATURE) += fdt_region.o

diff --git a/common/fdt_simplefb.c b/boot/fdt_simplefb.c
similarity index 100%
rename from common/fdt_simplefb.c
rename to boot/fdt_simplefb.c

diff --git a/common/Kconfig b/common/Kconfig
index d11292f52c2befce540834f189462d34cd6dfe71..21eaa5e815f9b55c6a7d4cd8b9f7cddf66e06761 100644 (file)
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -1157,14 +1157,5 @@ config VPL_IMAGE_SIGN_INFO
 
 endif
 
-config FDT_SIMPLEFB
-       bool "FDT tools for simplefb support"
-       depends on OF_LIBFDT
-       help
-         Enable the fdt tools to manage the simple fb nodes in device tree.
-         These functions can be used by board to indicate to the OS
-         the presence of the simple frame buffer with associated reserved
-         memory
-
 config IO_TRACE
        bool

diff --git a/common/Makefile b/common/Makefile
index 0948721d0b4757be4f367204cb5365fc4e81d3e9..5c1617206f07b3d724690e0193c59ded5ba08fa1 100644 (file)
--- a/common/Makefile
+++ b/common/Makefile
@@ -17,7 +17,6 @@ obj-y += board_r.o
 obj-$(CONFIG_DISPLAY_BOARDINFO) += board_info.o
 obj-$(CONFIG_DISPLAY_BOARDINFO_LATE) += board_info.o
 
-obj-$(CONFIG_FDT_SIMPLEFB) += fdt_simplefb.o
 obj-$(CONFIG_MII) += miiphyutil.o
 obj-$(CONFIG_CMD_MII) += miiphyutil.o
 obj-$(CONFIG_PHYLIB) += miiphyutil.o