diff options
author | Zhenhua Luo <zhenhua.luo@freescale.com> | 2015-08-12 22:42:29 +0800 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2016-04-19 15:03:15 -0300 |
commit | 4bd6734f92989c1402cfa163b555e6ce3bfa1231 (patch) | |
tree | 421824435690df766bcc482ce8e343682c55c135 /conf/machine/include | |
parent | 828c64ab4d11aa0777855918abb78be820cdc4b6 (diff) | |
download | meta-freescale-4bd6734f92989c1402cfa163b555e6ce3bfa1231.tar.gz |
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>
Diffstat (limited to 'conf/machine/include')
-rw-r--r-- | conf/machine/include/qoriq-arm.inc | 3 | ||||
-rw-r--r-- | conf/machine/include/qoriq-base.inc | 1 | ||||
-rw-r--r-- | conf/machine/include/qoriq-ppc.inc | 3 |
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 | |||
2 | 2 | ||
3 | DEFAULTTUNE ?= "cortexa7hf-neon" | 3 | DEFAULTTUNE ?= "cortexa7hf-neon" |
4 | 4 | ||
5 | # providers of QorIQ ARM targets | ||
6 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-ls1" | ||
7 | |||
8 | UBOOT_ENTRYPOINT = "0x80008000" | 5 | UBOOT_ENTRYPOINT = "0x80008000" |
9 | 6 | ||
10 | MKUBIFS_ARGS ??= "-m 512 -e 15360 -c 3600" | 7 | 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" | |||
8 | PREFERRED_PROVIDER_openssl = "openssl-qoriq" | 8 | PREFERRED_PROVIDER_openssl = "openssl-qoriq" |
9 | PREFERRED_PROVIDER_u-boot ?= "u-boot-qoriq" | 9 | PREFERRED_PROVIDER_u-boot ?= "u-boot-qoriq" |
10 | PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-qoriq" | 10 | PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-qoriq" |
11 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq" | ||
11 | 12 | ||
12 | # Define the default image type | 13 | # Define the default image type |
13 | IMAGE_CLASSES ?= "image_types_uboot" | 14 | 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 @@ | |||
1 | require conf/machine/include/qoriq-base.inc | 1 | require conf/machine/include/qoriq-base.inc |
2 | 2 | ||
3 | # providers of QorIQ PPC targets | ||
4 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq" | ||
5 | |||
6 | UBOOT_ENTRYPOINT = "0x80008000" | 3 | UBOOT_ENTRYPOINT = "0x80008000" |
7 | 4 | ||
8 | MKUBIFS_ARGS ??= "-m 512 -e 15360 -c 3600" | 5 | MKUBIFS_ARGS ??= "-m 512 -e 15360 -c 3600" |