summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/u-boot
Commit message (Collapse)AuthorAgeFilesLines
* u-boot: Add /boot in SYSROOT_DIRSFabre Sébastien2022-11-291-0/+1
| | | | | | | | | | | To be able to use /boot files, like UBOOT_ENV_BINARY, in other recipes, like kernel-fitimage.bbclass. (From OE-Core rev: 5ed129c4e793c76e2ce9c762cc67c4c2232df447) Signed-off-by: Fabre Sébastien <sebastien.fabre@actia.fr> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: Rework signing to remove interdependenciesSean Anderson2022-10-261-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The U-Boot signing code is a bit of a mess. The problem is that mkimage determines the public keys to embed into a device tree based on an image that it is signing. This results in all sorts of contortions: U-Boot has to be available to the kernel recipe so that it can have the correct public keys embedded. Then, the signed U-Boot has to be made available to U-Boot's do_deploy. This same dance is then repeated for SPL. To complicate matters, signing for U-Boot and U-Boot SPL is optional, so the whole process must be seamlessly integrated with a non-signed build. The complexity and interdependency of this process makes it difficult to extend. For example, it is not possible to install a signed U-Boot binary into the root filesystem. This is first because u-boot:do_install must run before linux:do_assemble_fitimage, which must run before u-boot:do_deploy. But aside from infrastructure issues, installing a signed U-Boot also can't happen, because the kernel image might have an embedded initramfs (containing the signed U-Boot). However, all of this complexity is accidental. It is not necessary to embed the public keys into U-Boot and sign the kernel in one fell swoop. Instead, we can sign the kernel, stage it, and sign the staged kernel again to embed the public keys into U-Boot [1]. This twice-signed kernel serves only to provide the correct parameters to mkimage, and does not have to be installed or deployed. By cutting the dependency of linux:do_assemble_fitimage on u-boot:do_install, we can drastically simplify the build process, making it much more extensible. The process of doing this conversion is a bit involved, since the U-Boot and Linux recipes are so intertwined at the moment. The most major change is that uboot-sign is no longer inherited by kernel-fitimage. Similarly, all U-Boot-related tasks have been removed from kernel-fitimage. We add a new step to the install task to stage the kernel in /sysroot-only. The logic to disable assemble_fitimage has been removed. We always assemble it, even if the final fitImage will use a bundled initramfs, because U-Boot will need it. On the U-Boot side, much of the churn stems from multiple config support. Previously, we took a fairly ad-hoc approach to UBOOT_CONFIG and UBOOT_MACHINE, introducing for loops wherever we needed to deal with them. However, I have chosen to use a much more structured approach. Each task which needs to use the build directory uses the following pseudocode: do_mytask() { if ${UBOOT_CONFIG}; then for config, type in zip(${UBOOT_CONFIG}, ${UBOOT_MACHINE}); do cd ${config} mytask_helper ${type} done else cd ${B} mytask_helper "" fi } By explicitly placing the work in mytask_helper, we make it easier to ensure that everything is covered, and we also allow bbappends files to more easily extend the task (as otherwise they would need to reimplement the loop themselves). [1] It doesn't particularly matter what we sign. Any FIT will do, but I chose the kernel's because we already went to the trouble of setting it up with the correct hashes and signatures. In the future, we could create a "dummy" image and sign that instead, but it would probably have to happen in the kernel recipe anyway (so we have access to the appropriate variables). (From OE-Core rev: 5e12dc911d0c541f43aa6d0c046fb87e8b7c1f7e) Signed-off-by: Sean Anderson <sean.anderson@seco.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: upgrade 2022.07 -> 2022.10wangmy2022-10-263-1/+1
| | | | | | | | (From OE-Core rev: c4c010dcf2c8936e685d2933bc32c5753f82ef4c) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: Add savedefconfig taskAlex Kiernan2022-10-251-0/+7
| | | | | | | | | | | Add savedefconfig task which U-Boot supports (unfortunately not all consumers of cml1 support this). (From OE-Core rev: efc54f1f836651c8ef27a683a9e5d583c8ce87a6) Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: Remove duplicate inherit of cml1Alex Kiernan2022-10-251-1/+1
| | | | | | | | | | | | Splitting u-boot-configure.inc out of the base left duplicate cml1.bbclass in the base include. Fixes: fc9a17ad386c ("u-boot: Split do_configure logic into separate file") (From OE-Core rev: 286f91f7659307bcdf0ba541b8d6b56db5604ceb) Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* libubootenv: upgrade 0.3.2 -> 0.3.3Stefano Babic2022-09-131-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This includes the following changes: 1081006 Prepare 0.3.3 5d3e33c CMakeLists.txt: fix some inconsistent coding style 0e8f45c fw_printenv: dont hard-code configuration/environment files 44ecc1c fw_setenv: fix bug when SPI flash write size != sector size 9ddccfc uboot_env: fix fileprotect for Android 066bec4 CI: add REUSE compatibility check 5cd7022 Android.bp: add missing copyright 73d0ded Android.bp: initial addition 629c5bc uboot_env: remove unused function 2dab85e uboot_env: remove unused parameters 82730b4 uboot_env: remove unused variables 2736ff3 uboot_env: fix pointer-sign warnings f5d9292 uboot_env: switch to strchr/strrchr 369121e Add description of the fw_setenv script syntax 10c9a57 Include cstddef in the header for C++ 471cdd5 Correct type of conversion of HEX .flags 7dbfffa Fix parsing multiple .flags variables de31f3d Add REUSE badge 6390c1c Make libubootenv REUSE compliant 0573071 doxygen: fix libuboot_open/close return value description 0d12468 Add documentation for the configuration file b1178c1 Add configuration for disabling MTD lock 5dadcb3 main: Remove duplicated code about '=' in variable name. e085e37 libubootenv: Forbid to give empty variable name to fw_setenv. 42f919e main: Check libuboot_set_env() result. 1bc91d1 CI: add gitlab config (From OE-Core rev: d3f264c62d4759693a9649e7a28e789c8891827f) Signed-off-by: Stefano Babic <sbabic@denx.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: switch from append to += in SRC_URIMikko Rapeli2022-09-131-1/+1
| | | | | | | | | | | | += allows custom layers to change the SRC_URI e.g. when updating the whole recipe to newer u-boot version. With :append, there is no way to change the variable from a bbappend. (From OE-Core rev: be96b384ce964ff14536d3bc40c89851a12dfb60) Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: update 2022.04 -> 2022.07Alexander Kanavin2022-07-234-3/+7
| | | | | | | | | | | | | | Native python and native swig are new requirements for scripts/dtc License-Update: added bzip2 licensed headers: https://source.denx.de/u-boot/u-boot/-/commit/fba0882bcdfd919727ee9ee8523ef3156daab507 (overall license still gpl2) (From OE-Core rev: 379bf04af85e412be155acf5292fe08e2e433de9) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: upgrade 2022.01 -> 2022.04Alexander Kanavin2022-05-204-3/+3
| | | | | | | | | | | | Change to a tools-only defconfig. Add gnutls/util-linux dependency for mkeficapsule. (From OE-Core rev: a9c5f9033343ad2e26539854ccde2f116528f235) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: Inherit pkgconfigPeter Kjellerstedt2022-04-191-0/+3
| | | | | | | | | | pkg-config is used by the Makefiles, and thus pkgconfig needs to be inherited. (From OE-Core rev: 6148ac9bc5d3e0d0ffdbbd6695acd96ca1836b78) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: Correct the SRC_URIPeter Kjellerstedt2022-04-191-2/+1
| | | | | | | | | This avoids a redirect. (From OE-Core rev: 879bc5098943cf6977c32555ac31cb21be7b46ae) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta/meta-selftest/meta-skeleton: Update LICENSE variable to use SPDX ↵Richard Purdie2022-02-202-2/+2
| | | | | | | | | | | | | license identifiers An automated conversion using scripts/contrib/convert-spdx-licenses.py to convert to use the standard SPDX license identifiers. Two recipes in meta-selftest were not converted as they're that way specifically for testing. A change in linux-firmware was also skipped and may need a more manual tweak. (From OE-Core rev: ceda3238cdbf1beb216ae9ddb242470d5dfc25e0) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: Fix RISCV build with binutils 2.38Khem Raj2022-02-163-8/+52
| | | | | | | | | Ensure right ABI and march is used which matches OE core settings (From OE-Core rev: 17cd727f333580c6fd7ff20c90ede9ccce9ef60b) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: Split do_configure logic into separate fileZev Weiss2022-01-202-30/+40
| | | | | | | | | | | | | Some auxiliary u-boot recipes may need u-boot properly configured (including *.cfg additions via bbappends) but aren't necessarily building u-boot itself; to support such situations, here we split the u-boot do_configure() out of u-boot.inc and into its own u-boot-configure.inc. (From OE-Core rev: e55e6fb4983a41f74c0e457bf54bd8dfa5608daa) Signed-off-by: Zev Weiss <zev@bewilderbeest.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: upgrade 2021.10 -> 2022.01Marek Vasut2022-01-183-1/+1
| | | | | | | | | | (From OE-Core rev: d9ff458e88fe764686e4df31faff9e74d5c490b7) Signed-off-by: Marek Vasut <marex@denx.de> Cc: Alexander Kanavin <alex.kanavin@gmail.com> Cc: Alexandre Belloni <alexandre.belloni@bootlin.com> Cc: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta: Add explict branch to git SRC_URIsRichard Purdie2021-10-302-2/+2
| | | | | | | | | | | | | There is uncertainty about the default branch name in git going forward. To try and cover the different possible outcomes, add branch names to all git:// and gitsm:// SRC_URI entries. This update was made with the script added to contrib in this patch which aims to help others convert other layers. (From OE-Core rev: b51c405faf6f8c0365f7533bfaf470d79152a463) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: upgrade 2021.07 -> 2021.10Alexander Kanavin2021-10-275-46/+4
| | | | | | | | (From OE-Core rev: 24a4b34e25548d71bd430224adb58d87015674a7) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: Fix syntax error in ${UBOOT_ENV}.scr compilationPeter Hoyes2021-10-231-1/+1
| | | | | | | | | | | | | A previous commit (a3d3c2d4ac421a0dde2a20825eab4434f16b2452) introduced support for compiling a U-Boot boot script, but the logic contained a syntax error which was only visible in the build log. Fix the error by using separate []s for each expression in the if statement. (From OE-Core rev: e33994157abbea897ceaf465f9d2a99a9c8212b1) Signed-off-by: Peter Hoyes <Peter.Hoyes@arm.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: Convert ${UBOOT_ENV}.cmd into ${UBOOT_ENV}.scrPeter Hoyes2021-10-161-0/+6
| | | | | | | | | | | | * Add extra SRC variables to uboot-config.class for source cmd file * Add DEPENDS on u-boot-mkimage-native if UBOOT_ENV_SUFFIX is scr * Compile cmd -> scr in do_compile if UBOOT_ENV_SUFFIX is scr (From OE-Core rev: 0ea02ca5c1fc4e15f640b1c26c0a5ce34fc08c05) Signed-off-by: Peter Hoyes <Peter.Hoyes@arm.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: Make UBOOT_BINARYNAME configurableStefan Herbrechtsmeier2021-09-021-9/+9
| | | | | | | | | | Make the u-boot binary name configurable. Use the existing variable UBOOT_BINARYNAME which is evaluated from the UBOOT_BINARY. (From OE-Core rev: e588cde6aed1e699a055e3481df0f3dc719c9774) Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: Make SPL suffix configurableStefan Herbrechtsmeier2021-09-021-10/+10
| | | | | | | | | | | | | | | | Make the SPL suffix configurable via SPL_SUFFIX variable to support SPL binaries with suffix. The suffix is optional and empty per default. The delimiter in front of the suffix is added automatically if the suffix is not empty. A new variable SPL_BINARYFILE contains the binary file name inclusive optional delimiter and suffix and the old variable SPL_BINARYNAME contains only the name of the binary without directory, delimiter and specified suffix. This behavior is backward compatible with empty SPL_SUFFIX variable. (From OE-Core rev: e4cfec633c20d6406523da905530e887b853f7ed) Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: Remove misplaced configuration type variableStefan Herbrechtsmeier2021-09-021-1/+1
| | | | | | | (From OE-Core rev: 3fe8adbad5226d673f22f31f4903149cf3376ae5) Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: Remove redundancy from installed and deployed SPL artifact namesStefan Herbrechtsmeier2021-09-021-8/+8
| | | | | | | | | | | Remove redundant parts from the deployed and installed SPL artifact names of multi config configurations to match the other U-Boot artifact names. (From OE-Core rev: 74f1f84d09ec5b435942e2a83697834677055343) Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: Package extlinux.conf separatelyPaul Barker2021-08-131-1/+4
| | | | | | | | | | | | | | A separate u-boot-extlinux package is created for the extlinux.conf file so that it can be installed on its own if needed. If this package is populated, it is added as a dependency of the main u-boot package so that installing just u-boot still results in the extlinux.conf file being present in the rootfs. (From OE-Core rev: 40de891259e5b335e636cfa6f831b62415127e4c) Signed-off-by: Paul Barker <paul@pbarker.dev> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Convert to new override syntaxRichard Purdie2021-08-025-27/+27
| | | | | | | | | | | | 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>
* libubootenv: Drop default-env RRECOMMENDSRichard Purdie2021-07-281-4/+0
| | | | | | | | | | | | | | | | | The link back to uboot's env is causing a ton of pain since it is making this recipe machine specific. Some machines may use uboot, some may not but you really want an architecture/machine neutral library. Revert this part of the 0.3 upgrade (OE-Core rev: 02d55cd35aac15095fc44f0cf8f9e7a71638f485) so that we don't need some of the horrible workarounds being seen in other layers. If a given machine uses u-boot, the env can be pulled in by the machine directly. (From OE-Core rev: e6d13986aa913c07f26afa81f1db35fd3e4e7779) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: upgrade 2021.04 -> 2021.07wangmy2021-07-093-1/+1
| | | | | | | | | | | | | | (Changes of v2021.07) Processed 1730 csets from 187 developers 29 employers found A total of 402449 lines added, 82710 removed (delta 319739) (From OE-Core rev: df987d673c933c1040a86a863d00387df7c550cc) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Revert "libubootenv: inherit uboot-config"Peter Bergin2021-07-021-1/+1
| | | | | | | | | | | | | | | | This reverts commit 10aa1291979fb90bed1beb49be4d406ed0e1e4d5. As there is no build dependency between libubootenv and the configuration of u-boot there is no reason to check for UBOOT_CONFIG or UBOOT_MACHINE by adding the class uboot-config. Revert this in order to remove useless workaround in bsp layer (meta-freescale). (From OE-Core rev: a6cc842973f8e3d5a72e6f4012d0430777901408) Signed-off-by: Peter Bergin <peter@berginkonsult.se> Acked-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot-tools: fix a mkimage signature issueMing Liu2021-06-222-0/+42
| | | | | | | | | | | | | | | | | | | A following error was observed: | Can't write signature for 'signature@1' signature node in 'conf@imx6ull-colibri-wifi-eval-v3.dtb' conf node: <unknown error> | uboot-mkimage Can't add hashes to FIT blob: -1 This is caused by a wrong return value being used in uboot source. The return value '-ENOSPC' of fit_set_timestamp function does not match the caller fit_image_write_sig's expection which is '-FDT_ERR_NOSPACE'. Fix it by not calling fit_set_timestamp, but call fdt_setprop instead. (From OE-Core rev: 8628a276a01e994e84d3c6ac8397860e8e2bbb5b) Signed-off-by: Ming Liu <liu.ming50@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* recipes-bsp/u-boot: Allow deploying the u-boot DTBAlistair Francis2021-06-071-1/+6
| | | | | | | | | | | Use ??= assignment for UBOOT_DTB_BINARY because it is set using ?= in fitImage bbclass as well, using ?= will preempt that (From OE-Core rev: efe9f33beb053c8d645bfa5791846ffaa3cbceb4) Signed-off-by: Alistair Francis <alistair.francis@wdc.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: upgrade 2021.01 -> 2021.04Alexander Kanavin2021-05-2110-1066/+1
| | | | | | | (From OE-Core rev: 9da492e576b2d7190130224c486ba22675dce416) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* libubootenv: upgrade 0.3.1 -> 0.3.2Stefano Babic2021-05-041-1/+1
| | | | | | | | | | | | | | | | | | | This is a bugfix release which includes the following changes: f4ab25d shared library: Link against zlib e663439 Always fsync file writes 80b7f31 Treat '=' as an illegal character in variable names 950f541 libuboot_env: fix calculation of usable envsize fb88032 Correct initialisations in libuboot_configure 20d1ec7 Force writing of environment if default is used 5ca11bd libuboot_env: correct length to usable env size length cd4a8f1 libuboot_env_store: fix env double-null termination 9510164 uboot_env: fix infinite loop on short read (EOF) (From OE-Core rev: ed270bd146139a85935544bc0c6f35c3ecc27313) Signed-off-by: Stefano Babic <sbabic@denx.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: Move definitions to common locationsKlaus Heinrich Kiwi2021-04-061-46/+0
| | | | | | | | | | | | Move some definitions from u-boot.inc into uboot-config.bbclass and similarly from kernel-fitimage.bbclass into uboot-sign.bbclass, so that they can be useful when signing the U-boot proper fitimage, for a verified-boot SPL. (From OE-Core rev: cc6c3e31526d3b6ef3a87ba5e548fcad7483bd51) Signed-off-by: Klaus Heinrich Kiwi <klaus@linux.vnet.ibm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: Fix CVE-2021-27097, CVE-2021-27138Scott Murray2021-03-238-0/+1065
| | | | | | | | | | | | | | | Backport fixes for CVE-2021-27097 and CVE-2021-27138 as well as a precursor fdt validation fix that allows using the upstream patches for the CVEs without significant rebasing. Note that the additional upstream changes to add new U-Boot fit image tests have been left out to keep the patch count down. Those tests are currently not used for ptest or oe-selftest, so it is believed their absence should not be problematic. (From OE-Core rev: b6c2df341d7e6da5defca9a5567fdb7212489efa) Signed-off-by: Scott Murray <scott.murray@konsulko.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: Add support for building for qemuriscv32Alistair Francis2021-03-142-0/+44
| | | | | | | (From OE-Core rev: a9666fbfe2dcb43fe9e8fd78e357eaacd99ca75e) Signed-off-by: Alistair Francis <alistair.francis@wdc.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: upgrade 2020.10 -> 2021.01Alexander Kanavin2021-02-094-6/+5
| | | | | | | | | tools/binman/binman needs python3-setuptools now. (From OE-Core rev: cb896051a7e7b25c02fb40aa8a422d3e5580dd34) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot-tools: Fix reproducibility issueRichard Purdie2020-12-211-0/+15
| | | | | | | | | | | | | | | | | | | | | | If you build on a system with git < 2.14 from scratch (e.g. debian9), the tree will be marked as "dirty" and the version will include "-dirty", leading to a reproducibility problem. The issue is the inode count for Licnses/README changing due to do_populate_lic hardlinking a copy of the file. We avoid this by ensuring the index is updated with a "git diff" before the u-boot machinery tries to determine the version. build$ ../git/scripts/setlocalversion ../git "" build$ ln ../git/ build$ ln ../git/README ../foo build$ ../git/scripts/setlocalversion ../git ""-dirty (i.e. creating a hardlink dirties the index) (From OE-Core rev: a4de915af9e2c4d365527ad09286483b2ee904fc) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: upgrade 2020.07 -> 2020.10Alexander Kanavin2020-11-033-2/+4
| | | | | | | | License-Update: added MIT license to README; overall license remains as it was (From OE-Core rev: 32e754ec89e8f33e5b6e83a8ac359ffc3690282f) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* libubootenv: upgrade 0.3 -> 0.3.1Pierre-Jean Texier2020-09-141-1/+1
| | | | | | | | | | | | | | This is a bugfix release which includes the following changes: 824551a Prepare 0.3.1 ca6aaa1 Fix file reading/writing when the environment is in EEPROM a031dea Fix regression in UBI volume support c91c150 Define SOVERSION to indicate API version (From OE-Core rev: 447eb941ef43cd5af19aed650fb7da718cedda61) Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* libubootenv: inherit uboot-configMing Liu2020-08-261-1/+1
| | | | | | | | | | | This mainly aims to involve in the sanity check of UBOOT_CONFIG and UBOOT_MACHINE, it will throw a error message at recipe parsing time if neither of them is set, and libubootenv would be skipped. (From OE-Core rev: 10aa1291979fb90bed1beb49be4d406ed0e1e4d5) Signed-off-by: Ming Liu <liu.ming50@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* libubootenv: uprev to v0.3Ming Liu2020-08-181-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update libubootenv to the latest 0.3 release, which comprises the following commits: ``` 1efed83 Increase max length for device name 6f4fc1c uboot_env: Use canonicalized pathname when reading device 23b3086 Fix bug introduced by commit 52a70114 ed1a53e Dont store to device if no value changes 4a0a466 Merge pull request #7 from TomzBench/cmake-fix 6117831 Added Coverity badge 49372a1 Fix coverity #293496 69a6819 Fix coverity #293503 and #293507 258bf52 Fix coverity #293501 aa52e61 Fix coverity #293505 52a7011 Fix coverity #293504 and #293506 e822218 Fix coverity #293495 and #293497 23b305f Fix coverity #293499 25ef1f6 Add coverity setup for Travis 41b5188 fixed install for static target, fixed BUILD_DOC acknowledgement 86bd30a Restore ability to feed script file via stdin, using `-s -`. c91dcca ubi, write: fix invalid envsize ptr to UBI_IOCVOLUP f4b9cde Allow negative offsets 45bf92a Detect sector size if not found in config 9f59db6 uboot_env: remove unused variables 65d243e README: libubootenv is now in oe-core ba952d0 BUG: variable lists not released in close() 690f868 Variables are not removed when loading from file 9e3586a Make sure there's no file descriptor leakage in case of error 03647c4 Check config file defines a non-zero Sector size 3b2d4f1 Check environment size from fw_env.config 879c073 Do not hardcode path for install d9c639b libubootenv: add pkg-config support cc628ee libuboot: wrap libuboot in extern "C" for C++ ``` Also add u-boot-default-env to RRECOMMENDS since /etc/u-boot-initial-env is being referred in libubootenv source, and turns libubootenv's PACKAGE_ARCH to be MACHINE_ARCH since u-boot-default-env is a machine-arch package. (From OE-Core rev: 02d55cd35aac15095fc44f0cf8f9e7a71638f485) Signed-off-by: Ming Liu <liu.ming50@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: upgrade 2020.04 -> 2020.07Pierre-Jean Texier2020-07-143-1/+1
| | | | | | | | | See https://lists.denx.de/pipermail/u-boot/2020-July/418797.html (From OE-Core rev: db6fedd77a1a468ce65f7276bb79b5f0ddf4a0b5) Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cml1: Move find_cfgs() helper to cml1.bbclassRasmus Villemoes2020-07-121-10/+0
| | | | | | | | | | | | | u-boot.inc and busybox.inc contain identical copies of this little helper. They both inherit the cml1 class and use cml1_do_configure right after having used this helper, and other recipes that want to write similar logic for doing Kconfig via fragments will also need it or something equivalent. (From OE-Core rev: af687c9137a3e8efe48afa6fd12866cf656ae913) Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: fix condition to allow use of *.cfgCharlie Davies2020-07-121-1/+1
| | | | | | | | | | | U-boot recipe supports .cfg files in SRC_URI, but bug in conditional statement meant that the code was unreachable and the .cfg files were never applied. (From OE-Core rev: 766f827df4c3f76b1ef06acaba3c4f160c3791aa) Signed-off-by: Charlie Davies <charles.davies@whitetree.xyz> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* libubootenv: bump to revision 86bd30aPierre-Jean Texier2020-06-281-1/+1
| | | | | | | | | | | | This includes the following changes: 86bd30a Restore ability to feed script file via stdin, using `-s -`. c91dcca ubi, write: fix invalid envsize ptr to UBI_IOCVOLUP (From OE-Core rev: cb961b737cc3ae36ca27867248d6077e8fbcf534) Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: avoid blind merging all *.cfgJens Rehsack2020-06-151-3/+5
| | | | | | | | | | | | | | | | | | | | | | | This fixes u-boot-qoriq breakage of: commit 4fde8c8f479f5acd24fb6e0d0b9b4dc94d6f560b Author: Ming Liu <ming.liu@toradex.com> Date: Wed Jun 3 13:56:01 2020 +0200 u-boot: support merging .cfg files for UBOOT_CONFIG U-boot recipe supports .cfg files in SRC_URI, but they would be merged to .config during do_configure only when UBOOT_MACHINE is set, we should also support merging .cfg files for UBOOT_CONFIG. The intension of 4fde8c8 looks more than append delta-config snippets to u-boot config and should probably be rewritten to express that much better than implicitely assume all "*.cfg" are for merging into .config. (From OE-Core rev: b4644f231a1463123d4100fcaf1448b3d174ef1a) Signed-off-by: Jens Rehsack <sno@netbsd.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: support merging .cfg files for UBOOT_CONFIGMing Liu2020-06-091-4/+17
| | | | | | | | | | | | U-boot recipe supports .cfg files in SRC_URI, but they would be merged to .config during do_configure only when UBOOT_MACHINE is set, we should also support merging .cfg files for UBOOT_CONFIG. (From OE-Core rev: ce3de00d41791fa5e9557c5e93a99fbe368311f5) Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Signed-off-by: Ming Liu <ming.liu@toradex.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: introduce UBOOT_INITIAL_ENVMing Liu2020-06-041-19/+36
| | | | | | | | | | | | | | | | | | | | | | | It defaults to ${PN}-initial-env, no functional changes with current implementation, but this allows it to be changed in individual u-boot recipes. If UBOOT_INITIAL_ENV is empty, then no initial env would be compiled/ installed/deployed, set ALLOW_EMPTY_${PN}-env = "1". The major purpose for introducing this, is that the users might have some scripts on targets like: ``` /sbin/fw_setenv -f /etc/u-boot-initial-env ``` and it should be able to run against a identical path generated by different u-boot recipes. (From OE-Core rev: fb7e8b6b88855f3f523b2176ea2c85a330bfe00b) Signed-off-by: Ming Liu <ming.liu@toradex.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot.inc: fix some inconsistent coding styleMing Liu2020-06-041-23/+21
| | | | | | | (From OE-Core rev: 5ffefba5f1a7a37f4752e34be86f1dc2942192d0) Signed-off-by: Ming Liu <ming.liu@toradex.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* libubootenv: Remove the DEPENDS on mtd-utilsAdrian Bunk2020-05-301-1/+1
| | | | | | | | | | | | It was only used for pulling in zlib, but this is now a direct dependency. Also move the DEPENDS to a more common location in the file. (From OE-Core rev: a99fd8b705be3b8c70cb0f17f60b013d989d625c) Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>