Move meta-fsl-ppc content to layer root

This commit is just a rename of all contents of meta-fsl-ppc
subdirectory to this layer's root, merging the contents of common
files, subsequent changes are based on top of that.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

47 files changed, 0 insertions, 783 deletions

diff --git a/meta-fsl-ppc/conf/layer.conf b/meta-fsl-ppc/conf/layer.conf
deleted file mode 100644
index a4d4add9..00000000
--- a/meta-fsl-ppc/conf/layer.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# We have a packages directory, add to BBFILES
-BBPATH .= ":${LAYERDIR}"
-
-BBFILES += "${LAYERDIR}/recipes-*/*/*.bb*"
-BBFILES += "${LAYERDIR}/images/*.bb*"
-BBFILES += "${LAYERDIR}/classes/*.bb*"
-
-BBFILE_COLLECTIONS += "fsl-ppc"
-BBFILE_PATTERN_fsl-ppc = "^${LAYERDIR}/"
-BBFILE_PRIORITY_fsl-ppc = "5"
-
-LICENSE_PATH += "${LAYERDIR}/custom-licenses"
-
-# Let us add layer-specific bbappends which are only applied when that
-# layer is included in our configuration
-BBFILES += "${@' '.join('${LAYERDIR}/%s/recipes*/*/*.bbappend' % layer \
-               for layer in BBFILE_COLLECTIONS.split())}"
-
diff --git a/meta-fsl-ppc/conf/machine/b4420qds-64b.conf b/meta-fsl-ppc/conf/machine/b4420qds-64b.conf
deleted file mode 100644
index 3df5e955..00000000
--- a/meta-fsl-ppc/conf/machine/b4420qds-64b.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-#@TYPE: Machine
-#@NAME: Freescale B4420QDS-64B
-#@SOC: b4420
-#@DESCRIPTION: Machine configuration for running B4420QDS in 64-bit mode
-#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
-
-require conf/machine/include/e6500-64b.inc
-
-SOC_FAMILY = "b4:b4420"
-UBOOT_MACHINES ?= "B4420QDS"
-KERNEL_DEVICETREE ?= "b4420qds.dtb b4420qds-usdpaa.dtb"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
-
-JFFS2_ERASEBLOCK = "0x10000"
-
diff --git a/meta-fsl-ppc/conf/machine/b4420qds.conf b/meta-fsl-ppc/conf/machine/b4420qds.conf
deleted file mode 100644
index c5433e86..00000000
--- a/meta-fsl-ppc/conf/machine/b4420qds.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-#@TYPE: Machine
-#@NAME: Freescale B4420QDS
-#@SOC: b4420
-#@DESCRIPTION: Machine configuration for running B4420QDS in 32-bit mode
-#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
-
-require conf/machine/include/e6500.inc
-
-SOC_FAMILY = "b4:b4420"
-UBOOT_MACHINES ?= "B4420QDS"
-KERNEL_DEVICETREE ?= "b4420qds.dtb b4420qds-usdpaa.dtb"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
-
-JFFS2_ERASEBLOCK = "0x10000"
-
diff --git a/meta-fsl-ppc/conf/machine/b4860qds-64b.conf b/meta-fsl-ppc/conf/machine/b4860qds-64b.conf
deleted file mode 100644
index c40fb305..00000000
--- a/meta-fsl-ppc/conf/machine/b4860qds-64b.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-#@TYPE: Machine
-#@NAME: Freescale B4860QDS-64B
-#@SOC: b4860
-#@DESCRIPTION: Machine configuration for running B4860QDS in 64-bit mode
-#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
-
-require conf/machine/include/e6500-64b.inc
-
-SOC_FAMILY = "b4:b4860"
-UBOOT_MACHINES ?= "B4860QDS B4860QDS_SECURE_BOOT"
-KERNEL_DEVICETREE ?= "b4860qds.dtb b4860qds-usdpaa.dtb \
-    b4860qds-usdpaa-shared-interfaces.dtb \
-"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
-
-JFFS2_ERASEBLOCK = "0x10000"
-
diff --git a/meta-fsl-ppc/conf/machine/b4860qds.conf b/meta-fsl-ppc/conf/machine/b4860qds.conf
deleted file mode 100644
index 10b4ad41..00000000
--- a/meta-fsl-ppc/conf/machine/b4860qds.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-#@TYPE: Machine
-#@NAME: Freescale B4860QDS
-#@SOC: b4860
-#@DESCRIPTION: Machine configuration for running B4860QDS in 32-bit mode
-#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
-
-require conf/machine/include/e6500.inc
-
-SOC_FAMILY = "b4:b4860"
-UBOOT_MACHINES ?= "B4860QDS B4860QDS_SECURE_BOOT"
-KERNEL_DEVICETREE ?= "b4860qds.dtb b4860qds-usdpaa.dtb \
-    b4860qds-usdpaa-shared-interfaces.dtb \
-"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
-
-JFFS2_ERASEBLOCK = "0x10000"
-
diff --git a/meta-fsl-ppc/conf/machine/bsc9131rdb.conf b/meta-fsl-ppc/conf/machine/bsc9131rdb.conf
deleted file mode 100644
index e65f7e4e..00000000
--- a/meta-fsl-ppc/conf/machine/bsc9131rdb.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-#@TYPE: Machine
-#@NAME: Freescale BSC9131RDB
-#@SOC: bsc9131
-#@DESCRIPTION: Machine configuration for running BSC9131RDB
-#@MAINTAINER: Chunrong Guo <B40290@freescale.com> 
-
-require conf/machine/include/e500v2.inc
-
-SOC_FAMILY = "bsc9131"
-UBOOT_MACHINES ?= "BSC9131RDB_SPIFLASH BSC9131RDB_NAND BSC9131RDB_NAND_SYSCLK100 BSC9131RDB_SPIFLASH_SYSCLK100"
-KERNEL_DEVICETREE ?= "bsc9131rdb.dtb"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/bsc913x_defconfig"
-
-JFFS2_ERASEBLOCK = "0x10000"
-
diff --git a/meta-fsl-ppc/conf/machine/bsc9132qds.conf b/meta-fsl-ppc/conf/machine/bsc9132qds.conf
deleted file mode 100644
index 90ac2a3b..00000000
--- a/meta-fsl-ppc/conf/machine/bsc9132qds.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-#@TYPE: Machine
-#@NAME: Freescale BSC9132QDS
-#@SOC: bsc9132
-#@DESCRIPTION: Machine configuration for running BSC9132QDS
-#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
-
-require conf/machine/include/e500v2.inc
-
-SOC_FAMILY = "bsc9132"
-UBOOT_MACHINES ?= " BSC9132QDS_NAND_DDRCLK133 BSC9132QDS_NAND_DDRCLK100 \
-    BSC9132QDS_NOR_DDRCLK100 BSC9132QDS_NOR_DDRCLK133 \
-    BSC9132QDS_SDCARD_DDRCLK100 BSC9132QDS_SDCARD_DDRCLK133 \
-    BSC9132QDS_SPIFLASH_DDRCLK100 BSC9132QDS_SPIFLASH_DDRCLK133 \
-    BSC9132QDS_NAND_DDRCLK100_SECURE BSC9132QDS_NAND_DDRCLK133_SECURE \
-    BSC9132QDS_NOR_DDRCLK100_SECURE BSC9132QDS_NOR_DDRCLK133_SECURE \
-    BSC9132QDS_SDCARD_DDRCLK100_SECURE BSC9132QDS_SDCARD_DDRCLK133_SECURE \
-    BSC9132QDS_SPIFLASH_DDRCLK100_SECURE BSC9132QDS_SPIFLASH_DDRCLK133_SECURE \
-"
-KERNEL_DEVICETREE ?= "bsc9132qds.dtb"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/bsc913x_smp_defconfig"
-
-JFFS2_ERASEBLOCK = "0x10000"
-
diff --git a/meta-fsl-ppc/conf/machine/c293pcie.conf b/meta-fsl-ppc/conf/machine/c293pcie.conf
deleted file mode 100644
index 6a63844e..00000000
--- a/meta-fsl-ppc/conf/machine/c293pcie.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-#@TYPE: Machine
-#@NAME: Freescale C293PCIE
-#@SOC: c293pcie
-#@DESCRIPTION: Machine configuration for running C293PCIE in 36-bit mode
-#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
-
-require conf/machine/include/e500v2.inc
-
-SOC_FAMILY = "c293pcie"
-BOOTFORMAT_CONFIG = "config_ddr3_512m_c29xpcie_800M.dat"
-UBOOT_MACHINES ?= "C29XPCIE C29XPCIE_SPIFLASH C29XPCIE_SECBOOT C29XPCIE_SPIFLASH_SECBOOT"
-KERNEL_DEVICETREE ?= "c293pcie_36b.dtb"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_defconfig"
-
-JFFS2_ERASEBLOCK = "0x10000"
-
diff --git a/meta-fsl-ppc/conf/machine/include/e500mc.inc b/meta-fsl-ppc/conf/machine/include/e500mc.inc
deleted file mode 100644
index 5871104d..00000000
--- a/meta-fsl-ppc/conf/machine/include/e500mc.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-TARGET_FPU = "hard"
-
-require conf/machine/include/tune-ppce500mc.inc
-require conf/machine/include/qoriq-base.inc
-
-MACHINEOVERRIDES .= ":e500mc"
diff --git a/meta-fsl-ppc/conf/machine/include/e500v2.inc b/meta-fsl-ppc/conf/machine/include/e500v2.inc
deleted file mode 100644
index a9372549..00000000
--- a/meta-fsl-ppc/conf/machine/include/e500v2.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-require conf/machine/include/tune-ppce500v2.inc
-require conf/machine/include/qoriq-base.inc
-
-MACHINEOVERRIDES .= ":e500v2"
diff --git a/meta-fsl-ppc/conf/machine/include/e5500-64b.inc b/meta-fsl-ppc/conf/machine/include/e5500-64b.inc
deleted file mode 100644
index d238ca89..00000000
--- a/meta-fsl-ppc/conf/machine/include/e5500-64b.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-TARGET_FPU = "hard"
-DEFAULTTUNE ?= "ppc64e5500"
-
-require conf/machine/include/tune-ppce5500.inc
-require conf/machine/include/qoriq-base.inc
-
-MACHINEOVERRIDES .= ":e5500-64b"
-
-require conf/multilib.conf
-MULTILIBS ?= "multilib:lib32"
-DEFAULTTUNE_virtclass-multilib-lib32 ?= "ppce5500"
-
diff --git a/meta-fsl-ppc/conf/machine/include/e5500.inc b/meta-fsl-ppc/conf/machine/include/e5500.inc
deleted file mode 100644
index 88f6d06e..00000000
--- a/meta-fsl-ppc/conf/machine/include/e5500.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-TARGET_FPU = "hard"
-
-require conf/machine/include/tune-ppce5500.inc
-require conf/machine/include/qoriq-base.inc
-
-MACHINEOVERRIDES .= ":e5500"
diff --git a/meta-fsl-ppc/conf/machine/include/e6500-64b.inc b/meta-fsl-ppc/conf/machine/include/e6500-64b.inc
deleted file mode 100644
index 522ee71f..00000000
--- a/meta-fsl-ppc/conf/machine/include/e6500-64b.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-TARGET_FPU = "hard"
-DEFAULTTUNE ?= "ppc64e6500"
-
-require conf/machine/include/tune-ppce6500.inc
-require conf/machine/include/qoriq-base.inc
-
-MACHINEOVERRIDES .= ":e6500-64b"
-
-require conf/multilib.conf
-MULTILIBS ?= "multilib:lib32"
-DEFAULTTUNE_virtclass-multilib-lib32 ?= "ppce6500"
-
diff --git a/meta-fsl-ppc/conf/machine/include/e6500.inc b/meta-fsl-ppc/conf/machine/include/e6500.inc
deleted file mode 100644
index 4121fbef..00000000
--- a/meta-fsl-ppc/conf/machine/include/e6500.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-TARGET_FPU = "hard"
-
-require conf/machine/include/tune-ppce6500.inc
-require conf/machine/include/qoriq-base.inc
-
-MACHINEOVERRIDES .= ":e6500"
-
-BUILD_64BIT_KERNEL = "1"
-
-require conf/multilib.conf
-MULTILIBS ?= "multilib:lib64"
-DEFAULTTUNE_virtclass-multilib-lib64 ?= "ppc64e6500"
-
diff --git a/meta-fsl-ppc/conf/machine/include/qoriq-base.inc b/meta-fsl-ppc/conf/machine/include/qoriq-base.inc
deleted file mode 100644
index 25d22978..00000000
--- a/meta-fsl-ppc/conf/machine/include/qoriq-base.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-# Provides the QorIQ common settings
-require conf/machine/include/soc-family.inc
-
-# providers
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq"
-PREFERRED_PROVIDER_u-boot ?= "u-boot-qoriq"
-
-# versions
-PREFERRED_VERSION_qemu = "2.2.0+fsl"
-PREFERRED_VERSION_openssl = "1.0.1i"
-
-# settings
-MACHINE_FEATURES = "keyboard pci ext2 ext3 serial"
-MACHINE_EXTRA_RRECOMMENDS += "udev-rules-qoriq kernel-modules"
-MACHINEOVERRIDES .= ":qoriq-ppc"
-
-IMAGE_CLASSES += "image_types_uboot"
-EXTRA_IMAGEDEPENDS += "u-boot"
-
-KERNEL_IMAGETYPE ?= "uImage"
-
-SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
-SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
-
-USE_VT = "0"
-
diff --git a/meta-fsl-ppc/conf/machine/p1010rdb.conf b/meta-fsl-ppc/conf/machine/p1010rdb.conf
deleted file mode 100644
index e24c341e..00000000
--- a/meta-fsl-ppc/conf/machine/p1010rdb.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-#@TYPE: Machine
-#@Name: Freescale P1010RDB
-#@SOC: p1010
-#@DESCRIPTION: Machine configuration for running P1010RDB
-#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
-
-require conf/machine/include/e500v2.inc
-
-SOC_FAMILY = "p1010"
-BOOTFORMAT_CONFIG = "config_sram_p1010rdb.dat"
-UBOOT_MACHINES ?= "P1010RDB-PB_NAND P1010RDB-PB_NOR \
-    P1010RDB-PB_SPIFLASH P1010RDB-PB_36BIT_NOR P1010RDB-PB_36BIT_NAND \
-    P1010RDB-PB_36BIT_SPIFLASH P1010RDB-PB_36BIT_NAND_SECBOOT \
-    P1010RDB-PB_36BIT_NOR_SECBOOT P1010RDB-PB_36BIT_SPIFLASH_SECBOOT \
-    P1010RDB-PB_NAND_SECBOOT P1010RDB-PB_NOR_SECBOOT \
-    P1010RDB-PB_SPIFLASH_SECBOOT \
-"
-KERNEL_DEVICETREE ?= "p1010rdb-pa.dtb p1010rdb-pb.dtb"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_defconfig"
-
-JFFS2_ERASEBLOCK = "0x20000"
-
diff --git a/meta-fsl-ppc/conf/machine/p1020rdb.conf b/meta-fsl-ppc/conf/machine/p1020rdb.conf
deleted file mode 100644
index e2b706ed..00000000
--- a/meta-fsl-ppc/conf/machine/p1020rdb.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-#@TYPE: Machine
-#@NAME: Freescale P1020RDB
-#@SOC: p1020
-#@DESCRIPTION: Machine configuration for running P1020RDB
-#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
-
-require conf/machine/include/e500v2.inc
-
-SOC_FAMILY = "p1020"
-BOOTFORMAT_CONFIG = "config_sram_p1022ds.dat"
-UBOOT_MACHINES ?= " P1020RDB-PD P1020RDB-PD_NAND P1020RDB-PD_SDCARD P1020RDB-PD_SPIFLASH"
-KERNEL_DEVICETREE ?= "p1020rdb-pd_32b.dtb"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
-
-JFFS2_ERASEBLOCK = "0x20000"
-
diff --git a/meta-fsl-ppc/conf/machine/p1021rdb.conf b/meta-fsl-ppc/conf/machine/p1021rdb.conf
deleted file mode 100644
index 03a18215..00000000
--- a/meta-fsl-ppc/conf/machine/p1021rdb.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-#@TYPE: Machine
-#@Name: Freescale P1021RDB
-#@SOC: p1021
-#@DESCRIPTION: Machine configuration for running P1021RDB
-#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
-
-require conf/machine/include/e500v2.inc
-
-SOC_FAMILY = "p1021"
-BOOTFORMAT_CONFIG = "config_sram_p1022ds.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 ?= "p1021rdb-pc_32b.dtb"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
-
-JFFS2_ERASEBLOCK = "0x20000"
-QE_UCODE ?= "fsl_qe_ucode_1021_10_A.bin"
-
diff --git a/meta-fsl-ppc/conf/machine/p1022ds.conf b/meta-fsl-ppc/conf/machine/p1022ds.conf
deleted file mode 100644
index 823131ad..00000000
--- a/meta-fsl-ppc/conf/machine/p1022ds.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-#@TYPE: Machine
-#@NAME: Freescale P1022DS 
-#@SOC: p1022
-#@DESCRIPTION: Machine configuration for running P1022DS
-#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
-
-require conf/machine/include/e500v2.inc
-
-SOC_FAMILY = "p1022"
-BOOTFORMAT_CONFIG = "config_sram_p1022ds.dat"
-UBOOT_MACHINES ?= "P1022DS P1022DS_NAND P1022DS_SPIFLASH P1022DS_SDCARD P1022DS_36BIT P1022DS_36BIT_SPIFLASH P1022DS_36BIT_NAND P1022DS_36BIT_SDCARD"
-KERNEL_DEVICETREE ?= "p1022ds_32b.dtb"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
-
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-
-XSERVER = " \
-        xserver-xorg \
-        xf86-input-evdev \
-        xf86-input-mouse \
-        xf86-input-keyboard \
-        xf86-video-fbdev \
-"
-
-JFFS2_ERASEBLOCK = "0x20000"
-
diff --git a/meta-fsl-ppc/conf/machine/p1023rdb.conf b/meta-fsl-ppc/conf/machine/p1023rdb.conf
deleted file mode 100644
index 02ec4a59..00000000
--- a/meta-fsl-ppc/conf/machine/p1023rdb.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-#@TYPE: Machine
-#@NAME: Freescale P1023RDB
-#@SOC: p1023
-#@DESCRIPTION: Machine configuration for running P1023RDB
-#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
-
-require conf/machine/include/e500v2.inc
-
-SOC_FAMILY = "p1023"
-UBOOT_MACHINES ?= "P1023RDB"
-KERNEL_DEVICETREE ?= "p1023rdb.dtb"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/p1023_defconfig"
-
-JFFS2_ERASEBLOCK = "0x10000"
-
diff --git a/meta-fsl-ppc/conf/machine/p1025twr.conf b/meta-fsl-ppc/conf/machine/p1025twr.conf
deleted file mode 100644
index 0c6bb57a..00000000
--- a/meta-fsl-ppc/conf/machine/p1025twr.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-#@TYPE: Machine
-#@Name: Freescale P1025TWR
-#@SOC: p1025
-#@DESCRIPTION: Machine configuration for running P1025TWR
-#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
-
-require conf/machine/include/e500v2.inc
-
-SOC_FAMILY = "p1025"
-BOOTFORMAT_CONFIG = "config_ddr3_1gb_p1_p2_rdb_pc_667M.dat"
-UBOOT_MACHINES ?= "TWR-P1025"
-KERNEL_DEVICETREE ?= "p1025twr_32b.dtb"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
-
-JFFS2_ERASEBLOCK = "0x20000"
-QE_UCODE ?= "fsl_qe_ucode_1021_10_A.bin"
-
diff --git a/meta-fsl-ppc/conf/machine/p2020rdb.conf b/meta-fsl-ppc/conf/machine/p2020rdb.conf
deleted file mode 100644
index 9544c256..00000000
--- a/meta-fsl-ppc/conf/machine/p2020rdb.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-#@TYPE: Machine
-#@Name: Freescale P2020RDB
-#@SOC: p2020
-#@DESCRIPTION: Machine configuration for running P2020RDB
-#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
-
-require conf/machine/include/e500v2.inc
-
-SOC_FAMILY = "p2020"
-BOOTFORMAT_CONFIG = "config_sram_p1022ds.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 ?= "p2020rdb-pc_32b.dtb"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
-
-JFFS2_ERASEBLOCK = "0x20000"
-
diff --git a/meta-fsl-ppc/conf/machine/p2041rdb.conf b/meta-fsl-ppc/conf/machine/p2041rdb.conf
deleted file mode 100644
index 9ed63ff1..00000000
--- a/meta-fsl-ppc/conf/machine/p2041rdb.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-#@TYPE: Machine
-#@NAME: Freescale P2041RDB
-#@SOC: p2041
-#@DESCRIPTION: Machine configuration for running P2041RDB
-#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
-
-require conf/machine/include/e500mc.inc
-
-SOC_FAMILY = "p2041"
-UBOOT_MACHINES ?= "P2041RDB P2041RDB_NAND P2041RDB_SECURE_BOOT \
-    P2041RDB_SDCARD P2041RDB_SPIFLASH \
-"
-KERNEL_DEVICETREE ?= "p2041rdb.dtb p2041rdb-usdpaa.dtb \
-    p2041rdb-usdpaa-shared-interfaces.dtb \
-"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
-
-JFFS2_ERASEBLOCK = "0x10000"
-
diff --git a/meta-fsl-ppc/conf/machine/p3041ds.conf b/meta-fsl-ppc/conf/machine/p3041ds.conf
deleted file mode 100644
index 8fca5b40..00000000
--- a/meta-fsl-ppc/conf/machine/p3041ds.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-#@TYPE: Machine
-#@NAME: Freescale P3041DS
-#@SOC: p3041
-#@DESCRIPTION: Machine configuration for running P3041DS
-#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
-
-require conf/machine/include/e500mc.inc
-
-SOC_FAMILY = "p3041"
-UBOOT_MACHINES ?= "P3041DS P3041DS_NAND P3041DS_SECURE_BOOT \
-    P3041DS_SDCARD P3041DS_SPIFLASH \
-"
-KERNEL_DEVICETREE ?= "p3041ds.dtb p3041ds-usdpaa.dtb \
-    p3041ds-usdpaa-shared-interfaces.dtb \
-"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
-
-JFFS2_ERASEBLOCK = "0x10000"
-
diff --git a/meta-fsl-ppc/conf/machine/p4080ds.conf b/meta-fsl-ppc/conf/machine/p4080ds.conf
deleted file mode 100644
index b3fc87b2..00000000
--- a/meta-fsl-ppc/conf/machine/p4080ds.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-#@TYPE: Machine
-#@NAME: Freescale P4080DS
-#@SOC: p4080
-#@DESCRIPTION: Machine configuration for running P4080DS
-#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
-
-require conf/machine/include/e500mc.inc
-
-SOC_FAMILY = "p4080"
-UBOOT_MACHINES ?= "P4080DS P4080DS_SECURE_BOOT P4080DS_SDCARD P4080DS_SPIFLASH "
-KERNEL_DEVICETREE ?= "p4080ds.dtb p4080ds-usdpaa.dtb \
-    p4080ds-usdpaa-shared-interfaces.dtb \
-"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
-
-JFFS2_ERASEBLOCK = "0x10000"
-
diff --git a/meta-fsl-ppc/conf/machine/p5020ds-64b.conf b/meta-fsl-ppc/conf/machine/p5020ds-64b.conf
deleted file mode 100644
index 3586da7b..00000000
--- a/meta-fsl-ppc/conf/machine/p5020ds-64b.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-#@TYPE: Machine
-#@NAME: Freescale P5020DS-64B
-#@SOC: p5020
-#@DESCRIPTION: Machine configuration for running P5020DS in 64-bit mode
-#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
-
-require conf/machine/include/e5500-64b.inc
-
-SOC_FAMILY = "p5020"
-UBOOT_MACHINES ?= "P5020DS P5020DS_NAND P5020DS_SECURE_BOOT \
-    P5020DS_SDCARD P5020DS_SPIFLASH \
-"
-KERNEL_DEVICETREE ?= "p5020ds.dtb p5020ds-usdpaa.dtb \
-    p5020ds-usdpaa-shared-interfaces.dtb \
-"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_smp_defconfig"
-
-JFFS2_ERASEBLOCK = "0x10000"
-
diff --git a/meta-fsl-ppc/conf/machine/p5020ds.conf b/meta-fsl-ppc/conf/machine/p5020ds.conf
deleted file mode 100644
index 57de0ca7..00000000
--- a/meta-fsl-ppc/conf/machine/p5020ds.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-#@TYPE: Machine
-#@NAME: Freescale P5020DS
-#@SOC: p5020
-#@DESCRIPTION: Machine configuration for running P5020DS in 32-bit mode
-#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
-
-require conf/machine/include/e5500.inc
-
-SOC_FAMILY = "p5020"
-UBOOT_MACHINES ?= "P5020DS P5020DS_NAND P5020DS_SECURE_BOOT \
-    P5020DS_SDCARD P5020DS_SPIFLASH \
-"
-KERNEL_DEVICETREE ?= "p5020ds.dtb p5020ds-usdpaa.dtb \
-    p5020ds-usdpaa-shared-interfaces.dtb \
-"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
-
-JFFS2_ERASEBLOCK = "0x10000"
-
diff --git a/meta-fsl-ppc/conf/machine/p5040ds-64b.conf b/meta-fsl-ppc/conf/machine/p5040ds-64b.conf
deleted file mode 100644
index cf2400db..00000000
--- a/meta-fsl-ppc/conf/machine/p5040ds-64b.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-#@TYPE: Machine
-#@NAME: Freescale P5040DS-64B
-#@SOC: p5040
-#@DESCRIPTION: Machine configuration for running P5040DS in 64-bit mode
-#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
-
-require conf/machine/include/e5500-64b.inc
-
-SOC_FAMILY = "p5040"
-UBOOT_MACHINES ?= "P5040DS P5040DS_NAND P5040DS_SECURE_BOOT \
-    P5040DS_SDCARD P5040DS_SPIFLASH \
-"
-KERNEL_DEVICETREE ?= "p5040ds.dtb p5040ds-usdpaa.dtb \
-    p5040ds-usdpaa-shared-interfaces.dtb \
-"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_smp_defconfig"
-
-JFFS2_ERASEBLOCK = "0x10000"
-
diff --git a/meta-fsl-ppc/conf/machine/p5040ds.conf b/meta-fsl-ppc/conf/machine/p5040ds.conf
deleted file mode 100644
index 534b5da2..00000000
--- a/meta-fsl-ppc/conf/machine/p5040ds.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-#@TYPE: Machine
-#@NAME: Freescale P5040DS
-#@SOC: p5040
-#@DESCRIPTION: Machine configuration for running P5040DS in 32-bit mode 
-#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
-
-require conf/machine/include/e5500.inc
-
-SOC_FAMILY = "p5040"
-UBOOT_MACHINES ?= "P5040DS P5040DS_NAND P5040DS_SECURE_BOOT \
-    P5040DS_SDCARD P5040DS_SPIFLASH \
-"
-KERNEL_DEVICETREE ?= "p5040ds.dtb p5040ds-usdpaa.dtb \
-    p5040ds-usdpaa-shared-interfaces.dtb \
-"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
-
-JFFS2_ERASEBLOCK = "0x10000"
-
diff --git a/meta-fsl-ppc/conf/machine/t1023rdb-64b.conf b/meta-fsl-ppc/conf/machine/t1023rdb-64b.conf
deleted file mode 100644
index 4cbfac0d..00000000
--- a/meta-fsl-ppc/conf/machine/t1023rdb-64b.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-#@TYPE: Machine
-#@NAME: Freescale T1023RDB
-#@SOC: t1023
-#@DESCRIPTION: Machine configuration for running T1023RDB in 64-bit mode
-#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
-
-require conf/machine/include/e5500-64b.inc
-
-SOC_FAMILY = "t1:t1023"
-UBOOT_MACHINES ?= "T1023RDB_NAND T1023RDB_SDCARD T1023RDB_SPIFLASH"
-KERNEL_DEVICETREE ?= "t1023rdb.dtb t1023rdb-usdpaa.dtb t1023rdb-usdpaa-shared-interfaces.dtb"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3l_smp_defconfig"
-
-JFFS2_ERASEBLOCK = "0x10000"
-
diff --git a/meta-fsl-ppc/conf/machine/t1023rdb.conf b/meta-fsl-ppc/conf/machine/t1023rdb.conf
deleted file mode 100644
index c895868f..00000000
--- a/meta-fsl-ppc/conf/machine/t1023rdb.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-#@TYPE: Machine
-#@NAME: Freescale T1023RDB
-#@SOC: t1023
-#@DESCRIPTION: Machine configuration for running T1023RDB in 32-bit mode
-#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
-
-require conf/machine/include/e5500.inc
-
-SOC_FAMILY = "t1:t1023"
-UBOOT_MACHINES ?= "T1023RDB_NAND T1023RDB_SDCARD T1023RDB_SPIFLASH"
-KERNEL_DEVICETREE ?= "t1023rdb.dtb t1023rdb-usdpaa.dtb t1023rdb-usdpaa-shared-interfaces.dtb"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_fmanv3l_smp_defconfig"
-
-JFFS2_ERASEBLOCK = "0x10000"
-
diff --git a/meta-fsl-ppc/conf/machine/t1024rdb-64b.conf b/meta-fsl-ppc/conf/machine/t1024rdb-64b.conf
deleted file mode 100644
index 9186be2d..00000000
--- a/meta-fsl-ppc/conf/machine/t1024rdb-64b.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-#@TYPE: Machine
-#@NAME: Freescale T1024RDB
-#@SOC: t1024
-#@DESCRIPTION: Machine configuration for running T1024RDB in 64-bit mode
-#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
-
-require conf/machine/include/e5500-64b.inc
-
-SOC_FAMILY = "t1:t1024"
-UBOOT_MACHINES ?= "T1024RDB T1024RDB_NAND T1024RDB_SDCARD T1024RDB_SPIFLASH T1024RDB_SECURE_BOOT"
-KERNEL_DEVICETREE ?= "t1024rdb.dtb t1024rdb-usdpaa.dtb t1024rdb-usdpaa-capwap.dtb"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3l_smp_defconfig"
-
-JFFS2_ERASEBLOCK = "0x10000"
-QE_UCODE ?= "iram_Type_A_T1024_r1.0.bin"
-
diff --git a/meta-fsl-ppc/conf/machine/t1024rdb.conf b/meta-fsl-ppc/conf/machine/t1024rdb.conf
deleted file mode 100644
index 275b5d1b..00000000
--- a/meta-fsl-ppc/conf/machine/t1024rdb.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-#@TYPE: Machine
-#@NAME: Freescale T1024RDB
-#@SOC: t1024
-#@DESCRIPTION: Machine configuration for running T1024RDB in 32-bit mode
-#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
-
-require conf/machine/include/e5500.inc
-
-SOC_FAMILY = "t1:t1024"
-UBOOT_MACHINES ?= "T1024RDB T1024RDB_NAND T1024RDB_SDCARD T1024RDB_SPIFLASH T1024RDB_SECURE_BOOT"
-KERNEL_DEVICETREE ?= "t1024rdb.dtb t1024rdb-usdpaa.dtb t1024rdb-usdpaa-capwap.dtb"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_fmanv3l_smp_defconfig"
-
-JFFS2_ERASEBLOCK = "0x10000"
-QE_UCODE ?= "iram_Type_A_T1024_r1.0.bin"
-
diff --git a/meta-fsl-ppc/conf/machine/t1040d4rdb-64b.conf b/meta-fsl-ppc/conf/machine/t1040d4rdb-64b.conf
deleted file mode 100644
index 2bfa6523..00000000
--- a/meta-fsl-ppc/conf/machine/t1040d4rdb-64b.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-#@TYPE: Machine
-#@NAME: Freescale T1040D4RDB
-#@SOC: t1040
-#@DESCRIPTION: Machine configuration for running T1040D4RDB in 64-bit mode
-#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
-
-require conf/machine/include/e5500-64b.inc
-
-SOC_FAMILY = "t1:t1040"
-UBOOT_MACHINES ?= "T1040D4RDB T1040D4RDB_NAND T1040D4RDB_SDCARD \
-    T1040D4RDB_SPIFLASH T1040D4RDB_SECURE_BOOT \
-"
-KERNEL_DEVICETREE ?= "t1040d4rdb.dtb t1040d4rdb-usdpaa-lag.dtb"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3l_smp_defconfig"
-
-JFFS2_ERASEBLOCK = "0x10000"
-
-QE_UCODE = "iram_Type_A_T1040_r1.0.bin"
diff --git a/meta-fsl-ppc/conf/machine/t1040d4rdb.conf b/meta-fsl-ppc/conf/machine/t1040d4rdb.conf
deleted file mode 100644
index 0872cfe1..00000000
--- a/meta-fsl-ppc/conf/machine/t1040d4rdb.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-#@TYPE: Machine
-#@NAME: Freescale T1040D4RDB
-#@SOC: t1040
-#@DESCRIPTION: Machine configuration for running T1040D4RDB in 32-bit mode
-#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
-
-require conf/machine/include/e5500.inc
-
-SOC_FAMILY = "t1:t1040"
-UBOOT_MACHINES ?= "T1040D4RDB T1040D4RDB_NAND T1040D4RDB_SDCARD \
-    T1040D4RDB_SPIFLASH T1040D4RDB_SECURE_BOOT \
-"
-KERNEL_DEVICETREE ?= "t1040d4rdb.dtb t1040d4rdb-usdpaa-lag.dtb"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_fmanv3l_smp_defconfig"
-
-JFFS2_ERASEBLOCK = "0x10000"
-
-QE_UCODE = "iram_Type_A_T1040_r1.0.bin"
diff --git a/meta-fsl-ppc/conf/machine/t1042d4rdb-64b.conf b/meta-fsl-ppc/conf/machine/t1042d4rdb-64b.conf
deleted file mode 100644
index d9898662..00000000
--- a/meta-fsl-ppc/conf/machine/t1042d4rdb-64b.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-#@TYPE: Machine
-#@NAME: Freescale T1042D4RDB
-#@SOC: t1042
-#@DESCRIPTION: Machine configuration for running T1042D4RDB in 64-bit mode
-#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
-
-require conf/machine/include/e5500-64b.inc
-
-SOC_FAMILY = "t1:t1042"
-UBOOT_MACHINES ?= "T1042D4RDB T1042D4RDB_NAND T1042D4RDB_SDCARD \
-    T1042D4RDB_SPIFLASH T1042D4RDB_SECURE_BOOT \
-"
-KERNEL_DEVICETREE ?= "t1042d4rdb.dtb"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3l_smp_defconfig"
-
-JFFS2_ERASEBLOCK = "0x10000"
-
-QE_UCODE = "iram_Type_A_T1040_r1.0.bin"
diff --git a/meta-fsl-ppc/conf/machine/t1042d4rdb.conf b/meta-fsl-ppc/conf/machine/t1042d4rdb.conf
deleted file mode 100644
index 6142bea4..00000000
--- a/meta-fsl-ppc/conf/machine/t1042d4rdb.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-#@TYPE: Machine
-#@NAME: Freescale T1042D4RDB
-#@SOC: t1042
-#@DESCRIPTION: Machine configuration for running T1042D4RDB in 32-bit mode
-#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
-
-require conf/machine/include/e5500.inc
-
-SOC_FAMILY = "t1:t1042"
-UBOOT_MACHINES ?= "T1042D4RDB T1042D4RDB_NAND T1042D4RDB_SDCARD \
-    T1042D4RDB_SPIFLASH T1042D4RDB_SECURE_BOOT \
-"
-KERNEL_DEVICETREE ?= "t1042d4rdb.dtb"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_fmanv3l_smp_defconfig"
-
-JFFS2_ERASEBLOCK = "0x10000"
-
-QE_UCODE = "iram_Type_A_T1040_r1.0.bin"
diff --git a/meta-fsl-ppc/conf/machine/t2080qds-64b.conf b/meta-fsl-ppc/conf/machine/t2080qds-64b.conf
deleted file mode 100644
index 3c81fb98..00000000
--- a/meta-fsl-ppc/conf/machine/t2080qds-64b.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-#@TYPE: Machine
-#@NAME: Freescale T2080QDS-64B
-#@SOC: t2080
-#@DESCRIPTION: Machine configuration for running T2080QDS in 64-bit mode
-#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
-
-require conf/machine/include/e6500-64b.inc
-
-SOC_FAMILY = "t2:t2080"
-UBOOT_MACHINES ?= "T2080QDS T2080QDS_SDCARD T2080QDS_SPIFLASH \
-    T2080QDS_NAND T2080QDS_SRIO_PCIE_BOOT T2080QDS_SECURE_BOOT \
-"
-KERNEL_DEVICETREE ?= "t2080qds.dtb t2080qds-usdpaa.dtb \
-    t2080qds-usdpaa-shared-interfaces.dtb \
-"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
-
-JFFS2_ERASEBLOCK = "0x10000"
-
diff --git a/meta-fsl-ppc/conf/machine/t2080qds.conf b/meta-fsl-ppc/conf/machine/t2080qds.conf
deleted file mode 100644
index 23b43ca3..00000000
--- a/meta-fsl-ppc/conf/machine/t2080qds.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-#@TYPE: Machine
-#@NAME: Freescale T2080QDS
-#@SOC: t2080
-#@DESCRIPTION: Machine configuration for running T2080QDS in 32-bit mode
-#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
-
-require conf/machine/include/e6500.inc
-
-SOC_FAMILY = "t2:t2080"
-UBOOT_MACHINES ?= "T2080QDS T2080QDS_SDCARD T2080QDS_SPIFLASH \
-    T2080QDS_NAND T2080QDS_SRIO_PCIE_BOOT T2080QDS_SECURE_BOOT \
-"
-KERNEL_DEVICETREE ?= "t2080qds.dtb t2080qds-usdpaa.dtb \
-    t2080qds-usdpaa-shared-interfaces.dtb \
-"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
-
-JFFS2_ERASEBLOCK = "0x10000"
-
diff --git a/meta-fsl-ppc/conf/machine/t2080rdb-64b.conf b/meta-fsl-ppc/conf/machine/t2080rdb-64b.conf
deleted file mode 100644
index e421567b..00000000
--- a/meta-fsl-ppc/conf/machine/t2080rdb-64b.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-#@TYPE: Machine
-#@NAME: Freescale T2080RDB
-#@SOC: t2080
-#@DESCRIPTION: Machine configuration for running T2080RDB in 64-bit mode
-#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
-
-require conf/machine/include/e6500-64b.inc
-
-SOC_FAMILY = "t2:t2080"
-UBOOT_MACHINES ?= "T2080RDB T2080RDB_SDCARD T2080RDB_SPIFLASH \
-    T2080RDB_NAND T2080RDB_SRIO_PCIE_BOOT T2080RDB_SECURE_BOOT \
-"
-KERNEL_DEVICETREE ?= "t2080rdb.dtb t2080rdb-usdpaa.dtb \
-    t2080rdb-usdpaa-shared-interfaces.dtb \
-"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
-
-JFFS2_ERASEBLOCK = "0x10000"
-
diff --git a/meta-fsl-ppc/conf/machine/t2080rdb.conf b/meta-fsl-ppc/conf/machine/t2080rdb.conf
deleted file mode 100644
index 8ce27e95..00000000
--- a/meta-fsl-ppc/conf/machine/t2080rdb.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-#@TYPE: Machine
-#@NAME: Freescale T2080RDB
-#@SOC: t2080
-#@DESCRIPTION: Machine configuration for running T2080RDB in 32-bit mode
-#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
-
-require conf/machine/include/e6500.inc
-
-SOC_FAMILY = "t2:t2080"
-UBOOT_MACHINES ?= "T2080RDB T2080RDB_SDCARD T2080RDB_SPIFLASH \
-    T2080RDB_NAND T2080RDB_SRIO_PCIE_BOOT T2080RDB_SECURE_BOOT \
-"
-KERNEL_DEVICETREE ?= "t2080rdb.dtb t2080rdb-usdpaa.dtb \
-    t2080rdb-usdpaa-shared-interfaces.dtb \
-"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
-
-JFFS2_ERASEBLOCK = "0x10000"
-
diff --git a/meta-fsl-ppc/conf/machine/t4160qds-64b.conf b/meta-fsl-ppc/conf/machine/t4160qds-64b.conf
deleted file mode 100644
index fb0d9663..00000000
--- a/meta-fsl-ppc/conf/machine/t4160qds-64b.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-#@TYPE: Machine
-#@NAME: Freescale T4160QDS-64B
-#@SOC: t4160
-#@DESCRIPTION: Machine configuration for running T4160QDS in 64-bit mode
-#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
-
-require conf/machine/include/e6500-64b.inc
-
-SOC_FAMILY = "t4:t4160"
-UBOOT_MACHINES ?= "T4160QDS T4160QDS_SECURE_BOOT"
-KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
-
-JFFS2_ERASEBLOCK = "0x10000"
-
diff --git a/meta-fsl-ppc/conf/machine/t4160qds.conf b/meta-fsl-ppc/conf/machine/t4160qds.conf
deleted file mode 100644
index d3dd58e3..00000000
--- a/meta-fsl-ppc/conf/machine/t4160qds.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-#@TYPE: Machine
-#@NAME: Freescale T4160QDS
-#@SOC: t4160
-#@DESCRIPTION: Machine configuration for running T4160QDS in 32-bit mode
-#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
-
-require conf/machine/include/e6500.inc
-
-SOC_FAMILY = "t4:t4160"
-UBOOT_MACHINES ?= "T4160QDS T4160QDS_SECURE_BOOT"
-KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
-
-JFFS2_ERASEBLOCK = "0x10000"
-
diff --git a/meta-fsl-ppc/conf/machine/t4240qds-64b.conf b/meta-fsl-ppc/conf/machine/t4240qds-64b.conf
deleted file mode 100644
index 1caa24e7..00000000
--- a/meta-fsl-ppc/conf/machine/t4240qds-64b.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-#@TYPE: Machine
-#@NAME: Freescale T4240QDS-64B
-#@SOC: t4240
-#@DESCRIPTION: Machine configuration for running T4240QDS in 64-bit mode
-#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
-
-require conf/machine/include/e6500-64b.inc
-
-SOC_FAMILY = "t4:t4240"
-UBOOT_MACHINES ?= "T4240QDS T4240QDS_SECURE_BOOT"
-KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb \
-    t4240qds-usdpaa-shared-interfaces.dtb \
-"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
-
-JFFS2_ERASEBLOCK = "0x10000"
-
diff --git a/meta-fsl-ppc/conf/machine/t4240qds.conf b/meta-fsl-ppc/conf/machine/t4240qds.conf
deleted file mode 100644
index c244bfb5..00000000
--- a/meta-fsl-ppc/conf/machine/t4240qds.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-#@TYPE: Machine
-#@NAME: Freescale T4240QDS
-#@SOC: t4240
-#@DESCRIPTION: Machine configuration for running T4240QDS in 32-bit mode
-#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
-
-require conf/machine/include/e6500.inc
-
-SOC_FAMILY = "t4:t4240"
-UBOOT_MACHINES ?= "T4240QDS T4240QDS_SECURE_BOOT"
-KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb \
-    t4240qds-usdpaa-shared-interfaces.dtb \
-"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
-
-JFFS2_ERASEBLOCK = "0x10000"
-
diff --git a/meta-fsl-ppc/conf/machine/t4240rdb-64b.conf b/meta-fsl-ppc/conf/machine/t4240rdb-64b.conf
deleted file mode 100644
index 7d6543c0..00000000
--- a/meta-fsl-ppc/conf/machine/t4240rdb-64b.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-#@TYPE: Machine
-#@NAME: Freescale T4240RDB
-#@SOC: t4240
-#@DESCRIPTION: Machine configuration for running T4240RDB in 64-bit mode
-#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
-
-require conf/machine/include/e6500-64b.inc
-
-SOC_FAMILY = "t4:t4240"
-UBOOT_MACHINES ?= "T4240RDB"
-KERNEL_DEVICETREE ?= "t4240rdb.dtb t4240rdb-usdpaa.dtb \
-    t4240rdb-usdpaa-shared-interfaces.dtb \
-"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
-
-JFFS2_ERASEBLOCK = "0x10000"
-
diff --git a/meta-fsl-ppc/conf/machine/t4240rdb.conf b/meta-fsl-ppc/conf/machine/t4240rdb.conf
deleted file mode 100644
index a4b79951..00000000
--- a/meta-fsl-ppc/conf/machine/t4240rdb.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-#@TYPE: Machine
-#@NAME: Freescale T4240RDB
-#@SOC: t4240
-#@DESCRIPTION: Machine configuration for running T4240RDB in 32-bit mode
-#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
-
-require conf/machine/include/e6500.inc
-
-SOC_FAMILY = "t4:t4240"
-UBOOT_MACHINES ?= "T4240RDB"
-KERNEL_DEVICETREE ?= "t4240rdb.dtb t4240rdb-usdpaa.dtb \
-    t4240rdb-usdpaa-shared-interfaces.dtb \
-"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
-
-JFFS2_ERASEBLOCK = "0x10000"
-