Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq

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

diff --git a/cmd/blob.c b/cmd/blob.c
index ac8b268e0b83735f7c487a425a8195b0d73f3d4f..80478b8802daa24d56c7f81793fa1d082207c8b1 100644 (file)
--- a/cmd/blob.c
+++ b/cmd/blob.c
@@ -1,19 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  *
  * Command for encapsulating/decapsulating blob of memory.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 #include <command.h>
-#include <environment.h>
 #include <malloc.h>
 #include <asm/byteorder.h>
 #include <linux/compiler.h>
 
-DECLARE_GLOBAL_DATA_PTR;
-
 /**
  * blob_decap() - Decapsulate the data as a blob
  * @key_mod:   - Pointer to key modifier/key
@@ -54,7 +50,7 @@ __weak int blob_encap(u8 *key_mod, u8 *src, u8 *dst, u32 len)
  */
 static int do_blob(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
 {
-       uint32_t key_addr, src_addr, dst_addr, len;
+       ulong key_addr, src_addr, dst_addr, len;
        uint8_t *km_ptr, *src_ptr, *dst_ptr;
        int enc, ret = 0;