summaryrefslogtreecommitdiffstats
path: root/meta/classes/uboot-config.bbclass
Commit message (Collapse)AuthorAgeFilesLines
* classes: Update classes to match new bitbake class scope functionalityRichard Purdie2022-08-121-133/+0
| | | | | | | | | Move classes to classes-global or classes-recipe as appropriate to take advantage of new bitbake functionality to check class scope/usage. (From OE-Core rev: f5c128008365e141082c129417eb72d2751e8045) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* classes: Add SPDX license identifiersRichard Purdie2022-08-121-0/+3
| | | | | | | | | | | | As stated in our top level license files, the license is MIT unless otherwise stated. Add SPDX identifers accordingly. Replace older license statementa with the standardised syntax. Also drop "All Rights Reserved" expression as it isn't used now, doesn't mean anything and is confusing. (From OE-Core rev: 081a391fe09a21265881e39a2a496e4e10b4f80b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* uboot-config.bbclass: Raise error for bad keyTom Hochstein2022-08-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | If an invalid key is used, the class ignores the error, with an indeterminate result. In my case, the problem surfaced in do_deploy: ``` | cp: cannot stat '/.../build/tmp/work/imx6qdlsabresd-fsl-linux-gnueabi/u-boot-imx-mfgtool/2022.04-r0/deploy-u-boot-imx-mfgtool/u-boot.imx': No such file or | directory ``` The root cause of this was that the uboot config key did not match a valid option. With the fix, the error is caught by the class: ``` ERROR: Nothing PROVIDES 'u-boot-imx-mfgtool' u-boot-imx-mfgtool was skipped: The selected UBOOT_CONFIG key ['mfgtool'] has no match in dict_keys(['sd-fslc', 'sd-imx', 'sd-optee-imx', 'sata-imx', 'mfgtool-imx']). ``` (From OE-Core rev: 801a27d73b10017cac3c0caa05d0a2af3502a7ba) Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> Acked-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Luca Ceresoli <luca.ceresoli@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/+2
| | | | | | | | | | | | * 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-2/+2
| | | | | | | | | | 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-3/+11
| | | | | | | | | | | | | | | | 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>
* recipes-bsp/u-boot: Allow deploying the u-boot DTBAlistair Francis2021-06-071-0/+4
| | | | | | | | | | | 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: Use a different Key for SPL signingKlaus Heinrich Kiwi2021-04-061-0/+2
| | | | | | | | | | Duplicate the variables governing u-boot signing so that we can have a different set of keys/parameters signing the SPL. (From OE-Core rev: 0e6b0fefa02356afeb11a32dfee7f0c7c250ab7f) Signed-off-by: Klaus Heinrich Kiwi <klaus@linux.vnet.ibm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: Move definitions to common locationsKlaus Heinrich Kiwi2021-04-061-0/+56
| | | | | | | | | | | | 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>
* classes/recipes: Convert SkipPackage -> SkipRecipeRichard Purdie2018-01-261-4/+4
| | | | | | | | | | The new name is much more consistent with what this actually means. We put the pieces in place to rename everything a while back but looks like we forgot to actually do it! Fix that now. (From OE-Core rev: af9612f5d6b848fceea22d10ee964437299be776) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* uboot-config: check UBOOT_CONFIG variable, not flags, for error conditionsDenys Dmytriyenko2017-06-141-8/+3
| | | | | | | | | | | | | Sometimes there's a need to change existing UBOOT_CONFIG setting from a recipe, distro or local config, such as an override or even switch back to UBOOT_MACHINE. Unfortunately, there's no easy way to override or unset flags, so using them as an error condition is rather heavy-handed. Change those conditions to check the UBOOT_CONFIG variable itself, not its flags. (From OE-Core rev: b51383e5268ff33e43a39862814e065afbbd10ca) Signed-off-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta: remove True option to getVar callsJoshua Lock2016-12-161-7/+7
| | | | | | | | | | | | | getVar() now defaults to expanding by default, thus remove the True option from getVar() calls with a regex search and replace. Search made with the following regex: getVar ?\(( ?[^,()]*), True\) (From OE-Core rev: 7c552996597faaee2fbee185b250c0ee30ea3b5f) Signed-off-by: Joshua Lock <joshua.g.lock@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: extend UBOOT_CONFIG format to support different binary nameTing Liu2016-07-011-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | When using UBOOT_CONFIG format, the final u-boot binary for each config may have different names. Extend UBOOT_CONFIG format to support different binary to be copied. The new format is supposed to be compatible with old one as ${UBOOT_BINARY} is copied by default, and images,binary can be empty. An example format to specify it, in the machine, is: UBOOT_CONFIG ??= "sdcard-ifc sdcard-qspi lpuart qspi secure-boot nor" UBOOT_CONFIG[nor] = "ls1021atwr_nor_config,,u-boot-dtb.bin" UBOOT_CONFIG[sdcard-ifc] = "ls1021atwr_sdcard_ifc_config,,u-boot-with-spl-pbl.bin" UBOOT_CONFIG[sdcard-qspi] = "ls1021atwr_sdcard_qspi_config,,u-boot-with-spl-pbl.bin" UBOOT_CONFIG[lpuart] = "ls1021atwr_nor_lpuart_config,,u-boot-dtb.bin" UBOOT_CONFIG[qspi] = "ls1021atwr_qspi_config,,u-boot-dtb.bin" UBOOT_CONFIG[secure-boot] = "ls1021atwr_nor_SECURE_BOOT_config" (From OE-Core rev: 2a5c484f314ddc75cab5f0d01b0215d7fc405b6b) Signed-off-by: Ting Liu <ting.liu@nxp.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* uboot-config.bbclass: Allow multiple U-Boot config for machineChunrong Guo2015-02-081-23/+14
| | | | | | | | | | | | | | | | | | | | | This adds support to build multiple U-Boot configs for a machine; this is useful when we have support for different media boots which require different U-Boot configuration (e.g: eMMC and NAND). Below there's an usage example: ,----[ i.MX6Q SABRE AUTO based example ] | UBOOT_CONFIG ??= "sd eimnor nand spinor" | UBOOT_CONFIG[sd] = "mx6qsabreauto_config,sdcard" | UBOOT_CONFIG[eimnor] = "mx6qsabreauto_eimnor_config" | UBOOT_CONFIG[nand] = "mx6qsabreauto_nand_config,ubifs" | UBOOT_CONFIG[spinor] = "mx6qsabreauto_spinor_config" `---- (From OE-Core rev: be997c70e4dec101786978b3ab5e49a1be87a85d) Signed-off-by: Chunrong Guo <B40290@freescale.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* uboot-config.bbclass: don't skip defaultvalRoss Burton2014-12-031-3/+0
| | | | | | | | | This field is now internal and won't be seen. (From OE-Core rev: cce39741bb9d1b0166c7fd63506f96abaa0d8af6) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* classes/uboot-config: ignore doc varflagPaul Eggleton2014-03-071-0/+2
| | | | | | | | | | | The doc varflag on UBOOT_CONFIG should be ignored by this code; without this the recent addition of the UBOOT_CONFIG[doc] to documentation.conf causes errors when UBOOT_MACHINE is used. (From OE-Core rev: e41aa22d7938c200f4150155589f5e23ed0331ce) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* uboot-config.bbclass: Skip the package if no valid configuration is foundOtavio Salvador2014-02-281-2/+2
| | | | | | | | | | | | The ValidError case makes parsing fail even if the U-Boot variant is not in use for the specific machine and this is not desired. So instead of raising a parsing error we skip the package. (From OE-Core rev: d265216dab8146cda17b9ec6167346749896a505) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* uboot-config.bbclass: Raise an error for unknown configsOtavio Salvador2013-10-141-0/+5
| | | | | | | | | | | | When passing the wrong value for UBOOT_CONFIG it ought to raise an error otherwise it is quite difficult for user to notice it didn't behave as expected. Reported-by: Lauren Post <lauren.post@freescale.com> (From OE-Core rev: 5110dc988e3b8a1ce8b2309e4ddf17abb3f1cb0c) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* uboot-config.bbclass: Fix use without IMAGE_FSTYPES appendingOtavio Salvador2013-10-141-1/+2
| | | | | | | | | | | Before checking if the image is a valid value, we need to check if the list of items is big enough or we will raise an exception. Reported-by: Lauren Post <lauren.post@freescale.com> (From OE-Core rev: b833837cac377e7c1c3ff18531b152340b669329) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* uboot-config.bbclass: Handle UBOOT_MACHINE settingOtavio Salvador2013-09-221-1/+17
| | | | | | | | | | | The class now consolidate the handle of UBOOT_MACHINE and UBOOT_CONFIG variables and handle possible mistakes done by user when using these variables. (From OE-Core rev: 87d9b585b2784bec04e9e244dc52c6e929484fd0) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* uboot-config.bbclass: Use an annonymous python functionOtavio Salvador2013-09-221-7/+5
| | | | | | | | | | The processing needs to happen per recipe and thus it ought to use annonymous python function instead to be triggered at event. (From OE-Core rev: 75bde3ee02262cb3c6b91279ca277e3e5324ee5e) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* uboot-config.bbclass: Allow choose of U-Boot config for machineOtavio Salvador2013-09-061-0/+39
Some machines provide several possible configurations and until now there was no easy way for user to override the default setting. This class provides a system similar to PACKAGECONFIG but for U-Boot. The format is: UBOOT_CONFIG ??= <default> UBOOT_CONFIG[foo] = "config,images" There are two possible parameters: - config: it is used to set UBOOT_MACHINE - images: it is used to append onto IMAGE_FSTYPES Below there's an usage example: ,----[ i.MX6Q SABRE AUTO based example ] | UBOOT_CONFIG ??= "sd" | UBOOT_CONFIG[sd] = "mx6qsabreauto_config,sdcard" | UBOOT_CONFIG[eimnor] = "mx6qsabreauto_eimnor_config" | UBOOT_CONFIG[nand] = "mx6qsabreauto_nand_config,ubifs" | UBOOT_CONFIG[spinor] = "mx6qsabreauto_spinor_config" `---- User can, from local.conf or environment, use UBOOT_CONFIG=nand and override the default setting, as: ,----[ Override example from command line ] | MACHINE=imx6qsabreauto UBOOT_CONFIG=nand bitbake core-image-base `---- (From OE-Core rev: 5dba521611d644357cf0a98d2e30dcf41777c6ef) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>