May 2022 - U-Boot

[PATCH 1/1] config: ls2088ardb: Add config CONFIG_SYS_FLASH_CFI_WIDTH
by Priyanka Singh 13 May '22

13 May '22

Add config CONFIG_SYS_FLASH_CFI_WIDTH as FLASH_CFI_16BIT to fix flash writing issue on ls2088ardb platform introduced by the commit '53879b1738' (cfi_flash: Fix detection of 8-bit bus flash devices via address shift) Signed-off-by: Priyanka Singh <priyanka.singh(a)nxp.com> --- include/configs/ls2080ardb.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index 60d99a0b37..6445193272 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* - * Copyright 2017, 2019-2021 NXP + * Copyright 2017, 2019-2022 NXP * Copyright 2015 Freescale Semiconductor */ @@ -77,6 +77,8 @@ #define CONFIG_SYS_NOR_FTIM3 0x04000000 #define CONFIG_SYS_IFC_CCR 0x01000000 +#define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT + #ifdef CONFIG_MTD_NOR_FLASH #define CONFIG_SYS_FLASH_QUIET_TEST #define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ -- 2.17.1

1 0

[PATCH v2 0/3] efi_loader: bootmgr: fix a problem in loading an image from a short-path
by AKASHI Takahiro 12 May '22

12 May '22

This is a reworked version of v1[1]. If a (root) file system does not have any partition table, the generated boot option (BOOTxxxx) by the command, => efidebug boot add -b ... does not work because a device path in the option is in a short-form and does not contain any valid media device path which should expectedly support EFI_SIMPLE_FILE_SYSTEM_PROTOCOL. [1] https://lists.denx.de/pipermail/u-boot/2022-April/482697.html Test: ===== * Azure CI passed[2] [2] https://dev.azure.com/u-boot/u-boot/_build/results?buildId=4220&view=results TODO: ===== The other types of short-form device paths, USB_CLASS and HARD_DRIVE, should also be implemented in boot manager rather than LoadImage API so as to more properly comply with the UEFI specification. See "3.1.2 Load Option Processing". Change history: =============== v2 (May, 12, 2022) * fully re-write the code to implement the feature in boot manager (patch#2) * try removable media first (patch#1,#2) * add a test case (patch#3) v1 (Apr 28, 2022) * initial patch AKASHI Takahiro (3): efi_loader: disk: add efi_disk_is_removable() efi_loader: bootmgr: fix a problem in loading an image from a short-path test: efi_bootmgr: add a test case for a short-form path include/efi_loader.h | 3 + lib/efi_loader/efi_bootmgr.c | 98 ++++++++++++++++++- lib/efi_loader/efi_disk.c | 27 +++++ test/py/tests/test_efi_bootmgr/conftest.py | 25 +++++ .../test_efi_bootmgr/test_efi_bootmgr.py | 25 +++++ 5 files changed, 174 insertions(+), 4 deletions(-) -- 2.33.0

2 9

[PATCH] fs/squashfs: use do_div function for math
by Sean Nyekjaer 12 May '22

12 May '22

From: Sean Nyekjaer <sean.nyekjaer.ext(a)siemensgamesa.com> When compling for x86: ld.bfd: fs/squashfs/sqfs.o: in function `sqfs_read': u-boot/fs/squashfs/sqfs.c:1443: undefined reference to `__udivmoddi4' ld.bfd: u-boot/fs/squashfs/sqfs.c:1521: undefined reference to `__udivmoddi4' Signed-off-by: Sean Nyekjaer <sean.nyekjaer.ext(a)siemensgamesa.com> --- fs/squashfs/sqfs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fs/squashfs/sqfs.c b/fs/squashfs/sqfs.c index 5d9c52af80..6405db4ff3 100644 --- a/fs/squashfs/sqfs.c +++ b/fs/squashfs/sqfs.c @@ -8,6 +8,7 @@ */ #include <asm/unaligned.h> +#include <div64.h> #include <errno.h> #include <fs.h> #include <linux/types.h> @@ -1440,7 +1441,7 @@ int sqfs_read(const char *filename, void *buf, loff_t offset, loff_t len, } for (j = 0; j < datablk_count; j++) { - start = data_offset / ctxt.cur_dev->blksz; + start = do_div(data_offset, ctxt.cur_dev->blksz); table_size = SQFS_BLOCK_SIZE(finfo.blk_sizes[j]); table_offset = data_offset - (start * ctxt.cur_dev->blksz); n_blks = DIV_ROUND_UP(table_size + table_offset, @@ -1516,7 +1517,7 @@ int sqfs_read(const char *filename, void *buf, loff_t offset, loff_t len, goto out; } - start = frag_entry.start / ctxt.cur_dev->blksz; + start = do_div(frag_entry.start, ctxt.cur_dev->blksz); table_size = SQFS_BLOCK_SIZE(frag_entry.size); table_offset = frag_entry.start - (start * ctxt.cur_dev->blksz); n_blks = DIV_ROUND_UP(table_size + table_offset, ctxt.cur_dev->blksz); -- 2.35.1

5 10

[PATCH 0/6] board: freescale: p1_p2_rdb_pc: Fix sizes of LBC peripherals
by Pali Rohár 12 May '22

12 May '22

On LBC (Local Bus Controller) are connected memory peripherals (NOR, NAND, CPLD). Fix size mappings of all these peripherals. Size needs to be correctly set in TLB, LAW and LBC OR registers. Use named macros for human readable configuration. Pali Rohár (6): Revert "Convert CONFIG_SYS_BR0_PRELIM et al to Kconfig" Revert "p1_p2_rdb: Remove CONFIG_CPLD_[BO]R_PRELIM" mpc85xx: Replace magic values in BR/OR PRELIM config options by proper C macros board: freescale: p1_p2_rdb_pc: Fix size of CPLD mapping board: freescale: p1_p2_rdb_pc: Fix size of FLASH NOR mapping board: freescale: p1_p2_rdb_pc: Fix size of NAND mapping README | 11 ++ arch/powerpc/cpu/mpc83xx/elbc/elbc.h | 170 +++++++++++++++++++ arch/powerpc/cpu/mpc8xx/Kconfig | 85 ++++++++++ board/freescale/p1_p2_rdb_pc/law.c | 10 +- board/freescale/p1_p2_rdb_pc/tlb.c | 20 ++- configs/M5272C3_defconfig | 24 --- configs/MCR3000_defconfig | 47 +++-- configs/MPC837XERDB_defconfig | 9 - configs/MPC8548CDS_36BIT_defconfig | 12 -- configs/MPC8548CDS_defconfig | 12 -- configs/MPC8548CDS_legacy_defconfig | 12 -- configs/P1020RDB-PC_36BIT_NAND_defconfig | 12 -- configs/P1020RDB-PC_36BIT_SDCARD_defconfig | 9 - configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig | 9 - configs/P1020RDB-PC_36BIT_defconfig | 9 - configs/P1020RDB-PC_NAND_defconfig | 12 -- configs/P1020RDB-PC_SDCARD_defconfig | 9 - configs/P1020RDB-PC_SPIFLASH_defconfig | 9 - configs/P1020RDB-PC_defconfig | 9 - configs/P1020RDB-PD_NAND_defconfig | 12 -- configs/P1020RDB-PD_SDCARD_defconfig | 9 - configs/P1020RDB-PD_SPIFLASH_defconfig | 9 - configs/P1020RDB-PD_defconfig | 9 - configs/P2020RDB-PC_36BIT_NAND_defconfig | 12 -- configs/P2020RDB-PC_36BIT_SDCARD_defconfig | 9 - configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig | 9 - configs/P2020RDB-PC_36BIT_defconfig | 9 - configs/P2020RDB-PC_NAND_defconfig | 12 -- configs/P2020RDB-PC_SDCARD_defconfig | 9 - configs/P2020RDB-PC_SPIFLASH_defconfig | 9 - configs/P2020RDB-PC_defconfig | 9 - configs/P2041RDB_NAND_defconfig | 9 - configs/P2041RDB_SDCARD_defconfig | 6 - configs/P2041RDB_SPIFLASH_defconfig | 6 - configs/P2041RDB_defconfig | 6 - configs/P3041DS_NAND_defconfig | 12 -- configs/P3041DS_SDCARD_defconfig | 9 - configs/P3041DS_SPIFLASH_defconfig | 9 - configs/P3041DS_defconfig | 9 - configs/P4080DS_SDCARD_defconfig | 9 - configs/P4080DS_SPIFLASH_defconfig | 9 - configs/P4080DS_defconfig | 9 - configs/P5040DS_NAND_defconfig | 12 -- configs/P5040DS_SDCARD_defconfig | 9 - configs/P5040DS_SPIFLASH_defconfig | 9 - configs/P5040DS_defconfig | 9 - configs/cobra5272_defconfig | 24 --- configs/gazerbeam_defconfig | 9 - configs/ids8313_defconfig | 12 -- configs/kmcoge5ne_defconfig | 12 -- configs/kmeter1_defconfig | 9 - configs/kmopti2_defconfig | 12 -- configs/kmsupx5_defconfig | 9 - configs/kmtegr1_defconfig | 9 - configs/kmtepr2_defconfig | 12 -- configs/socrates_defconfig | 12 -- configs/tuge1_defconfig | 9 - configs/tuxx1_defconfig | 12 -- drivers/ddr/fsl/Kconfig | 92 ---------- include/configs/M5272C3.h | 20 +++ include/configs/MPC8548CDS.h | 17 ++ include/configs/P2041RDB.h | 25 ++- include/configs/cobra5272.h | 30 ++++ include/configs/corenet_ds.h | 30 +++- include/configs/p1_p2_rdb_pc.h | 46 ++++- include/configs/socrates.h | 9 + scripts/config_whitelist.txt | 18 ++ 67 files changed, 498 insertions(+), 669 deletions(-) -- 2.20.1

2 15

[PATCH 0/3] usb: add isp1760 hcd support
by Rui Miguel Silva 12 May '22

12 May '22

Add support for the usb isp1760 host controller family, which for example is present in MPS3 FPGA board from Arm (isp1763). First we move some helper functions and defines to a more common place to be shared by several urb users. (patch 1/3) Then add the driver itself, is a ported version of the kernel actual driver, which I am also the maintainer. (patch 2/3) And last, enable it for the corstone1000 platform that uses that MPS3 board for its implementation (patch 3/3). Cheers, Rui PS: This should go on top of the corstone1000 platform enable series [0] 0: https://lore.kernel.org/u-boot/20220511095541.1461937-1-rui.silva@linaro.or… Rui Miguel Silva (3): usb: common: move urb code to common usb: add isp1760 family driver corstone1000: enable isp1763 usb controller and mmc Makefile | 1 + configs/corstone1000_defconfig | 3 + drivers/usb/Kconfig | 2 + drivers/usb/common/Makefile | 3 + drivers/usb/common/usb_urb.c | 160 ++ drivers/usb/host/r8a66597-hcd.c | 30 +- drivers/usb/isp1760/Kconfig | 12 + drivers/usb/isp1760/Makefile | 6 + drivers/usb/isp1760/isp1760-core.c | 376 +++ drivers/usb/isp1760/isp1760-core.h | 96 + drivers/usb/isp1760/isp1760-hcd.c | 2477 +++++++++++++++++ drivers/usb/isp1760/isp1760-hcd.h | 81 + drivers/usb/isp1760/isp1760-if.c | 125 + drivers/usb/isp1760/isp1760-regs.h | 292 ++ drivers/usb/isp1760/isp1760-uboot.c | 75 + drivers/usb/isp1760/isp1760-uboot.h | 27 + drivers/usb/musb-new/musb_core.c | 2 +- drivers/usb/musb-new/musb_host.c | 2 +- drivers/usb/musb-new/musb_host.h | 2 +- drivers/usb/musb-new/musb_uboot.c | 38 +- drivers/usb/musb-new/musb_uboot.h | 2 +- include/configs/corstone1000.h | 6 + .../linux/usb/usb_urb_compat.h | 47 +- include/usb_defs.h | 32 + 24 files changed, 3821 insertions(+), 76 deletions(-) create mode 100644 drivers/usb/common/usb_urb.c create mode 100644 drivers/usb/isp1760/Kconfig create mode 100644 drivers/usb/isp1760/Makefile create mode 100644 drivers/usb/isp1760/isp1760-core.c create mode 100644 drivers/usb/isp1760/isp1760-core.h create mode 100644 drivers/usb/isp1760/isp1760-hcd.c create mode 100644 drivers/usb/isp1760/isp1760-hcd.h create mode 100644 drivers/usb/isp1760/isp1760-if.c create mode 100644 drivers/usb/isp1760/isp1760-regs.h create mode 100644 drivers/usb/isp1760/isp1760-uboot.c create mode 100644 drivers/usb/isp1760/isp1760-uboot.h rename drivers/usb/musb-new/usb-compat.h => include/linux/usb/usb_urb_compat.h (59%) -- 2.36.1

1 3

Bug in p1_p2_rdb_pc? Caching-inhibited bit for initial L2 SRAM entry in TLB
by Pali Rohár 12 May '22

12 May '22

Hello! I suspect that there is a bug in board/freescale/p1_p2_rdb_pc/tlb.c code which configures TLB entry for initial L2 SRAM. When L2 is 512 kB long (e.g. on P2020) then U-Boot *unsets* MAS2_I bit for first half of L2 and for second half of L2 U-Boot *sets* this bit. See code: https://source.denx.de/u-boot/u-boot/-/blob/v2022.04/board/freescale/p1_p2_… I do not think that one part of L2 SRAM should be configured differently as second part. Therefore I think that this is a bug in U-Boot code. Do you know is correct configuration of TLB entries for initial L2 SRAM? MAS2_I is Caching-inhibited bit which is described as: Caching-inhibited: * 0 - Accesses to this page are considered cacheable. * 1 - The page is considered caching-inhibited. All loads and stores to the page bypass the caches and are performed directly to main memory. A read or write to a caching-inhibited page affects only the memory element specified by the operation.

2 4

[PATCH 0/2] U-Boot ENV in EXT4 support for Expressobin (revised)
by Rogier Stam 11 May '22

11 May '22

Hi Per comments of Stefan I have split the patch in two: - one for env file changes - one for espressobin related changes Let me know if any other changes are needed. Regards Rogier Rogier Stam (2): Fix Espressobin build for configs where ENV is not in SPI Add SCSI scan for ENV in EXT4 or FAT arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi | 2 ++ board/Marvell/mvebu_armada-37xx/board.c | 4 +++- env/ext4.c | 5 +++++ env/fat.c | 5 +++++ 4 files changed, 15 insertions(+), 1 deletion(-) -- 2.7.4

3 8

[PATCH 1/4] spl: Rename Kconfig SPL_LEGACY_IMAGE_SUPPORT to SPL_LEGACY_IMAGE_FORMAT
by Andrew Davis 11 May '22

11 May '22

This matches what this support is called in the non-SPL case. The postfix _SUPPORT is redundant as enabling Kconfig options implies support. With this we can use CONFIG_IS_ENABLED() as needed. Signed-off-by: Andrew Davis <afd(a)ti.com> --- common/spl/Kconfig | 6 +++--- common/spl/Makefile | 2 +- common/spl/spl_nor.c | 2 +- configs/axm_defconfig | 2 +- configs/imx8mm_data_modul_edm_sbc_defconfig | 2 +- configs/imx8mn_evk_defconfig | 2 +- configs/kontron-sl-mx6ul_defconfig | 2 +- configs/mx6sabreauto_defconfig | 2 +- configs/mx6sabresd_defconfig | 2 +- configs/openpiton_riscv64_spl_defconfig | 2 +- configs/stm32mp15_dhcom_basic_defconfig | 2 +- configs/stm32mp15_dhcor_basic_defconfig | 2 +- configs/taurus_defconfig | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 84f2847c72..43485af468 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -225,7 +225,7 @@ config SPL_RAW_IMAGE_SUPPORT is y. If this is not set, SPL will move on to other available boot media to find a suitable image. -config SPL_LEGACY_IMAGE_SUPPORT +config SPL_LEGACY_IMAGE_FORMAT bool "Support SPL loading and booting of Legacy images" default y if !TI_SECURE_DEVICE && !SPL_LOAD_FIT help @@ -235,7 +235,7 @@ config SPL_LEGACY_IMAGE_SUPPORT config SPL_LEGACY_IMAGE_CRC_CHECK bool "Check CRC of Legacy images" - depends on SPL_LEGACY_IMAGE_SUPPORT + depends on SPL_LEGACY_IMAGE_FORMAT select SPL_CRC32 help Enable this to check the CRC of Legacy images. While this increases @@ -451,7 +451,7 @@ config SYS_MMCSD_RAW_MODE_EMMC_BOOT_PARTITION config SPL_CRC32 bool "Support CRC32" - default y if SPL_LEGACY_IMAGE_SUPPORT || SPL_EFI_PARTITION + default y if SPL_LEGACY_IMAGE_FORMAT || SPL_EFI_PARTITION default y if SPL_ENV_SUPPORT || TPL_BLOBLIST help Enable this to support CRC32 in uImages or FIT images within SPL. diff --git a/common/spl/Makefile b/common/spl/Makefile index e71e7bee66..13db3df993 100644 --- a/common/spl/Makefile +++ b/common/spl/Makefile @@ -10,7 +10,7 @@ ifdef CONFIG_SPL_BUILD obj-$(CONFIG_$(SPL_TPL_)FRAMEWORK) += spl.o obj-$(CONFIG_$(SPL_TPL_)BOOTROM_SUPPORT) += spl_bootrom.o obj-$(CONFIG_$(SPL_TPL_)LOAD_FIT) += spl_fit.o -obj-$(CONFIG_$(SPL_TPL_)LEGACY_IMAGE_SUPPORT) += spl_legacy.o +obj-$(CONFIG_$(SPL_TPL_)LEGACY_IMAGE_FORMAT) += spl_legacy.o obj-$(CONFIG_$(SPL_TPL_)NOR_SUPPORT) += spl_nor.o obj-$(CONFIG_$(SPL_TPL_)XIP_SUPPORT) += spl_xip.o obj-$(CONFIG_$(SPL_TPL_)YMODEM_SUPPORT) += spl_ymodem.o diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c index 0f4fff8493..067a2d42bb 100644 --- a/common/spl/spl_nor.c +++ b/common/spl/spl_nor.c @@ -110,7 +110,7 @@ static int spl_nor_load_image(struct spl_image_info *spl_image, } /* Legacy image handling */ - if (IS_ENABLED(CONFIG_SPL_LEGACY_IMAGE_SUPPORT)) { + if (IS_ENABLED(CONFIG_SPL_LEGACY_IMAGE_FORMAT)) { load.bl_len = 1; load.read = spl_nor_load_read; return spl_load_legacy_img(spl_image, bootdev, &load, diff --git a/configs/axm_defconfig b/configs/axm_defconfig index 457bf76bd4..89b9f9faea 100644 --- a/configs/axm_defconfig +++ b/configs/axm_defconfig @@ -35,7 +35,7 @@ CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="run flash_self" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y -# CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set +# CONFIG_SPL_LEGACY_IMAGE_FORMAT is not set CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_CRC32=y CONFIG_SPL_NAND_SUPPORT=y diff --git a/configs/imx8mm_data_modul_edm_sbc_defconfig b/configs/imx8mm_data_modul_edm_sbc_defconfig index afc8c43ca9..edceb18201 100644 --- a/configs/imx8mm_data_modul_edm_sbc_defconfig +++ b/configs/imx8mm_data_modul_edm_sbc_defconfig @@ -42,7 +42,7 @@ CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y CONFIG_ARCH_MISC_INIT=y CONFIG_BOARD_LATE_INIT=y # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set -CONFIG_SPL_LEGACY_IMAGE_SUPPORT=y +CONFIG_SPL_LEGACY_IMAGE_FORMAT=y CONFIG_SPL_LEGACY_IMAGE_CRC_CHECK=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x300 diff --git a/configs/imx8mn_evk_defconfig b/configs/imx8mn_evk_defconfig index 22fad70c5d..c18c19fa14 100644 --- a/configs/imx8mn_evk_defconfig +++ b/configs/imx8mn_evk_defconfig @@ -29,7 +29,7 @@ CONFIG_BOARD_LATE_INIT=y CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_BOOTROM_SUPPORT=y # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set -CONFIG_SPL_LEGACY_IMAGE_SUPPORT=y +CONFIG_SPL_LEGACY_IMAGE_FORMAT=y CONFIG_SPL_LEGACY_IMAGE_CRC_CHECK=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x300 diff --git a/configs/kontron-sl-mx6ul_defconfig b/configs/kontron-sl-mx6ul_defconfig index a59dacf27b..11e4e956c8 100644 --- a/configs/kontron-sl-mx6ul_defconfig +++ b/configs/kontron-sl-mx6ul_defconfig @@ -26,7 +26,7 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_BOARD_TYPES=y CONFIG_BOARD_EARLY_INIT_F=y -CONFIG_SPL_LEGACY_IMAGE_SUPPORT=y +CONFIG_SPL_LEGACY_IMAGE_FORMAT=y CONFIG_SPL_LEGACY_IMAGE_CRC_CHECK=y CONFIG_SPL_USB_HOST=y CONFIG_SPL_USB_GADGET=y diff --git a/configs/mx6sabreauto_defconfig b/configs/mx6sabreauto_defconfig index 0c7aaa6a20..053026daa3 100644 --- a/configs/mx6sabreauto_defconfig +++ b/configs/mx6sabreauto_defconfig @@ -32,7 +32,7 @@ CONFIG_BOOTCOMMAND="run findfdt;mmc dev ${mmcdev};if mmc rescan; then if run loa # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y -CONFIG_SPL_LEGACY_IMAGE_SUPPORT=y +CONFIG_SPL_LEGACY_IMAGE_FORMAT=y CONFIG_SPL_FIT_IMAGE_TINY=y CONFIG_SPL_FS_EXT4=y CONFIG_SPL_I2C=y diff --git a/configs/mx6sabresd_defconfig b/configs/mx6sabresd_defconfig index c8d9ebdc64..674384c878 100644 --- a/configs/mx6sabresd_defconfig +++ b/configs/mx6sabresd_defconfig @@ -31,7 +31,7 @@ CONFIG_BOOTCOMMAND="run findfdt;mmc dev ${mmcdev};if mmc rescan; then if run loa # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y -CONFIG_SPL_LEGACY_IMAGE_SUPPORT=y +CONFIG_SPL_LEGACY_IMAGE_FORMAT=y CONFIG_SPL_FIT_IMAGE_TINY=y CONFIG_SPL_USB_HOST=y CONFIG_SPL_USB_GADGET=y diff --git a/configs/openpiton_riscv64_spl_defconfig b/configs/openpiton_riscv64_spl_defconfig index cbcbe42caf..8a7e3ccf3d 100644 --- a/configs/openpiton_riscv64_spl_defconfig +++ b/configs/openpiton_riscv64_spl_defconfig @@ -20,7 +20,7 @@ CONFIG_ENV_VARS_UBOOT_CONFIG=y # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="fdt addr ${fdtcontroladdr}; fdt move ${fdtcontroladdr} ${fdt_addr_r}; load mmc ${mmcdev}:${mmcpart} ${kernel_addr_r} ${image}; booti ${kernel_addr_r} - ${fdt_addr_r}; " -# CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set +# CONFIG_SPL_LEGACY_IMAGE_FORMAT is not set CONFIG_SPL_SYS_MALLOC_SIMPLE=y # CONFIG_SPL_BANNER_PRINT is not set CONFIG_SPL_CPU=y diff --git a/configs/stm32mp15_dhcom_basic_defconfig b/configs/stm32mp15_dhcom_basic_defconfig index ec955eae20..2dfeaacf5f 100644 --- a/configs/stm32mp15_dhcom_basic_defconfig +++ b/configs/stm32mp15_dhcom_basic_defconfig @@ -25,7 +25,7 @@ CONFIG_BOOTDELAY=1 CONFIG_BOOTCOMMAND="run bootcmd_stm32mp" CONFIG_CONSOLE_MUX=y CONFIG_BOARD_EARLY_INIT_F=y -CONFIG_SPL_LEGACY_IMAGE_SUPPORT=y +CONFIG_SPL_LEGACY_IMAGE_FORMAT=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=3 CONFIG_SPL_ENV_SUPPORT=y diff --git a/configs/stm32mp15_dhcor_basic_defconfig b/configs/stm32mp15_dhcor_basic_defconfig index 387e068155..373ead834d 100644 --- a/configs/stm32mp15_dhcor_basic_defconfig +++ b/configs/stm32mp15_dhcor_basic_defconfig @@ -23,7 +23,7 @@ CONFIG_BOOTDELAY=1 CONFIG_BOOTCOMMAND="run bootcmd_stm32mp" CONFIG_CONSOLE_MUX=y CONFIG_BOARD_EARLY_INIT_F=y -CONFIG_SPL_LEGACY_IMAGE_SUPPORT=y +CONFIG_SPL_LEGACY_IMAGE_FORMAT=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=3 CONFIG_SPL_ENV_SUPPORT=y diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig index c24b4488a7..e6bef6c974 100644 --- a/configs/taurus_defconfig +++ b/configs/taurus_defconfig @@ -39,7 +39,7 @@ CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="nand read 0x22000000 0x200000 0x300000; bootm" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y -# CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set +# CONFIG_SPL_LEGACY_IMAGE_FORMAT is not set CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_CRC32=y CONFIG_SPL_NAND_SUPPORT=y -- 2.36.0

2 11

[PATCH] Makefile: update warning about CONFIG_OF_EMBED
by Ralph Siemsen 11 May '22

11 May '22

Update the diagnostic message with revised location of document, which changed in 3e9fddfc4f1 ("doc: Move devicetree control doc to rST") Signed-off-by: Ralph Siemsen <ralph.siemsen(a)linaro.org> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ccc87c3a5cd..486a9b9ca23 100644 --- a/Makefile +++ b/Makefile @@ -1113,7 +1113,7 @@ ifeq ($(CONFIG_OF_EMBED)$(CONFIG_EFI_APP),y) @echo >&2 "CONFIG_OF_EMBED is enabled. This option should only" @echo >&2 "be used for debugging purposes. Please use" @echo >&2 "CONFIG_OF_SEPARATE for boards in mainline." - @echo >&2 "See doc/README.fdt-control for more info." + @echo >&2 "See doc/develop/devicetree/control.rst for more info." @echo >&2 "====================================================" endif ifneq ($(CONFIG_SPL_FIT_GENERATOR),) -- 2.25.1

2 1

[PATCH] board_r: use IS_ENABLED(CONFIG_NEEDS_MANUAL_RELOC) in board_init_r()
by Ovidiu Panait 11 May '22

11 May '22

Drop CONFIG_NEEDS_MANUAL_RELOC ifdefs in board_init_r() and use IS_ENABLED() instead. Also, use the MANUAL_RELOC() macro to update the initcall pointers. Signed-off-by: Ovidiu Panait <ovidiu.panait(a)windriver.com> --- common/board_r.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/common/board_r.c b/common/board_r.c index 93c9c2e50d..6f4aca2077 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -61,6 +61,7 @@ #include <wdt.h> #include <asm-generic/gpio.h> #include <efi_loader.h> +#include <relocate.h> DECLARE_GLOBAL_DATA_PTR; @@ -810,19 +811,15 @@ void board_init_r(gd_t *new_gd, ulong dest_addr) if (CONFIG_IS_ENABLED(X86_64) && !IS_ENABLED(CONFIG_EFI_APP)) arch_setup_gd(new_gd); -#ifdef CONFIG_NEEDS_MANUAL_RELOC - int i; -#endif - #if !defined(CONFIG_X86) && !defined(CONFIG_ARM) && !defined(CONFIG_ARM64) gd = new_gd; #endif gd->flags &= ~GD_FLG_LOG_READY; -#ifdef CONFIG_NEEDS_MANUAL_RELOC - for (i = 0; i < ARRAY_SIZE(init_sequence_r); i++) - init_sequence_r[i] += gd->reloc_off; -#endif + if (IS_ENABLED(CONFIG_NEEDS_MANUAL_RELOC)) { + for (int i = 0; i < ARRAY_SIZE(init_sequence_r); i++) + MANUAL_RELOC(init_sequence_r[i]); + } if (initcall_run_list(init_sequence_r)) hang(); -- 2.36.0

2 1