linux-qoriq: Unify recipe for QorIQ ARM and QorIQ PPC

* update linux-qoriq recipe to support both QorIQ ARM and QorIQ PPC
* move PREFERRED_PROVIDER_virtual/linux to qoriq-base.inc
* remove linux-ls1 recipes

Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
Acked-by: Daiane Angolini <daiane.angolini@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

3 files changed, 1 insertions, 6 deletions

diff --git a/conf/machine/include/qoriq-arm.inc b/conf/machine/include/qoriq-arm.inc
index 7f07e405..232bcbee 100644
--- a/conf/machine/include/qoriq-arm.inc
+++ b/conf/machine/include/qoriq-arm.inc
@@ -2,9 +2,6 @@ require conf/machine/include/qoriq-base.inc
 
 DEFAULTTUNE ?= "cortexa7hf-neon"
 
-# providers of QorIQ ARM targets
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-ls1"
-
 UBOOT_ENTRYPOINT = "0x80008000"
 
 MKUBIFS_ARGS ??= "-m 512 -e 15360 -c 3600"
diff --git a/conf/machine/include/qoriq-base.inc b/conf/machine/include/qoriq-base.inc
index eb325f39..60957a61 100644
--- a/conf/machine/include/qoriq-base.inc
+++ b/conf/machine/include/qoriq-base.inc
@@ -8,6 +8,7 @@ PREFERRED_PROVIDER_cryptodev-tests = "cryptodev-qoriq-tests"
 PREFERRED_PROVIDER_openssl = "openssl-qoriq"
 PREFERRED_PROVIDER_u-boot ?= "u-boot-qoriq"
 PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-qoriq"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq"
 
 # Define the default image type
 IMAGE_CLASSES ?= "image_types_uboot"
diff --git a/conf/machine/include/qoriq-ppc.inc b/conf/machine/include/qoriq-ppc.inc
index cfc1ffba..c60da4a4 100644
--- a/conf/machine/include/qoriq-ppc.inc
+++ b/conf/machine/include/qoriq-ppc.inc
@@ -1,8 +1,5 @@
 require conf/machine/include/qoriq-base.inc
 
-# providers of QorIQ PPC targets
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq"
-
 UBOOT_ENTRYPOINT = "0x80008000"
 
 MKUBIFS_ARGS ??= "-m 512 -e 15360 -c 3600"