Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-16 18:04:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

boot: add support for fdt_fixup command in environment

Browse source 
The "fdt" command is convenient for making small changes to the OS FDT,
especially during development. This is easy when the kernel and FDT are
loaded separately, but can be cumbersome for FIT images, requiring to
unpack the image, manually apply overlays, etc.

Add an option to execute a command "fdt_fixup" from the environment at
the beginning of image_setup_libfdt() (after overlays are applied, and
before the other fixups).

Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Matthias Schiffer 2023-12-11 12:03:17 +01:00 • committed by Tom Rini
parent 0d72b0f2f8
commit e91d6607af
2 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
boot/Kconfig
View file

@ -1514,6 +1514,15 @@ if OF_LIBFDT
menu "Devicetree fixup"
config OF_ENV_SETUP
bool "Run a command from environment to set up device tree before boot"
depends on CMD_FDT
help
This causes U-Boot to run a command from the environment variable
fdt_fixup before booting into the operating system, which can use the
fdt command to modify the device tree. The device tree is then passed
to the OS.
config OF_BOARD_SETUP
bool "Set up board-specific details in device tree before boot"
help

20
boot/image-fdt.c
View file

@ -9,6 +9,7 @@
*/
#include <common.h>
#include <command.h>
#include <fdt_support.h>
#include <fdtdec.h>
#include <env.h>
@ -576,9 +577,22 @@ int image_setup_libfdt(struct bootm_headers *images, void *blob,
{
ulong *initrd_start = &images->initrd_start;
ulong *initrd_end = &images->initrd_end;
int ret = -EPERM;
int fdt_ret;
int of_size;
int ret, fdt_ret, of_size;
if (IS_ENABLED(CONFIG_OF_ENV_SETUP)) {
const char *fdt_fixup;
fdt_fixup = env_get("fdt_fixup");
if (fdt_fixup) {
set_working_fdt_addr(map_to_sysmem(blob));
ret = run_command_list(fdt_fixup, -1, 0);
if (ret)
printf("WARNING: fdt_fixup command returned %d\n",
ret);
}
}
ret = -EPERM;
if (fdt_root(blob) < 0) {
printf("ERROR: root node setup failed\n");