spl: fit: Break out some functions into a common file

Some of the functions within spl_fit will be used for non spl purposes.
Instead of duplicating functions simply break the functions to be reused
into its own file.

Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
[trini: Only add the new define to image.h, otherwise we see breakage
due to massive include leakage into host tools in some cases]
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/common/Makefile b/common/Makefile
index 539cf98e19f35b8742454d1188e4110e12affcba..d6d0764e7a9c5d8c49bb477b01c86eb260924aef 100644 (file)
--- a/common/Makefile
+++ b/common/Makefile
@@ -96,6 +96,7 @@ obj-$(CONFIG_SPL_DFU_SUPPORT) += cli_hush.o
 obj-$(CONFIG_SPL_HASH_SUPPORT) += hash.o
 obj-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o
 obj-$(CONFIG_SPL_YMODEM_SUPPORT) += xyzModem.o
+obj-$(CONFIG_SPL_LOAD_FIT) += common_fit.o
 obj-$(CONFIG_SPL_NET_SUPPORT) += miiphyutil.o
 obj-$(CONFIG_SPL_OF_LIBFDT) += fdt_support.o
 ifdef CONFIG_SPL_USB_HOST_SUPPORT

diff --git a/common/common_fit.c b/common/common_fit.c
new file mode 100644 (file)
index 0000000..5f5f3f9
--- /dev/null
+++ b/common/common_fit.c
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2016 Google, Inc
+ * Written by Simon Glass <sjg@chromium.org>
+ *
+ * SPDX-License-Identifier:     GPL-2.0+
+ */
+
+#include <common.h>
+#include <errno.h>
+#include <image.h>
+#include <libfdt.h>
+#include <spl.h>
+
+ulong fdt_getprop_u32(const void *fdt, int node, const char *prop)
+{
+       const u32 *cell;
+       int len;
+
+       cell = fdt_getprop(fdt, node, prop, &len);
+       if (!cell || len != sizeof(*cell))
+               return FDT_ERROR;
+
+       return fdt32_to_cpu(*cell);
+}
+
+/*
+ * Iterate over all /configurations subnodes and call a platform specific
+ * function to find the matching configuration.
+ * Returns the node offset or a negative error number.
+ */
+int fit_find_config_node(const void *fdt)
+{
+       const char *name;
+       int conf, node, len;
+
+       conf = fdt_path_offset(fdt, FIT_CONFS_PATH);
+       if (conf < 0) {
+               debug("%s: Cannot find /configurations node: %d\n", __func__,
+                     conf);
+               return -EINVAL;
+       }
+       for (node = fdt_first_subnode(fdt, conf);
+            node >= 0;
+            node = fdt_next_subnode(fdt, node)) {
+               name = fdt_getprop(fdt, node, "description", &len);
+               if (!name) {
+#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
+                       printf("%s: Missing FDT description in DTB\n",
+                              __func__);
+#endif
+                       return -EINVAL;
+               }
+               if (board_fit_config_name_match(name))
+                       continue;
+
+               debug("Selecting config '%s'", name);
+
+               return node;
+       }
+
+       return -ENOENT;
+}

diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c
index 4c42a96ca3627d1ad7d5b91c19ab78659c703faa..d2a352ecbe430f1d3e3bfae3ae05bba5f568417c 100644 (file)
--- a/common/spl/spl_fit.c
+++ b/common/spl/spl_fit.c
@@ -11,58 +11,6 @@
 #include <libfdt.h>
 #include <spl.h>
 
-#define FDT_ERROR ((ulong)(-1))
-
-static ulong fdt_getprop_u32(const void *fdt, int node, const char *prop)
-{
-       const u32 *cell;
-       int len;
-
-       cell = fdt_getprop(fdt, node, prop, &len);
-       if (!cell || len != sizeof(*cell))
-               return FDT_ERROR;
-
-       return fdt32_to_cpu(*cell);
-}
-
-/*
- * Iterate over all /configurations subnodes and call a platform specific
- * function to find the matching configuration.
- * Returns the node offset or a negative error number.
- */
-static int spl_fit_find_config_node(const void *fdt)
-{
-       const char *name;
-       int conf, node, len;
-
-       conf = fdt_path_offset(fdt, FIT_CONFS_PATH);
-       if (conf < 0) {
-               debug("%s: Cannot find /configurations node: %d\n", __func__,
-                     conf);
-               return -EINVAL;
-       }
-       for (node = fdt_first_subnode(fdt, conf);
-            node >= 0;
-            node = fdt_next_subnode(fdt, node)) {
-               name = fdt_getprop(fdt, node, "description", &len);
-               if (!name) {
-#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
-                       printf("%s: Missing FDT description in DTB\n",
-                              __func__);
-#endif
-                       return -EINVAL;
-               }
-               if (board_fit_config_name_match(name))
-                       continue;
-
-               debug("Selecting config '%s'", name);
-
-               return node;
-       }
-
-       return -ENOENT;
-}
-
 /**
  * spl_fit_get_image_node(): By using the matching configuration subnode,
  * retrieve the name of an image, specified by a property name and an index
@@ -82,7 +30,7 @@ static int spl_fit_get_image_node(const void *fit, int images,
        int node, conf_node;
        int len, i;
 
-       conf_node = spl_fit_find_config_node(fit);
+       conf_node = fit_find_config_node(fit);
        if (conf_node < 0) {
 #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
                printf("No matching DT out of these options:\n");

diff --git a/include/image.h b/include/image.h
index fcfe730204a63e54f9063ad270050e84a0d1d540..1d763b33b833af418492cf52cb2742e94ed564d1 100644 (file)
--- a/include/image.h
+++ b/include/image.h
@@ -1270,6 +1270,8 @@ int board_fit_config_name_match(const char *name);
 void board_fit_image_post_process(void **p_image, size_t *p_size);
 #endif /* CONFIG_SPL_FIT_IMAGE_POST_PROCESS */
 
+#define FDT_ERROR      ((ulong)(-1))
+
 /**
  * Mapping of image types to function handlers to be invoked on the associated
  * loaded images