Fix the two typos in the spelling of same and set in common/Kconfig and include/bloblist.h.

Signed-off-by: Harrison Mutai harrison.mutai@arm.com --- common/Kconfig | 2 +- include/bloblist.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/Kconfig b/common/Kconfig index 0e8c44f3f7..7a80b797df 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -1083,7 +1083,7 @@ config BLOBLIST_SIZE Sets the size of the bloblist in bytes. This must include all overhead (alignment, bloblist header, record header). The bloblist is set up in the first part of U-Boot to run (TPL, SPL or U-Boot - proper), and this sane bloblist is used for subsequent phases. + proper), and this same bloblist is used for subsequent phases.

config BLOBLIST_SIZE_RELOC hex "Size of bloblist after relocation" diff --git a/include/bloblist.h b/include/bloblist.h index f999391f74..03d9862c0f 100644 --- a/include/bloblist.h +++ b/include/bloblist.h @@ -463,7 +463,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 */

When booting into the Linux kernel with semi-hosting, use the device tree provided by hardware unless one is provided in the current directory.

Signed-off-by: Harrison Mutai harrison.mutai@arm.com --- include/configs/vexpress_aemv8.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/include/configs/vexpress_aemv8.h b/include/configs/vexpress_aemv8.h index 8020689e39..2341b3a938 100644 --- a/include/configs/vexpress_aemv8.h +++ b/include/configs/vexpress_aemv8.h @@ -169,12 +169,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 "

When the configuration option CONFIG_BLOBLIST_PASSAGE is selected, the bloblist present in the incoming standard passage is utilised in-place. There is no need to specify the size of the bloblist as the system automatically detects it using the header information.

Signed-off-by: Harrison Mutai harrison.mutai@arm.com --- common/Kconfig | 8 +++++++- common/bloblist.c | 5 ++++- 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/common/Kconfig b/common/Kconfig index 7a80b797df..49fe04ffca 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -1064,6 +1064,12 @@ config BLOBLIST_ALLOC specify a fixed address on systems where this is unknown or can change at runtime.

+config BLOBLIST_PASSAGE + bool "Use bloblist in-place" + help + Use a bloblist in the incoming standard passage. The size is detected + automatically so CONFIG_BLOBLIST_SIZE can be 0. + endchoice

config BLOBLIST_ADDR @@ -1078,6 +1084,7 @@ config BLOBLIST_ADDR

config BLOBLIST_SIZE hex "Size of bloblist" + default 0x0 if BLOBLIST_PASSAGE default 0x400 help Sets the size of the bloblist in bytes. This must include all @@ -1088,7 +1095,6 @@ config BLOBLIST_SIZE config BLOBLIST_SIZE_RELOC hex "Size of bloblist after relocation" default BLOBLIST_SIZE if BLOBLIST_FIXED || BLOBLIST_ALLOC - default 0x0 if BLOBLIST_PASSAGE default 0x20000 if (ARM && EFI_LOADER && GENERATE_ACPI_TABLE) help Sets the size of the bloblist in bytes after relocation. Since U-Boot diff --git a/common/bloblist.c b/common/bloblist.c index 110bb9dc44..f52f1eaca9 100644 --- a/common/bloblist.c +++ b/common/bloblist.c @@ -475,6 +475,9 @@ int bloblist_reloc(void *to, uint to_size) { struct bloblist_hdr *hdr;

+ if (to_size == 0) + return 0; + if (to_size < gd->bloblist->total_size) return -ENOSPC;

@@ -510,7 +513,7 @@ int bloblist_init(void) * install the bloblist passed from previous loader to this fixed * address. */ - bool from_boot_arg = fixed && xpl_is_first_phase(); + bool from_boot_arg = xpl_is_first_phase();

if (xpl_prev_phase() == PHASE_TPL && !IS_ENABLED(CONFIG_TPL_BLOBLIST)) from_addr = false;