Commit 648fe99e authored by Soren Brinkmann's avatar Soren Brinkmann
Browse files

zynqmp: Ignore the revision field of the IDCODE



The revision field may change between silicon revisions without changing
the mapping to a part. This avoids errors like:
  ERROR: Incorrect XILINX IDCODE 0x14738093, maskid 0x4600093
  NOTICE: ATF running on XCZUUNKN/EP108 v3/RTL5.1 at 0xfffe5000
on parts with a newer revision.
Reported-by: default avatarLove Kumar <love.kumar@xilinx.com>
Signed-off-by: default avatarSoren Brinkmann <soren.brinkmann@xilinx.com>
Acked-by: default avatarAlistair Francis <alistair.francis@xilinx.com>
Tested-by: default avatarLove Kumar <love.kumar@xilinx.com>
parent 03b80773
...@@ -183,11 +183,9 @@ static char *zynqmp_print_silicon_idcode(void) ...@@ -183,11 +183,9 @@ static char *zynqmp_print_silicon_idcode(void)
tmp = id; tmp = id;
tmp &= ZYNQMP_CSU_IDCODE_XILINX_ID_MASK | tmp &= ZYNQMP_CSU_IDCODE_XILINX_ID_MASK |
ZYNQMP_CSU_IDCODE_FAMILY_MASK | ZYNQMP_CSU_IDCODE_FAMILY_MASK;
ZYNQMP_CSU_IDCODE_REVISION_MASK;
maskid = ZYNQMP_CSU_IDCODE_XILINX_ID << ZYNQMP_CSU_IDCODE_XILINX_ID_SHIFT | maskid = ZYNQMP_CSU_IDCODE_XILINX_ID << ZYNQMP_CSU_IDCODE_XILINX_ID_SHIFT |
ZYNQMP_CSU_IDCODE_FAMILY << ZYNQMP_CSU_IDCODE_FAMILY_SHIFT | ZYNQMP_CSU_IDCODE_FAMILY << ZYNQMP_CSU_IDCODE_FAMILY_SHIFT;
ZYNQMP_CSU_IDCODE_REVISION << ZYNQMP_CSU_IDCODE_REVISION_SHIFT;
if (tmp != maskid) { if (tmp != maskid) {
ERROR("Incorrect XILINX IDCODE 0x%x, maskid 0x%x\n", id, maskid); ERROR("Incorrect XILINX IDCODE 0x%x, maskid 0x%x\n", id, maskid);
return "UNKN"; return "UNKN";
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment