Merge "memcheck: fix guest pc <-> host pc mapping on 64 bit arch"
diff --git a/hw/goldfish_nand.c b/hw/goldfish_nand.c
index 9e40e2e..9e16e78 100644
--- a/hw/goldfish_nand.c
+++ b/hw/goldfish_nand.c
@@ -667,8 +667,8 @@
     int read_only = 0;
     int pad;
     ssize_t read_size;
-    uint32_t page_size = 2048;
-    uint32_t extra_size = 64;
+    uint32_t page_size = 512;
+    uint32_t extra_size = 0;
     uint32_t erase_pages = 64;
 
     VERBOSE_PRINT(init, "%s: %s", __FUNCTION__, arg);