diff options
Diffstat (limited to 'meta/recipes-bsp/u-boot')
-rw-r--r-- | meta/recipes-bsp/u-boot/u-boot-common.inc | 2 | ||||
-rw-r--r-- | meta/recipes-bsp/u-boot/u-boot-tools.inc | 13 | ||||
-rw-r--r-- | meta/recipes-bsp/u-boot/u-boot-tools_2024.04.bb (renamed from meta/recipes-bsp/u-boot/u-boot-tools_2024.01.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-bsp/u-boot/u-boot.inc | 8 | ||||
-rw-r--r-- | meta/recipes-bsp/u-boot/u-boot_2024.04.bb (renamed from meta/recipes-bsp/u-boot/u-boot_2024.01.bb) | 0 |
5 files changed, 14 insertions, 9 deletions
diff --git a/meta/recipes-bsp/u-boot/u-boot-common.inc b/meta/recipes-bsp/u-boot/u-boot-common.inc index 1f17bd7d0a..ca5357392a 100644 --- a/meta/recipes-bsp/u-boot/u-boot-common.inc +++ b/meta/recipes-bsp/u-boot/u-boot-common.inc | |||
@@ -12,7 +12,7 @@ PE = "1" | |||
12 | 12 | ||
13 | # We use the revision in order to avoid having to fetch it from the | 13 | # We use the revision in order to avoid having to fetch it from the |
14 | # repo during parse | 14 | # repo during parse |
15 | SRCREV = "866ca972d6c3cabeaf6dbac431e8e08bb30b3c8e" | 15 | SRCREV = "25049ad560826f7dc1c4740883b0016014a59789" |
16 | 16 | ||
17 | SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master" | 17 | SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master" |
18 | 18 | ||
diff --git a/meta/recipes-bsp/u-boot/u-boot-tools.inc b/meta/recipes-bsp/u-boot/u-boot-tools.inc index 09b3c3f68c..f3010763c0 100644 --- a/meta/recipes-bsp/u-boot/u-boot-tools.inc +++ b/meta/recipes-bsp/u-boot/u-boot-tools.inc | |||
@@ -4,10 +4,10 @@ DEPENDS += "gnutls openssl util-linux swig-native" | |||
4 | inherit python3native | 4 | inherit python3native |
5 | export STAGING_INCDIR="${STAGING_INCDIR_NATIVE}" | 5 | export STAGING_INCDIR="${STAGING_INCDIR_NATIVE}" |
6 | 6 | ||
7 | PROVIDES = "${MLPREFIX}u-boot-mkimage ${MLPREFIX}u-boot-mkenvimage" | 7 | PROVIDES = "${MLPREFIX}u-boot-mkimage ${MLPREFIX}u-boot-mkenvimage ${MLPREFIX}u-boot-mkeficapsule" |
8 | PROVIDES:class-native = "u-boot-mkimage-native u-boot-mkenvimage-native" | 8 | PROVIDES:class-native = "u-boot-mkimage-native u-boot-mkenvimage-native u-boot-mkeficapsule-native" |
9 | 9 | ||
10 | PACKAGES += "${PN}-mkimage ${PN}-mkenvimage" | 10 | PACKAGES += "${PN}-mkimage ${PN}-mkenvimage ${PN}-mkeficapsule" |
11 | 11 | ||
12 | # Required for backward compatibility with "u-boot-mkimage-xxx.bb" | 12 | # Required for backward compatibility with "u-boot-mkimage-xxx.bb" |
13 | RPROVIDES:${PN}-mkimage = "u-boot-mkimage" | 13 | RPROVIDES:${PN}-mkimage = "u-boot-mkimage" |
@@ -70,15 +70,20 @@ do_install () { | |||
70 | # fit_check_sign | 70 | # fit_check_sign |
71 | install -m 0755 tools/fit_check_sign ${D}${bindir}/uboot-fit_check_sign | 71 | install -m 0755 tools/fit_check_sign ${D}${bindir}/uboot-fit_check_sign |
72 | ln -sf uboot-fit_check_sign ${D}${bindir}/fit_check_sign | 72 | ln -sf uboot-fit_check_sign ${D}${bindir}/fit_check_sign |
73 | |||
74 | # mkeficapsule | ||
75 | install -m 0755 tools/mkeficapsule ${D}${bindir}/uboot-mkeficapsule | ||
76 | ln -sf uboot-mkeficapsule ${D}${bindir}/mkeficapsule | ||
73 | } | 77 | } |
74 | 78 | ||
75 | ALLOW_EMPTY:${PN} = "1" | 79 | ALLOW_EMPTY:${PN} = "1" |
76 | FILES:${PN} = "" | 80 | FILES:${PN} = "" |
77 | FILES:${PN}-mkimage = "${bindir}/uboot-mkimage ${bindir}/mkimage ${bindir}/uboot-dumpimage ${bindir}/dumpimage ${bindir}/uboot-fit_check_sign ${bindir}/fit_check_sign" | 81 | FILES:${PN}-mkimage = "${bindir}/uboot-mkimage ${bindir}/mkimage ${bindir}/uboot-dumpimage ${bindir}/dumpimage ${bindir}/uboot-fit_check_sign ${bindir}/fit_check_sign" |
78 | FILES:${PN}-mkenvimage = "${bindir}/uboot-mkenvimage ${bindir}/mkenvimage" | 82 | FILES:${PN}-mkenvimage = "${bindir}/uboot-mkenvimage ${bindir}/mkenvimage" |
83 | FILES:${PN}-mkeficapsule = "${bindir}/uboot-mkeficapsule ${bindir}/mkeficapsule" | ||
79 | 84 | ||
80 | RDEPENDS:${PN}-mkimage += "dtc" | 85 | RDEPENDS:${PN}-mkimage += "dtc" |
81 | RDEPENDS:${PN} += "${PN}-mkimage ${PN}-mkenvimage" | 86 | RDEPENDS:${PN} += "${PN}-mkimage ${PN}-mkenvimage ${PN}-mkeficapsule" |
82 | RDEPENDS:${PN}:class-native = "" | 87 | RDEPENDS:${PN}:class-native = "" |
83 | 88 | ||
84 | BBCLASSEXTEND = "native nativesdk" | 89 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/meta/recipes-bsp/u-boot/u-boot-tools_2024.01.bb b/meta/recipes-bsp/u-boot/u-boot-tools_2024.04.bb index 7eaf721ca8..7eaf721ca8 100644 --- a/meta/recipes-bsp/u-boot/u-boot-tools_2024.01.bb +++ b/meta/recipes-bsp/u-boot/u-boot-tools_2024.04.bb | |||
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index f5b43f6e36..45d700fbdd 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc | |||
@@ -157,9 +157,9 @@ do_install () { | |||
157 | fi | 157 | fi |
158 | fi | 158 | fi |
159 | 159 | ||
160 | if [ -e ${WORKDIR}/fw_env.config ] ; then | 160 | if [ -e ${UNPACKDIR}/fw_env.config ] ; then |
161 | install -d ${D}${sysconfdir} | 161 | install -d ${D}${sysconfdir} |
162 | install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config | 162 | install -m 644 ${UNPACKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config |
163 | fi | 163 | fi |
164 | 164 | ||
165 | if [ -n "${SPL_BINARY}" ] | 165 | if [ -n "${SPL_BINARY}" ] |
@@ -259,8 +259,8 @@ do_deploy () { | |||
259 | fi | 259 | fi |
260 | fi | 260 | fi |
261 | 261 | ||
262 | if [ -e ${WORKDIR}/fw_env.config ] ; then | 262 | if [ -e ${UNPACKDIR}/fw_env.config ] ; then |
263 | install -D -m 644 ${WORKDIR}/fw_env.config ${DEPLOYDIR}/fw_env.config-${MACHINE}-${PV}-${PR} | 263 | install -D -m 644 ${UNPACKDIR}/fw_env.config ${DEPLOYDIR}/fw_env.config-${MACHINE}-${PV}-${PR} |
264 | cd ${DEPLOYDIR} | 264 | cd ${DEPLOYDIR} |
265 | ln -sf fw_env.config-${MACHINE}-${PV}-${PR} fw_env.config-${MACHINE} | 265 | ln -sf fw_env.config-${MACHINE}-${PV}-${PR} fw_env.config-${MACHINE} |
266 | ln -sf fw_env.config-${MACHINE}-${PV}-${PR} fw_env.config | 266 | ln -sf fw_env.config-${MACHINE}-${PV}-${PR} fw_env.config |
diff --git a/meta/recipes-bsp/u-boot/u-boot_2024.01.bb b/meta/recipes-bsp/u-boot/u-boot_2024.04.bb index b15bcaa818..b15bcaa818 100644 --- a/meta/recipes-bsp/u-boot/u-boot_2024.01.bb +++ b/meta/recipes-bsp/u-boot/u-boot_2024.04.bb | |||