diff options
| author | Igor Opaniuk <igor.opaniuk@toradex.com> | 2020-04-15 16:09:19 +0300 |
|---|---|---|
| committer | Igor Opaniuk <igor.opaniuk@toradex.com> | 2020-05-05 12:09:18 +0300 |
| commit | 10dcdc2135dc9bec980bce435305ce2d718c9fbb (patch) | |
| tree | 5a31f7bcc7a397dfd179f56ca06c1ecf6083edc8 /board/toradex/common/tdx-common.c | |
| parent | e97dadb6d015e7adf796549ad0bd0b7d9d4f9a69 (diff) | |
toradex: tdx-cfg-clock: add migration routine from PID8
1. Add migration routine from PID8 (including sane value checks)
2. s/extra/carrier/g if functionality is used only for carrier board
tdx config block.
Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
Diffstat (limited to 'board/toradex/common/tdx-common.c')
| -rw-r--r-- | board/toradex/common/tdx-common.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/board/toradex/common/tdx-common.c b/board/toradex/common/tdx-common.c index 3d825774b7..dc87cc4b5a 100644 --- a/board/toradex/common/tdx-common.c +++ b/board/toradex/common/tdx-common.c @@ -72,7 +72,7 @@ int show_board_info(void) { unsigned char ethaddr[6]; char* tdx_module_name; - char* tdx_carrier_name; + char* tdx_carrier_board_name; if (read_tdx_cfg_block()) { printf("MISSING TORADEX CONFIG BLOCK\n"); @@ -101,11 +101,12 @@ int show_board_info(void) tdx_board_rev_str, tdx_serial_str); #ifdef CONFIG_TDX_CFG_BLOCK_EXTRA - if (read_tdx_cfg_block_extra()) { - printf("MISSING TORADEX EXTRA CONFIG BLOCKS\n"); + if (read_tdx_cfg_block_carrier()) { + printf("MISSING TORADEX CARRIER CONFIG BLOCKS\n"); + try_migrate_tdx_cfg_block_carrier(); } else { - tdx_carrier_name = (char *) - toradex_carriers[tdx_car_hw_tag.prodid]; + tdx_carrier_board_name = (char *) + toradex_carrier_boards[tdx_car_hw_tag.prodid]; sprintf(tdx_car_serial_str, "%08u", tdx_car_serial); sprintf(tdx_car_rev_str, "V%1d.%1d%c", @@ -116,7 +117,7 @@ int show_board_info(void) env_set("carrier_serial#", tdx_car_serial_str); printf("Carrier: Toradex %s %s, Serial# %s\n", - tdx_carrier_name, + tdx_carrier_board_name, tdx_car_rev_str, tdx_car_serial_str); } |