| Message ID | 1452609644-25249-3-git-send-email-p.marczak@samsung.com |
|---|---|
| State | Accepted |
| Commit | 4428f3c87ac90c71d5dae3df0289eb2442b628a8 |
| Delegated to: | Simon Glass |
| Headers | show |
On 12 January 2016 at 07:40, Przemyslaw Marczak <p.marczak@samsung.com> wrote: > This reverts commit 71105f50fedddfa5b0535d102c3d5078671721ad. > > The reverted commit was applied for a temporary to unbreak > few Exynos boards on the release. > > After the discussion about the change, this commit should be avoided. > Fixed device-tree for Exynos, allows reverting it without any issues. > > Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com> > Cc: Stefan Roese <sr@denx.de> > Cc: Tom Rini <trini@konsulko.com> > Cc: Simon Glass <sjg@chromium.org> > Cc: Stephen Warren <swarren@nvidia.com> > Cc: Stephen Warren <swarren@wwwdotorg.org> > --- > common/fdt_support.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) Tested on snow: Tested-by: Simon Glass <sjg@chromium.org> Acked-by: Simon Glass <sjg@chromium.org>
On 14 January 2016 at 10:17, Simon Glass <sjg@chromium.org> wrote: > On 12 January 2016 at 07:40, Przemyslaw Marczak <p.marczak@samsung.com> wrote: >> This reverts commit 71105f50fedddfa5b0535d102c3d5078671721ad. >> >> The reverted commit was applied for a temporary to unbreak >> few Exynos boards on the release. >> >> After the discussion about the change, this commit should be avoided. >> Fixed device-tree for Exynos, allows reverting it without any issues. >> >> Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com> >> Cc: Stefan Roese <sr@denx.de> >> Cc: Tom Rini <trini@konsulko.com> >> Cc: Simon Glass <sjg@chromium.org> >> Cc: Stephen Warren <swarren@nvidia.com> >> Cc: Stephen Warren <swarren@wwwdotorg.org> >> --- >> common/fdt_support.c | 7 ++++--- >> 1 file changed, 4 insertions(+), 3 deletions(-) > > Tested on snow: > Tested-by: Simon Glass <sjg@chromium.org> > Acked-by: Simon Glass <sjg@chromium.org> Applied to u-boot-dm/next, thanks!
diff --git a/common/fdt_support.c b/common/fdt_support.c index a539389..66464db 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -952,7 +952,8 @@ void fdt_del_node_and_alias(void *blob, const char *alias) /* Max address size we deal with */ #define OF_MAX_ADDR_CELLS 4 #define OF_BAD_ADDR FDT_ADDR_T_NONE -#define OF_CHECK_COUNTS(na) ((na) > 0 && (na) <= OF_MAX_ADDR_CELLS) +#define OF_CHECK_COUNTS(na, ns) ((na) > 0 && (na) <= OF_MAX_ADDR_CELLS && \ + (ns) > 0) /* Debug utility */ #ifdef DEBUG @@ -1120,7 +1121,7 @@ static u64 __of_translate_address(void *blob, int node_offset, const fdt32_t *in /* Cound address cells & copy address locally */ bus->count_cells(blob, parent, &na, &ns); - if (!OF_CHECK_COUNTS(na)) { + if (!OF_CHECK_COUNTS(na, ns)) { printf("%s: Bad cell count for %s\n", __FUNCTION__, fdt_get_name(blob, node_offset, NULL)); goto bail; @@ -1147,7 +1148,7 @@ static u64 __of_translate_address(void *blob, int node_offset, const fdt32_t *in /* Get new parent bus and counts */ pbus = &of_busses[0]; pbus->count_cells(blob, parent, &pna, &pns); - if (!OF_CHECK_COUNTS(pna)) { + if (!OF_CHECK_COUNTS(pna, pns)) { printf("%s: Bad cell count for %s\n", __FUNCTION__, fdt_get_name(blob, node_offset, NULL)); break;
This reverts commit 71105f50fedddfa5b0535d102c3d5078671721ad. The reverted commit was applied for a temporary to unbreak few Exynos boards on the release. After the discussion about the change, this commit should be avoided. Fixed device-tree for Exynos, allows reverting it without any issues. Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com> Cc: Stefan Roese <sr@denx.de> Cc: Tom Rini <trini@konsulko.com> Cc: Simon Glass <sjg@chromium.org> Cc: Stephen Warren <swarren@nvidia.com> Cc: Stephen Warren <swarren@wwwdotorg.org> --- common/fdt_support.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)