qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmd: move "rkimgtest" to individual file 

The command is used for all image type, it should not depend on bootrkp.c

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I8d27318485c7e7ffb8c4e06112396fa18e8b2dc0
This commit is contained in:
Joseph Chen 2020-01-06 19:28:36 +08:00
parent 6f3562b04c
commit 73ec4e0398
3 changed files with 65 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/Makefile
View File

@ -168,6 +168,8 @@ obj-$(CONFIG_CMD_REGULATOR) += regulator.o
obj-$(CONFIG_CMD_DVFS) += dvfs.o obj-$(CONFIG_CMD_DVFS) += dvfs.o
obj-$(CONFIG_CMD_BLOB) += blob.o obj-$(CONFIG_CMD_BLOB) += blob.o
obj-$(CONFIG_ARCH_ROCKCHIP) += rkimgtest.o
endif # !CONFIG_SPL_BUILD endif # !CONFIG_SPL_BUILD
# core command # core command

52
cmd/bootrkp.c Executable file → Normal file
View File

@ -79,55 +79,3 @@ U_BOOT_CMD(
"boot.img: ramdisk\n" "boot.img: ramdisk\n"
"resource.img: dtb, u-boot logo, kernel logo" "resource.img: dtb, u-boot logo, kernel logo"
); );
static int do_rkimg_test(cmd_tbl_t *cmdtp, int flag, int argc,
char *const argv[])
{
struct blk_desc *dev_desc;
u32 *buffer;
int ret;
dev_desc = blk_get_dev(argv[1], simple_strtoul(argv[2], NULL, 16));
if (!dev_desc) {
printf("%s: dev_desc is NULL!\n", __func__);
return CMD_RET_FAILURE;
}
/* Read one block from beginning of IDB data */
buffer = memalign(ARCH_DMA_MINALIGN, 1024);
ret = blk_dread(dev_desc, 64, 2, buffer);
if (ret != 2) {
printf("%s: Fail to read data from IDB\n", __func__);
free(buffer);
return CMD_RET_FAILURE;
}
if (buffer[0] == 0xFCDC8C3B) {
ret = CMD_RET_SUCCESS;
if (!strcmp("mmc", argv[1]))
printf("Found IDB in SDcard\n");
else
printf("Found IDB in U-disk\n");
/* TAG in IDB */
if (0 == buffer[128 + 104 / 4]) {
if (!strcmp("mmc", argv[1]))
env_update("bootargs", "sdfwupdate");
else
env_update("bootargs", "usbfwupdate");
}
} else {
ret = CMD_RET_FAILURE;
}
free(buffer);
return ret;
}
U_BOOT_CMD(
rkimgtest, 3, 0, do_rkimg_test,
"Test if storage media have rockchip image",
""
);

63
cmd/rkimgtest.c Normal file
View File

@ -0,0 +1,63 @@
/*
* (C) Copyright 2019 Rockchip Electronics Co., Ltd
*
* SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
#include <malloc.h>
static int do_rkimg_test(cmd_tbl_t *cmdtp, int flag,
int argc, char *const argv[])
{
struct blk_desc *dev_desc;
u32 *buffer;
int ret;
if (argc != 3)
return CMD_RET_USAGE;
dev_desc = blk_get_dev(argv[1], simple_strtoul(argv[2], NULL, 16));
if (!dev_desc) {
printf("%s: dev_desc is NULL!\n", __func__);
return CMD_RET_FAILURE;
}
/* read one block from beginning of IDB data */
buffer = memalign(ARCH_DMA_MINALIGN, 1024);
ret = blk_dread(dev_desc, 64, 2, buffer);
if (ret != 2) {
printf("%s: Failed to read data from IDB\n", __func__);
free(buffer);
return CMD_RET_FAILURE;
}
if (buffer[0] == 0xFCDC8C3B) {
ret = CMD_RET_SUCCESS;
if (!strcmp("mmc", argv[1]))
printf("Found IDB in SDcard\n");
else
printf("Found IDB in U-disk\n");
/* TAG in IDB */
if (0 == buffer[128 + 104 / 4]) {
if (!strcmp("mmc", argv[1]))
env_update("bootargs", "sdfwupdate");
else
env_update("bootargs", "usbfwupdate");
}
} else {
ret = CMD_RET_FAILURE;
}
free(buffer);
return ret;
}
U_BOOT_CMD(
rkimgtest, 3, 0, do_rkimg_test,
"Test if storage media have rockchip image",
"<devtype> <devnum>"
);