LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

board: ge: bx50v3: remove confidx magic numbers 

Instead of hardcoding index magic numbers in the board code,
also rely on board_fit_config_name_match choosing the right
config for the fitImage containing the kernel.

Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
This commit is contained in:
Sebastian Reichel 2020-12-15 00:41:56 +01:00 committed by Stefano Babic
parent db43c0b72d
commit c44d374bef
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
board/ge/bx50v3/bx50v3.c
View File

@ -356,15 +356,12 @@ static void process_vpd(struct vpd_cache *vpd)
switch (vpd->product_id) { switch (vpd->product_id) {
case VPD_PRODUCT_B450: case VPD_PRODUCT_B450:
env_set("confidx", "1");
i210_index = 1; i210_index = 1;
break; break;
case VPD_PRODUCT_B650: case VPD_PRODUCT_B650:
env_set("confidx", "2");
i210_index = 1; i210_index = 1;
break; break;
case VPD_PRODUCT_B850: case VPD_PRODUCT_B850:
env_set("confidx", "3");
i210_index = 2; i210_index = 2;
break; break;
} }
@ -554,16 +551,23 @@ int ft_board_setup(void *blob, struct bd_info *bd)
int board_fit_config_name_match(const char *name) int board_fit_config_name_match(const char *name)
{ {
const char *machine = name;
if (!vpd.is_read) if (!vpd.is_read)
return strcmp(name, "imx6q-bx50v3"); return strcmp(name, "imx6q-bx50v3");
if (!strncmp(machine, "Boot ", 5))
machine += 5;
if (!strncmp(machine, "imx6q-", 6))
machine += 6;
switch (vpd.product_id) { switch (vpd.product_id) {
case VPD_PRODUCT_B450: case VPD_PRODUCT_B450:
return strcmp(name, "imx6q-b450v3"); return strcasecmp(machine, "b450v3");
case VPD_PRODUCT_B650: case VPD_PRODUCT_B650:
return strcmp(name, "imx6q-b650v3"); return strcasecmp(machine, "b650v3");
case VPD_PRODUCT_B850: case VPD_PRODUCT_B850:
return strcmp(name, "imx6q-b850v3"); return strcasecmp(machine, "b850v3");
default: default:
return -1; return -1;
} }

4
include/configs/ge_bx50v3.h
View File

@ -62,7 +62,7 @@
"networkboot=" \ "networkboot=" \
"run setnetworkboot; " \ "run setnetworkboot; " \
"nfs ${loadaddr} /srv/nfs/fitImage; " \ "nfs ${loadaddr} /srv/nfs/fitImage; " \
"bootm ${loadaddr}#conf@${confidx}\0" \ "bootm ${loadaddr}\0" \
#define CONFIG_NETWORKBOOTCOMMAND \ #define CONFIG_NETWORKBOOTCOMMAND \
"run networkboot; " \ "run networkboot; " \
@ -111,7 +111,7 @@
"doboot=" \ "doboot=" \
"echo Booting from ${dev}:${devnum}:${partnum} ...; " \ "echo Booting from ${dev}:${devnum}:${partnum} ...; " \
"run setargs; " \ "run setargs; " \
"bootm ${loadaddr}#conf@${confidx}\0" \ "bootm ${loadaddr}\0" \
"tryboot=" \ "tryboot=" \
"setenv partnum 1; run hasfirstboot || setenv partnum 2; " \ "setenv partnum 1; run hasfirstboot || setenv partnum 2; " \
"run loadimage || run swappartitions && run loadimage || " \ "run loadimage || run swappartitions && run loadimage || " \