December 2021 - U-Boot

[PATCH v8 00/25] efi: Improvements to U-Boot running on top of UEFI
by Simon Glass 05 Jan '22

05 Jan '22

At present U-Boot can be built as an EFI app, but it is really just for testing, with very few features. Instead, the payload build is used for booting on top of UEFI, where U-Boot takes over the machine immediately and supplies its own drivers. But the app could be made more useful. This series provides access to EFI block devices and the video console within U-Boot. It also restructures the app to make it possible to boot a kernel, although further work is needed to implement this. This can be thought of as making U-Boot perform a little like 'grub', in that it runs purely based on UEFI-provided services. Of course a lot more work is required, but this is a start. Note: It would be very useful to include qemu tests of the app and stub in CI. This is available at u-boot-dm/efi-working Changes in v8: - Add new patch to make unicode printf available to the app - Finish off the comment in add_entry_addr() - Tidy up the comment as well - Use the unicode print functions instead of rolling out own Changes in v7: - Rebase on -master instead of -next Changes in v6: - Add comment for dm_scan_other() - Add comment for free_memory() - Drop setup_disks() as U-Boot does not support it - Fix 'have have' typo - Fix 'stuff' typo in comment - Fix Alo typo in commit message - Fix comment style in setup_info_table() - Fix typo in function comment - Update comment format for devpath_is_partition() - Update to 'This function' in comment - Use 'U-Boot' instead of 'ARP' typo Changes in v5: - Add new patch to avoid setting up global_data again with EFI - Add new patch to avoid using the 64-bit link script for the EFI app - Add new patch to build the 64-bit app properly - Add new patch to round out the link script for 64-bit EFI - Add new patch to set the correct link flags for the 64-bit EFI app - Add new patch to tweak the code used for the 64-bit EFI app - Add various patches to fix up the 64-bit app so that it boots - Fix grammar in commit message Changes in v3: - Add new patch to show the system-table revision - Drop comments that confuse sphinx - Move device_path path change to its own patch Changes in v2: - Add a better boot command too - Add a sentence about what the patch does - Add new patch to support the efi command in the app - Don't export efi_bind_block() - Fix 'as' typo - Only bind devices for media devices, not for partitions - Show devices that are processed - Store device path in struct efi_media_plat - Update documentation - Use log_info() instead of printf() Simon Glass (25): efi: Make unicode printf available to the app efi: Locate all block devices in the app efi: serial: Support arrow keys x86: Allow booting a kernel from the EFI app x86: Don't process the kernel command line unless enabled x86: efi: Add room for the binman definition in the dtb efi: Drop device_path from struct efi_priv efi: Add comments to struct efi_priv efi: Fix ll_boot_init() operation with the app efi: Add a few comments to the stub efi: Share struct efi_priv between the app and stub code efi: Move exit_boot_services into a function efi: Check for failure when initing the app efi: Mention that efi_info_get() is only used in the stub efi: Show when allocated pages are used efi: Allow easy selection of serial-only operation x86: efi: Update efi_get_next_mem_desc() to avoid needing a map efi: Support the efi command in the app x86: efi: Show the system-table revision x86: efi: Don't set up global_data again with EFI x86: efi: Tweak the code used for the 64-bit EFI app x86: efi: Round out the link script for 64-bit EFI x86: efi: Don't use the 64-bit link script for the EFI app x86: efi: Set the correct link flags for the 64-bit EFI app efi: Build the 64-bit app properly Makefile | 4 +- arch/x86/config.mk | 15 +- arch/x86/cpu/config.mk | 2 +- arch/x86/cpu/efi/payload.c | 17 +- arch/x86/cpu/x86_64/cpu.c | 5 + arch/x86/dts/Makefile | 2 +- arch/x86/lib/Makefile | 5 +- arch/x86/lib/bootm.c | 11 +- arch/x86/lib/elf_x86_64_efi.lds | 5 +- arch/x86/lib/relocate.c | 2 + arch/x86/lib/zimage.c | 13 +- cmd/Makefile | 2 +- cmd/efi.c | 78 +++++---- common/board_r.c | 5 +- doc/develop/uefi/u-boot_on_efi.rst | 6 +- drivers/serial/serial_efi.c | 11 +- include/configs/efi-x86_app.h | 25 +++ include/efi.h | 106 +++++++++++- include/efi_api.h | 15 ++ include/init.h | 7 +- lib/Kconfig | 2 +- lib/efi/efi.c | 97 +++++++++++ lib/efi/efi_app.c | 254 +++++++++++++++++++++++++++-- lib/efi/efi_stub.c | 102 +++++------- lib/vsprintf.c | 9 +- 25 files changed, 648 insertions(+), 152 deletions(-) -- 2.34.1.448.ga2b2bfdf31-goog

2 46

[PATCH v2 0/1] Add more support for NXP's mfgtool
by Angus Ainslie 04 Jan '22

04 Jan '22

NXP's mfgtool needs to query the block size for sparse image upload Changes since v1: * Dropped the "all" parition type patch * Added more detail to the patch commit message * Only define getvar_logical_blocksize when FASTBOOT_FLASH_MMC is defined * Combined fb_get_block_size into getvar_logical_blocksize * Fixed fastboot returned error message Angus Ainslie (1): fastboot: fb_getvar: Add getvar_logical_blocksize for NXP mfgtool drivers/fastboot/fb_getvar.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) -- 2.25.1

3 8

[PATCH] dm: Fix OF_BAD_ADDR definition
by Patrice Chotard 04 Jan '22

04 Jan '22

When OF_LIVE flag is enabled on a 64 bits platform, there is an issue when dev_read_addr() is called and need to perform an address translation using __of_translate_address(). In case of error, __of_translate_address() return value is OF_BAD_ADDR (wich is defined in include/dm/of.h to ((u64)-1) = 0xffffffffffffffff). The return value of dev_read_addr() is often compared to FDT_ADDR_T_NONE which is defined as (-1U) = 0xffffffff. In this case the comparison is always false. To fix this issue, define OF_BAD_ADDR to FDT_ADDR_T_NONE. Signed-off-by: Patrice Chotard <patrice.chotard(a)foss.st.com> --- include/dm/of.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/dm/of.h b/include/dm/of.h index 5cb6f44a6c..0208cc234a 100644 --- a/include/dm/of.h +++ b/include/dm/of.h @@ -95,7 +95,7 @@ static inline bool of_live_active(void) return gd_of_root() != NULL; } -#define OF_BAD_ADDR ((u64)-1) +#define OF_BAD_ADDR FDT_ADDR_T_NONE static inline const char *of_node_full_name(const struct device_node *np) { -- 2.17.1

3 2

[RFC PATCH 0/5] configs: Migrate CONFIG_SYS_MAX_FLASH_BANKS to Kconfig
by Patrick Delaunay 03 Jan '22

03 Jan '22

3 10

How should I set load_address for fdt in the .its file...
by ckim＠etri.re.kr 03 Jan '22

03 Jan '22

Hello all, I saw https://www.thegoodpenguin.co.uk/blog/u-boot-fit-image-overview/ and used it to make .itb file (FIT image). (see the its sample right below the line saying : Let's try this out by creating an image tree source file (.its): ) I was doing the experiment and found the load address of fdt was set wrong and changed it to the next address after the linux kernel (but 8 byte aligned). But the SPL program complains it can't find the 'configurations' node. So I'm curious about how I should set the address. But I'm not sure how to set the 'load_address' and 'entry_address' for fdt. Should I set it so that fdt is just placed some place above the linux Image? And why doesn't initrd image node have those 'load_address' and 'entry_address'? Thanks for reading. Chan Kim

2 1

[PATCH v2] efi_loader: Get rid of kaslr-seed
by Ilias Apalodimas 03 Jan '22

03 Jan '22

Right now we unconditionally pass a 'kaslr-seed' property to the kernel if the DTB we ended up in EFI includes the entry. However the kernel EFI stub completely ignores it and only relies on EFI_RNG_PROTOCOL for it's own randomness needs (i.e the randomization of the physical placement of the kernel). So let's get rid of it if EFI_RNG_PPROTOCOL is installed. It's worth noting that TPMs also provide an RNG. So if we tweak our EFI_RNG_PROTOCOL slightly and install the protocol when a TPM device is present the 'kaslr-seed' property will always be removed, allowing us to reliably measure our DTB as well. Acked-by: Ard Biesheuvel <ardb(a)kernel.org> Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> --- changes since v1: - Only removing the property if EFI_RNG_PROTOCOL is installed, since some OS'es rely on kaslr-seed - Only display an error message if the kaslr-seed entry was found but not removed cmd/bootefi.c | 2 ++ include/efi_loader.h | 2 ++ lib/efi_loader/efi_dt_fixup.c | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+) diff --git a/cmd/bootefi.c b/cmd/bootefi.c index d77d3b6e943d..57f13ce701ec 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -310,6 +310,8 @@ efi_status_t efi_install_fdt(void *fdt) /* Create memory reservations as indicated by the device tree */ efi_carve_out_dt_rsv(fdt); + efi_try_purge_kaslr_seed(fdt); + /* Install device tree as UEFI table */ ret = efi_install_configuration_table(&efi_guid_fdt, fdt); if (ret != EFI_SUCCESS) { diff --git a/include/efi_loader.h b/include/efi_loader.h index 9dd6c2033634..1fe003db69e0 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -519,6 +519,8 @@ efi_status_t EFIAPI efi_convert_pointer(efi_uintn_t debug_disposition, void **address); /* Carve out DT reserved memory ranges */ void efi_carve_out_dt_rsv(void *fdt); +/* Purge unused kaslr-seed */ +void efi_try_purge_kaslr_seed(void *fdt); /* Called by bootefi to make console interface available */ efi_status_t efi_console_register(void); /* Called by bootefi to make all disk storage accessible as EFI objects */ diff --git a/lib/efi_loader/efi_dt_fixup.c b/lib/efi_loader/efi_dt_fixup.c index b6fe5d2e5a34..d3923e5dba1b 100644 --- a/lib/efi_loader/efi_dt_fixup.c +++ b/lib/efi_loader/efi_dt_fixup.c @@ -8,6 +8,7 @@ #include <common.h> #include <efi_dt_fixup.h> #include <efi_loader.h> +#include <efi_rng.h> #include <fdtdec.h> #include <mapmem.h> @@ -40,6 +41,38 @@ static void efi_reserve_memory(u64 addr, u64 size, bool nomap) addr, size); } +/** + * efi_try_purge_kaslr_seed() - Remove unused kaslr-seed + * + * Kernel's EFI STUB only relies on EFI_RNG_PROTOCOL for randomization + * and completely ignores the kaslr-seed for its own randomness needs + * (i.e the randomization of the physical placement of the kernel). + * Weed it out from the DTB we hand over, which would mess up our DTB + * TPM measurements as well. + * + * @fdt: Pointer to device tree + */ +void efi_try_purge_kaslr_seed(void *fdt) +{ + const efi_guid_t efi_guid_rng_protocol = EFI_RNG_PROTOCOL_GUID; + struct efi_handler *handler; + efi_status_t ret; + int nodeoff = 0; + int err = 0; + + ret = efi_search_protocol(efi_root, &efi_guid_rng_protocol, &handler); + if (ret != EFI_SUCCESS) + return; + + nodeoff = fdt_path_offset(fdt, "/chosen"); + if (nodeoff < 0) + return; + + err = fdt_delprop(fdt, nodeoff, "kaslr-seed"); + if (err < 0 && err != -FDT_ERR_NOTFOUND) + log_err("Error deleting kaslr-seed\n"); +} + /** * efi_carve_out_dt_rsv() - Carve out DT reserved memory ranges * -- 2.30.2

3 11

help on udoo_neo power up on mainline uboot
by Tommaso Merciai 02 Jan '22

02 Jan '22

Hi Simon Glass, I'm actually trying to boot up udoo_neo board with minimal configuration (512 MB Ram) at the moment using the following cmd to flash the board I'm no able to boot it (flashing uSD with ): - sudo dd if=u-boot-with-spl.imx of=/dev/sde bs=1k seek=1 conv=fsync (don't work) - sudo dd if=SPL of=/dev/sde bs=1K seek=1 - sudo dd if=u-boot.img of=/dev/sde bs=1K seek=69 (don't work) I'm building uboot using: - make udoo_neo_defconfig - make Are you able to boot the board with basic configuration (UDOO_NEO_TYPE_BASIC)? I found this uboot on the web and with that I'm able to boot the board: - https://github.com/UDOOboard/uboot-imx Can you give me one help on that? Are you abe to boot the board? Let me know. Thanks, Tommaso

3 21

Please pull u-boot-video/next
by Anatolij Gustschin 01 Jan '22

01 Jan '22

Hi Tom, please pull video patches for next. CI: https://source.denx.de/u-boot/custodians/u-boot-video/-/pipelines/10395 Thanks, Anatolij The following changes since commit bc0abd80b3c2d395a0245d4e1ce4f8f445f79cde: Merge branch '2021-12-23-make-OF_BOARD-a-boolean' into next (2021-12-24 09:31:35 -0500) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-video.git tags/video-next-20211228 for you to fetch changes up to 92302ab1a279859824ec0f2e3864be44e883bff9: x86: coreboot: Add a sample script to build a qemu image (2021-12-26 23:33:28 +0100) ---------------------------------------------------------------- - various fixes to the sandbox display support - support for showing a logo without splash screen config - support for BMP drawing to depths other than 16bpp - tests for the different types of supported BMP images - support showing a logo when running coreboot via qemu ---------------------------------------------------------------- Simon Glass (23): sandbox: video: Support 8bpp depth video: sandbox: Avoid duplicate display windows console: Avoid serial output before the console is running video: sandbox: Set a maximum frame-buffer size sandbox: video: Correct the address of the copy base sandbox: video: Add BMP tests for 32bpp and 8bpp modes video: Expand video debugging buffer size sandbox: Enable support for the gzip command video: Drop fb_put_byte() el at video: Move BMP pixel-writing into a function video: bmp: Update RLE8 support to use the write function video: Drop the uclass colour map video: Tidy up 24/32 BMP blitting video: Add a test for 16bpp BMP files video: theadorable: Use RGB565 for BMP blitting video: Drop #ifdefs from video_bmp video: Convert CONFIG_VIDEO_LOGO to Kconfig video: Drop VIDEO_LOGO from cfb_console video: Support showing the U-Boot logo video: Show the U-Boot logo by default video: Support virtio devices with the splash screen x86: coreboot: Support getting a logo from virtio x86: coreboot: Add a sample script to build a qemu image .gitattributes | 1 + README | 1 - arch/sandbox/cpu/sdl.c | 98 ++++++++-- arch/sandbox/include/asm/sdl.h | 7 + arch/sandbox/include/asm/test.h | 18 ++ board/coreboot/coreboot/coreboot.c | 20 +- cmd/unzip.c | 4 +- common/console.c | 6 +- common/splash.c | 2 +- common/splash_source.c | 14 ++ configs/apalis_imx6_defconfig | 1 + configs/aristainetos2c_defconfig | 1 + configs/aristainetos2ccslb_defconfig | 1 + configs/cm_fx6_defconfig | 1 + configs/colibri-imx6ull-emmc_defconfig | 1 + configs/colibri-imx6ull_defconfig | 1 + configs/colibri_imx6_defconfig | 1 + configs/colibri_imx7_defconfig | 1 + configs/colibri_imx7_emmc_defconfig | 1 + configs/colibri_vf_defconfig | 1 + configs/gurnard_defconfig | 1 + configs/gwventana_emmc_defconfig | 1 + configs/gwventana_gw5904_defconfig | 1 + configs/gwventana_nand_defconfig | 1 + configs/imx6dl_icore_nand_defconfig | 1 + configs/imx6q_icore_nand_defconfig | 1 + configs/imx6qdl_icore_mmc_defconfig | 1 + configs/imx6qdl_icore_nand_defconfig | 1 + configs/imxrt1050-evk_defconfig | 1 + configs/m53menlo_defconfig | 1 + configs/marsboard_defconfig | 1 + configs/mx6cuboxi_defconfig | 1 + configs/mx6sabreauto_defconfig | 1 + configs/mx6sabresd_defconfig | 1 + configs/mx6ul_14x14_evk_defconfig | 1 + configs/mx6ul_9x9_evk_defconfig | 1 + configs/novena_defconfig | 1 + configs/opos6uldev_defconfig | 1 + configs/pico-dwarf-imx7d_defconfig | 1 + configs/pico-hobbit-imx7d_defconfig | 1 + configs/pico-imx6_defconfig | 1 + configs/pico-imx6ul_defconfig | 1 + configs/pico-imx7d_bl33_defconfig | 1 + configs/pico-imx7d_defconfig | 1 + configs/pico-nymph-imx7d_defconfig | 1 + configs/pico-pi-imx7d_defconfig | 1 + configs/riotboard_defconfig | 1 + configs/s5p4418_nanopi2_defconfig | 1 + configs/sandbox_defconfig | 2 + configs/sandbox_flattree_defconfig | 2 + configs/tbs2910_defconfig | 1 + configs/wandboard_defconfig | 1 + drivers/video/Kconfig | 11 ++ drivers/video/Makefile | 3 + drivers/video/cfb_console.c | 325 +-------------------------------- drivers/video/console_truetype.c | 21 +++ drivers/video/sandbox_sdl.c | 77 +++++++- drivers/video/u_boot_logo.bmp | Bin 0 -> 6932 bytes drivers/video/video-uclass.c | 35 ++-- drivers/video/video_bmp.c | 249 ++++++++++++------------- include/configs/T102xRDB.h | 1 - include/configs/T104xRDB.h | 1 - include/configs/apalis_imx6.h | 1 - include/configs/aristainetos2.h | 1 - include/configs/cm_fx6.h | 1 - include/configs/colibri-imx6ull.h | 1 - include/configs/colibri_imx6.h | 1 - include/configs/colibri_imx7.h | 1 - include/configs/colibri_vf.h | 1 - include/configs/coreboot.h | 3 + include/configs/embestmx6boards.h | 1 - include/configs/gw_ventana.h | 1 - include/configs/imx6-engicam.h | 1 - include/configs/imxrt1050-evk.h | 1 - include/configs/ls1021aqds.h | 1 - include/configs/ls1021atwr.h | 1 - include/configs/m53menlo.h | 1 - include/configs/mx23evk.h | 1 - include/configs/mx28evk.h | 1 - include/configs/mx51evk.h | 1 - include/configs/mx53loco.h | 1 - include/configs/mx6cuboxi.h | 1 - include/configs/mx6sabre_common.h | 1 - include/configs/mx6sxsabresd.h | 1 - include/configs/mx6ul_14x14_evk.h | 1 - include/configs/mx7dsabresd.h | 1 - include/configs/nokia_rx51.h | 1 - include/configs/novena.h | 1 - include/configs/opos6uldev.h | 1 - include/configs/pico-imx6.h | 1 - include/configs/pico-imx6ul.h | 1 - include/configs/pico-imx7d.h | 1 - include/configs/pxm2.h | 1 - include/configs/rut.h | 1 - include/configs/s5p4418_nanopi2.h | 2 - include/configs/wandboard.h | 1 - include/configs/x86-common.h | 5 + include/splash.h | 1 + include/video.h | 4 +- include/virtio.h | 1 + scripts/Makefile.lib | 21 +++ scripts/build-cb.sh | 19 ++ scripts/config_whitelist.txt | 1 - test/dm/video.c | 189 ++++++++++++++++++- tools/logos/denx-16bpp.bmp.gz | Bin 0 -> 4516 bytes tools/logos/denx-24bpp.bmp.gz | Bin 0 -> 7137 bytes 106 files changed, 678 insertions(+), 538 deletions(-) create mode 100644 drivers/video/u_boot_logo.bmp create mode 100755 scripts/build-cb.sh create mode 100644 tools/logos/denx-16bpp.bmp.gz create mode 100644 tools/logos/denx-24bpp.bmp.gz

2 1

Boot Linux FIT image from SPL
by Sven Schwermer 31 Dec '21

31 Dec '21

Hi, I was wondering whether it's possible to boot a Linux FIT image (kernel zImage, DTB, initramfs) straight from SPL? Specifically, I'm trying to reduce the boot time when booting into a tiny Linux with RAM disk over USB SDP (i.MX6ULL). This works fine with the chain ROM -> SPL -> u-boot proper -> Linux. I have given it a try to boot the FIT image straight from SPL, but I'm getting a few (debug-level) errors: U-Boot SPL 2021.10-00003-gc254f7c98d-dirty (Dec 27 2021 - 20:15:09 +0100) Trying to boot from USB SDP SDP: initialize... SDP: handle requests... Downloading file of size 2440036 to 0x81000000... done Jumping to header at 0x81000000 Header Tag is not an IMX image Found header at 0x81000000 fit read sector 0, sectors=2440036, dst=88302888, count=2440036, size=0x253b64 cannot find property 'firmware': -1 kernel: 'kernel-1' Embedded data: dst=82000000, size=13caf0 Image OS is Linux fdt: 'fdt-imx6ull-myir-mys-6ulx-eval.dtb' Embedded data: dst=8213caf0, size=64f7 cannot find property 'loadables': -1 The "loadables" config property seems to be specific to the u-boot proper FIT image. I have consulted the falcon-mode readme, but it doesn't mention FIT images which leads me to believe that this is not an intended use case? Best regards, Sven

2 7

[PATCH 1/2] cmd: source: Use script from default config
by Sven Schwermer 31 Dec '21

31 Dec '21

When sourcing FIT images, source the script node from the "bootscr" property within the default configuration. If board_fit_config_name_match is overridden, this will determine the selected configuration rather than the default one. The old behaviour is inconsistent with the FIT image specification which does not mention a "default" property in the "/images" node. Signed-off-by: Sven Schwermer <sven(a)svenschwermer.de> --- boot/Makefile | 8 ++------ cmd/source.c | 22 +++++++++++++--------- include/image.h | 1 + 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/boot/Makefile b/boot/Makefile index 2938c3f145..51181b10fc 100644 --- a/boot/Makefile +++ b/boot/Makefile @@ -24,14 +24,10 @@ obj-$(CONFIG_ANDROID_AB) += android_ab.o obj-$(CONFIG_ANDROID_BOOT_IMAGE) += image-android.o image-android-dt.o obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += image-fdt.o obj-$(CONFIG_$(SPL_TPL_)FIT_SIGNATURE) += fdt_region.o -obj-$(CONFIG_$(SPL_TPL_)FIT) += image-fit.o -obj-$(CONFIG_$(SPL_)MULTI_DTB_FIT) += boot_fit.o common_fit.o +obj-$(CONFIG_$(SPL_TPL_)FIT) += common_fit.o image-fit.o +obj-$(CONFIG_$(SPL_)MULTI_DTB_FIT) += boot_fit.o obj-$(CONFIG_$(SPL_TPL_)IMAGE_SIGN_INFO) += image-sig.o obj-$(CONFIG_$(SPL_TPL_)FIT_SIGNATURE) += image-fit-sig.o obj-$(CONFIG_$(SPL_TPL_)FIT_CIPHER) += image-cipher.o obj-$(CONFIG_CMD_ADTIMG) += image-android-dt.o - -ifdef CONFIG_SPL_BUILD -obj-$(CONFIG_SPL_LOAD_FIT) += common_fit.o -endif diff --git a/cmd/source.c b/cmd/source.c index 81e015b64e..a7d65ce377 100644 --- a/cmd/source.c +++ b/cmd/source.c @@ -26,19 +26,23 @@ #if defined(CONFIG_FIT) /** - * get_default_image() - Return default property from /images + * get_default_bootscr() - Return default boot script unit name. + * + * The default configuration is used unless board_fit_config_name_match + * is overridden. * - * Return: Pointer to value of default property (or NULL) + * Return: Pointer to value of bootscr property (or NULL) */ -static const char *get_default_image(const void *fit) +static const char *get_default_bootscr(const void *fit) { - int images_noffset; + int noffset; - images_noffset = fdt_path_offset(fit, FIT_IMAGES_PATH); - if (images_noffset < 0) + /* get default or board-specific configuration node */ + noffset = fit_find_config_node(fit); + if (noffset < 0) return NULL; - return fdt_getprop(fit, images_noffset, FIT_DEFAULT_PROP, NULL); + return fdt_getprop(fit, noffset, FIT_BOOTSCR_PROP, NULL); } #endif @@ -113,7 +117,7 @@ int image_source_script(ulong addr, const char *fit_uname) } if (!fit_uname) - fit_uname = get_default_image(fit_hdr); + fit_uname = get_default_bootscr(fit_hdr); if (!fit_uname) { puts("No FIT subimage unit name\n"); @@ -128,7 +132,7 @@ int image_source_script(ulong addr, const char *fit_uname) } if (!fit_image_check_type (fit_hdr, noffset, IH_TYPE_SCRIPT)) { - puts ("Not a image image\n"); + puts ("Not a script image\n"); return 1; } diff --git a/include/image.h b/include/image.h index fd662e74b4..67c70952bd 100644 --- a/include/image.h +++ b/include/image.h @@ -936,6 +936,7 @@ int booti_setup(ulong image, ulong *relocated_addr, ulong *size, #define FIT_KERNEL_PROP "kernel" #define FIT_RAMDISK_PROP "ramdisk" #define FIT_FDT_PROP "fdt" +#define FIT_BOOTSCR_PROP "bootscr" #define FIT_LOADABLE_PROP "loadables" #define FIT_DEFAULT_PROP "default" #define FIT_SETUP_PROP "setup" -- 2.34.1

1 1