16 files changed, 14 insertions, 14 deletions

diff --git a/conf/machine/ls1012afrwy.conf b/conf/machine/ls1012afrwy.conf
index 449e518c..72605cc1 100644
--- a/conf/machine/ls1012afrwy.conf
+++ b/conf/machine/ls1012afrwy.conf
@@ -27,5 +27,5 @@ RCWQSPI ?= "N_SSNP_3305/rcw_1000"
 KERNEL_DEVICETREE ?= "freescale/fsl-ls1012a-frwy.dtb"
 KERNEL_DEFCONFIG ?= "defconfig"
 
-EXTRA_IMAGEDEPENDS += "ppfe-firmware rcw atf"
+EXTRA_IMAGEDEPENDS += "ppfe-firmware rcw qoriq-atf"
 USE_VT = "0"
diff --git a/conf/machine/ls1012ardb.conf b/conf/machine/ls1012ardb.conf
index 6efd6b3d..b4bfc571 100644
--- a/conf/machine/ls1012ardb.conf
+++ b/conf/machine/ls1012ardb.conf
@@ -28,5 +28,5 @@ RCWQSPISEC ?= "R_SPNH_3508/rcw_1000"
 KERNEL_DEVICETREE ?= "freescale/fsl-ls1012a-rdb.dtb freescale/fsl-ls1012a-qds.dtb"
 KERNEL_DEFCONFIG ?= "defconfig"
 
-EXTRA_IMAGEDEPENDS += "ppfe-firmware rcw atf"
+EXTRA_IMAGEDEPENDS += "ppfe-firmware rcw qoriq-atf"
 USE_VT = "0"
diff --git a/conf/machine/ls1028ardb.conf b/conf/machine/ls1028ardb.conf
index b0bbc5b8..7647bf41 100644
--- a/conf/machine/ls1028ardb.conf
+++ b/conf/machine/ls1028ardb.conf
@@ -34,5 +34,5 @@ RCWSD ?= "R_SQPP_0x85bb/rcw_1500_gpu600"
 RCWXSPI ?= "R_SQPP_0x85bb/rcw_1500_gpu600"
 RCWEMMC ?= "R_SQPP_0x85bb/rcw_1500_gpu600"
 
-EXTRA_IMAGEDEPENDS += "rcw atf dp-firmware-cadence"
+EXTRA_IMAGEDEPENDS += "rcw qoriq-atf dp-firmware-cadence"
 USE_VT = "0"
diff --git a/conf/machine/ls1043ardb.conf b/conf/machine/ls1043ardb.conf
index 6f1f7ea4..369abdcf 100644
--- a/conf/machine/ls1043ardb.conf
+++ b/conf/machine/ls1043ardb.conf
@@ -40,5 +40,5 @@ RCWSD ?= "RR_FQPP_1455/rcw_1600_sdboot"
 RCWNAND ?= "RR_FQPP_1455/rcw_1600_nandboot"
 
 QE_UCODE = "iram_Type_A_LS1021a_r1.0.bin"
-EXTRA_IMAGEDEPENDS += "fm-ucode rcw qe-ucode uefi atf ls2-phy"
+EXTRA_IMAGEDEPENDS += "fm-ucode rcw qe-ucode uefi qoriq-atf ls2-phy"
 USE_VT = "0"
diff --git a/conf/machine/ls1046afrwy.conf b/conf/machine/ls1046afrwy.conf
index 884f7666..f6854a0c 100644
--- a/conf/machine/ls1046afrwy.conf
+++ b/conf/machine/ls1046afrwy.conf
@@ -37,5 +37,5 @@ SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
 RCWQSPI ?= "NN_NNQNNPNP_3040_0506/rcw_1600_qspiboot"
 RCWSD ?= "NN_NNQNNPNP_3040_0506/rcw_1600_sdboot"
 
-EXTRA_IMAGEDEPENDS += "fm-ucode rcw atf ls2-phy qe-ucode"
+EXTRA_IMAGEDEPENDS += "fm-ucode rcw qoriq-atf ls2-phy qe-ucode"
 USE_VT = "0"
diff --git a/conf/machine/ls1046ardb.conf b/conf/machine/ls1046ardb.conf
index e8773366..64f26792 100644
--- a/conf/machine/ls1046ardb.conf
+++ b/conf/machine/ls1046ardb.conf
@@ -40,5 +40,5 @@ UEFI_QSPIBOOT ?= "LS1046ARDB_EFI_QSPIBOOT.fd"
 RCWQSPI ?= "RR_FFSSPPPH_1133_5559/rcw_1800_qspiboot"
 RCWSD ?= "RR_FFSSPPPH_1133_5559/rcw_1800_sdboot"
 
-EXTRA_IMAGEDEPENDS += "fm-ucode rcw uefi atf qe-ucode ls2-phy"
+EXTRA_IMAGEDEPENDS += "fm-ucode rcw uefi qoriq-atf qe-ucode ls2-phy"
 USE_VT = "0"
diff --git a/conf/machine/ls1088ardb-pb.conf b/conf/machine/ls1088ardb-pb.conf
index 2e456f1b..1ae5693b 100644
--- a/conf/machine/ls1088ardb-pb.conf
+++ b/conf/machine/ls1088ardb-pb.conf
@@ -31,5 +31,5 @@ RCWSD ?= "FCSSRR_PPPP_0x1d_0x13/rcw_1600_sd"
 RCWQSPI ?= "FCSSRR_PPPP_0x1d_0x13/rcw_1600_qspi"
 
 
-EXTRA_IMAGEDEPENDS += "mc-utils rcw management-complex atf"
+EXTRA_IMAGEDEPENDS += "mc-utils rcw management-complex qoriq-atf"
 USE_VT = "0"
diff --git a/conf/machine/ls1088ardb.conf b/conf/machine/ls1088ardb.conf
index 8f47f284..9922248f 100644
--- a/conf/machine/ls1088ardb.conf
+++ b/conf/machine/ls1088ardb.conf
@@ -30,5 +30,5 @@ SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
 RCWSD ?= "FCQQQQQQQQ_PPP_H_0x1d_0x0d/rcw_1600_sd"
 RCWQSPI ?= "FCQQQQQQQQ_PPP_H_0x1d_0x0d/rcw_1600_qspi"
 
-EXTRA_IMAGEDEPENDS += "mc-utils rcw management-complex atf"
+EXTRA_IMAGEDEPENDS += "mc-utils rcw management-complex qoriq-atf"
 USE_VT = "0"
diff --git a/conf/machine/ls2088ardb.conf b/conf/machine/ls2088ardb.conf
index f920d601..92c99326 100644
--- a/conf/machine/ls2088ardb.conf
+++ b/conf/machine/ls2088ardb.conf
@@ -31,5 +31,5 @@ KERNEL_DEFCONFIG ?= "defconfig"
 SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyAMA0"
 SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
 
-EXTRA_IMAGEDEPENDS += "mc-utils ls2-phy rcw management-complex uefi atf"
+EXTRA_IMAGEDEPENDS += "mc-utils ls2-phy rcw management-complex uefi qoriq-atf"
 USE_VT = "0"
diff --git a/conf/machine/lx2160ardb.conf b/conf/machine/lx2160ardb.conf
index a8bbdbda..5e68a9fd 100644
--- a/conf/machine/lx2160ardb.conf
+++ b/conf/machine/lx2160ardb.conf
@@ -32,5 +32,5 @@ RCWXSPI ?= "XGGFF_PP_HHHH_RR_19_5_2/rcw_2000_700_2900_19_5_2"
 RCWSD ?= "XGGFF_PP_HHHH_RR_19_5_2/rcw_2000_700_2900_19_5_2"
 RCWEMMC ?= "XGGFF_PP_HHHH_RR_19_5_2/rcw_2000_700_2900_19_5_2"
 
-EXTRA_IMAGEDEPENDS += "management-complex mc-utils rcw ls2-phy ddr-phy uefi atf inphi"
+EXTRA_IMAGEDEPENDS += "management-complex mc-utils rcw ls2-phy ddr-phy uefi qoriq-atf inphi"
 USE_VT = "0"
diff --git a/conf/machine/lx2162aqds.conf b/conf/machine/lx2162aqds.conf
index 33f1b99d..c7ab95fb 100644
--- a/conf/machine/lx2162aqds.conf
+++ b/conf/machine/lx2162aqds.conf
@@ -32,5 +32,5 @@ RCWXSPI ?= "GGGG_NNNN_PPPP_PPPP_RR_17_2/rcw_2000_650_2900_17_2"
 RCWSD ?= "GGGG_NNNN_PPPP_PPPP_RR_17_2/rcw_2000_650_2900_17_2"
 RCWEMMC ?= "GGGG_NNNN_PPPP_PPPP_RR_17_2/rcw_2000_650_2900_17_2"
 
-EXTRA_IMAGEDEPENDS += "management-complex mc-utils rcw ls2-phy ddr-phy atf inphi"
+EXTRA_IMAGEDEPENDS += "management-complex mc-utils rcw ls2-phy ddr-phy qoriq-atf inphi"
 USE_VT = "0"
diff --git a/recipes-bsp/atf/atf-2.3.inc b/recipes-bsp/atf/qoriq-atf-2.3.inc
index bc8b912a..bc8b912a 100644
--- a/recipes-bsp/atf/atf-2.3.inc
+++ b/recipes-bsp/atf/qoriq-atf-2.3.inc
diff --git a/recipes-bsp/atf/atf-tools_2.3.bb b/recipes-bsp/atf/qoriq-atf-tools_2.3.bb
index 57f53168..d4be32be 100644
--- a/recipes-bsp/atf/atf-tools_2.3.bb
+++ b/recipes-bsp/atf/qoriq-atf-tools_2.3.bb
@@ -1,4 +1,4 @@
-require atf-${PV}.inc
+require qoriq-atf-${PV}.inc
 
 SUMMARY = "Tools for ARM Trusted Firmware, e.g. FIP image creation tool"
 
diff --git a/recipes-bsp/atf/atf_1.5.bb b/recipes-bsp/atf/qoriq-atf_1.5.bb
index 650acc3b..650acc3b 100644
--- a/recipes-bsp/atf/atf_1.5.bb
+++ b/recipes-bsp/atf/qoriq-atf_1.5.bb
diff --git a/recipes-bsp/atf/atf_2.3.bb b/recipes-bsp/atf/qoriq-atf_2.3.bb
index ff83bbc8..aed32851 100644
--- a/recipes-bsp/atf/atf_2.3.bb
+++ b/recipes-bsp/atf/qoriq-atf_2.3.bb
@@ -1,4 +1,4 @@
-require atf-${PV}.inc
+require qoriq-atf-${PV}.inc
 
 DESCRIPTION = "ARM Trusted Firmware"
 
diff --git a/recipes-bsp/ddr-phy/ddr-phy_git.bb b/recipes-bsp/ddr-phy/ddr-phy_git.bb
index 17893733..fa8833fd 100644
--- a/recipes-bsp/ddr-phy/ddr-phy_git.bb
+++ b/recipes-bsp/ddr-phy/ddr-phy_git.bb
@@ -11,7 +11,7 @@ S = "${WORKDIR}/git"
 
 REGLEX = "lx2160a"
 
-DEPENDS += "atf-tools-native"
+DEPENDS += "qoriq-atf-tools-native"
 
 do_compile() {
     cd ${S}/${REGLEX}