$ git diff|cat;

diff

diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
index d906ffb565..f76de0034b 100644
--- a/hw/ppc/pnv.c
+++ b/hw/ppc/pnv.c
@@ -63,7 +63,7 @@
 
 #define FW_FILE_NAME            "skiboot.lid"
 #define FW_LOAD_ADDR            0x0
-#define FW_MAX_SIZE             (16 * MiB)
+#define FW_MAX_SIZE             (64 * MiB)
 
 #define KERNEL_LOAD_ADDR        0x20000000
 #define KERNEL_MAX_SIZE         (256 * MiB)
diff --git a/hw/ppc/pnv_core.c b/hw/ppc/pnv_core.c
index 4724ddf96c..527dc53e77 100644
--- a/hw/ppc/pnv_core.c
+++ b/hw/ppc/pnv_core.c
@@ -53,7 +53,7 @@ static void pnv_core_cpu_reset(PnvCore *pc, PowerPCCPU *cpu)
      * system and it can be any.
      */
     env->gpr[3] = PNV_FDT_ADDR;
-    env->nip = 0x10;
+    env->nip = 0x0;
     env->msr |= MSR_HVB; /* Hypervisor mode */
 
     env->spr[SPR_HRMOR] = pc->hrmor;
diff --git a/hw/ppc/pnv_pnor.c b/hw/ppc/pnv_pnor.c
index 60336561d7..7efeca58de 100644
--- a/hw/ppc/pnv_pnor.c
+++ b/hw/ppc/pnv_pnor.c
@@ -258,7 +258,7 @@ static void pnv_pnor_realize(DeviceState *dev, Error **errp)
         }
 
         /* Read partitions to validate contents */
-        pnv_pnor_find_skiboot(s, errp);
+        /* pnv_pnor_find_skiboot(s, errp); */
     } else {
         s->storage = blk_blockalign(NULL, s->size);
         memset(s->storage, 0xFF, s->size);