| Message ID | 20200107062142.24672-1-thiruan@linux.microsoft.com |
|---|---|
| State | Accepted |
| Commit | 28b417ce859490d6b06e71dbf4e842841e64d34d |
| Headers | show |
| Series | image: fdt: check "status" of "/reserved-memory" subnodes | expand |
diff --git a/common/image-fdt.c b/common/image-fdt.c index 48388488d9..cf13d655c0 100644 --- a/common/image-fdt.c +++ b/common/image-fdt.c @@ -122,7 +122,7 @@ void boot_fdt_add_mem_rsv_regions(struct lmb *lmb, void *fdt_blob) /* check if this subnode has a reg property */ ret = fdt_get_resource(fdt_blob, subnode, "reg", 0, &res); - if (!ret) { + if (!ret && fdtdec_get_is_enabled(fdt_blob, subnode)) { addr = res.start; size = res.end - res.start + 1; boot_fdt_reserve_region(lmb, addr, size);
boot_fdt_add_mem_rsv_regions() scans the subnodes of "/reserved-memory" and adds them to reserved lmb regions. Currently this scanning does not take into "status" property. Even if the subnode is disabled, it gets added to the reserved lmb regions. This patch checks the "status" property before adding it to reserved lmb regions. Signed-off-by: Thirupathaiah Annapureddy <thiruan at linux.microsoft.com> --- common/image-fdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)