aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2021-11-16env: Allow U-Boot scripts to be placed in a .env fileSimon Glass10-2/+372
At present U-Boot environment variables, and thus scripts, are defined by CONFIG_EXTRA_ENV_SETTINGS. It is painful to add large amounts of text to this file and dealing with quoting and newlines is harder than it should be. It would be better if we could just type the script into a text file and have it included by U-Boot. Add a feature that brings in a .env file associated with the board config, if present. To use it, create a file in a board/<vendor> directory, typically called <board>.env and controlled by the CONFIG_ENV_SOURCE_FILE option. The environment variables should be of the form "var=value". Values can extend to multiple lines. See the README under 'Environment Variables:' for more information and an example. In many cases environment variables need access to the U-Boot CONFIG variables to select different options. Enable this so that the environment scripts can be as useful as the ones currently in the board config files. This uses the C preprocessor, means that comments can be included in the environment using /* ... */ Also support += to allow variables to be appended to. This is needed when using the preprocessor. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Marek Behún <marek.behun@nic.cz> Tested-by: Marek Behún <marek.behun@nic.cz>
2021-11-16doc: Move environment documentation to rSTSimon Glass2-328/+381
Move this from the README to rST format. Drop i2cfast since it is obviously obsolete and breaks the formatting. Other changes and improvements are in a following patch. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Marek Behún <marek.behun@nic.cz>
2021-11-16sandbox: Drop distro_bootSimon Glass1-11/+0
This is a complicated set of #defines and it is painful to convert to a text file. We can (once pending patches are applied) provide the same functionality with bootmethod. Drop this for sandbox to allow conversion to a text-file environment. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Marek Behún <marek.behun@nic.cz>
2021-11-15Prepare v2022.01-rc2v2022.01-rc2Tom Rini1-1/+1
Signed-off-by: Tom Rini <trini@konsulko.com>
2021-11-15usb: Make USB_MUSB_PIO_ONLY selected by USB_MUSB_SUNXISamuel Dionne-Riel1-0/+1
This ensures the USB_MUSB_PIO_ONLY config is set to an apppropriate value from the changes enabling USB_MUSB_GADGET does. Namely, USB_MUSB_PIO_ONLY default to =y on USB_MUSB_SUNXI being y. Signed-off-by: Samuel Dionne-Riel <samuel@dionne-riel.com>
2021-11-14Dockerfile, CI: Update to latest "focal" tagWIP/14Nov2021Tom Rini3-3/+3
Signed-off-by: Tom Rini <trini@konsulko.com>
2021-11-14Dockerfile: build swtpmHeinrich Schuchardt1-0/+28
For testing the TPM drivers and the EFI_TCG2_PROTOCOL we need the tool swtpm. Once we move to Ubuntu Impish we can take libtpms from package libtpms-dev. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
2021-11-13Merge tag 'dm-pull-13nov21' of ↵WIP/13Nov2021Tom Rini19-39/+396
https://source.denx.de/u-boot/custodians/u-boot-dm env tidy-ups test fixes binman fixes and ELF enhancements
2021-11-13Merge tag 'efi-2022-01-rc2-2' of ↵Tom Rini14-438/+854
https://source.denx.de/u-boot/custodians/u-boot-efi Pull request for efi-2022-01-rc2-2 UEFI: * fix measurement of BootOrder variable for TCG2 protocol TPM: * TIS mmio driver. This driver supports QEMU's emulated TPM.
2021-11-13binman: Fix replace subcommand help and commentsJan Kiszka2-4/+4
Fix some copy&paste artifacts. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
2021-11-13bootstage: Differentiate boot progress kconfig entriesJan Kiszka1-1/+1
Both U-Boot proper and SPL entries were using the same description. Fixes: b55881dd ("bootstage: Add SPL support") Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2021-11-13sandbox: fix sandbox_wdt_expire_now()Heinrich Schuchardt1-0/+1
With CONFIG_SYSRESET_WATCHDOG=y the sandbox can use a watchdog based system reset. To make this work calling sandbox_wdt_expire_now() must lead to a reset. With this change we can test the development suggested in [PATCH 0/4] Improved sysreset/watchdog uclass integration https://lists.denx.de/pipermail/u-boot/2021-August/458656.html Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2021-11-13test/dm: fix watchdog testHeinrich Schuchardt1-1/+3
For successful execution of the watchdog test we need both the GPIO as well as the SANDBOX watchdog. Avoid a build failure for CONFIG_WDT_GPIO=n. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2021-11-13Makefile: Correct TPL rule for OF_REALSimon Glass1-1/+1
Correct an error in the tpl-dtb parameter to binman. At present the TPL rule follows SPL but this is not correct, if TPL uses of-platdata, for example. Fixes: f99cbe4e867 ("fdt: Update Makefile rules with the new OF_REAL Kconfig") Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
2021-11-13env: Simplify env_get_default()Marek Behún1-21/+24
Instead of pretending that we don't have environment to force searching default environment in env_get_default(), get the data from the default_environment[] buffer directly. Signed-off-by: Marek Behún <marek.behun@nic.cz> Reviewed-by: Simon Glass <sjg@chromium.org>
2021-11-13env: Fix env_get() when returning empty string using env_get_f()Marek Behún1-1/+1
The env_get_f() function returns -1 on failure. Returning 0 means that the variable exists, and is empty string. Signed-off-by: Marek Behún <marek.behun@nic.cz> Reviewed-by: Simon Glass <sjg@chromium.org>
2021-11-13env: Don't set ready flag if import failed in env_set_default()Marek Behún1-1/+3
Do not set GD_FLG_ENV_READY nor GD_FLG_ENV_DEFAULT if failed importing in env_set_default(). Signed-off-by: Marek Behún <marek.behun@nic.cz> Reviewed-by: Simon Glass <sjg@chromium.org>
2021-11-13binman: Support updating the dtb in an ELF fileSimon Glass9-2/+216
WIth EFI we must embed the devicetree in an ELF image so that it is loaded as part of the executable file. We want it to include the binman definition in there also, which in some cases cannot be created until the ELF (u-boot) is built. Add an option to binman to support writing the updated dtb to the ELF file u-boot.out This is useful with the EFI app, which is always packaged as an ELF file. Signed-off-by: Simon Glass <sjg@chromium.org>
2021-11-13binman: Tidy up comments on _DoTestFile()Simon Glass1-0/+5
The comment for this function is missing an argument and the return value. Fix it. Signed-off-by: Simon Glass <sjg@chromium.org>
2021-11-13binman: Support reading the offset of an ELF-file symbolSimon Glass6-5/+131
Binman needs to be able to update the contents of an ELF file after it has been build. To support this, add a function to locate the position of a symbol's contents within the file. Fix the comments on bss_data.c and Symbol while we are here. Signed-off-by: Simon Glass <sjg@chromium.org>
2021-11-13binman: Report an error if test files fail to compileSimon Glass1-2/+6
At present any error from the 'make' command is silently swallowed by the test system. Fix this by showing it when detected. Signed-off-by: Simon Glass <sjg@chromium.org>
2021-11-13patman: Use a ValueError exception if tools.Run() failsSimon Glass1-1/+1
The Exception base class is a very vague and could be confusing to the test system. Use the more specific ValueError exception instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2021-11-12configs: Resync with savedefconfigTom Rini54-55/+37
Rsync all defconfig files using moveconfig.py Signed-off-by: Tom Rini <trini@konsulko.com>
2021-11-12Merge branch '2021-11-12-Kconfig-migrations'Tom Rini168-229/+129
- An assortment of "finish migrating .." symbol patches. This will help make it harder for migrated symbols to end up again in board config.h files.
2021-11-12Convert CONFIG_LAST_STAGE_INIT to KconfigWIP/2021-11-12-Kconfig-migrationsTom Rini7-5/+5
This converts the following to Kconfig: CONFIG_LAST_STAGE_INIT Signed-off-by: Tom Rini <trini@konsulko.com>
2021-11-12Remove CONFIG_SERIAL_MULTITom Rini4-4/+0
This symbol has been functionally dead for a long time. Remove the last and recent re-introductions of setting it, and update the whitelist so it will not be re-introduced again. Signed-off-by: Tom Rini <trini@konsulko.com>
2021-11-12Convert CONFIG_PL011_SERIAL et al to KconfigTom Rini11-6/+8
This converts the following to Kconfig: CONFIG_PL011_SERIAL CONFIG_PL01X_SERIAL Signed-off-by: Tom Rini <trini@konsulko.com>
2021-11-12Convert CONFIG_MACB to KconfigTom Rini22-15/+15
This converts the following to Kconfig: CONFIG_MACB Signed-off-by: Tom Rini <trini@konsulko.com>
2021-11-12Convert CONFIG_MD5 to KconfigTom Rini4-2/+2
This converts the following to Kconfig: CONFIG_MD5 Signed-off-by: Tom Rini <trini@konsulko.com>
2021-11-12Convert CONFIG_MX6 et al to KconfigTom Rini2-8/+0
This converts the following to Kconfig: CONFIG_MX6 CONFIG_MX7 Signed-off-by: Tom Rini <trini@konsulko.com>
2021-11-12Convert CONFIG_IMX_BOOTAUX et al to KconfigTom Rini10-10/+5
This converts the following to Kconfig: CONFIG_IMX_BOOTAUX CONFIG_IMX_THERMAL Signed-off-by: Tom Rini <trini@konsulko.com>
2021-11-12Convert CONFIG_SYS_PROMPT et al to KconfigTom Rini12-23/+2
This converts the following to Kconfig: CONFIG_SYS_PROMPT CONFIG_SYS_PROMPT_HUSH_PS2 Signed-off-by: Tom Rini <trini@konsulko.com>
2021-11-12Convert CONFIG_I2C_EDID et al to KconfigTom Rini22-18/+20
This converts the following to Kconfig: CONFIG_I2C_EDID CONFIG_I2C_EEPROM Signed-off-by: Tom Rini <trini@konsulko.com>
2021-11-12Convert CONFIG_PHYLIB et al to KconfigTom Rini37-19/+32
This converts the following to Kconfig: CONFIG_PHYLIB CONFIG_PHY_ATHEROS CONFIG_PHY_GIGE CONFIG_MII Signed-off-by: Tom Rini <trini@konsulko.com>
2021-11-12Convert CONFIG_MISC_INIT_F et al to KconfigTom Rini9-10/+5
This converts the following to Kconfig: CONFIG_MISC_INIT_F CONFIG_MISC_INIT_R Signed-off-by: Tom Rini <trini@konsulko.com>
2021-11-12Convert CONFIG_TRACE et al to KconfigTom Rini2-16/+0
This converts the following to Kconfig: CONFIG_TRACE CONFIG_TRACE_BUFFER_SIZE CONFIG_TRACE_EARLY CONFIG_TRACE_EARLY_ADDR CONFIG_TRACE_EARLY_SIZE Signed-off-by: Tom Rini <trini@konsulko.com>
2021-11-12Convert CONFIG_SYS_CONSOLE_IS_IN_ENV to KconfigTom Rini3-5/+1
This converts the following to Kconfig: CONFIG_SYS_CONSOLE_IS_IN_ENV Signed-off-by: Tom Rini <trini@konsulko.com>
2021-11-12Convert CONFIG_ENV_IS_IN_SPI_FLASH et al to KconfigTom Rini22-50/+9
This converts the following to Kconfig: CONFIG_ENV_IS_IN_SPI_FLASH CONFIG_ENV_IS_NOWHERE CONFIG_ENV_OFFSET CONFIG_ENV_OVERWRITE CONFIG_ENV_SECT_SIZE CONFIG_SYS_MMC_ENV_DEV CONFIG_SYS_MMC_ENV_PART Signed-off-by: Tom Rini <trini@konsulko.com>
2021-11-12Convert CONFIG_FSL_USDHC to KconfigTom Rini21-22/+11
This converts the following to Kconfig: CONFIG_FSL_USDHC Signed-off-by: Tom Rini <trini@konsulko.com>
2021-11-12Convert CONFIG_FSL_LAYERSCAPE to KconfigTom Rini2-1/+2
This converts the following to Kconfig: CONFIG_FSL_LAYERSCAPE Signed-off-by: Tom Rini <trini@konsulko.com>
2021-11-12Convert CONFIG_BITBANGMII to KconfigTom Rini2-1/+1
This converts the following to Kconfig: CONFIG_BITBANGMII Signed-off-by: Tom Rini <trini@konsulko.com>
2021-11-12Convert CONFIG_DOS_PARTITION to KconfigTom Rini7-3/+4
This converts the following to Kconfig: CONFIG_DOS_PARTITION Signed-off-by: Tom Rini <trini@konsulko.com>
2021-11-12Convert CONFIG_E1000 to KconfigTom Rini8-10/+6
This converts the following to Kconfig: CONFIG_E1000 Signed-off-by: Tom Rini <trini@konsulko.com>
2021-11-12Convert CONFIG_ARCH_CPU_INIT to KconfigTom Rini2-1/+1
This converts the following to Kconfig: CONFIG_ARCH_CPU_INIT Signed-off-by: Tom Rini <trini@konsulko.com>
2021-11-12Merge branch '2021-11-12-assorted-updates'Tom Rini49-728/+884
- A number of pxe related cleanups and related re-organization. - A few related pxe/sysboot/extlinux improvements - Remove some dead code. - Update Azure to use a newer Windows build environment - Add a .get_maintainer.conf file - A few minor TI SoC platform updates
2021-11-11rtc: ds1337: fix compatible string typoClemens Gruber1-1/+1
The driver supports the ds1339 as well, which was probably intended by the author but prevented by a typo. Fix the typo. Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
2021-11-11boards: siemens: iot2050: Ignore network errors during bootstage trackingJan Kiszka1-1/+2
We need to filter out NET_ETH_START errors because we have to enable networking in order to propagate the MAC addresses to the DT while there is no network driver for the prueth in U-Boot yet. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
2021-11-11boards: siemens: iot2050: Re-enable bootstage reportingJan Kiszka1-0/+2
This got lost while fixing up the condition in board/siemens/iot2050/board.c Fixes: b55881dd ("bootstage: Add SPL support") Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2021-11-11ARM: dts: am335x-chiliboard: add /chosen/tick-timerMarcin Niestroj1-1/+2
Commit 4b2be78ab66c ("time: Fix get_ticks being non-monotonic") has broken boot on chiliboard platform, as it requires '/chosen/tick-timer' in device-tree. This resulted in following panic message: Could not initialize timer (err -19) Provide missing chosen property in device-tree to fix chiliboard support. Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com>
2021-11-11get_maintainer.pl: add .get_maintainer.confMichael Walle1-0/+1
Since commit e57c7c5c4282 ("get_maintainer.pl: update from Linux kernel v5.13-rc6") only the top level MAINTAINERS file is used. This is because this commit (accidentally) disabled the search of MAINTAINERS files (find_maintainer_files is set to 0 again). Before that, commit b79372ae94fb ("scripts/get_maintainer.pl: enable find_maintainer_files") explicitly enabled that feature. Nowadays, we also have to set maintainer_path to a directory. To fix it and enable recursive search of MAINTAINERS, create a configuration file to set these two variables. Signed-off-by: Michael Walle <michael@walle.cc>