projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
env: Rename getenv_hex(), getenv_yesno(), getenv_ulong()
[oweals/u-boot.git]
/
arch
/
powerpc
/
cpu
/
mpc85xx
/
fdt.c
diff --git
a/arch/powerpc/cpu/mpc85xx/fdt.c
b/arch/powerpc/cpu/mpc85xx/fdt.c
index a9ea947305ffab9df1ed3312c38cca0563ce38a4..64b0a51f75e74fa15a866205a657859155278aa2 100644
(file)
--- a/
arch/powerpc/cpu/mpc85xx/fdt.c
+++ b/
arch/powerpc/cpu/mpc85xx/fdt.c
@@
-92,7
+92,7
@@
void ft_fixup_cpu(void *blob, u64 memory_limit)
* Extract hwconfig from environment.
* Search for tdm entry in hwconfig.
*/
* Extract hwconfig from environment.
* Search for tdm entry in hwconfig.
*/
- ret =
getenv
_f("hwconfig", buffer, sizeof(buffer));
+ ret =
env_get
_f("hwconfig", buffer, sizeof(buffer));
if (ret > 0)
tdm_hwconfig_enabled = hwconfig_f("tdm", buffer);
if (ret > 0)
tdm_hwconfig_enabled = hwconfig_f("tdm", buffer);
@@
-770,8
+770,15
@@
int ft_verify_fdt(void *fdt)
/* First check the CCSR base address */
off = fdt_node_offset_by_prop_value(fdt, -1, "device_type", "soc", 4);
/* First check the CCSR base address */
off = fdt_node_offset_by_prop_value(fdt, -1, "device_type", "soc", 4);
- if (off > 0)
- addr = fdt_get_base_address(fdt, off);
+ if (off > 0) {
+ 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) {
printf("Warning: could not determine base CCSR address in "
if (!addr) {
printf("Warning: could not determine base CCSR address in "