diff --git a/build/gcdfirm/gcdfirm-disp/Makefile b/build/gcdfirm/gcdfirm-disp/Makefile
index 4b121de5..c8392331 100644
--- a/build/gcdfirm/gcdfirm-disp/Makefile
+++ b/build/gcdfirm/gcdfirm-disp/Makefile
@@ -31,7 +31,7 @@ MAKEFIRM_ARM7		=	ARM7/bin/$(TWL_BUILDTYPE_ARM7)/gcdfirm_disp7.tef
 MAKEFIRM_RSA_PRVKEY	=	$(TWL_KEYSDIR)/rsa/private_gcd.der
 LDEPENDS_BIN		+=	wram_regs/wram_regs.rbin
 
-MAKEFIRM_FLAGS		+=	-p
+#MAKEFIRM_FLAGS		+=	-p
 FIRM_SPEC		=	gcdfirm.gcdsf
 
 LDIRT_CLEAN		+=	$(wildcard *.gcd) \
diff --git a/build/gcdfirm/gcdfirm-print/Makefile b/build/gcdfirm/gcdfirm-print/Makefile
index 58f93251..8e865d8a 100644
--- a/build/gcdfirm/gcdfirm-print/Makefile
+++ b/build/gcdfirm/gcdfirm-print/Makefile
@@ -28,7 +28,7 @@ MAKEFIRM_ARM7		=	../../norfirm/norfirm-print/ARM7/bin/$(TWL_BUILDTYPE_ARM7)/twl_
 MAKEFIRM_RSA_PRVKEY	=	$(TWL_KEYSDIR)/rsa/private_gcd.der
 LDEPENDS_BIN		+=	../../norfirm/norfirm-print/wram_regs/wram_regs.rbin
 
-MAKEFIRM_FLAGS		+=	-p
+#MAKEFIRM_FLAGS		+=	-p
 FIRM_SPEC		=	gcdfirm.gcdsf
 
 LDIRT_CLEAN		+=	$(wildcard *.gcd) \
diff --git a/build/gcdfirm/sdmc-launcher-writer/Makefile b/build/gcdfirm/sdmc-launcher-writer/Makefile
index 3c3b8b9a..fbe89e23 100644
--- a/build/gcdfirm/sdmc-launcher-writer/Makefile
+++ b/build/gcdfirm/sdmc-launcher-writer/Makefile
@@ -36,7 +36,7 @@ MAKEFIRM_ARM7		=	ARM7/bin/$(TWL_BUILDTYPE_ARM7)/sdmc_launcher_writer7.tef
 MAKEFIRM_RSA_PRVKEY	=	$(TWL_KEYSDIR)/rsa/private_gcd.der
 LDEPENDS_BIN		+=	wram_regs/wram_regs.rbin
 
-MAKEFIRM_FLAGS		+=	-p
+#MAKEFIRM_FLAGS		+=	-p
 FIRM_SPEC		=	gcdfirm.gcdsf
 
 MAKEFIRM_DEFS		+= 	-DNANDFIRM_BIN=$(NANDFIRM_BIN)
diff --git a/build/gcdfirm/sdmc-launcher/Makefile b/build/gcdfirm/sdmc-launcher/Makefile
index f192adfa..8a4bd771 100644
--- a/build/gcdfirm/sdmc-launcher/Makefile
+++ b/build/gcdfirm/sdmc-launcher/Makefile
@@ -31,7 +31,7 @@ MAKEFIRM_ARM7		=	ARM7/bin/$(TWL_BUILDTYPE_ARM7)/sdmc_launcher7.tef
 MAKEFIRM_RSA_PRVKEY	=	$(TWL_KEYSDIR)/rsa/private_gcd.der
 LDEPENDS_BIN		+=	wram_regs/wram_regs.rbin
 
-MAKEFIRM_FLAGS		+=	-p
+#MAKEFIRM_FLAGS		+=	-p
 FIRM_SPEC		=	gcdfirm.gcdsf
 
 LDIRT_CLEAN		+=	$(wildcard *.gcd) \
diff --git a/build/nandfirm/menu-launcher/Makefile b/build/nandfirm/menu-launcher/Makefile
index fe8d3353..8f6426a3 100644
--- a/build/nandfirm/menu-launcher/Makefile
+++ b/build/nandfirm/menu-launcher/Makefile
@@ -31,7 +31,7 @@ MAKEFIRM_ARM7		=	ARM7/bin/$(TWL_BUILDTYPE_ARM7)/menu_launcher7.tef
 MAKEFIRM_RSA_PRVKEY	=	$(TWL_KEYSDIR)/rsa/private_nand.der
 LDEPENDS_BIN		+=	wram_regs/wram_regs.rbin
 
-MAKEFIRM_FLAGS		+=	-p
+#MAKEFIRM_FLAGS		+=	-p
 FIRM_SPEC		=	nandfirm.nandsf
 
 LDIRT_CLEAN		+=	$(wildcard *.nand) \
diff --git a/build/nandfirm/nandfirm-print/Makefile b/build/nandfirm/nandfirm-print/Makefile
index 87f7aea9..1da31acc 100644
--- a/build/nandfirm/nandfirm-print/Makefile
+++ b/build/nandfirm/nandfirm-print/Makefile
@@ -28,7 +28,7 @@ MAKEFIRM_ARM7		=	../../norfirm/norfirm-print/ARM7/bin/$(TWL_BUILDTYPE_ARM7)/twl_
 MAKEFIRM_RSA_PRVKEY	=	$(TWL_KEYSDIR)/rsa/private_nand.der
 LDEPENDS_BIN		+=	../../norfirm/norfirm-print/wram_regs/wram_regs.rbin
 
-MAKEFIRM_FLAGS		+=	-p
+#MAKEFIRM_FLAGS		+=	-p
 FIRM_SPEC		=	nandfirm-BB.nandsf
 
 LDIRT_CLEAN		+=	$(wildcard *.nand) \
diff --git a/build/nandfirm/sdmc-launcher/Makefile b/build/nandfirm/sdmc-launcher/Makefile
index 4eb1d0f2..b4724afb 100644
--- a/build/nandfirm/sdmc-launcher/Makefile
+++ b/build/nandfirm/sdmc-launcher/Makefile
@@ -31,7 +31,7 @@ MAKEFIRM_ARM7		=	ARM7/bin/$(TWL_BUILDTYPE_ARM7)/sdmc_launcher7.tef
 MAKEFIRM_RSA_PRVKEY	=	$(TWL_KEYSDIR)/rsa/private_nand.der
 LDEPENDS_BIN		+=	wram_regs/wram_regs.rbin
 
-MAKEFIRM_FLAGS		+=	-p
+#MAKEFIRM_FLAGS		+=	-p
 FIRM_SPEC		=	nandfirm.nandsf
 
 LDIRT_CLEAN		+=	$(wildcard *.nand) \
diff --git a/build/norfirm/firm-dev/Makefile b/build/norfirm/firm-dev/Makefile
index b94d093a..9ea4eec9 100644
--- a/build/norfirm/firm-dev/Makefile
+++ b/build/norfirm/firm-dev/Makefile
@@ -31,7 +31,7 @@ MAKEFIRM_ARM7		=	ARM7/bin/$(TWL_BUILDTYPE_ARM7)/firm_dev7.tef
 MAKEFIRM_RSA_PRVKEY	=	$(TWL_KEYSDIR)/rsa/private_nor.der
 LDEPENDS_BIN		+=	wram_regs/wram_regs.rbin
 
-MAKEFIRM_FLAGS		+=	-p
+#MAKEFIRM_FLAGS		+=	-p
 FIRM_SPEC		=	norfirm.norsf
 
 LDIRT_CLEAN		+=	$(wildcard *.nor) \
diff --git a/build/norfirm/norfirm-empty/Makefile b/build/norfirm/norfirm-empty/Makefile
index 52ada49f..6c5a1ae7 100644
--- a/build/norfirm/norfirm-empty/Makefile
+++ b/build/norfirm/norfirm-empty/Makefile
@@ -33,7 +33,7 @@ BINDIR			=	.
 MAKEFIRM_ARM9	 	=
 MAKEFIRM_ARM7	 	=
 MAKEFIRM_RSA_PRVKEY	=	$(TWL_KEYSDIR)/rsa/private_nor.der
-MAKEFIRM_FLAGS		+=	-p
+#MAKEFIRM_FLAGS		+=	-p
 FIRM_SPEC		=	norfirm-BB.norsf
 
 LDIRT_CLEAN		+=	$(TARGETS) \
diff --git a/build/norfirm/norfirm-print/Makefile b/build/norfirm/norfirm-print/Makefile
index 18048884..0c895204 100644
--- a/build/norfirm/norfirm-print/Makefile
+++ b/build/norfirm/norfirm-print/Makefile
@@ -31,7 +31,7 @@ MAKEFIRM_ARM7		=	ARM7/bin/$(TWL_BUILDTYPE_ARM7)/twl_norfirm7_print.tef
 MAKEFIRM_RSA_PRVKEY	=	$(TWL_KEYSDIR)/rsa/private_nor.der
 LDEPENDS_BIN		+=	wram_regs/wram_regs.rbin
 
-MAKEFIRM_FLAGS		+=	-p
+#MAKEFIRM_FLAGS		+=	-p
 FIRM_SPEC		=	norfirm-BB.norsf
 
 LDIRT_CLEAN		+=	$(wildcard *.nor) \