leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PowerPC: mpc85xx: Update ft_verify_fdt

Browse Source 
With the changes to fdt_get_base_address() we need to modify the logic
in ft_verify_fdt() for how we check the validity of the CCSR address.

Tested-on: qemu-ppce500 -M mpc8544ds
Fixes: 336a44877a ("fdt: Correct fdt_get_base_address()")
Cc: York Sun <york.sun@nxp.com>
Cc: Wolfgang Denk <wd@denx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini 2017-08-03 09:33:07 -04:00
parent 9f841559a5
commit 217324b23c
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/powerpc/cpu/mpc85xx/fdt.c
View File

@ -770,8 +770,15 @@ int ft_verify_fdt(void *fdt)
/* First check the CCSR base address */ /* First check the CCSR base address */
off = fdt_node_offset_by_prop_value(fdt, -1, "device_type", "soc", 4); off = fdt_node_offset_by_prop_value(fdt, -1, "device_type", "soc", 4);
if (off > 0) if (off > 0) {
addr = fdt_get_base_address(fdt, off); int size;
u32 naddr;
const fdt32_t *prop;
naddr = fdt_address_cells(fdt, off);
prop = fdt_getprop(fdt, off, "ranges", &size);
addr = fdt_translate_address(fdt, off, prop + naddr);
}
if (!addr) { if (!addr) {
printf("Warning: could not determine base CCSR address in " printf("Warning: could not determine base CCSR address in "