test/py: test_ut.py: Ensure we use bytes

[oweals/u-boot.git] / cmd / source.c

diff --git a/cmd/source.c b/cmd/source.c
index db7ab7e5f4092a0b996f96702e4ed53b9cd897bb..3a51ebf0b665c5d58db508f5d6b453f1bd64463a 100644 (file)
--- a/cmd/source.c
+++ b/cmd/source.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2001
  * Kyle Harris, kharris@nexus-tech.net
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /*
@@ -17,20 +16,36 @@
 
 #include <common.h>
 #include <command.h>
+#include <env.h>
 #include <image.h>
 #include <malloc.h>
 #include <mapmem.h>
 #include <asm/byteorder.h>
 #include <asm/io.h>
-#if defined(CONFIG_8xx)
-#include <mpc8xx.h>
+
+#if defined(CONFIG_FIT)
+/**
+ * get_default_image() - Return default property from /images
+ *
+ * Return: Pointer to value of default property (or NULL)
+ */
+static const char *get_default_image(const void *fit)
+{
+       int images_noffset;
+
+       images_noffset = fdt_path_offset(fit, FIT_IMAGES_PATH);
+       if (images_noffset < 0)
+               return NULL;
+
+       return fdt_getprop(fit, images_noffset, FIT_DEFAULT_PROP, NULL);
+}
 #endif
 
 int
 source (ulong addr, const char *fit_uname)
 {
        ulong           len;
-#if defined(CONFIG_IMAGE_FORMAT_LEGACY)
+#if defined(CONFIG_LEGACY_IMAGE_FORMAT)
        const image_header_t *hdr;
 #endif
        u32             *data;
@@ -43,11 +58,11 @@ source (ulong addr, const char *fit_uname)
        size_t          fit_len;
 #endif
 
-       verify = getenv_yesno ("verify");
+       verify = env_get_yesno("verify");
 
        buf = map_sysmem(addr, 0);
        switch (genimg_get_format(buf)) {
-#if defined(CONFIG_IMAGE_FORMAT_LEGACY)
+#if defined(CONFIG_LEGACY_IMAGE_FORMAT)
        case IMAGE_FORMAT_LEGACY:
                hdr = buf;
 
@@ -91,17 +106,20 @@ source (ulong addr, const char *fit_uname)
 #endif
 #if defined(CONFIG_FIT)
        case IMAGE_FORMAT_FIT:
-               if (fit_uname == NULL) {
-                       puts ("No FIT subimage unit name\n");
-                       return 1;
-               }
-
                fit_hdr = buf;
                if (!fit_check_format (fit_hdr)) {
                        puts ("Bad FIT image format\n");
                        return 1;
                }
 
+               if (!fit_uname)
+                       fit_uname = get_default_image(fit_hdr);
+
+               if (!fit_uname) {
+                       puts("No FIT subimage unit name\n");
+                       return 1;
+               }
+
                /* get script component image node offset */
                noffset = fit_image_get_node (fit_hdr, fit_uname);
                if (noffset < 0) {