diff options
| author | Tom Rini <[email protected]> | 2025-02-11 18:09:05 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-02-11 18:09:05 -0600 |
| commit | 87dec3078a0a36d2e6da7602b9a750010c2d111d (patch) | |
| tree | 1f18e43f1a5a6e32dd4f0319cf58a5cfc3fbdf91 /include | |
| parent | b4df7003dfd06da630c248c958993a686fb1619b (diff) | |
| parent | 42aebf0f987798599b5f2d2ca6098a775bb9f448 (diff) | |
Merge patch series "Enable bloblist support on Vexpress64"
Harrison Mutai <[email protected]> says:
This series of patches enhances the vexpress64 platform by enabling bloblist
support. It also introduces support for CONFIG_BLOBLIST_PASSAGE. This is
necessary to boot vexpress64 and other boards without manually specifying a
fixed address and size for the bloblist.
After this change, all the bloblist init modes are supported (i.e., fixed,
alloc, passage) and Vexpress64 boots with CONFIG_BLOBLIST_PASSAGE.
Link: https://lore.kernel.org/r/[email protected]
Diffstat (limited to 'include')
| -rw-r--r-- | include/bloblist.h | 2 | ||||
| -rw-r--r-- | include/configs/vexpress_aemv8.h | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/include/bloblist.h b/include/bloblist.h index 52ba0ddcf84..98aacf52733 100644 --- a/include/bloblist.h +++ b/include/bloblist.h @@ -481,7 +481,7 @@ int bloblist_init(void); /** * bloblist_maybe_init() - Init the bloblist system if not already done * - * Calls bloblist_init() if the GD_FLG_BLOBLIST_READY flag is not et + * Calls bloblist_init() if the GD_FLG_BLOBLIST_READY flag is not set * * Return: 0 if OK, -ve on error */ diff --git a/include/configs/vexpress_aemv8.h b/include/configs/vexpress_aemv8.h index b5a17f93efc..5eee13b3fc0 100644 --- a/include/configs/vexpress_aemv8.h +++ b/include/configs/vexpress_aemv8.h @@ -181,12 +181,14 @@ " if load hostfs - ${kernel_addr_r} ${kernel_name}; then" \ " setenv fdt_high 0xffffffffffffffff;" \ " setenv initrd_high 0xffffffffffffffff;" \ - " load hostfs - ${fdt_addr_r} ${fdtfile};" \ + " if test -n load hostfs - ${fdt_addr_r} ${fdtfile}; then" \ + " fdt move $fdtcontroladdr $fdt_addr_r;" \ + " fi;" \ " load hostfs - ${ramdisk_addr_r} ${ramdisk_name};" \ " fdt addr ${fdt_addr_r};" \ " fdt resize;" \ " fdt chosen ${ramdisk_addr_r} ${filesize};" \ - " booti $kernel_addr_r - $fdt_addr_r;" \ + " booti $kernel_addr_r - ${fdt_addr_r};" \ " fi;" \ "fi\0" #define BOOTENV_DEV_NAME_SMH(devtypeu, devtypel, instance) "smh " |