remove fslmachine MACHINEOVERRIDES usage

fslmachine is too generic, use qoriq-ppc instead.

Signed-off-by: Ting Liu <b28495@freescale.com>

diff --git a/meta-fsl-ppc/conf/machine/include/e500mc.inc b/meta-fsl-ppc/conf/machine/include/e500mc.inc
index 09b5c69e1ba7b93457311cd5d42dcbaa806a6d8f..5871104dcee57c591719e906600be64ae80eb056 100644 (file)
--- a/meta-fsl-ppc/conf/machine/include/e500mc.inc
+++ b/meta-fsl-ppc/conf/machine/include/e500mc.inc
@@ -3,4 +3,4 @@ TARGET_FPU = "hard"
 require conf/machine/include/tune-ppce500mc.inc
 require conf/machine/include/qoriq-base.inc
 
-MACHINEOVERRIDES .= ":e500mc:fslmachine"
+MACHINEOVERRIDES .= ":e500mc"

diff --git a/meta-fsl-ppc/conf/machine/include/e500v2.inc b/meta-fsl-ppc/conf/machine/include/e500v2.inc
index 178de1882865fcd09fd62c9c1feaa9ed072822ab..a93725494ea2f9b09580bb127fe206ba51933718 100644 (file)
--- a/meta-fsl-ppc/conf/machine/include/e500v2.inc
+++ b/meta-fsl-ppc/conf/machine/include/e500v2.inc
@@ -1,4 +1,4 @@
 require conf/machine/include/tune-ppce500v2.inc
 require conf/machine/include/qoriq-base.inc
 
-MACHINEOVERRIDES .= ":e500v2:fslmachine"
+MACHINEOVERRIDES .= ":e500v2"

diff --git a/meta-fsl-ppc/conf/machine/include/e5500-64b.inc b/meta-fsl-ppc/conf/machine/include/e5500-64b.inc
index 47a9ad7c54213020217c78f77093156365f52ca2..5c7588380f2824db25ffda9b66312ce29dbf5b22 100644 (file)
--- a/meta-fsl-ppc/conf/machine/include/e5500-64b.inc
+++ b/meta-fsl-ppc/conf/machine/include/e5500-64b.inc
@@ -4,4 +4,4 @@ DEFAULTTUNE ?= "ppc64e5500"
 require conf/machine/include/tune-ppce5500.inc
 require conf/machine/include/qoriq-base.inc
 
-MACHINEOVERRIDES .= ":e5500-64b:fslmachine"
+MACHINEOVERRIDES .= ":e5500-64b"

diff --git a/meta-fsl-ppc/conf/machine/include/e5500.inc b/meta-fsl-ppc/conf/machine/include/e5500.inc
index e6f0400ad49d45d1611c00937555012538638e51..88f6d06e2ceb9f54d06d8e56c1430efac0e29884 100644 (file)
--- a/meta-fsl-ppc/conf/machine/include/e5500.inc
+++ b/meta-fsl-ppc/conf/machine/include/e5500.inc
@@ -3,4 +3,4 @@ TARGET_FPU = "hard"
 require conf/machine/include/tune-ppce5500.inc
 require conf/machine/include/qoriq-base.inc
 
-MACHINEOVERRIDES .= ":e5500:fslmachine"
+MACHINEOVERRIDES .= ":e5500"

diff --git a/meta-fsl-ppc/conf/machine/include/e6500-64b.inc b/meta-fsl-ppc/conf/machine/include/e6500-64b.inc
index 0770cc37dcb0e5864a8cd01d26c50c8d24307b76..5e533e01217364de05e8394832dfc3e46fcf3818 100644 (file)
--- a/meta-fsl-ppc/conf/machine/include/e6500-64b.inc
+++ b/meta-fsl-ppc/conf/machine/include/e6500-64b.inc
@@ -4,4 +4,4 @@ DEFAULTTUNE ?= "ppc64e6500"
 require conf/machine/include/tune-ppce6500.inc
 require conf/machine/include/qoriq-base.inc
 
-MACHINEOVERRIDES .= ":e6500-64b:fslmachine"
+MACHINEOVERRIDES .= ":e6500-64b"

diff --git a/meta-fsl-ppc/conf/machine/include/e6500.inc b/meta-fsl-ppc/conf/machine/include/e6500.inc
index 323e420d7bf19ab8e1b4a618b59322d25cd95f1b..5ebeccf63bcebb1cd72cef3425bcc760e8e2c12f 100644 (file)
--- a/meta-fsl-ppc/conf/machine/include/e6500.inc
+++ b/meta-fsl-ppc/conf/machine/include/e6500.inc
@@ -3,7 +3,7 @@ TARGET_FPU = "hard"
 require conf/machine/include/tune-ppce6500.inc
 require conf/machine/include/qoriq-base.inc
 
-MACHINEOVERRIDES .= ":e6500:fslmachine"
+MACHINEOVERRIDES .= ":e6500"
 
 BUILD_64BIT_KERNEL = "1"
 

diff --git a/meta-fsl-ppc/recipes-bsp/rcw/rcw_git.bb b/meta-fsl-ppc/recipes-bsp/rcw/rcw_git.bb
index 5e751b8cd8c827687927985a27de9dddc8dae36f..1bc60d21383d87442585009cfa0da4fc95036fc1 100644 (file)
--- a/meta-fsl-ppc/recipes-bsp/rcw/rcw_git.bb
+++ b/meta-fsl-ppc/recipes-bsp/rcw/rcw_git.bb
@@ -42,6 +42,6 @@ addtask deploy after do_install
 PACKAGES += "${PN}-image"
 FILES_${PN}-image += "/boot"
 
-COMPATIBLE_HOST_fslmachine = ".*"
+COMPATIBLE_HOST_qoriq-ppc = ".*"
 COMPATIBLE_HOST ?= "(none)"
 ALLOW_EMPTY_${PN} = "1"

diff --git a/meta-fsl-ppc/recipes-devtools/qemu/qemu_fslgit.bb b/meta-fsl-ppc/recipes-devtools/qemu/qemu_fslgit.bb
index 30f27d6074f9f02ef1d9119d9968037dc6a0efbb..88e78b58cf96dafe136c1813f6d277390a5883a3 100644 (file)
--- a/meta-fsl-ppc/recipes-devtools/qemu/qemu_fslgit.bb
+++ b/meta-fsl-ppc/recipes-devtools/qemu/qemu_fslgit.bb
@@ -46,4 +46,4 @@ INSANE_SKIP_${PN} += "dev-deps"
 # the package get built. COMPATIBLE_HOST would not work
 # because it was too generic
 COMPATIBLE_MACHINE = "a^"
-COMPATIBLE_MACHINE_libc-glibc_fslmachine = ".*"
+COMPATIBLE_MACHINE_libc-glibc_qoriq-ppc = ".*"

diff --git a/meta-fsl-ppc/recipes-dpaa/fmlib/fmlib_git.bb b/meta-fsl-ppc/recipes-dpaa/fmlib/fmlib_git.bb
index 04ca515adc4f65d0dba5e530dd7512bf9649ef92..d59d6aca3c0ad4038b60518f32fb23d7ca8da769 100644 (file)
--- a/meta-fsl-ppc/recipes-dpaa/fmlib/fmlib_git.bb
+++ b/meta-fsl-ppc/recipes-dpaa/fmlib/fmlib_git.bb
@@ -16,7 +16,7 @@ S = "${WORKDIR}/git"
 TARGET_ARCH_FMLIB = "${DEFAULTTUNE}"
 TARGET_ARCH_FMLIB_e5500 = "ppc32e5500"
 TARGET_ARCH_FMLIB_e6500 = "ppc32e6500"
-COMPATIBLE_HOST_fslmachine = ".*"
+COMPATIBLE_HOST_qoriq-ppc = ".*"
 COMPATIBLE_HOST ?= "(none)"
 
 EXTRA_OEMAKE = "DESTDIR=${D} PREFIX=${prefix} LIB_DEST_DIR=${libdir} \

diff --git a/meta-fsl-ppc/recipes-dpaa/usdpaa/usdpaa_git.bb b/meta-fsl-ppc/recipes-dpaa/usdpaa/usdpaa_git.bb
index 9c7e38827e031c0ce2c618d50ef89677a57e5a29..78d42535358d5882a788b8a439dc188eae7b3dec 100644 (file)
--- a/meta-fsl-ppc/recipes-dpaa/usdpaa/usdpaa_git.bb
+++ b/meta-fsl-ppc/recipes-dpaa/usdpaa/usdpaa_git.bb
@@ -71,6 +71,6 @@ do_install () {
 PARALLEL_MAKE_pn-${PN} = ""
 FILES_${PN} += "/root/SOURCE_THIS /usr/etc/"
 
-COMPATIBLE_HOST_fslmachine = ".*"
+COMPATIBLE_HOST_qoriq-ppc = ".*"
 COMPATIBLE_HOST ?= "(none)"
 

diff --git a/meta-fsl-ppc/recipes-extended/testfloat/testfloat_2a.bb b/meta-fsl-ppc/recipes-extended/testfloat/testfloat_2a.bb
index fb89e263b7828a778362b36b6cc0ce2d15e4a110..800cef3d172ef297ec0256fd28b1fd9ecb26b203 100644 (file)
--- a/meta-fsl-ppc/recipes-extended/testfloat/testfloat_2a.bb
+++ b/meta-fsl-ppc/recipes-extended/testfloat/testfloat_2a.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://testfloat/testfloat.txt;beginline=87;endline=95;md5=b
 SRC_URI = " http://www.jhauser.us/arithmetic/TestFloat-2a.tar.Z;name=TestFloat \
             http://www.jhauser.us/arithmetic/SoftFloat-2b.tar.Z;name=SoftFloat \
           "
-SRC_URI_append_fslmachine = " file://SoftFloat-powerpc-1.patch \
+SRC_URI_append_qoriq-ppc = " file://SoftFloat-powerpc-1.patch \
                               file://TestFloat-powerpc-E500v2-SPE-1.patch \
                               file://Yocto-replace-COMPILE_PREFIX-gcc.patch \
                             "

diff --git a/meta-fsl-ppc/recipes-kernel/cryptodev/cryptodev-fsl.inc b/meta-fsl-ppc/recipes-kernel/cryptodev/cryptodev-fsl.inc
index 774ef102e66ca5dea15aa9020eae622e59fdb7d4..3bdd3018f3765d09f4017859b2f2df57086f1094 100644 (file)
--- a/meta-fsl-ppc/recipes-kernel/cryptodev/cryptodev-fsl.inc
+++ b/meta-fsl-ppc/recipes-kernel/cryptodev/cryptodev-fsl.inc
@@ -1,6 +1,6 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/cryptodev-fsl"
 
-SRC_URI_fslmachine = "git://github.com/nmav/cryptodev-linux.git \
+SRC_URI_qoriq-ppc = "git://github.com/nmav/cryptodev-linux.git \
     file://0001-add-support-for-composite-TLS-SHA1-AES-algorithm-off.patch \
     file://0002-use-function-local-storage-for-cipher-and-hmac-keys.patch \
     file://0003-Add-support-for-aead-keys-for-composite-algorithms.patch \
@@ -18,7 +18,7 @@ SRC_URI_fslmachine = "git://github.com/nmav/cryptodev-linux.git \
     file://0015-Add-RSA-Key-generation-offloading.patch \
     file://0016-Fixed-compilation-error-of-openssl-with-fsl-cryptode.patch \
 "
-SRCREV_fslmachine = "e8609a408d40c83ae8fc11bbe9a7b3847612669b"
+SRCREV_qoriq-ppc = "e8609a408d40c83ae8fc11bbe9a7b3847612669b"
 
-S_fslmachine = "${WORKDIR}/git"
+S_qoriq-ppc = "${WORKDIR}/git"
 

diff --git a/meta-fsl-ppc/recipes-kernel/cryptodev/cryptodev-module_1.6.bbappend b/meta-fsl-ppc/recipes-kernel/cryptodev/cryptodev-module_1.6.bbappend
index 1dbf3b64e9c43088677c9ba977394418a2051385..345a09d448d373a8bfd811e1ac25ed9505021a48 100644 (file)
--- a/meta-fsl-ppc/recipes-kernel/cryptodev/cryptodev-module_1.6.bbappend
+++ b/meta-fsl-ppc/recipes-kernel/cryptodev/cryptodev-module_1.6.bbappend
@@ -2,7 +2,7 @@ require recipes-kernel/cryptodev/cryptodev-fsl.inc
 
 inherit qoriq_build_64bit_kernel
 
-do_install_append_fslmachine () {
+do_install_append_qoriq-ppc () {
     rm -fr ${D}/usr
 }
 

diff --git a/meta-fsl-ppc/recipes-virtualization/hv-cfg/hv-cfg_git.bb b/meta-fsl-ppc/recipes-virtualization/hv-cfg/hv-cfg_git.bb
index 304b78f8fa30b07745f33b5466216c350650b5f4..0fc83e09e8a8fc77d58871fa6763550db909cead 100644 (file)
--- a/meta-fsl-ppc/recipes-virtualization/hv-cfg/hv-cfg_git.bb
+++ b/meta-fsl-ppc/recipes-virtualization/hv-cfg/hv-cfg_git.bb
@@ -41,6 +41,6 @@ addtask deploy after do_install
 PACKAGES += "${PN}-image"
 FILES_${PN}-image += "/boot"
 
-COMPATIBLE_HOST_fslmachine = ".*"
+COMPATIBLE_HOST_qoriq-ppc = ".*"
 COMPATIBLE_HOST ?= "(none)"
 ALLOW_EMPTY_${PN} = "1"

diff --git a/meta-fsl-ppc/recipes-virtualization/hypervisor/hypervisor_git.bb b/meta-fsl-ppc/recipes-virtualization/hypervisor/hypervisor_git.bb
index 4add9f304cdf0981a7162898528e67c144aabbc8..c2a5d2c018a623d153297dee4cfb68f192e8269b 100644 (file)
--- a/meta-fsl-ppc/recipes-virtualization/hypervisor/hypervisor_git.bb
+++ b/meta-fsl-ppc/recipes-virtualization/hypervisor/hypervisor_git.bb
@@ -36,7 +36,7 @@ EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TOOLCHA
 DEFCONFIG = "defconfig"
 DEFCONFIG_powerpc64 = "64bit_defconfig"
 
-COMPATIBLE_HOST_fslmachine = ".*"
+COMPATIBLE_HOST_qoriq-ppc = ".*"
 COMPATIBLE_HOST ?= "(none)"
 
 inherit cml1