10 files changed, 21 insertions, 15 deletions

diff --git a/meta-fsl-ppc/conf/machine/mpc8536ds.conf b/meta-fsl-ppc/conf/machine/mpc8536ds.conf
index 171233b2..e60292e3 100644
--- a/meta-fsl-ppc/conf/machine/mpc8536ds.conf
+++ b/meta-fsl-ppc/conf/machine/mpc8536ds.conf
@@ -4,6 +4,7 @@
 
 require e500v2.inc
 
-UBOOT_MACHINES = "MPC8536DS"
+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"
diff --git a/meta-fsl-ppc/conf/machine/p1020mbg.conf b/meta-fsl-ppc/conf/machine/p1020mbg.conf
index ba1de3c8..5bb8436b 100644
--- a/meta-fsl-ppc/conf/machine/p1020mbg.conf
+++ b/meta-fsl-ppc/conf/machine/p1020mbg.conf
@@ -4,6 +4,7 @@
 
 require e500v2.inc
 
-UBOOT_MACHINES = "P1020MBG-PC"
+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"
diff --git a/meta-fsl-ppc/conf/machine/p1020rdb.conf b/meta-fsl-ppc/conf/machine/p1020rdb.conf
index 1d046b4c..d9b6579f 100644
--- a/meta-fsl-ppc/conf/machine/p1020rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p1020rdb.conf
@@ -3,8 +3,8 @@
 
 require e500v2.inc
 
-BOOTFORMAT_CONFIG = "config_ddr3_1gb_p1_p2_rdb_pc_667M.dat"
-UBOOT_MACHINES = "P1020RDB P1020RDB-PC P1020RDB-PC_SPIFLASH P1020RDB-PC_NAND P1020RDB-PC_SDCARD"
+BOOTFORMAT_CONFIG = "config_ddr3_1gb_p1_p2_rdb_pc_800M.dat"
+UBOOT_MACHINES = " P1020RDB-PC P1020RDB-PC_SPIFLASH P1020RDB-PC_NAND P1020RDB-PC_SDCARD P1020RDB-PC_36BIT P1020RDB-PC_36BIT_SPIFLASH P1020RDB-PC_36BIT_NAND P1020RDB-PC_36BIT_SDCARD"
 
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1020rdb.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
diff --git a/meta-fsl-ppc/conf/machine/p1020utm.conf b/meta-fsl-ppc/conf/machine/p1020utm.conf
index 91833b16..eb3311f3 100644
--- a/meta-fsl-ppc/conf/machine/p1020utm.conf
+++ b/meta-fsl-ppc/conf/machine/p1020utm.conf
@@ -4,6 +4,7 @@
 
 require e500v2.inc
 
-UBOOT_MACHINES = "P1020UTM-PC"
+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"
diff --git a/meta-fsl-ppc/conf/machine/p1021rdb.conf b/meta-fsl-ppc/conf/machine/p1021rdb.conf
index 7e029be4..8bdc4005 100644
--- a/meta-fsl-ppc/conf/machine/p1021rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p1021rdb.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the Freescale P1021RDB
 
 require e500v2.inc
-
-UBOOT_MACHINES = "P1021RDB-PC"
+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"
diff --git a/meta-fsl-ppc/conf/machine/p1022ds.conf b/meta-fsl-ppc/conf/machine/p1022ds.conf
index b104a482..c9f18779 100644
--- a/meta-fsl-ppc/conf/machine/p1022ds.conf
+++ b/meta-fsl-ppc/conf/machine/p1022ds.conf
@@ -3,7 +3,8 @@
 
 require e500v2.inc
 
-UBOOT_MACHINES = "P1022DS"
+BOOTFORMAT_CONFIG = "config_ddr3_2gb_p1022ds.dat"
+UBOOT_MACHINES = "P1022DS P1022DS_NAND P1022DS_SPIFLASH P1022DS_SDCARD P1022DS_36BIT P1022DS_36BIT_SPIFLASH P1022DS_36BIT_NAND P1022DS_36BIT_SDCARD"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1022ds.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 
diff --git a/meta-fsl-ppc/conf/machine/p1024rdb.conf b/meta-fsl-ppc/conf/machine/p1024rdb.conf
index e170a997..c562e035 100644
--- a/meta-fsl-ppc/conf/machine/p1024rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p1024rdb.conf
@@ -4,6 +4,7 @@
 
 require e500v2.inc
 
-UBOOT_MACHINES = "P1024RDB"
+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"
diff --git a/meta-fsl-ppc/conf/machine/p1025rdb.conf b/meta-fsl-ppc/conf/machine/p1025rdb.conf
index 6e7b3c0b..6d2f4faa 100644
--- a/meta-fsl-ppc/conf/machine/p1025rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p1025rdb.conf
@@ -4,6 +4,8 @@
 
 require e500v2.inc
 
-UBOOT_MACHINES = "P1025RDB"
+
+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"
diff --git a/meta-fsl-ppc/conf/machine/p2020ds.conf b/meta-fsl-ppc/conf/machine/p2020ds.conf
index 527c67dd..59288626 100644
--- a/meta-fsl-ppc/conf/machine/p2020ds.conf
+++ b/meta-fsl-ppc/conf/machine/p2020ds.conf
@@ -2,10 +2,8 @@
 #@DESCRIPTION: Machine configuration for running 
 
 require e500v2.inc
+BOOTFORMAT_CONFIG = "config_sram_p2020ds.dat"
 
-UBOOT_MACHINES = "P2020DS"
+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"
-
-UBOOT_MACHINES = "P2020DS_SDCARD_config P2020DS_config"
-BOOTFORMAT_CONFIG = "config_sram_p2020ds.dat"
diff --git a/meta-fsl-ppc/conf/machine/p2020rdb.conf b/meta-fsl-ppc/conf/machine/p2020rdb.conf
index 22b07f8c..1cb2319c 100644
--- a/meta-fsl-ppc/conf/machine/p2020rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p2020rdb.conf
@@ -4,6 +4,7 @@
 
 require e500v2.inc
 
-UBOOT_MACHINES = "P2020RDB-PC"
+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"