Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 2b7c4a19835dab608bbd8662a60b03aa0f37a423

Authored by Prabhakar Kushwaha
Committed by York Sun
1 parent cd8aefc076
Exists in v2017.01-smarct4x and in 33 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf-6.6.52-2.2.0, emb_lf_v2022.04, emb_lf_v2023.04, emb_lf_v2024.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

drivers: fsl-mc: Return error for major version mismatch 

Management complex major version should match to the firmware present in flash.

Return error during mismatch of major version.

Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Reviewed-by: York Sun <yorksun@freescale.com>

Showing 1 changed file with 7 additions and 2 deletions Side-by-side Diff

drivers/net/fsl-mc/mc.c
Diff comments   View file @ 2b7c4a1
... ... @@ -518,10 +518,15 @@
518 518 goto out;
519 519 }
520 520  
521   - if (MC_VER_MAJOR != mc_ver_info.major)
  521 + if (MC_VER_MAJOR != mc_ver_info.major) {
522 522 printf("fsl-mc: ERROR: Firmware major version mismatch (found: %d, expected: %d)\n",
523 523 mc_ver_info.major, MC_VER_MAJOR);
  524 + printf("fsl-mc: Update the Management Complex firmware\n");
524 525  
  526 + error = -ENODEV;
  527 + goto out;
  528 + }
  529 +
525 530 if (MC_VER_MINOR != mc_ver_info.minor)
526 531 printf("fsl-mc: WARNING: Firmware minor version mismatch (found: %d, expected: %d)\n",
527 532 mc_ver_info.minor, MC_VER_MINOR);
... ... @@ -541,7 +546,7 @@
541 546  
542 547 out:
543 548 if (error != 0)
544   - mc_boot_status = -error;
  549 + mc_boot_status = error;
545 550 else
546 551 mc_boot_status = 0;
547 552