diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2013-04-06 12:53:54 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2013-04-06 12:53:54 +0000 |
| commit | 9196dd411d580c27f85daa209ff9a501d719ebc0 (patch) | |
| tree | 48f15e89b2be219c1d106328c044d250b2f9cb05 /hw/nand.c | |
| parent | 893986fe94eb229f2317f50fac0e35e068eb66ba (diff) | |
| parent | 32aea752f47f30c00878dcc323ac4debf0c9e645 (diff) | |
| download | focaccia-qemu-9196dd411d580c27f85daa209ff9a501d719ebc0.tar.gz focaccia-qemu-9196dd411d580c27f85daa209ff9a501d719ebc0.zip | |
Merge branch 'arm-devs.next' of git://git.linaro.org/people/pmaydell/qemu-arm
* 'arm-devs.next' of git://git.linaro.org/people/pmaydell/qemu-arm: hw/nand.c: Fix nand erase operation cadence_uart: Flush queued characters on reset pl330: Don't inhibit ES bits on INTEN pflash_cfi01: Implement migration support pflash_cfi01: Drop unused 'bypass' field hw/arm_gic_common: Use vmstate struct rather than save/load functions arm_gic: Fix sizes of state fields in preparation for vmstate support vmstate: Add support for two dimensional arrays hw/onenand.c: fix migration of dynamically allocated buffer "otp" hw/sd.c: fix migration of dynamically allocated buffer "buf" vmstate.h: introduce VMSTATE_BUFFER_POINTER_UNSAFE macro hw/arm_mptimer: Save the timer state pl050: Don't send always-constant is_mouse field hw/arm/nseries: don't print to stdout or stderr
Diffstat (limited to 'hw/nand.c')
| -rw-r--r-- | hw/nand.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/nand.c b/hw/nand.c index de3e502596..63620938fb 100644 --- a/hw/nand.c +++ b/hw/nand.c @@ -297,6 +297,7 @@ static void nand_command(NANDFlashState *s) break; case NAND_CMD_BLOCKERASE2: + s->addr &= (1ull << s->addrlen * 8) - 1; if (nand_flash_ids[s->chip_id].options & NAND_SAMSUNG_LP) s->addr <<= 16; else |