rockchip: Enable PCIe/M.2 and NVMe on Firefly RK3399

[oweals/u-boot.git] / common / image-fit.c

diff --git a/common/image-fit.c b/common/image-fit.c
index 4435bc4f1d9389a34154ad5b835e2d67b656c364..1ece100a21455bc0f699c1dacd562ee619e1966a 100644 (file)
--- a/common/image-fit.c
+++ b/common/image-fit.c
@@ -11,12 +11,14 @@
 #ifdef USE_HOSTCC
 #include "mkimage.h"
 #include <time.h>
+#include <linux/libfdt.h>
 #include <u-boot/crc.h>
 #else
 #include <linux/compiler.h>
 #include <linux/kconfig.h>
 #include <common.h>
 #include <errno.h>
+#include <log.h>
 #include <mapmem.h>
 #include <asm/io.h>
 #include <malloc.h>
@@ -168,7 +170,7 @@ static void fit_image_print_data(const void *fit, int noffset, const char *p,
        int value_len;
        char *algo;
        const char *padding;
-       int required;
+       bool required;
        int ret, i;
 
        debug("%s  %s node:    '%s'\n", p, type,
@@ -179,8 +181,8 @@ static void fit_image_print_data(const void *fit, int noffset, const char *p,
                return;
        }
        printf("%s", algo);
-       keyname = fdt_getprop(fit, noffset, "key-name-hint", NULL);
-       required = fdt_getprop(fit, noffset, "required", NULL) != NULL;
+       keyname = fdt_getprop(fit, noffset, FIT_KEY_HINT, NULL);
+       required = fdt_getprop(fit, noffset, FIT_KEY_REQUIRED, NULL) != NULL;
        if (keyname)
                printf(":%s", keyname);
        if (required)
@@ -1271,7 +1273,7 @@ int fit_image_verify_with_data(const void *fit, int image_noffset,
        int ret;
 
        /* Verify all required signatures */
-       if (IMAGE_ENABLE_VERIFY &&
+       if (FIT_IMAGE_ENABLE_VERIFY &&
            fit_image_verify_required_sigs(fit, image_noffset, data, size,
                                           gd_fdt_blob(), &verify_all)) {
                err_msg = "Unable to verify required signature";
@@ -1293,7 +1295,7 @@ int fit_image_verify_with_data(const void *fit, int image_noffset,
                                                 &err_msg))
                                goto error;
                        puts("+ ");
-               } else if (IMAGE_ENABLE_VERIFY && verify_all &&
+               } else if (FIT_IMAGE_ENABLE_VERIFY && verify_all &&
                                !strncmp(name, FIT_SIG_NODENAME,
                                        strlen(FIT_SIG_NODENAME))) {
                        ret = fit_image_check_sig(fit, noffset, data,
@@ -1712,24 +1714,6 @@ int fit_conf_find_compat(const void *fit, const void *fdt)
        return best_match_offset;
 }
 
-/**
- * fit_conf_get_node - get node offset for configuration of a given unit name
- * @fit: pointer to the FIT format image header
- * @conf_uname: configuration node unit name
- *
- * fit_conf_get_node() finds a configuration (within the '/configurations'
- * parent node) of a provided unit name. If configuration is found its node
- * offset is returned to the caller.
- *
- * When NULL is provided in second argument fit_conf_get_node() will search
- * for a default configuration node instead. Default configuration node unit
- * name is retrieved from FIT_DEFAULT_PROP property of the '/configurations'
- * node.
- *
- * returns:
- *     configuration node offset when found (>=0)
- *     negative number on failure (FDT_ERR_* code)
- */
 int fit_conf_get_node(const void *fit, const char *conf_uname)
 {
        int noffset, confs_noffset;
@@ -1951,7 +1935,7 @@ int fit_image_load(bootm_headers_t *images, ulong addr,
                if (image_type == IH_TYPE_KERNEL)
                        images->fit_uname_cfg = fit_base_uname_config;
 
-               if (IMAGE_ENABLE_VERIFY && images->verify) {
+               if (FIT_IMAGE_ENABLE_VERIFY && images->verify) {
                        puts("   Verifying Hash Integrity ... ");
                        if (fit_config_verify(fit, cfg_noffset)) {
                                puts("Bad Data Hash\n");
@@ -1969,7 +1953,7 @@ int fit_image_load(bootm_headers_t *images, ulong addr,
                fit_uname = fit_get_name(fit, noffset, NULL);
        }
        if (noffset < 0) {
-               puts("Could not find subimage node\n");
+               printf("Could not find subimage node type '%s'\n", prop_name);
                bootstage_error(bootstage_id + BOOTSTAGE_SUB_SUBNODE);
                return -ENOENT;
        }
@@ -2007,7 +1991,8 @@ int fit_image_load(bootm_headers_t *images, ulong addr,
                fit_image_check_os(fit, noffset, IH_OS_LINUX) ||
                fit_image_check_os(fit, noffset, IH_OS_U_BOOT) ||
                fit_image_check_os(fit, noffset, IH_OS_OPENRTOS) ||
-               fit_image_check_os(fit, noffset, IH_OS_EFI);
+               fit_image_check_os(fit, noffset, IH_OS_EFI) ||
+               fit_image_check_os(fit, noffset, IH_OS_VXWORKS);
 
        /*
         * If either of the checks fail, we should report an error, but