22 files changed, 66 insertions, 0 deletions

diff --git a/conf/machine/mpc8536ds.conf b/conf/machine/mpc8536ds.conf
index e60292e..21effbc 100644
--- a/conf/machine/mpc8536ds.conf
+++ b/conf/machine/mpc8536ds.conf
@@ -8,3 +8,6 @@ BOOTFORMAT_CONFIG = "config_ddr2_512m_mpc8536ds_667M.dat"
 UBOOT_MACHINES = "MPC8536DS MPC8536DS_36BIT MPC8536DS_NAND MPC8536DS_SDCARD MPC8536DS_SPIFLASH"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/mpc8536ds.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_defconfig"
+
+JFFS2_ERASEBLOCK = "0x20000"
+
diff --git a/conf/machine/mpc8544ds.conf b/conf/machine/mpc8544ds.conf
index 39e2aae..a9cfadc 100644
--- a/conf/machine/mpc8544ds.conf
+++ b/conf/machine/mpc8544ds.conf
@@ -7,3 +7,6 @@ require e500v2.inc
 UBOOT_MACHINES = "MPC8544DS"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/mpc8544ds.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_defconfig"
+
+JFFS2_ERASEBLOCK = "0x20000"
+
diff --git a/conf/machine/mpc8548cds.conf b/conf/machine/mpc8548cds.conf
index 22cc558..0d0dcf1 100644
--- a/conf/machine/mpc8548cds.conf
+++ b/conf/machine/mpc8548cds.conf
@@ -7,3 +7,6 @@ require e500v2.inc
 UBOOT_MACHINES = "MPC8548CDS"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/mpc8548cds.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_defconfig"
+
+JFFS2_ERASEBLOCK = "0x20000"
+
diff --git a/conf/machine/mpc8572ds.conf b/conf/machine/mpc8572ds.conf
index 164c0db..277cdc4 100644
--- a/conf/machine/mpc8572ds.conf
+++ b/conf/machine/mpc8572ds.conf
@@ -6,3 +6,6 @@ require e500v2.inc
 UBOOT_MACHINES = "MPC8572DS"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/mpc8572ds.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
+
+JFFS2_ERASEBLOCK = "0x20000"
+
diff --git a/conf/machine/p1010rdb.conf b/conf/machine/p1010rdb.conf
index 693eed1..362acd2 100644
--- a/conf/machine/p1010rdb.conf
+++ b/conf/machine/p1010rdb.conf
@@ -7,3 +7,6 @@ require e500v2.inc
 UBOOT_MACHINES = "P1010RDB_NAND"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1010rdb.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_defconfig"
+
+JFFS2_ERASEBLOCK = "0x20000"
+
diff --git a/conf/machine/p1020mbg.conf b/conf/machine/p1020mbg.conf
index 5bb8436..f2b9eaf 100644
--- a/conf/machine/p1020mbg.conf
+++ b/conf/machine/p1020mbg.conf
@@ -8,3 +8,6 @@ BOOTFORMAT_CONFIG = "config_ddr3_1gb_p1_p2_rdb_pc_800M.dat"
 UBOOT_MACHINES = "P1020MBG-PC P1020MBG-PC_SDCARD P1020MBG-PC_36BIT P1020MBG-PC_36BIT_SDCARD"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1020mbg.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
+
+JFFS2_ERASEBLOCK = "0x20000"
+
diff --git a/conf/machine/p1020rdb.conf b/conf/machine/p1020rdb.conf
index d9b6579..80d113e 100644
--- a/conf/machine/p1020rdb.conf
+++ b/conf/machine/p1020rdb.conf
@@ -8,3 +8,6 @@ UBOOT_MACHINES = " P1020RDB-PC P1020RDB-PC_SPIFLASH P1020RDB-PC_NAND P1020RDB-PC
 
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1020rdb.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
+
+JFFS2_ERASEBLOCK = "0x20000"
+
diff --git a/conf/machine/p1020utm.conf b/conf/machine/p1020utm.conf
index eb3311f..98b8ef3 100644
--- a/conf/machine/p1020utm.conf
+++ b/conf/machine/p1020utm.conf
@@ -8,3 +8,6 @@ BOOTFORMAT_CONFIG = "config_ddr3_1gb_p1_p2_rdb_pc_800M.dat"
 UBOOT_MACHINES = "P1020UTM-PC P1020UTM-PC_SDCARD P1020UTM-PC_36BIT P1020UTM-PC_36BIT_SDCARD"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1020utm.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
+
+JFFS2_ERASEBLOCK = "0x20000"
+
diff --git a/conf/machine/p1021rdb.conf b/conf/machine/p1021rdb.conf
index 8bdc400..6da8ef3 100644
--- a/conf/machine/p1021rdb.conf
+++ b/conf/machine/p1021rdb.conf
@@ -7,3 +7,6 @@ BOOTFORMAT_CONFIG = "config_ddr3_1gb_p1_p2_rdb_pc_800M.dat"
 UBOOT_MACHINES = "P1021RDB-PC P1021RDB-PC_NAND P1021RDB-PC_SDCARD P1021RDB-PC_SPIFLASH P1021RDB-PC_36BIT P1021RDB-PC_36BIT_SPIFLASH P1021RDB-PC_36BIT_NAND P1021RDB-PC_36BIT_SDCARD"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1021rdb.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
+
+JFFS2_ERASEBLOCK = "0x20000"
+
diff --git a/conf/machine/p1022ds.conf b/conf/machine/p1022ds.conf
index c9f1877..3071bae 100644
--- a/conf/machine/p1022ds.conf
+++ b/conf/machine/p1022ds.conf
@@ -17,3 +17,6 @@ XSERVER = " \
         xf86-input-keyboard \
         xf86-video-fbdev \
 "
+
+JFFS2_ERASEBLOCK = "0x20000"
+
diff --git a/conf/machine/p1023rds.conf b/conf/machine/p1023rds.conf
index b3e7631..522bde6 100644
--- a/conf/machine/p1023rds.conf
+++ b/conf/machine/p1023rds.conf
@@ -6,3 +6,6 @@ require e500v2.inc
 UBOOT_MACHINES = "P1023RDS P1023RDS_NAND"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1023rds.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/85xx/p1023rds_defconfig"
+
+JFFS2_ERASEBLOCK = "0x10000"
+
diff --git a/conf/machine/p1024rdb.conf b/conf/machine/p1024rdb.conf
index c562e03..aa6b22f 100644
--- a/conf/machine/p1024rdb.conf
+++ b/conf/machine/p1024rdb.conf
@@ -8,3 +8,6 @@ BOOTFORMAT_CONFIG = "config_ddr3_1gb_p1_p2_rdb_pc_667M.dat"
 UBOOT_MACHINES = "P1024RDB P1024RDB_36BIT P1024RDB_NAND P1024RDB_SDCARD P1024RDB_SPIFLASH"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1024rdb.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
+
+JFFS2_ERASEBLOCK = "0x20000"
+
diff --git a/conf/machine/p1025rdb.conf b/conf/machine/p1025rdb.conf
index 6d2f4fa..27e3fa4 100644
--- a/conf/machine/p1025rdb.conf
+++ b/conf/machine/p1025rdb.conf
@@ -9,3 +9,6 @@ BOOTFORMAT_CONFIG = "config_ddr3_1gb_p1_p2_rdb_pc_667M.dat"
 UBOOT_MACHINES = "P1025RDB P1025RDB_36BIT P1025RDB_NAND P1025RDB_SDCARD P1025RDB_SPIFLASH"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1025rdb.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
+
+JFFS2_ERASEBLOCK = "0x20000"
+
diff --git a/conf/machine/p2020ds.conf b/conf/machine/p2020ds.conf
index 5928862..3059bde 100644
--- a/conf/machine/p2020ds.conf
+++ b/conf/machine/p2020ds.conf
@@ -7,3 +7,6 @@ BOOTFORMAT_CONFIG = "config_sram_p2020ds.dat"
 UBOOT_MACHINES = "P2020DS P2020DS_36BIT P2020DS_DDR2 P2020DS_SDCARD P2020DS_SPIFLASH"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p2020ds.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
+
+JFFS2_ERASEBLOCK = "0x20000"
+
diff --git a/conf/machine/p2020rdb.conf b/conf/machine/p2020rdb.conf
index 1cb2319..976134a 100644
--- a/conf/machine/p2020rdb.conf
+++ b/conf/machine/p2020rdb.conf
@@ -8,3 +8,6 @@ BOOTFORMAT_CONFIG = "config_ddr3_1gb_64bit_p2020rdb_pc.dat"
 UBOOT_MACHINES = " P2020RDB-PC P2020RDB-PC_NAND P2020RDB-PC_SDCARD P2020RDB-PC_SPIFLASH P2020RDB-PC_36BIT P2020RDB-PC_36BIT_SPIFLASH P2020RDB-PC_36BIT_NAND P2020RDB-PC_36BIT_SDCARD"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p2020rdb.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
+
+JFFS2_ERASEBLOCK = "0x20000"
+
diff --git a/conf/machine/p2041rdb.conf b/conf/machine/p2041rdb.conf
index 014699e..bc6b67a 100644
--- a/conf/machine/p2041rdb.conf
+++ b/conf/machine/p2041rdb.conf
@@ -7,3 +7,6 @@ UBOOT_MACHINES = "P2041RDB P2041RDB_SECURE_BOOT P2041RDB_SDCARD P2041RDB_SPIFLAS
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p2041rdb.dts \
                         ${S}/arch/powerpc/boot/dts/p2041rdb-usdpaa.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
+
+JFFS2_ERASEBLOCK = "0x10000"
+
diff --git a/conf/machine/p3041ds.conf b/conf/machine/p3041ds.conf
index 2bdfb33..facfc4a 100644
--- a/conf/machine/p3041ds.conf
+++ b/conf/machine/p3041ds.conf
@@ -7,3 +7,6 @@ UBOOT_MACHINES = "P3041DS P3041DS_NAND P3041DS_SECURE_BOOT P3041DS_SRIOBOOT_MAST
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p3041ds.dts \
                         ${S}/arch/powerpc/boot/dts/p3041ds-usdpaa.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
+
+JFFS2_ERASEBLOCK = "0x10000"
+
diff --git a/conf/machine/p4080ds.conf b/conf/machine/p4080ds.conf
index 66a9554..cebedc9 100644
--- a/conf/machine/p4080ds.conf
+++ b/conf/machine/p4080ds.conf
@@ -7,3 +7,6 @@ UBOOT_MACHINES = "P4080DS P4080DS_SECURE_BOOT P4080DS_SRIOBOOT_MASTER P4080DS_SR
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p4080ds.dts \
                         ${S}/arch/powerpc/boot/dts/p4080ds-usdpaa.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
+
+JFFS2_ERASEBLOCK = "0x10000"
+
diff --git a/conf/machine/p5020ds-64b.conf b/conf/machine/p5020ds-64b.conf
index 7333643..e9e919d 100644
--- a/conf/machine/p5020ds-64b.conf
+++ b/conf/machine/p5020ds-64b.conf
@@ -8,3 +8,6 @@ UBOOT_MACHINES = "P5020DS"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p5020ds.dts \
                         ${S}/arch/powerpc/boot/dts/p5020ds-usdpaa.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet64_smp_defconfig"
+
+JFFS2_ERASEBLOCK = "0x10000"
+
diff --git a/conf/machine/p5020ds.conf b/conf/machine/p5020ds.conf
index 84de757..ab64014 100644
--- a/conf/machine/p5020ds.conf
+++ b/conf/machine/p5020ds.conf
@@ -7,3 +7,6 @@ UBOOT_MACHINES = "P5020DS P5020DS_NAND P5020DS_SECURE_BOOT P5020DS_SRIOBOOT_MAST
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p5020ds.dts \
                         ${S}/arch/powerpc/boot/dts/p5020ds-usdpaa.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
+
+JFFS2_ERASEBLOCK = "0x10000"
+
diff --git a/conf/machine/p5040ds-64b.conf b/conf/machine/p5040ds-64b.conf
index 3e4d66e..a0c5637 100644
--- a/conf/machine/p5040ds-64b.conf
+++ b/conf/machine/p5040ds-64b.conf
@@ -8,3 +8,6 @@ UBOOT_MACHINES = "P5040DS"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p5040ds.dts "
 
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet64_smp_defconfig"
+
+JFFS2_ERASEBLOCK = "0x10000"
+
diff --git a/conf/machine/p5040ds.conf b/conf/machine/p5040ds.conf
index f980b0c..b8998ca 100644
--- a/conf/machine/p5040ds.conf
+++ b/conf/machine/p5040ds.conf
@@ -7,3 +7,6 @@ UBOOT_MACHINES = "P5040DS"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p5040ds.dts \
                         ${S}/arch/powerpc/boot/dts/p5040ds-usdpaa.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
+
+JFFS2_ERASEBLOCK = "0x10000"
+