| Message ID | 504B145D.60103@web.de |
|---|---|
| State | New |
| Headers | show |
On 8 September 2012 10:48, Jan Kiszka <jan.kiszka@web.de> wrote: > The old arithmetic assumed 32 physical address bits which is no longer > true for ARM since 3cc0cd61f4. > > Signed-off-by: Jan Kiszka <jan.kiszka@web.de> > --- > > Changes in v2: > - mark large constant ULL > > #ifdef TARGET_WORDS_BIGENDIAN > - pflash_cfi02_register(0-MP_FLASH_SIZE_MAX, NULL, > + pflash_cfi02_register(0x100000000-MP_FLASH_SIZE_MAX, NULL, > "musicpal.flash", flash_size, ...wrong version of patch sent? -- PMM
On 2012-09-08 11:50, Peter Maydell wrote: > On 8 September 2012 10:48, Jan Kiszka <jan.kiszka@web.de> wrote: >> The old arithmetic assumed 32 physical address bits which is no longer >> true for ARM since 3cc0cd61f4. >> >> Signed-off-by: Jan Kiszka <jan.kiszka@web.de> >> --- >> >> Changes in v2: >> - mark large constant ULL >> >> #ifdef TARGET_WORDS_BIGENDIAN >> - pflash_cfi02_register(0-MP_FLASH_SIZE_MAX, NULL, >> + pflash_cfi02_register(0x100000000-MP_FLASH_SIZE_MAX, NULL, >> "musicpal.flash", flash_size, > > ...wrong version of patch sent? Grrr...
diff --git a/hw/musicpal.c b/hw/musicpal.c index ad725b5..10c2c16 100644 --- a/hw/musicpal.c +++ b/hw/musicpal.c @@ -1583,7 +1583,7 @@ static void musicpal_init(ram_addr_t ram_size, * image is smaller than 32 MB. */ #ifdef TARGET_WORDS_BIGENDIAN - pflash_cfi02_register(0-MP_FLASH_SIZE_MAX, NULL, + pflash_cfi02_register(0x100000000-MP_FLASH_SIZE_MAX, NULL, "musicpal.flash", flash_size, dinfo->bdrv, 0x10000, (flash_size + 0xffff) >> 16, @@ -1591,7 +1591,7 @@ static void musicpal_init(ram_addr_t ram_size, 2, 0x00BF, 0x236D, 0x0000, 0x0000, 0x5555, 0x2AAA, 1); #else - pflash_cfi02_register(0-MP_FLASH_SIZE_MAX, NULL, + pflash_cfi02_register(0x100000000-MP_FLASH_SIZE_MAX, NULL, "musicpal.flash", flash_size, dinfo->bdrv, 0x10000, (flash_size + 0xffff) >> 16,
The old arithmetic assumed 32 physical address bits which is no longer true for ARM since 3cc0cd61f4. Signed-off-by: Jan Kiszka <jan.kiszka@web.de> --- Changes in v2: - mark large constant ULL hw/musicpal.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)