diff options
| author | Zhenhua Luo <zhenhua.luo@freescale.com> | 2015-08-12 22:42:17 +0800 |
|---|---|---|
| committer | Otavio Salvador <otavio@ossystems.com.br> | 2016-04-19 15:03:15 -0300 |
| commit | 22f20b33f442514e3bb93ec35b9c363eb07661bc (patch) | |
| tree | b340a5d3615934b0639fc27cb6597651a75e6919 /conf/machine | |
| parent | e91d77daebaec5c83f5bc4ef36970b098a7ba751 (diff) | |
| download | meta-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.inc | 2 | ||||
| -rw-r--r-- | conf/machine/include/qoriq-base.inc | 2 | ||||
| -rw-r--r-- | conf/machine/include/qoriq-ppc.inc | 2 |
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 | |||
| 3 | DEFAULTTUNE ?= "cortexa7hf-neon" | 3 | DEFAULTTUNE ?= "cortexa7hf-neon" |
| 4 | 4 | ||
| 5 | # providers of QorIQ ARM targets | 5 | # providers of QorIQ ARM targets |
| 6 | PREFERRED_PROVIDER_u-boot ?= "u-boot-ls1" | ||
| 7 | PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ls1" | ||
| 8 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-ls1" | 6 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-ls1" |
| 9 | 7 | ||
| 10 | UBOOT_ENTRYPOINT = "0x80008000" | 8 | UBOOT_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" | |||
| 6 | PREFERRED_PROVIDER_cryptodev-module = "cryptodev-qoriq-module" | 6 | PREFERRED_PROVIDER_cryptodev-module = "cryptodev-qoriq-module" |
| 7 | PREFERRED_PROVIDER_cryptodev-tests = "cryptodev-qoriq-tests" | 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" | ||
| 10 | PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-qoriq" | ||
| 9 | 11 | ||
| 10 | # Define the default image type | 12 | # Define the default image type |
| 11 | IMAGE_CLASSES ?= "image_types_uboot" | 13 | IMAGE_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 @@ | |||
| 1 | require conf/machine/include/qoriq-base.inc | 1 | require conf/machine/include/qoriq-base.inc |
| 2 | 2 | ||
| 3 | # providers of QorIQ PPC targets | 3 | # providers of QorIQ PPC targets |
| 4 | PREFERRED_PROVIDER_u-boot ?= "u-boot-qoriq" | ||
| 5 | PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-qoriq" | ||
| 6 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq" | 4 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq" |
| 7 | 5 | ||
| 8 | UBOOT_ENTRYPOINT = "0x80008000" | 6 | UBOOT_ENTRYPOINT = "0x80008000" |