nearology/u-boot
1
0
Fork 0
Code Actions Activity

Merge branch 'master' of git://www.denx.de/git/u-boot-dm

Browse Source
This commit is contained in:
Tom Rini
2016-12-03 19:43:51 -05:00
parent bfb380b30a a2558e8729
commit 73eed452b9
45 changed files with 790 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/cros_ec.c
+23
View File
@@ -19,6 +19,29 @@ static const char * const ec_current_image_name[] = {"unknown", "RO", "RW"};
DECLARE_GLOBAL_DATA_PTR;
/**
* Decode a flash region parameter
*
* @param argc Number of params remaining
* @param argv List of remaining parameters
* @return flash region (EC_FLASH_REGION_...) or -1 on error
*/
static int cros_ec_decode_region(int argc, char * const argv[])
{
if (argc > 0) {
if (0 == strcmp(*argv, "rw"))
return EC_FLASH_REGION_RW;
else if (0 == strcmp(*argv, "ro"))
return EC_FLASH_REGION_RO;
debug("%s: Invalid region '%s'\n", __func__, *argv);
} else {
debug("%s: Missing region parameter\n", __func__);
}
return -1;
}
/**
* Perform a flash read or write command
*
cmd/fdt.c
+10 -12
View File
@@ -206,7 +206,17 @@ static int do_fdt(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
return 1;
}
working_fdt = newaddr;
#ifdef CONFIG_OF_SYSTEM_SETUP
/* Call the board-specific fixup routine */
} else if (strncmp(argv[1], "sys", 3) == 0) {
int err = ft_system_setup(working_fdt, gd->bd);
if (err) {
printf("Failed to add system information to FDT: %s\n",
fdt_strerror(err));
return CMD_RET_FAILURE;
}
#endif
/*
* Make a new node
*/
@@ -576,18 +586,6 @@ static int do_fdt(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
return CMD_RET_FAILURE;
}
}
#endif
#ifdef CONFIG_OF_SYSTEM_SETUP
/* Call the board-specific fixup routine */
else if (strncmp(argv[1], "sys", 3) == 0) {
int err = ft_system_setup(working_fdt, gd->bd);
if (err) {
printf("Failed to add system information to FDT: %s\n",
fdt_strerror(err));
return CMD_RET_FAILURE;
}
}
#endif
/* Create a chosen node */
else if (strncmp(argv[1], "cho", 3) == 0) {
cmd/tpm_test.c
+6 -6
View File
@@ -532,15 +532,15 @@ static cmd_tbl_t cmd_cros_tpm_sub[] = {
static int do_tpmtest(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
cmd_tbl_t *c;
int i;
printf("argc = %d, argv = ", argc);
do {
int i = 0;
for (i = 0; i < argc; i++)
printf(" %s", argv[i]);
printf("\n------\n");
} while (0);
for (i = 0; i < argc; i++)
printf(" %s", argv[i]);
printf("\n------\n");
argc--;
argv++;
c = find_cmd_tbl(argv[0], cmd_cros_tpm_sub,