summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/u-boot
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-28 23:28:15 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-02 15:44:10 +0100
commitbb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch)
tree76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-bsp/u-boot
parentfcc456ee4b8f619134abb4649db53c638074082c (diff)
downloadpoky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz
Convert to new override syntax
This is the result of automated script conversion: scripts/contrib/convert-overrides.py <oe-core directory> converting the metadata to use ":" as the override character instead of "_". (From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp/u-boot')
-rw-r--r--meta/recipes-bsp/u-boot/libubootenv_0.3.2.bb2
-rw-r--r--meta/recipes-bsp/u-boot/u-boot-tools.inc38
-rw-r--r--meta/recipes-bsp/u-boot/u-boot-tools_2021.07.bb2
-rw-r--r--meta/recipes-bsp/u-boot/u-boot.inc10
-rw-r--r--meta/recipes-bsp/u-boot/u-boot_2021.07.bb2
5 files changed, 27 insertions, 27 deletions
diff --git a/meta/recipes-bsp/u-boot/libubootenv_0.3.2.bb b/meta/recipes-bsp/u-boot/libubootenv_0.3.2.bb
index 488a9df792..ce14bc48aa 100644
--- a/meta/recipes-bsp/u-boot/libubootenv_0.3.2.bb
+++ b/meta/recipes-bsp/u-boot/libubootenv_0.3.2.bb
@@ -21,6 +21,6 @@ EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release"
21 21
22DEPENDS = "zlib" 22DEPENDS = "zlib"
23PROVIDES += "u-boot-fw-utils" 23PROVIDES += "u-boot-fw-utils"
24RPROVIDES_${PN}-bin += "u-boot-fw-utils" 24RPROVIDES:${PN}-bin += "u-boot-fw-utils"
25 25
26BBCLASSEXTEND = "native" 26BBCLASSEXTEND = "native"
diff --git a/meta/recipes-bsp/u-boot/u-boot-tools.inc b/meta/recipes-bsp/u-boot/u-boot-tools.inc
index 4ed936a70d..7eda6a0897 100644
--- a/meta/recipes-bsp/u-boot/u-boot-tools.inc
+++ b/meta/recipes-bsp/u-boot/u-boot-tools.inc
@@ -2,25 +2,25 @@ SUMMARY = "U-Boot bootloader tools"
2DEPENDS += "openssl" 2DEPENDS += "openssl"
3 3
4PROVIDES = "${MLPREFIX}u-boot-mkimage ${MLPREFIX}u-boot-mkenvimage" 4PROVIDES = "${MLPREFIX}u-boot-mkimage ${MLPREFIX}u-boot-mkenvimage"
5PROVIDES_class-native = "u-boot-mkimage-native u-boot-mkenvimage-native" 5PROVIDES:class-native = "u-boot-mkimage-native u-boot-mkenvimage-native"
6 6
7PACKAGES += "${PN}-mkimage ${PN}-mkenvimage" 7PACKAGES += "${PN}-mkimage ${PN}-mkenvimage"
8 8
9# Required for backward compatibility with "u-boot-mkimage-xxx.bb" 9# Required for backward compatibility with "u-boot-mkimage-xxx.bb"
10RPROVIDES_${PN}-mkimage = "u-boot-mkimage" 10RPROVIDES:${PN}-mkimage = "u-boot-mkimage"
11RREPLACES_${PN}-mkimage = "u-boot-mkimage" 11RREPLACES:${PN}-mkimage = "u-boot-mkimage"
12RCONFLICTS_${PN}-mkimage = "u-boot-mkimage" 12RCONFLICTS:${PN}-mkimage = "u-boot-mkimage"
13 13
14EXTRA_OEMAKE_class-target = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1' 14EXTRA_OEMAKE:class-target = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1'
15EXTRA_OEMAKE_class-native = 'CC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1' 15EXTRA_OEMAKE:class-native = 'CC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1'
16EXTRA_OEMAKE_class-nativesdk = 'CROSS_COMPILE="${HOST_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1' 16EXTRA_OEMAKE:class-nativesdk = 'CROSS_COMPILE="${HOST_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1'
17 17
18SED_CONFIG_EFI = '-e "s/CONFIG_EFI_LOADER=.*/# CONFIG_EFI_LOADER is not set/"' 18SED_CONFIG_EFI = '-e "s/CONFIG_EFI_LOADER=.*/# CONFIG_EFI_LOADER is not set/"'
19SED_CONFIG_EFI_x86 = '' 19SED_CONFIG_EFI:x86 = ''
20SED_CONFIG_EFI_x86-64 = '' 20SED_CONFIG_EFI:x86-64 = ''
21SED_CONFIG_EFI_arm = '' 21SED_CONFIG_EFI:arm = ''
22SED_CONFIG_EFI_armeb = '' 22SED_CONFIG_EFI:armeb = ''
23SED_CONFIG_EFI_aarch64 = '' 23SED_CONFIG_EFI:aarch64 = ''
24 24
25do_compile () { 25do_compile () {
26 # Yes, this is crazy. If you build on a system with git < 2.14 from scratch, the tree will 26 # Yes, this is crazy. If you build on a system with git < 2.14 from scratch, the tree will
@@ -68,14 +68,14 @@ do_install () {
68 ln -sf uboot-fit_check_sign ${D}${bindir}/fit_check_sign 68 ln -sf uboot-fit_check_sign ${D}${bindir}/fit_check_sign
69} 69}
70 70
71ALLOW_EMPTY_${PN} = "1" 71ALLOW_EMPTY:${PN} = "1"
72FILES_${PN} = "" 72FILES:${PN} = ""
73FILES_${PN}-mkimage = "${bindir}/uboot-mkimage ${bindir}/mkimage ${bindir}/uboot-dumpimage ${bindir}/dumpimage ${bindir}/uboot-fit_check_sign ${bindir}/fit_check_sign" 73FILES:${PN}-mkimage = "${bindir}/uboot-mkimage ${bindir}/mkimage ${bindir}/uboot-dumpimage ${bindir}/dumpimage ${bindir}/uboot-fit_check_sign ${bindir}/fit_check_sign"
74FILES_${PN}-mkenvimage = "${bindir}/uboot-mkenvimage ${bindir}/mkenvimage" 74FILES:${PN}-mkenvimage = "${bindir}/uboot-mkenvimage ${bindir}/mkenvimage"
75 75
76RDEPENDS_${PN}-mkimage += "dtc" 76RDEPENDS:${PN}-mkimage += "dtc"
77RDEPENDS_${PN} += "${PN}-mkimage ${PN}-mkenvimage" 77RDEPENDS:${PN} += "${PN}-mkimage ${PN}-mkenvimage"
78RDEPENDS_${PN}_class-native = "" 78RDEPENDS:${PN}:class-native = ""
79 79
80BBCLASSEXTEND = "native nativesdk" 80BBCLASSEXTEND = "native nativesdk"
81 81
diff --git a/meta/recipes-bsp/u-boot/u-boot-tools_2021.07.bb b/meta/recipes-bsp/u-boot/u-boot-tools_2021.07.bb
index 4e90081911..d0c0f30a98 100644
--- a/meta/recipes-bsp/u-boot/u-boot-tools_2021.07.bb
+++ b/meta/recipes-bsp/u-boot/u-boot-tools_2021.07.bb
@@ -1,4 +1,4 @@
1require u-boot-common.inc 1require u-boot-common.inc
2require u-boot-tools.inc 2require u-boot-tools.inc
3 3
4SRC_URI_append = " file://0001-tools-image-host-fix-wrong-return-value.patch" 4SRC_URI:append = " file://0001-tools-image-host-fix-wrong-return-value.patch"
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
index 8ccc532f7e..4340b17cb6 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -212,15 +212,15 @@ do_install () {
212 212
213PACKAGE_BEFORE_PN += "${PN}-env" 213PACKAGE_BEFORE_PN += "${PN}-env"
214 214
215RPROVIDES_${PN}-env += "u-boot-default-env" 215RPROVIDES:${PN}-env += "u-boot-default-env"
216ALLOW_EMPTY_${PN}-env = "1" 216ALLOW_EMPTY:${PN}-env = "1"
217FILES_${PN}-env = " \ 217FILES:${PN}-env = " \
218 ${@ '${sysconfdir}/${UBOOT_INITIAL_ENV}*' if d.getVar('UBOOT_INITIAL_ENV') else ''} \ 218 ${@ '${sysconfdir}/${UBOOT_INITIAL_ENV}*' if d.getVar('UBOOT_INITIAL_ENV') else ''} \
219 ${sysconfdir}/fw_env.config \ 219 ${sysconfdir}/fw_env.config \
220" 220"
221 221
222FILES_${PN} = "/boot ${datadir}" 222FILES:${PN} = "/boot ${datadir}"
223RDEPENDS_${PN} += "${PN}-env" 223RDEPENDS:${PN} += "${PN}-env"
224 224
225do_deploy () { 225do_deploy () {
226 if [ -n "${UBOOT_CONFIG}" ] 226 if [ -n "${UBOOT_CONFIG}" ]
diff --git a/meta/recipes-bsp/u-boot/u-boot_2021.07.bb b/meta/recipes-bsp/u-boot/u-boot_2021.07.bb
index bbbc99bf8d..c8dbe477e0 100644
--- a/meta/recipes-bsp/u-boot/u-boot_2021.07.bb
+++ b/meta/recipes-bsp/u-boot/u-boot_2021.07.bb
@@ -1,6 +1,6 @@
1require u-boot-common.inc 1require u-boot-common.inc
2require u-boot.inc 2require u-boot.inc
3 3
4SRC_URI_append = " file://0001-riscv32-Use-double-float-ABI-for-rv32.patch" 4SRC_URI:append = " file://0001-riscv32-Use-double-float-ABI-for-rv32.patch"
5 5
6DEPENDS += "bc-native dtc-native python3-setuptools-native" 6DEPENDS += "bc-native dtc-native python3-setuptools-native"