| commit | c7b03fa0bdc04e00bfbdc4cc69da144b11108f37 | [log] [tgz] |
|---|---|---|
| author | Matt Fleming <matt@console-pimps.org> | Sun Apr 25 17:29:07 2010 +0100 |
| committer | Matt Fleming <matt@console-pimps.org> | Sun Apr 25 20:44:23 2010 +0100 |
| tree | 1dab19213c06e87818faef6badd7eb101877be2e | |
| parent | 9c3d936352fefaadec57bafda1fe3807890cbf2c [diff] |
sh: Do not try merging two 128MB PMB mappings There is a logic error in pmb_merge() that means we will incorrectly try to merge two 128MB PMB mappings into one mapping. However, 256MB isn't a valid PMB map size and pmb_merge() will actually drop the second 128MB mapping. This patch allows my SDK7786 board to boot when configured with CONFIG_MEMORY_SIZE=0x10000000. Signed-off-by: Matt Fleming <matt@console-pimps.org>