diff options
author | Wolfgang Denk <wd@denx.de> | 2010-09-23 21:16:32 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2010-09-23 21:16:32 +0200 |
commit | d03161b455125f0581918b25fabc5fde0268ae4e (patch) | |
tree | 67e61ba7679d82a64dbcb3d55344a31a22a7e6da /arch/powerpc | |
parent | 2675244fa4a0c2c3088af279d57dbe8457bacf77 (diff) | |
parent | 8a805df13615667ebdcc9f3a3a6fbf6c7778a992 (diff) |
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/cpu/ppc4xx/fdt.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/powerpc/cpu/ppc4xx/fdt.c b/arch/powerpc/cpu/ppc4xx/fdt.c index 15a184b5c6..e99b2b03dc 100644 --- a/arch/powerpc/cpu/ppc4xx/fdt.c +++ b/arch/powerpc/cpu/ppc4xx/fdt.c @@ -59,14 +59,14 @@ void __ft_board_setup(void *blob, bd_t *bd) *p++ = 0; *p++ = bxcr & EBC_BXCR_BAS_MASK; *p++ = EBC_BXCR_BANK_SIZE(bxcr); + } + } + #ifdef CONFIG_FDT_FIXUP_NOR_FLASH_SIZE - /* Try to update reg property in nor flash node too */ - fdt_fixup_nor_flash_size(blob, i, - EBC_BXCR_BANK_SIZE(bxcr)); + /* Update reg property in all nor flash nodes too */ + fdt_fixup_nor_flash_size(blob); #endif - } - } /* Some 405 PPC's have EBC as direct PLB child in the dts */ if (fdt_path_offset(blob, ebc_path) < 0) |