summaryrefslogtreecommitdiffstats
path: root/common/cmd_blob.c
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2016-01-17 20:53:51 -0700
committerTom Rini <trini@konsulko.com>2016-01-25 10:39:43 -0500
commit72a8cf8dccf6f8b86d1683205e032a94eaa86938 (patch)
treeb29378eb8af182f0faf2028cb52465a021de40cc /common/cmd_blob.c
parent25d5352c71dcc599030a4a764d8087185ed537d3 (diff)
downloadtalos-obmc-uboot-72a8cf8dccf6f8b86d1683205e032a94eaa86938.tar.gz
talos-obmc-uboot-72a8cf8dccf6f8b86d1683205e032a94eaa86938.zip
Move all command code into its own directory
There are a lot of unrelated files in common, including all of the commands. Moving them into their own directory makes them easier to find and is more logical. Some commands include non-command code, such as cmd_scsi.c. This should be sorted out at some point so that the function can be enabled with or without the associated command. Unfortunately, with m68k I get this error: m68k: + M5329AFEE +arch/m68k/cpu/mcf532x/start.o: In function `_start': +arch/m68k/cpu/mcf532x/start.S:159:(.text+0x452): relocation truncated to fit: R_68K_PC16 against symbol `board_init_f' defined in .text.board_init_f section in common/built-in.o I hope someone can shed some light on what this means. I hope it isn't depending on the position of code in the image. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Heiko Schocher <hs@denx.de> Acked-by: Stefan Roese <sr@denx.de> Acked-by: Przemyslaw Marczak <p.marczak@samsung.com>
Diffstat (limited to 'common/cmd_blob.c')
-rw-r--r--common/cmd_blob.c111
1 files changed, 0 insertions, 111 deletions
diff --git a/common/cmd_blob.c b/common/cmd_blob.c
deleted file mode 100644
index ac8b268e0b..0000000000
--- a/common/cmd_blob.c
+++ /dev/null
@@ -1,111 +0,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
- * @src: - Address of data to be decapsulated
- * @dst: - Address of data to be decapsulated
- * @len: - Size of data to be decapsulated
- *
- * Returns zero on success,and negative on error.
- */
-__weak int blob_decap(u8 *key_mod, u8 *src, u8 *dst, u32 len)
-{
- return 0;
-}
-
-/**
- * blob_encap() - Encapsulate the data as a blob
- * @key_mod: - Pointer to key modifier/key
- * @src: - Address of data to be encapsulated
- * @dst: - Address of data to be encapsulated
- * @len: - Size of data to be encapsulated
- *
- * Returns zero on success,and negative on error.
- */
-__weak int blob_encap(u8 *key_mod, u8 *src, u8 *dst, u32 len)
-{
- return 0;
-}
-
-/**
- * do_blob() - Handle the "blob" command-line command
- * @cmdtp: Command data struct pointer
- * @flag: Command flag
- * @argc: Command-line argument count
- * @argv: Array of command-line arguments
- *
- * Returns zero on success, CMD_RET_USAGE in case of misuse and negative
- * on error.
- */
-static int do_blob(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
-{
- uint32_t key_addr, src_addr, dst_addr, len;
- uint8_t *km_ptr, *src_ptr, *dst_ptr;
- int enc, ret = 0;
-
- if (argc != 6)
- return CMD_RET_USAGE;
-
- if (!strncmp(argv[1], "enc", 3))
- enc = 1;
- else if (!strncmp(argv[1], "dec", 3))
- enc = 0;
- else
- return CMD_RET_USAGE;
-
- src_addr = simple_strtoul(argv[2], NULL, 16);
- dst_addr = simple_strtoul(argv[3], NULL, 16);
- len = simple_strtoul(argv[4], NULL, 16);
- key_addr = simple_strtoul(argv[5], NULL, 16);
-
- km_ptr = (uint8_t *)(uintptr_t)key_addr;
- src_ptr = (uint8_t *)(uintptr_t)src_addr;
- dst_ptr = (uint8_t *)(uintptr_t)dst_addr;
-
- if (enc)
- ret = blob_encap(km_ptr, src_ptr, dst_ptr, len);
- else
- ret = blob_decap(km_ptr, src_ptr, dst_ptr, len);
-
- return ret;
-}
-
-/***************************************************/
-static char blob_help_text[] =
- "enc src dst len km - Encapsulate and create blob of data\n"
- " $len bytes long at address $src and\n"
- " store the result at address $dst.\n"
- " $km is the address where the key\n"
- " modifier is stored.\n"
- " The modifier is required for generation\n"
- " /use as key for cryptographic operation.\n"
- " Key modifier should be 16 byte long.\n"
- "blob dec src dst len km - Decapsulate the blob of data at address\n"
- " $src and store result of $len byte at\n"
- " addr $dst.\n"
- " $km is the address where the key\n"
- " modifier is stored.\n"
- " The modifier is required for generation\n"
- " /use as key for cryptographic operation.\n"
- " Key modifier should be 16 byte long.\n";
-
-U_BOOT_CMD(
- blob, 6, 1, do_blob,
- "Blob encapsulation/decryption",
- blob_help_text
-);
OpenPOWER on IntegriCloud