Skip to contentSkip to conversation

tools/imximage: fix reported DCD information for MX7ULP

PATCH New Jorge Ramirez-Ortiz 3 participants 5 messages Nov 28, 2019 – Dec 3, 2019 Arm i.MX and Layerscape

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tools/imximage: fix reported DCD information for MX7ULP

On the MX7ULP, OCRAM for DCD is at 0x2f010000

---
 tools/imximage.c | 6 ++++++
 1 file changed, 6 insertions(+)
tools/imximage.c +6 -0
index d7c0b6e883..762a06d468 100644
@@ -11,6 +11,7 @@
 #include "imagetool.h"
 #include <image.h>
 #include "imximage.h"
+#include <generated/autoconf.h>
 
 #define UNDEFINED 0xFFFFFFFF
 
@@ -524,8 +525,13 @@ static void print_hdr_v2(struct imx_header *imx_hdr)
 			printf("HAB Blocks:   0x%08x 0x%08x 0x%08x\n",
 			       (uint32_t)fhdr_v2->self, 0,
 			       (uint32_t)(fhdr_v2->csf - fhdr_v2->self));
+#ifndef CONFIG_MX7ULP
 			printf("DCD Blocks:   0x00910000 0x%08x 0x%08x\n",
 			       offs, be16_to_cpu(dcdlen));
+#else
+			printf("DCD Blocks:   0x2f010000 0x%08x 0x%08x\n",
+			       offs, be16_to_cpu(dcdlen));
+#endif
 		}
 	} else {
 		imx_header_v2_t *next_hdr_v2;
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/1 tools/imximage: fix reported DCD information for MX7ULP

Quoted 1 line · Jorge Ramirez-Ortiz

On the MX7ULP, OCRAM for DCD is at 0x2f010000

any comments?

do notice that this is not trivial debug information: this is required for security puposes so images can then be signed and booted via SDP. Dumping the wrong information here is important stuff.

Quoted 39 lines
---
 tools/imximage.c | 6 ++++++
 1 file changed, 6 insertions(+)
tools/imximage.c +6 -0
index d7c0b6e883..762a06d468 100644
@@ -11,6 +11,7 @@
 #include "imagetool.h"
 #include <image.h>
 #include "imximage.h"
+#include <generated/autoconf.h>
 
 #define UNDEFINED 0xFFFFFFFF
 
@@ -524,8 +525,13 @@ static void print_hdr_v2(struct imx_header *imx_hdr)
 			printf("HAB Blocks:   0x%08x 0x%08x 0x%08x\n",
 			       (uint32_t)fhdr_v2->self, 0,
 			       (uint32_t)(fhdr_v2->csf - fhdr_v2->self));
+#ifndef CONFIG_MX7ULP
 			printf("DCD Blocks:   0x00910000 0x%08x 0x%08x\n",
 			       offs, be16_to_cpu(dcdlen));
+#else
+			printf("DCD Blocks:   0x2f010000 0x%08x 0x%08x\n",
+			       offs, be16_to_cpu(dcdlen));
+#endif
 		}
 	} else {
 		imx_header_v2_t *next_hdr_v2;
Signature · 6 lines
2.17.1

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
https://lists.denx.de/listinfo/u-boot
reviewer
#2 lore raw

PATCH 1/1 tools/imximage: fix reported DCD information for MX7ULP

In reply to Jorge Ramirez-Ortiz

Hi Jorge,

Adding Breno.

Quoted 21 lines · Jorge Ramirez-Ortiz

On the MX7ULP, OCRAM for DCD is at 0x2f010000

---
 tools/imximage.c | 6 ++++++
 1 file changed, 6 insertions(+)
tools/imximage.c +1 -0
index d7c0b6e883..762a06d468 100644
@@ -11,6 +11,7 @@
 #include "imagetool.h"
 #include <image.h>
 #include "imximage.h"
+#include <generated/autoconf.h>
 
 #define UNDEFINED 0xFFFFFFFF
 

tools/imximage.c static void print_hdr_v2(struct imx_header *imx_hdr) · line 534

Quoted 10 lines
tools/imximage.c +5 -0
@@ -524,8 +525,13 @@ static void print_hdr_v2(struct imx_header *imx_hdr)
                        printf("HAB Blocks:   0x%08x 0x%08x 0x%08x\n",
                               (uint32_t)fhdr_v2->self, 0,
                               (uint32_t)(fhdr_v2->csf - fhdr_v2->self));
+#ifndef CONFIG_MX7ULP
                        printf("DCD Blocks:   0x00910000 0x%08x 0x%08x\n",
                               offs, be16_to_cpu(dcdlen));
+#else
+                       printf("DCD Blocks:   0x2f010000 0x%08x 0x%08x\n",
+                              offs, be16_to_cpu(dcdlen));
+#endif

Can we make the DCD OCRAM a variable passed via Kconfig and selected by SoC type?

This way we don't need to keep changing this for future SoCs.

What do you think?

#3 lore raw

PATCH 1/1 tools/imximage: fix reported DCD information for MX7ULP

Quoted 40 lines · Fabio Estevam

Hi Jorge,

Adding Breno.

Quoted 21 lines · Jorge Ramirez-Ortiz

On the MX7ULP, OCRAM for DCD is at 0x2f010000

---
 tools/imximage.c | 6 ++++++
 1 file changed, 6 insertions(+)
tools/imximage.c +1 -0
index d7c0b6e883..762a06d468 100644
@@ -11,6 +11,7 @@
 #include "imagetool.h"
 #include <image.h>
 #include "imximage.h"
+#include <generated/autoconf.h>
 
 #define UNDEFINED 0xFFFFFFFF
 

tools/imximage.c static void print_hdr_v2(struct imx_header *imx_hdr) · line 534

Quoted 10 lines
tools/imximage.c +5 -0
@@ -524,8 +525,13 @@ static void print_hdr_v2(struct imx_header *imx_hdr)
                        printf("HAB Blocks:   0x%08x 0x%08x 0x%08x\n",
                               (uint32_t)fhdr_v2->self, 0,
                               (uint32_t)(fhdr_v2->csf - fhdr_v2->self));
+#ifndef CONFIG_MX7ULP
                        printf("DCD Blocks:   0x00910000 0x%08x 0x%08x\n",
                               offs, be16_to_cpu(dcdlen));
+#else
+                       printf("DCD Blocks:   0x2f010000 0x%08x 0x%08x\n",
+                              offs, be16_to_cpu(dcdlen));
+#endif

Can we make the DCD OCRAM a variable passed via Kconfig and selected by SoC type?

Quoted 3 lines

This way we don't need to keep changing this for future SoCs.

What do you think?

sure that would work. given that the default 0x00910000 is valid on
most of the cases - well all but the mx7ulp - we could apply this default and only change to the Kconfig value if defined.

should we go for that?

reviewer
#4 lore raw

PATCH 1/1 tools/imximage: fix reported DCD information for MX7ULP

Hi Jorge,

Quoted 5 lines · Foundries

sure that would work. given that the default 0x00910000 is valid on
most of the cases - well all but the mx7ulp - we could apply this default and only change to the Kconfig value if defined.

should we go for that?

Yes, that would be fine.