Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 5743981e27f7b22b9b0edef8618e61157b16c65a

Authored by Ibai Erkiaga
Committed by Michal Simek
1 parent 009ab7b93a
Exists in smarc_8mq_lf_v2020.04 and in 9 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.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_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

arm64: zynqmp: use firmware driver to get version 

Use the new function from firmware version to get the firmware version.

Signed-off-by: Ibai Erkiaga <ibai.erkiaga-elorza@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

Showing 2 changed files with 3 additions and 3 deletions Side-by-side Diff

board/xilinx/zynqmp/zynqmp.c
Diff comments   View file @ 5743981
... ... @@ -321,7 +321,7 @@
321 321 #if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_CLK_ZYNQMP)
322 322 u32 pm_api_version;
323 323  
324   - pm_api_version = zynqmp_pmufw_version();
  324 + pm_api_version = zynqmp_firmware_version();
325 325 printf("PMUFW:\tv%d.%d\n",
326 326 pm_api_version >> ZYNQMP_PM_VERSION_MAJOR_SHIFT,
327 327 pm_api_version & ZYNQMP_PM_VERSION_MINOR_MASK);
drivers/fpga/zynqmppl.c
Diff comments   View file @ 5743981
... ... @@ -152,7 +152,7 @@
152 152  
153 153 buf = new_buf;
154 154 } else if ((swap != SWAP_DONE) &&
155   - (zynqmp_pmufw_version() <= PMUFW_V1_0)) {
  155 + (zynqmp_firmware_version() <= PMUFW_V1_0)) {
156 156 /* For bitstream which are aligned */
157 157 new_buf = buf;
158 158  
... ... @@ -205,7 +205,7 @@
205 205 u32 ret_payload[PAYLOAD_ARG_CNT];
206 206 bool xilfpga_old = false;
207 207  
208   - if (zynqmp_pmufw_version() <= PMUFW_V1_0) {
  208 + if (zynqmp_firmware_version() <= PMUFW_V1_0) {
209 209 puts("WARN: PMUFW v1.0 or less is detected\n");
210 210 puts("WARN: Not all bitstream formats are supported\n");
211 211 puts("WARN: Please upgrade PMUFW\n");