mirror/u-boot-2016
1
0
Fork 0
mirror of https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git synced 2025-12-10 07:44:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

bootqca: add key parsing support in bootargs

Browse source 
Change-Id: Ibdd89e117da0bda61793af79d0eb00bacbe7585b
Signed-off-by: Vandhiadevan Karunamoorthy <quic_vkarunam@quicinc.com>
This commit is contained in:
Vandhiadevan Karunamoorthy 2023-07-17 23:15:34 +05:30 • committed by Gerrit - the friendly Code Review server
parent da8430c5fb
commit 4d65cdacde
1 changed files with 55 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
board/qca/arm/common/cmd_bootqca.c
View file

@ -38,6 +38,9 @@
#define PRIMARY_PARTITION 1 #define PRIMARY_PARTITION 1
#define SECONDARY_PARTITION 2 #define SECONDARY_PARTITION 2
#define FIT_KEY_PROP "key"
#define MAX_ARG_SIZE 512
extern int qca_scm_part_info(void *cmd_buf, size_t cmd_len); extern int qca_scm_part_info(void *cmd_buf, size_t cmd_len);
unsigned long __stack_chk_guard = 0x000a0dff; unsigned long __stack_chk_guard = 0x000a0dff;
@ -88,6 +91,49 @@ void __stack_chk_fail(void)
printf("stack-protector: U-boot stack is corrupted.\n"); printf("stack-protector: U-boot stack is corrupted.\n");
bad_mode (); bad_mode ();
} }
static int update_bootargs(void *addr)
{
char *key, *temp, *check, *strings = getenv("bootargs");
char cmd_line[MAX_ARG_SIZE] = { 0 };
int len, size, size2, ret = CMD_RET_SUCCESS;
key = (char *)fdt_getprop(addr, 0, FIT_KEY_PROP, &len);
check = strstr(strings, "dm-mod.create");
if ((key != NULL) && len && (check != NULL)) {
if ((strlen(strings) +
strlen(getenv("fsbootargs")) +
len) > MAX_ARG_SIZE) {
ret = CMD_RET_FAILURE;
} else {
size = (check - strings) + strlen("dm-mod.create") + 2;
memcpy(cmd_line, strings, size);
temp = strchr(strings + size, '"');
size2 = temp - (strings + size);
memcpy(cmd_line + size, strings + size, size2);
size += size2;
snprintf(cmd_line + size, sizeof(cmd_line),
" %s%s %s rootwait",
key, temp, getenv("fsbootargs"));
}
} else {
memcpy(cmd_line, strings, strlen(strings));
len = snprintf(cmd_line + strlen(strings), sizeof(cmd_line),
" %s rootwait", getenv("fsbootargs"));
if (len >= MAX_ARG_SIZE)
ret = CMD_RET_FAILURE;
}
if (ret == CMD_RET_FAILURE) {
printf("Env size exceed ...\n");
} else {
setenv("bootargs", NULL);
setenv("bootargs", cmd_line);
}
return ret;
}
/* /*
* Set the root device and bootargs for mounting root filesystem. * Set the root device and bootargs for mounting root filesystem.
*/ */
@ -197,7 +243,7 @@ static int set_fs_bootargs(int *fs_on_nand)
return -EINVAL; return -EINVAL;
} }
return run_command("setenv bootargs ${bootargs} ${fsbootargs} rootwait", 0); return 0;
} }
int config_select(unsigned int addr, char *rcmd, int rcmd_size) int config_select(unsigned int addr, char *rcmd, int rcmd_size)
@ -212,18 +258,20 @@ int config_select(unsigned int addr, char *rcmd, int rcmd_size)
#ifdef CONFIG_ARCH_IPQ806x #ifdef CONFIG_ARCH_IPQ806x
int soc_version = 0; int soc_version = 0;
#endif #endif
int i, strings_count; int i, strings_count, ret;
const char *config = getenv("config_name"); const char *config = getenv("config_name");
if (config) { if (config) {
printf("Manual device tree config selected!\n"); printf("Manual device tree config selected!\n");
strlcpy(dtb_config_name, config, sizeof(dtb_config_name)); strlcpy(dtb_config_name, config, sizeof(dtb_config_name));
if (fit_conf_get_node((void *)addr, dtb_config_name) >= 0) { if (fit_conf_get_node((void *)addr, dtb_config_name) >= 0) {
ret = update_bootargs((void *)addr);
if (ret)
goto fail;
snprintf(rcmd, rcmd_size, "bootm 0x%x#%s\n", snprintf(rcmd, rcmd_size, "bootm 0x%x#%s\n",
addr, dtb_config_name); addr, dtb_config_name);
return 0; return 0;
} }
} else { } else {
strings_count = fdt_count_strings(gd->fdt_blob, 0, "config_name"); strings_count = fdt_count_strings(gd->fdt_blob, 0, "config_name");
@ -250,6 +298,9 @@ int config_select(unsigned int addr, char *rcmd, int rcmd_size)
} }
#endif #endif
if (fit_conf_get_node((void *)addr, dtb_config_name) >= 0) { if (fit_conf_get_node((void *)addr, dtb_config_name) >= 0) {
ret = update_bootargs((void *)addr);
if (ret)
goto fail;
snprintf(rcmd, rcmd_size, "bootm 0x%x#%s\n", snprintf(rcmd, rcmd_size, "bootm 0x%x#%s\n",
addr, dtb_config_name); addr, dtb_config_name);
return 0; return 0;
@ -257,8 +308,8 @@ int config_select(unsigned int addr, char *rcmd, int rcmd_size)
} }
} }
printf("Config not available\n"); printf("Config not available\n");
fail:
return -1; return -1;
} }