summaryrefslogtreecommitdiffstats
path: root/conf/machine
diff options
context:
space:
mode:
authorZhenhua Luo <zhenhua.luo@freescale.com>2015-08-12 22:42:17 +0800
committerOtavio Salvador <otavio@ossystems.com.br>2016-04-19 15:03:15 -0300
commit22f20b33f442514e3bb93ec35b9c363eb07661bc (patch)
treeb340a5d3615934b0639fc27cb6597651a75e6919 /conf/machine
parente91d77daebaec5c83f5bc4ef36970b098a7ba751 (diff)
downloadmeta-freescale-22f20b33f442514e3bb93ec35b9c363eb07661bc.tar.gz
u-boot-qoirq: Unify the u-boot recipe for QorIQ ARM and QorIQ PPC
* update u-boot-qoriq recipe to support QorIQ ARM and QorIQ PPC * remove u-boot-ls1 recipe which is replaced by u-boot-qoriq * move PREFERRED_PROVIDER_u-boot to qoriq-base.inc 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')
-rw-r--r--conf/machine/include/qoriq-arm.inc2
-rw-r--r--conf/machine/include/qoriq-base.inc2
-rw-r--r--conf/machine/include/qoriq-ppc.inc2
3 files changed, 2 insertions, 4 deletions
diff --git a/conf/machine/include/qoriq-arm.inc b/conf/machine/include/qoriq-arm.inc
index 1ec8917a..7f07e405 100644
--- a/conf/machine/include/qoriq-arm.inc
+++ b/conf/machine/include/qoriq-arm.inc
@@ -3,8 +3,6 @@ require conf/machine/include/qoriq-base.inc
3DEFAULTTUNE ?= "cortexa7hf-neon" 3DEFAULTTUNE ?= "cortexa7hf-neon"
4 4
5# providers of QorIQ ARM targets 5# providers of QorIQ ARM targets
6PREFERRED_PROVIDER_u-boot ?= "u-boot-ls1"
7PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ls1"
8PREFERRED_PROVIDER_virtual/kernel ?= "linux-ls1" 6PREFERRED_PROVIDER_virtual/kernel ?= "linux-ls1"
9 7
10UBOOT_ENTRYPOINT = "0x80008000" 8UBOOT_ENTRYPOINT = "0x80008000"
diff --git a/conf/machine/include/qoriq-base.inc b/conf/machine/include/qoriq-base.inc
index d38238a4..eb325f39 100644
--- a/conf/machine/include/qoriq-base.inc
+++ b/conf/machine/include/qoriq-base.inc
@@ -6,6 +6,8 @@ PREFERRED_PROVIDER_cryptodev = "cryptodev-qoriq"
6PREFERRED_PROVIDER_cryptodev-module = "cryptodev-qoriq-module" 6PREFERRED_PROVIDER_cryptodev-module = "cryptodev-qoriq-module"
7PREFERRED_PROVIDER_cryptodev-tests = "cryptodev-qoriq-tests" 7PREFERRED_PROVIDER_cryptodev-tests = "cryptodev-qoriq-tests"
8PREFERRED_PROVIDER_openssl = "openssl-qoriq" 8PREFERRED_PROVIDER_openssl = "openssl-qoriq"
9PREFERRED_PROVIDER_u-boot ?= "u-boot-qoriq"
10PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-qoriq"
9 11
10# Define the default image type 12# Define the default image type
11IMAGE_CLASSES ?= "image_types_uboot" 13IMAGE_CLASSES ?= "image_types_uboot"
diff --git a/conf/machine/include/qoriq-ppc.inc b/conf/machine/include/qoriq-ppc.inc
index 6b772102..cfc1ffba 100644
--- a/conf/machine/include/qoriq-ppc.inc
+++ b/conf/machine/include/qoriq-ppc.inc
@@ -1,8 +1,6 @@
1require conf/machine/include/qoriq-base.inc 1require conf/machine/include/qoriq-base.inc
2 2
3# providers of QorIQ PPC targets 3# providers of QorIQ PPC targets
4PREFERRED_PROVIDER_u-boot ?= "u-boot-qoriq"
5PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-qoriq"
6PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq" 4PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq"
7 5
8UBOOT_ENTRYPOINT = "0x80008000" 6UBOOT_ENTRYPOINT = "0x80008000"