diff options
-rw-r--r-- | conf/machine/include/e500mc.inc | 2 | ||||
-rw-r--r-- | conf/machine/include/e500v2.inc | 2 | ||||
-rw-r--r-- | conf/machine/include/e5500-64b.inc | 2 | ||||
-rw-r--r-- | conf/machine/include/e5500.inc | 2 | ||||
-rw-r--r-- | conf/machine/include/e6500-64b.inc | 2 | ||||
-rw-r--r-- | conf/machine/include/e6500.inc | 2 | ||||
-rw-r--r-- | recipes-bsp/rcw/rcw_git.bb | 2 | ||||
-rw-r--r-- | recipes-devtools/qemu/qemu_fslgit.bb | 2 | ||||
-rw-r--r-- | recipes-dpaa/fmlib/fmlib_git.bb | 2 | ||||
-rw-r--r-- | recipes-dpaa/usdpaa/usdpaa_git.bb | 2 | ||||
-rw-r--r-- | recipes-extended/testfloat/testfloat_2a.bb | 2 | ||||
-rw-r--r-- | recipes-kernel/cryptodev/cryptodev-fsl.inc | 6 | ||||
-rw-r--r-- | recipes-kernel/cryptodev/cryptodev-module_1.6.bbappend | 2 | ||||
-rw-r--r-- | recipes-virtualization/hv-cfg/hv-cfg_git.bb | 2 | ||||
-rw-r--r-- | recipes-virtualization/hypervisor/hypervisor_git.bb | 2 |
15 files changed, 17 insertions, 17 deletions
diff --git a/conf/machine/include/e500mc.inc b/conf/machine/include/e500mc.inc index 09b5c69..5871104 100644 --- a/conf/machine/include/e500mc.inc +++ b/conf/machine/include/e500mc.inc | |||
@@ -3,4 +3,4 @@ TARGET_FPU = "hard" | |||
3 | require conf/machine/include/tune-ppce500mc.inc | 3 | require conf/machine/include/tune-ppce500mc.inc |
4 | require conf/machine/include/qoriq-base.inc | 4 | require conf/machine/include/qoriq-base.inc |
5 | 5 | ||
6 | MACHINEOVERRIDES .= ":e500mc:fslmachine" | 6 | MACHINEOVERRIDES .= ":e500mc" |
diff --git a/conf/machine/include/e500v2.inc b/conf/machine/include/e500v2.inc index 178de18..a937254 100644 --- a/conf/machine/include/e500v2.inc +++ b/conf/machine/include/e500v2.inc | |||
@@ -1,4 +1,4 @@ | |||
1 | require conf/machine/include/tune-ppce500v2.inc | 1 | require conf/machine/include/tune-ppce500v2.inc |
2 | require conf/machine/include/qoriq-base.inc | 2 | require conf/machine/include/qoriq-base.inc |
3 | 3 | ||
4 | MACHINEOVERRIDES .= ":e500v2:fslmachine" | 4 | MACHINEOVERRIDES .= ":e500v2" |
diff --git a/conf/machine/include/e5500-64b.inc b/conf/machine/include/e5500-64b.inc index 47a9ad7..5c75883 100644 --- a/conf/machine/include/e5500-64b.inc +++ b/conf/machine/include/e5500-64b.inc | |||
@@ -4,4 +4,4 @@ DEFAULTTUNE ?= "ppc64e5500" | |||
4 | require conf/machine/include/tune-ppce5500.inc | 4 | require conf/machine/include/tune-ppce5500.inc |
5 | require conf/machine/include/qoriq-base.inc | 5 | require conf/machine/include/qoriq-base.inc |
6 | 6 | ||
7 | MACHINEOVERRIDES .= ":e5500-64b:fslmachine" | 7 | MACHINEOVERRIDES .= ":e5500-64b" |
diff --git a/conf/machine/include/e5500.inc b/conf/machine/include/e5500.inc index e6f0400..88f6d06 100644 --- a/conf/machine/include/e5500.inc +++ b/conf/machine/include/e5500.inc | |||
@@ -3,4 +3,4 @@ TARGET_FPU = "hard" | |||
3 | require conf/machine/include/tune-ppce5500.inc | 3 | require conf/machine/include/tune-ppce5500.inc |
4 | require conf/machine/include/qoriq-base.inc | 4 | require conf/machine/include/qoriq-base.inc |
5 | 5 | ||
6 | MACHINEOVERRIDES .= ":e5500:fslmachine" | 6 | MACHINEOVERRIDES .= ":e5500" |
diff --git a/conf/machine/include/e6500-64b.inc b/conf/machine/include/e6500-64b.inc index 0770cc3..5e533e0 100644 --- a/conf/machine/include/e6500-64b.inc +++ b/conf/machine/include/e6500-64b.inc | |||
@@ -4,4 +4,4 @@ DEFAULTTUNE ?= "ppc64e6500" | |||
4 | require conf/machine/include/tune-ppce6500.inc | 4 | require conf/machine/include/tune-ppce6500.inc |
5 | require conf/machine/include/qoriq-base.inc | 5 | require conf/machine/include/qoriq-base.inc |
6 | 6 | ||
7 | MACHINEOVERRIDES .= ":e6500-64b:fslmachine" | 7 | MACHINEOVERRIDES .= ":e6500-64b" |
diff --git a/conf/machine/include/e6500.inc b/conf/machine/include/e6500.inc index 323e420..5ebeccf 100644 --- a/conf/machine/include/e6500.inc +++ b/conf/machine/include/e6500.inc | |||
@@ -3,7 +3,7 @@ TARGET_FPU = "hard" | |||
3 | require conf/machine/include/tune-ppce6500.inc | 3 | require conf/machine/include/tune-ppce6500.inc |
4 | require conf/machine/include/qoriq-base.inc | 4 | require conf/machine/include/qoriq-base.inc |
5 | 5 | ||
6 | MACHINEOVERRIDES .= ":e6500:fslmachine" | 6 | MACHINEOVERRIDES .= ":e6500" |
7 | 7 | ||
8 | BUILD_64BIT_KERNEL = "1" | 8 | BUILD_64BIT_KERNEL = "1" |
9 | 9 | ||
diff --git a/recipes-bsp/rcw/rcw_git.bb b/recipes-bsp/rcw/rcw_git.bb index 5e751b8..1bc60d2 100644 --- a/recipes-bsp/rcw/rcw_git.bb +++ b/recipes-bsp/rcw/rcw_git.bb | |||
@@ -42,6 +42,6 @@ addtask deploy after do_install | |||
42 | PACKAGES += "${PN}-image" | 42 | PACKAGES += "${PN}-image" |
43 | FILES_${PN}-image += "/boot" | 43 | FILES_${PN}-image += "/boot" |
44 | 44 | ||
45 | COMPATIBLE_HOST_fslmachine = ".*" | 45 | COMPATIBLE_HOST_qoriq-ppc = ".*" |
46 | COMPATIBLE_HOST ?= "(none)" | 46 | COMPATIBLE_HOST ?= "(none)" |
47 | ALLOW_EMPTY_${PN} = "1" | 47 | ALLOW_EMPTY_${PN} = "1" |
diff --git a/recipes-devtools/qemu/qemu_fslgit.bb b/recipes-devtools/qemu/qemu_fslgit.bb index 30f27d6..88e78b5 100644 --- a/recipes-devtools/qemu/qemu_fslgit.bb +++ b/recipes-devtools/qemu/qemu_fslgit.bb | |||
@@ -46,4 +46,4 @@ INSANE_SKIP_${PN} += "dev-deps" | |||
46 | # the package get built. COMPATIBLE_HOST would not work | 46 | # the package get built. COMPATIBLE_HOST would not work |
47 | # because it was too generic | 47 | # because it was too generic |
48 | COMPATIBLE_MACHINE = "a^" | 48 | COMPATIBLE_MACHINE = "a^" |
49 | COMPATIBLE_MACHINE_libc-glibc_fslmachine = ".*" | 49 | COMPATIBLE_MACHINE_libc-glibc_qoriq-ppc = ".*" |
diff --git a/recipes-dpaa/fmlib/fmlib_git.bb b/recipes-dpaa/fmlib/fmlib_git.bb index 04ca515..d59d6ac 100644 --- a/recipes-dpaa/fmlib/fmlib_git.bb +++ b/recipes-dpaa/fmlib/fmlib_git.bb | |||
@@ -16,7 +16,7 @@ S = "${WORKDIR}/git" | |||
16 | TARGET_ARCH_FMLIB = "${DEFAULTTUNE}" | 16 | TARGET_ARCH_FMLIB = "${DEFAULTTUNE}" |
17 | TARGET_ARCH_FMLIB_e5500 = "ppc32e5500" | 17 | TARGET_ARCH_FMLIB_e5500 = "ppc32e5500" |
18 | TARGET_ARCH_FMLIB_e6500 = "ppc32e6500" | 18 | TARGET_ARCH_FMLIB_e6500 = "ppc32e6500" |
19 | COMPATIBLE_HOST_fslmachine = ".*" | 19 | COMPATIBLE_HOST_qoriq-ppc = ".*" |
20 | COMPATIBLE_HOST ?= "(none)" | 20 | COMPATIBLE_HOST ?= "(none)" |
21 | 21 | ||
22 | EXTRA_OEMAKE = "DESTDIR=${D} PREFIX=${prefix} LIB_DEST_DIR=${libdir} \ | 22 | EXTRA_OEMAKE = "DESTDIR=${D} PREFIX=${prefix} LIB_DEST_DIR=${libdir} \ |
diff --git a/recipes-dpaa/usdpaa/usdpaa_git.bb b/recipes-dpaa/usdpaa/usdpaa_git.bb index 9c7e388..78d4253 100644 --- a/recipes-dpaa/usdpaa/usdpaa_git.bb +++ b/recipes-dpaa/usdpaa/usdpaa_git.bb | |||
@@ -71,6 +71,6 @@ do_install () { | |||
71 | PARALLEL_MAKE_pn-${PN} = "" | 71 | PARALLEL_MAKE_pn-${PN} = "" |
72 | FILES_${PN} += "/root/SOURCE_THIS /usr/etc/" | 72 | FILES_${PN} += "/root/SOURCE_THIS /usr/etc/" |
73 | 73 | ||
74 | COMPATIBLE_HOST_fslmachine = ".*" | 74 | COMPATIBLE_HOST_qoriq-ppc = ".*" |
75 | COMPATIBLE_HOST ?= "(none)" | 75 | COMPATIBLE_HOST ?= "(none)" |
76 | 76 | ||
diff --git a/recipes-extended/testfloat/testfloat_2a.bb b/recipes-extended/testfloat/testfloat_2a.bb index fb89e26..800cef3 100644 --- a/recipes-extended/testfloat/testfloat_2a.bb +++ b/recipes-extended/testfloat/testfloat_2a.bb | |||
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://testfloat/testfloat.txt;beginline=87;endline=95;md5=b | |||
6 | SRC_URI = " http://www.jhauser.us/arithmetic/TestFloat-2a.tar.Z;name=TestFloat \ | 6 | SRC_URI = " http://www.jhauser.us/arithmetic/TestFloat-2a.tar.Z;name=TestFloat \ |
7 | http://www.jhauser.us/arithmetic/SoftFloat-2b.tar.Z;name=SoftFloat \ | 7 | http://www.jhauser.us/arithmetic/SoftFloat-2b.tar.Z;name=SoftFloat \ |
8 | " | 8 | " |
9 | SRC_URI_append_fslmachine = " file://SoftFloat-powerpc-1.patch \ | 9 | SRC_URI_append_qoriq-ppc = " file://SoftFloat-powerpc-1.patch \ |
10 | file://TestFloat-powerpc-E500v2-SPE-1.patch \ | 10 | file://TestFloat-powerpc-E500v2-SPE-1.patch \ |
11 | file://Yocto-replace-COMPILE_PREFIX-gcc.patch \ | 11 | file://Yocto-replace-COMPILE_PREFIX-gcc.patch \ |
12 | " | 12 | " |
diff --git a/recipes-kernel/cryptodev/cryptodev-fsl.inc b/recipes-kernel/cryptodev/cryptodev-fsl.inc index 774ef10..3bdd301 100644 --- a/recipes-kernel/cryptodev/cryptodev-fsl.inc +++ b/recipes-kernel/cryptodev/cryptodev-fsl.inc | |||
@@ -1,6 +1,6 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/cryptodev-fsl" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/cryptodev-fsl" |
2 | 2 | ||
3 | SRC_URI_fslmachine = "git://github.com/nmav/cryptodev-linux.git \ | 3 | SRC_URI_qoriq-ppc = "git://github.com/nmav/cryptodev-linux.git \ |
4 | file://0001-add-support-for-composite-TLS-SHA1-AES-algorithm-off.patch \ | 4 | file://0001-add-support-for-composite-TLS-SHA1-AES-algorithm-off.patch \ |
5 | file://0002-use-function-local-storage-for-cipher-and-hmac-keys.patch \ | 5 | file://0002-use-function-local-storage-for-cipher-and-hmac-keys.patch \ |
6 | file://0003-Add-support-for-aead-keys-for-composite-algorithms.patch \ | 6 | 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 \ | |||
18 | file://0015-Add-RSA-Key-generation-offloading.patch \ | 18 | file://0015-Add-RSA-Key-generation-offloading.patch \ |
19 | file://0016-Fixed-compilation-error-of-openssl-with-fsl-cryptode.patch \ | 19 | file://0016-Fixed-compilation-error-of-openssl-with-fsl-cryptode.patch \ |
20 | " | 20 | " |
21 | SRCREV_fslmachine = "e8609a408d40c83ae8fc11bbe9a7b3847612669b" | 21 | SRCREV_qoriq-ppc = "e8609a408d40c83ae8fc11bbe9a7b3847612669b" |
22 | 22 | ||
23 | S_fslmachine = "${WORKDIR}/git" | 23 | S_qoriq-ppc = "${WORKDIR}/git" |
24 | 24 | ||
diff --git a/recipes-kernel/cryptodev/cryptodev-module_1.6.bbappend b/recipes-kernel/cryptodev/cryptodev-module_1.6.bbappend index 1dbf3b6..345a09d 100644 --- a/recipes-kernel/cryptodev/cryptodev-module_1.6.bbappend +++ b/recipes-kernel/cryptodev/cryptodev-module_1.6.bbappend | |||
@@ -2,7 +2,7 @@ require recipes-kernel/cryptodev/cryptodev-fsl.inc | |||
2 | 2 | ||
3 | inherit qoriq_build_64bit_kernel | 3 | inherit qoriq_build_64bit_kernel |
4 | 4 | ||
5 | do_install_append_fslmachine () { | 5 | do_install_append_qoriq-ppc () { |
6 | rm -fr ${D}/usr | 6 | rm -fr ${D}/usr |
7 | } | 7 | } |
8 | 8 | ||
diff --git a/recipes-virtualization/hv-cfg/hv-cfg_git.bb b/recipes-virtualization/hv-cfg/hv-cfg_git.bb index 304b78f..0fc83e0 100644 --- a/recipes-virtualization/hv-cfg/hv-cfg_git.bb +++ b/recipes-virtualization/hv-cfg/hv-cfg_git.bb | |||
@@ -41,6 +41,6 @@ addtask deploy after do_install | |||
41 | PACKAGES += "${PN}-image" | 41 | PACKAGES += "${PN}-image" |
42 | FILES_${PN}-image += "/boot" | 42 | FILES_${PN}-image += "/boot" |
43 | 43 | ||
44 | COMPATIBLE_HOST_fslmachine = ".*" | 44 | COMPATIBLE_HOST_qoriq-ppc = ".*" |
45 | COMPATIBLE_HOST ?= "(none)" | 45 | COMPATIBLE_HOST ?= "(none)" |
46 | ALLOW_EMPTY_${PN} = "1" | 46 | ALLOW_EMPTY_${PN} = "1" |
diff --git a/recipes-virtualization/hypervisor/hypervisor_git.bb b/recipes-virtualization/hypervisor/hypervisor_git.bb index 4add9f3..c2a5d2c 100644 --- a/recipes-virtualization/hypervisor/hypervisor_git.bb +++ b/recipes-virtualization/hypervisor/hypervisor_git.bb | |||
@@ -36,7 +36,7 @@ EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TOOLCHA | |||
36 | DEFCONFIG = "defconfig" | 36 | DEFCONFIG = "defconfig" |
37 | DEFCONFIG_powerpc64 = "64bit_defconfig" | 37 | DEFCONFIG_powerpc64 = "64bit_defconfig" |
38 | 38 | ||
39 | COMPATIBLE_HOST_fslmachine = ".*" | 39 | COMPATIBLE_HOST_qoriq-ppc = ".*" |
40 | COMPATIBLE_HOST ?= "(none)" | 40 | COMPATIBLE_HOST ?= "(none)" |
41 | 41 | ||
42 | inherit cml1 | 42 | inherit cml1 |