13 files changed, 130 insertions, 8 deletions

diff --git a/conf/machine/include/e6500-64b.inc b/conf/machine/include/e6500-64b.inc
new file mode 100644
index 00000000..e0e04dbc
--- /dev/null
+++ b/conf/machine/include/e6500-64b.inc
@@ -0,0 +1,11 @@
+TARGET_FPU = "hard"
+DEFAULTTUNE ?= "ppc64e6500"
+
+require conf/machine/include/tune-ppce6500.inc
+require conf/machine/include/qoriq-ppc.inc
+
+MACHINEOVERRIDES =. "e6500-64b:"
+
+require conf/multilib.conf
+MULTILIBS ?= "multilib:lib32"
+DEFAULTTUNE_virtclass-multilib-lib32 ?= "ppce6500"
diff --git a/conf/machine/ls1012afrdm-32b.conf b/conf/machine/ls1012afrdm-32b.conf
index 853260c5..e74cdff9 100644
--- a/conf/machine/ls1012afrdm-32b.conf
+++ b/conf/machine/ls1012afrdm-32b.conf
@@ -25,7 +25,7 @@ KERNEL_IMAGETYPE = "zImage"
 KERNEL_DEVICETREE ?= "freescale/fsl-ls1012a-frdm.dtb"
 KERNEL_DEFCONFIG ?= "multi_v7_defconfig"
 
-EXTRA_IMAGEDEPENDS += "ppa rcw-bin"
+EXTRA_IMAGEDEPENDS += "ppa rcw"
 USE_VT = "0"
 
 require conf/multilib.conf
diff --git a/conf/machine/ls1012afrdm.conf b/conf/machine/ls1012afrdm.conf
index 355105ea..0a203f8e 100644
--- a/conf/machine/ls1012afrdm.conf
+++ b/conf/machine/ls1012afrdm.conf
@@ -22,5 +22,5 @@ UBOOT_CONFIG[qspi] = "ls1012afrdm_qspi_defconfig,,u-boot-dtb.bin"
 KERNEL_DEVICETREE ?= "freescale/fsl-ls1012a-frdm.dtb"
 KERNEL_DEFCONFIG ?= "defconfig"
 
-EXTRA_IMAGEDEPENDS += "ppa ppfe-firmware rcw-bin"
+EXTRA_IMAGEDEPENDS += "ppa ppfe-firmware rcw"
 USE_VT = "0"
diff --git a/conf/machine/ls1012ardb-32b.conf b/conf/machine/ls1012ardb-32b.conf
index 64fa50fd..392b432d 100644
--- a/conf/machine/ls1012ardb-32b.conf
+++ b/conf/machine/ls1012ardb-32b.conf
@@ -26,7 +26,7 @@ KERNEL_IMAGETYPE = "zImage"
 KERNEL_DEVICETREE ?= "freescale/fsl-ls1012a-rdb.dtb"
 KERNEL_DEFCONFIG ?= "multi_v7_defconfig"
 
-EXTRA_IMAGEDEPENDS += "ppa rcw-bin"
+EXTRA_IMAGEDEPENDS += "ppa rcw"
 USE_VT = "0"
 
 require conf/multilib.conf
diff --git a/conf/machine/ls1012ardb.conf b/conf/machine/ls1012ardb.conf
index ad3e30fb..249a151b 100644
--- a/conf/machine/ls1012ardb.conf
+++ b/conf/machine/ls1012ardb.conf
@@ -23,5 +23,5 @@ UBOOT_CONFIG[qspi-secure-boot] = "ls1012ardb_qspi_SECURE_BOOT_defconfig,,u-boot-
 KERNEL_DEVICETREE ?= "freescale/fsl-ls1012a-rdb.dtb"
 KERNEL_DEFCONFIG ?= "defconfig"
 
-EXTRA_IMAGEDEPENDS += "ppa ppa-optee ppfe-firmware rcw-bin"
+EXTRA_IMAGEDEPENDS += "ppa ppa-optee ppfe-firmware rcw"
 USE_VT = "0"
diff --git a/conf/machine/ls1088ardb.conf b/conf/machine/ls1088ardb.conf
index 325bcc49..3cb8784d 100644
--- a/conf/machine/ls1088ardb.conf
+++ b/conf/machine/ls1088ardb.conf
@@ -26,5 +26,5 @@ KERNEL_DEFCONFIG ?= "defconfig"
 SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyAMA0"
 SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
 
-EXTRA_IMAGEDEPENDS += "mc-utils rcw-bin management-complex ppa"
+EXTRA_IMAGEDEPENDS += "mc-utils rcw management-complex ppa"
 USE_VT = "0"
diff --git a/conf/machine/ls2088ardb.conf b/conf/machine/ls2088ardb.conf
index 39a87aa9..a23f762c 100644
--- a/conf/machine/ls2088ardb.conf
+++ b/conf/machine/ls2088ardb.conf
@@ -27,5 +27,5 @@ KERNEL_DEFCONFIG ?= "defconfig"
 SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyAMA0"
 SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
 
-EXTRA_IMAGEDEPENDS += "mc-utils ls2-phy rcw-bin management-complex ppa uefi"
+EXTRA_IMAGEDEPENDS += "mc-utils ls2-phy rcw management-complex ppa uefi"
 USE_VT = "0"
diff --git a/conf/machine/p5040ds-64b.conf b/conf/machine/p5040ds-64b.conf
new file mode 100644
index 00000000..161eb5e9
--- /dev/null
+++ b/conf/machine/p5040ds-64b.conf
@@ -0,0 +1,28 @@
+#@TYPE: Machine
+#@NAME: NXP P5040DS-64B
+#@SOC: p5040
+#@DESCRIPTION: Machine configuration for Freescale QorIQ P5040 Development
+#              System with ppce5500 core in 64b mode
+#@MAINTAINER: Chunrong Guo <chunrong.guo@nxp.com>
+
+require conf/machine/include/e5500-64b.inc
+
+MACHINEOVERRIDES =. "p5040:"
+
+UBOOT_CONFIG ??= "nand secure-boot sdcard spi nor"
+UBOOT_CONFIG[nor] = "P5040DS_config"
+UBOOT_CONFIG[nand] = "P5040DS_NAND_config,,u-boot.pbl"
+UBOOT_CONFIG[secure-boot] = "P5040DS_SECURE_BOOT_config"
+UBOOT_CONFIG[sdcard] = "P5040DS_SDCARD_config,,u-boot.pbl"
+UBOOT_CONFIG[spi] = "P5040DS_SPIFLASH_config,,u-boot.pbl"
+
+HV_CFG_M = "p5040ds"
+
+KERNEL_DEVICETREE ?= "p5040ds.dtb"
+KERNEL_DEFCONFIG ?= "corenet64_smp_defconfig"
+
+JFFS2_ERASEBLOCK = "0x10000"
+
+EXTRA_IMAGEDEPENDS += "fm-ucode rcw"
+
+USE_VT ?= "0"
diff --git a/conf/machine/t1024rdb-64b.conf b/conf/machine/t1024rdb-64b.conf
new file mode 100644
index 00000000..490c8491
--- /dev/null
+++ b/conf/machine/t1024rdb-64b.conf
@@ -0,0 +1,29 @@
+#@TYPE: Machine
+#@NAME: NXP T1024RDB
+#@SOC: t1024
+#@DESCRIPTION: Machine configuration for Freescale QorIQ T1024 Reference
+#              Design Board with ppce5500 core in 64b mode
+#@MAINTAINER: Chunrong Guo <chunrong.guo@nxp.com>
+
+require conf/machine/include/e5500-64b.inc
+
+MACHINEOVERRIDES =. "t1:t1024:"
+
+UBOOT_CONFIG ??= "nand sdcard spi secure-boot nor"
+UBOOT_CONFIG[nor] = "T1024RDB_config"
+UBOOT_CONFIG[nand] = "T1024RDB_NAND_config,,u-boot-with-spl-pbl.bin"
+UBOOT_CONFIG[sdcard] = "T1024RDB_SDCARD_config,,u-boot-with-spl-pbl.bin"
+UBOOT_CONFIG[spi] = "T1024RDB_SPIFLASH_config,,u-boot-with-spl-pbl.bin"
+UBOOT_CONFIG[secure-boot] = "T1024RDB_SECURE_BOOT_config"
+
+HV_CFG_M = "t1024rdb"
+
+KERNEL_DEVICETREE ?= "t1024rdb.dtb"
+KERNEL_DEFCONFIG ?= "corenet64_smp_defconfig"
+
+JFFS2_ERASEBLOCK = "0x10000"
+QE_UCODE ?= "iram_Type_A_T1024_r1.0.bin"
+
+EXTRA_IMAGEDEPENDS += "fm-ucode rcw qe-ucode"
+
+USE_VT ?= "0"
diff --git a/conf/machine/t2080rdb-64b.conf b/conf/machine/t2080rdb-64b.conf
new file mode 100644
index 00000000..b9534af3
--- /dev/null
+++ b/conf/machine/t2080rdb-64b.conf
@@ -0,0 +1,29 @@
+#@TYPE: Machine
+#@NAME: NXP T2080RDB
+#@SOC: t2080
+#@DESCRIPTION: Machine configuration for Freescale QorIQ T2080 Reference
+#              Design Board with ppce6500 core in 64b mode
+#@MAINTAINER: Chunrong Guo <chunrong.guo@nxp.com>
+
+require conf/machine/include/e6500-64b.inc
+
+MACHINEOVERRIDES =. "t2:t2080:"
+
+UBOOT_CONFIG ??= "sdcard spi nand srio-pcie-boot secure-boot nor"
+UBOOT_CONFIG[nor] = "T2080RDB_config"
+UBOOT_CONFIG[sdcard] = "T2080RDB_SDCARD_config,,u-boot-with-spl-pbl.bin"
+UBOOT_CONFIG[spi] = "T2080RDB_SPIFLASH_config,,u-boot-with-spl-pbl.bin"
+UBOOT_CONFIG[nand] = "T2080RDB_NAND_config,,u-boot-with-spl-pbl.bin"
+UBOOT_CONFIG[srio-pcie-boot] = "T2080RDB_SRIO_PCIE_BOOT_config"
+UBOOT_CONFIG[secure-boot] = "T2080RDB_SECURE_BOOT_config"
+
+HV_CFG_M = "t2080rdb"
+
+KERNEL_DEVICETREE ?= "t2080rdb.dtb"
+KERNEL_DEFCONFIG ?= "corenet64_smp_defconfig"
+
+JFFS2_ERASEBLOCK = "0x10000"
+
+EXTRA_IMAGEDEPENDS += "fm-ucode rcw"
+
+USE_VT ?= "0"
diff --git a/conf/machine/t4240rdb-64b.conf b/conf/machine/t4240rdb-64b.conf
new file mode 100644
index 00000000..c0f466b3
--- /dev/null
+++ b/conf/machine/t4240rdb-64b.conf
@@ -0,0 +1,24 @@
+#@TYPE: Machine
+#@NAME: NXP T4240RDB
+#@SOC: t4240
+#@DESCRIPTION: Machine configuration for Freescale QorIQ T4240 Reference
+#              Design Board with ppce6500 core in 64b mode
+#@MAINTAINER: Chunrong Guo <chunrong.guo@nxp.com>
+
+require conf/machine/include/e6500-64b.inc
+
+MACHINEOVERRIDES =. "t4:t4240:"
+
+UBOOT_CONFIG ??= "nor"
+UBOOT_CONFIG[nor] = "T4240RDB_config"
+
+HV_CFG_M = "t4240rdb"
+
+KERNEL_DEVICETREE ?= "t4240rdb.dtb"
+KERNEL_DEFCONFIG ?= "corenet64_smp_defconfig"
+
+JFFS2_ERASEBLOCK = "0x10000"
+
+EXTRA_IMAGEDEPENDS += "fm-ucode rcw"
+
+USE_VT ?= "0"
diff --git a/recipes-bsp/ls2-phy/ls2-phy_git.bb b/recipes-bsp/ls2-phy/ls2-phy_git.bb
index c798e883..61ca9b89 100644
--- a/recipes-bsp/ls2-phy/ls2-phy_git.bb
+++ b/recipes-bsp/ls2-phy/ls2-phy_git.bb
@@ -23,6 +23,6 @@ addtask deploy before do_build after do_install
 PACKAGES += "${PN}-image"
 FILES_${PN}-image += "/boot"
 
-COMPATIBLE_MACHINE = "(ls2080ardb|ls2088ardb)"
+COMPATIBLE_MACHINE = "(ls2080ardb|ls2088ardb|t2080|t4240)"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
diff --git a/recipes-security/optee/optee-os-qoriq_git.bb b/recipes-security/optee/optee-os-qoriq_git.bb
index fba81fb0..92c3d289 100644
--- a/recipes-security/optee/optee-os-qoriq_git.bb
+++ b/recipes-security/optee/optee-os-qoriq_git.bb
@@ -38,7 +38,8 @@ do_install() {
     #install core on boot directory
     install -d ${D}/lib/firmware/
 
-    install -m 644 ${B}/out/arm-plat-ls/core/tee.elf ${D}/lib/firmware/tee_${MACHINE}.bin
+    ${OBJCOPY} -v -O binary ${B}/out/arm-plat-ls/core/tee.elf   ${B}/out/arm-plat-ls/core/tee.bin
+    install -m 644 ${B}/out/arm-plat-ls/core/tee.bin ${D}/lib/firmware/tee_${MACHINE}.bin
     #install TA devkit
     install -d ${D}/usr/include/optee/export-user_ta/