From 4ada34bc6d48c23c580bd5dc40f26b03f7e522cc Mon Sep 17 00:00:00 2001 From: "Christopher N. Hesse" Date: Mon, 29 Jan 2018 22:47:52 +0100 Subject: [PATCH] dtbhtool: Print better warnings for PLATFORM/SUBTYPE mismatch Change-Id: I486239d47255d5a5347e7b8ac7348afb8bc5bddb (cherry picked from commit 8f74f0a7e9839d4f6f499aecdcc6c042ca4671a0) --- dtbhtool/dtbimg.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dtbhtool/dtbimg.c b/dtbhtool/dtbimg.c index a85c9016..744222fe 100644 --- a/dtbhtool/dtbimg.c +++ b/dtbhtool/dtbimg.c @@ -170,14 +170,16 @@ void *load_dtbh_block(const char *dtb_path, unsigned pagesize, unsigned *_sz) prop_platform = fdt_getprop(dtb, offset, "model_info-platform", &len); if (strcmp((char *)&prop_platform[0], DTBH_PLATFORM)) { - warnx("model_info-platform of %s is invalid, skipping", fname); + warnx("model_info-platform of %s is invalid, skipping (expected %s but got %s)", + fname, DTBH_PLATFORM, (char *)&prop_platform[0]); free(dtb); continue; } prop_subtype = fdt_getprop(dtb, offset, "model_info-subtype", &len); if (strcmp((char *)&prop_subtype[0], DTBH_SUBTYPE)) { - warnx("model_info-subtype of %s is invalid, skipping", fname); + warnx("model_info-subtype of %s is invalid, skipping (expected %s but got %s)", + fname, DTBH_SUBTYPE, (char *)&prop_subtype[0]); free(dtb); continue; }