ppc4xx/fdt/flash: Fix bug in fdt_fixup_nor_flash_node()
PATCH 1/1 ppc4xx/fdt/flash: Fix bug in fdt_fixup_nor_flash_node()
This patch fixes a bug in fdt_fixup_nor_flash_node() when the reg property has multiple reg tuples, like:
reg = <0 0x00000000 0x04000000 0 0x04000000 0x04000000>;
In this case this function did not update the reg property correctly.
Signed-off-by Stefan Roese <[email protected]>
--- common/fdt_support.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-)
common/fdt_support.c +10 -7
@@ -620,7 +620,7 @@ int fdt_fixup_nor_flash_size(void *blob)int off;int len;struct fdt_property *prop; -u32 *reg; +u32 *reg, *reg2;int i;for (i =0 ; i <2 ; i++) {
@@ -640,18 +640,21 @@ int fdt_fixup_nor_flash_size(void *blob)* There might be multiple reg-tuples, * so loop through them all */ - len /= tuple_size; - reg = (u32 *)&prop->data[0 ]; -for (idx =0 ; idx < len; idx++) { + reg = reg2 = (u32 *)&prop->data[0 ]; +for (idx =0 ; idx < (len / tuple_size); idx++) {/* * Update size in reg property */ reg[2 ] =flash_get_bank_size (reg[0 ], idx); -fdt_setprop (blob, off,"reg" , reg, - tuple_size); - reg += tuple_size; + +/* +* Point to next reg tuple +*/ + reg +=3 ; } + +fdt_setprop (blob, off,"reg" , reg2, len); }/* Move to next compatible node */
Signature · 1 line
1.7.3
PATCH 1/1 ppc4xx/fdt/flash: Fix bug in fdt_fixup_nor_flash_node()
Quoted 7 lines · On Wednesday 29 September 2010 17:22:32 Stefan Roese wrote:
This patch fixes a bug in
fdt_fixup_nor_flash_node()when the reg property has multiple reg tuples, like:reg = <0 0x00000000 0x04000000 0 0x04000000 0x04000000>;In this case this function did not update the reg property correctly.
Applied to u-boot-ppc4xx/master. Thanks.
Cheers,
Stefan
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: office at denx.de