cmd: fdt: Use separate CMD_FDT Kconfig entry instead of OF_LIBFDT

Create CMD_FDT Kconfig entry to have an option to disable fdt command
which is not required for small configuration which requires libfdt
only.
Enable it by default for all targets which enables OF_LIBFDT.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
[trini: Fixup flea3/sandbox/id8313/siemens-am33xx/smartweb]
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/cmd/Kconfig b/cmd/Kconfig
index fe8b4f0510da1586969621243c6894cb740d2ccf..8703cdb4a9bebe8a007f60717639bf6966d20ff6 100644 (file)
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -173,6 +173,13 @@ config CMD_ELF
        help
          Boot an ELF/vxWorks image from the memory.
 
+config CMD_FDT
+       bool "Flattened Device Tree utility commands"
+       default y
+       depends on OF_LIBFDT
+       help
+         Do FDT related setup before booting into the Operating System.
+
 config CMD_GO
        bool "go"
        default y

diff --git a/cmd/Makefile b/cmd/Makefile
index ba041973079cdf2e87d7742aeac622c192e1694c..f95759e6704424ea9edfb258d79937d68d783c91 100644 (file)
--- a/cmd/Makefile
+++ b/cmd/Makefile
@@ -54,7 +54,7 @@ obj-$(CONFIG_CMD_EXT4) += ext4.o
 obj-$(CONFIG_CMD_EXT2) += ext2.o
 obj-$(CONFIG_CMD_FAT) += fat.o
 obj-$(CONFIG_CMD_FDC) += fdc.o
-obj-$(CONFIG_OF_LIBFDT) += fdt.o
+obj-$(CONFIG_CMD_FDT) += fdt.o
 obj-$(CONFIG_CMD_FITUPD) += fitupd.o
 obj-$(CONFIG_CMD_FLASH) += flash.o
 ifdef CONFIG_FPGA

diff --git a/include/configs/flea3.h b/include/configs/flea3.h
index 3e4aaf6cd65b66ee37baf02b6cfa2ca074a239d3..15905b984065c072449b75ef791efa07bc838d2e 100644 (file)
--- a/include/configs/flea3.h
+++ b/include/configs/flea3.h
@@ -250,7 +250,4 @@
                "else echo U-Boot not downloaded..exiting;fi\0"         \
        "bootcmd=run net_nfs\0"
 
-/* Enable FIT images support */
-#define CONFIG_CMD_FDT
-
 #endif                         /* __CONFIG_H */

diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h
index 5855d81858ef5469a46a0561c4d756debea31ed0..de51d10068ab99f478cae511076c5751d317419d 100644 (file)
--- a/include/configs/ids8313.h
+++ b/include/configs/ids8313.h
@@ -559,7 +559,6 @@
 #define CONFIG_VERSION_VARIABLE
 
 #define CONFIG_IMAGE_FORMAT_LEGACY
-#define CONFIG_CMD_FDT
 #define CONFIG_CMD_HASH
 #define CONFIG_SHA1
 #define CONFIG_SHA256

diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index cc224674421994158088cf7b32c0c4c664d2a300..2dd7fc0f7ccc5a7e1cb70ba1ee3e2da5b1534e50 100644 (file)
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -29,7 +29,6 @@
 #define CONFIG_SANDBOX_BITS_PER_LONG   64
 
 #define CONFIG_LMB
-#define CONFIG_CMD_FDT
 #define CONFIG_ANDROID_BOOT_IMAGE
 
 #define CONFIG_CMD_PCI

diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index df2a514b5174ddac46df7e34145d21d35e01e532..8ea31a6b33b337a49e277a42dffc9566bee90e11 100644 (file)
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -623,7 +623,4 @@
 #define CONFIG_BOOTCOUNT_LIMIT
 #define CONFIG_BOOTCOUNT_ENV
 
-/* Enable Device-Tree (FDT) support */
-#define CONFIG_CMD_FDT
-
 #endif /* ! __CONFIG_SIEMENS_AM33X_COMMON_H */

diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h
index db820ba7fed62d058cfd738c48e8cd68e5ccb8c9..7dcb82b53b6aaac981c4ac706c8f70f2fca6f7a7 100644 (file)
--- a/include/configs/smartweb.h
+++ b/include/configs/smartweb.h
@@ -240,8 +240,6 @@
 # undef CONFIG_CMD_NFS
 #endif /* CONFIG_MACB */
 
-#define CONFIG_CMD_FDT
-
 #ifdef CONFIG_SPL_BUILD
 #define CONFIG_SYS_INIT_SP_ADDR                0x301000
 #define CONFIG_SPL_STACK_R