diff options
author | Khem Raj <raj.khem@gmail.com> | 2021-08-02 11:01:05 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2021-08-12 10:08:24 -0700 |
commit | 59d36c9832702989bfcca8a5af29fb2dff01efcc (patch) | |
tree | b2b07d98cb22bc5241cde7403b6a15d99821318e /recipes-bsp/atf | |
parent | 72f59d35816cd2be6159013e4d96d03abf7f1c4b (diff) | |
download | meta-freescale-59d36c9832702989bfcca8a5af29fb2dff01efcc.tar.gz |
layer: Convert to new override syntax
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes-bsp/atf')
-rw-r--r-- | recipes-bsp/atf/qoriq-atf_1.5.bb | 20 | ||||
-rw-r--r-- | recipes-bsp/atf/qoriq-atf_2.3.bb | 6 |
2 files changed, 13 insertions, 13 deletions
diff --git a/recipes-bsp/atf/qoriq-atf_1.5.bb b/recipes-bsp/atf/qoriq-atf_1.5.bb index 19208334..f2657726 100644 --- a/recipes-bsp/atf/qoriq-atf_1.5.bb +++ b/recipes-bsp/atf/qoriq-atf_1.5.bb | |||
@@ -8,7 +8,7 @@ PV = "1.5+git${SRCPV}" | |||
8 | inherit deploy | 8 | inherit deploy |
9 | 9 | ||
10 | DEPENDS += "u-boot-mkimage-native u-boot openssl openssl-native mbedtls rcw cst-native" | 10 | DEPENDS += "u-boot-mkimage-native u-boot openssl openssl-native mbedtls rcw cst-native" |
11 | DEPENDS_append_lx2160a = " ddr-phy" | 11 | DEPENDS:append:lx2160a = " ddr-phy" |
12 | do_compile[depends] += "u-boot:do_deploy rcw:do_deploy uefi:do_deploy" | 12 | do_compile[depends] += "u-boot:do_deploy rcw:do_deploy uefi:do_deploy" |
13 | 13 | ||
14 | S = "${WORKDIR}/git" | 14 | S = "${WORKDIR}/git" |
@@ -21,12 +21,12 @@ COMPATIBLE_MACHINE = "(qoriq)" | |||
21 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 21 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
22 | 22 | ||
23 | PLATFORM = "${MACHINE}" | 23 | PLATFORM = "${MACHINE}" |
24 | PLATFORM_ls1088ardb-pb = "ls1088ardb" | 24 | PLATFORM:ls1088ardb-pb = "ls1088ardb" |
25 | PLATFORM_ADDITIONAL_TARGET ??= "" | 25 | PLATFORM_ADDITIONAL_TARGET ??= "" |
26 | PLATFORM_ADDITIONAL_TARGET_ls1012afrwy = "ls1012afrwy_512mb" | 26 | PLATFORM_ADDITIONAL_TARGET:ls1012afrwy = "ls1012afrwy_512mb" |
27 | 27 | ||
28 | RCW_FOLDER ?= "${MACHINE}" | 28 | RCW_FOLDER ?= "${MACHINE}" |
29 | RCW_FOLDER_ls1088ardb-pb = "ls1088ardb" | 29 | RCW_FOLDER:ls1088ardb-pb = "ls1088ardb" |
30 | 30 | ||
31 | # requires CROSS_COMPILE set by hand as there is no configure script | 31 | # requires CROSS_COMPILE set by hand as there is no configure script |
32 | export CROSS_COMPILE="${TARGET_PREFIX}" | 32 | export CROSS_COMPILE="${TARGET_PREFIX}" |
@@ -56,16 +56,16 @@ PACKAGECONFIG[optee] = ",,optee-os-qoriq" | |||
56 | uboot_boot_sec ?= "${DEPLOY_DIR_IMAGE}/u-boot.bin-tfa-secure-boot" | 56 | uboot_boot_sec ?= "${DEPLOY_DIR_IMAGE}/u-boot.bin-tfa-secure-boot" |
57 | uboot_boot ?= "${DEPLOY_DIR_IMAGE}/u-boot.bin-tfa" | 57 | uboot_boot ?= "${DEPLOY_DIR_IMAGE}/u-boot.bin-tfa" |
58 | rcw ?= "" | 58 | rcw ?= "" |
59 | rcw_ls1012a = "_default" | 59 | rcw:ls1012a = "_default" |
60 | rcwsec ?= "_sben" | 60 | rcwsec ?= "_sben" |
61 | 61 | ||
62 | chassistype ?= "ls2088_1088" | 62 | chassistype ?= "ls2088_1088" |
63 | chassistype_ls1012a = "ls104x_1012" | 63 | chassistype:ls1012a = "ls104x_1012" |
64 | chassistype_ls1043a = "ls104x_1012" | 64 | chassistype:ls1043a = "ls104x_1012" |
65 | chassistype_ls1046a = "ls104x_1012" | 65 | chassistype:ls1046a = "ls104x_1012" |
66 | 66 | ||
67 | ddrphyopt ?= "" | 67 | ddrphyopt ?= "" |
68 | ddrphyopt_lx2160a = "fip_ddr_sec" | 68 | ddrphyopt:lx2160a = "fip_ddr_sec" |
69 | 69 | ||
70 | do_configure[noexec] = "1" | 70 | do_configure[noexec] = "1" |
71 | 71 | ||
@@ -242,5 +242,5 @@ do_deploy() { | |||
242 | fi | 242 | fi |
243 | } | 243 | } |
244 | addtask deploy after do_install | 244 | addtask deploy after do_install |
245 | FILES_${PN} += "/boot" | 245 | FILES:${PN} += "/boot" |
246 | BBCLASSEXTEND = "native nativesdk" | 246 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/recipes-bsp/atf/qoriq-atf_2.3.bb b/recipes-bsp/atf/qoriq-atf_2.3.bb index aed32851..f2922c91 100644 --- a/recipes-bsp/atf/qoriq-atf_2.3.bb +++ b/recipes-bsp/atf/qoriq-atf_2.3.bb | |||
@@ -47,7 +47,7 @@ do_compile() { | |||
47 | if [ "${NXP_COT}" = "true" -a "${ARM_COT}" = "true" ]; then | 47 | if [ "${NXP_COT}" = "true" -a "${ARM_COT}" = "true" ]; then |
48 | bbfatal " \ | 48 | bbfatal " \ |
49 | Error!, Both ARM CoT and NXP CoT are enabled. Only one CoT is built in a yocto build, \ | 49 | Error!, Both ARM CoT and NXP CoT are enabled. Only one CoT is built in a yocto build, \ |
50 | Don't add nxp-cot and arm-cot into DISTRO_FEATURES_append at the same time." | 50 | Don't add nxp-cot and arm-cot into DISTRO_FEATURES:append at the same time." |
51 | fi | 51 | fi |
52 | 52 | ||
53 | if [ "${NXP_COT}" = "true" ]; then | 53 | if [ "${NXP_COT}" = "true" ]; then |
@@ -160,7 +160,7 @@ do_install() { | |||
160 | 160 | ||
161 | do_deploy() { | 161 | do_deploy() { |
162 | if [ "${ARM_COT}" = "true" ]; then | 162 | if [ "${ARM_COT}" = "true" ]; then |
163 | outputdir="atf_arm-cot" | 163 | outputdir="atf:arm-cot" |
164 | elif [ "${NXP_COT}" = "true" ]; then | 164 | elif [ "${NXP_COT}" = "true" ]; then |
165 | outputdir="atf_nxp-cot" | 165 | outputdir="atf_nxp-cot" |
166 | else | 166 | else |
@@ -171,5 +171,5 @@ do_deploy() { | |||
171 | cp -fr ${D}/boot/atf/* ${DEPLOYDIR}/${outputdir}/ | 171 | cp -fr ${D}/boot/atf/* ${DEPLOYDIR}/${outputdir}/ |
172 | } | 172 | } |
173 | addtask deploy after do_install | 173 | addtask deploy after do_install |
174 | FILES_${PN} += "/boot" | 174 | FILES:${PN} += "/boot" |
175 | COMPATIBLE_MACHINE = "(lx2160a|lx2162a)" | 175 | COMPATIBLE_MACHINE = "(lx2160a|lx2162a)" |