May 2022 - U-Boot

[PATCH 1/1] lib: fix selection of CONFIG_CHARSET
by Heinrich Schuchardt 02 May '22

02 May '22

lib/charset.c is not optional for EFI_APP || EFI_LOADER || UFS || UT_UNICODE. These must select CONFIG_CHARSET. Fixes: 726cd9836db0 ("efi: Make unicode printf available to the app") Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- drivers/ufs/Kconfig | 1 + lib/Kconfig | 5 ----- lib/efi/Kconfig | 1 + lib/efi_loader/Kconfig | 1 + test/Kconfig | 1 + 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/ufs/Kconfig b/drivers/ufs/Kconfig index c2aafd3020..69ea18edf8 100644 --- a/drivers/ufs/Kconfig +++ b/drivers/ufs/Kconfig @@ -3,6 +3,7 @@ menu "UFS Host Controller Support" config UFS bool "Support UFS controllers" depends on DM_SCSI + select CHARSET help This selects support for Universal Flash Subsystem (UFS). Say Y here if you want UFS Support. diff --git a/lib/Kconfig b/lib/Kconfig index 858be14f09..25d15058e9 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -52,11 +52,6 @@ config CC_OPTIMIZE_LIBS_FOR_SPEED config CHARSET bool - default y if UT_UNICODE || EFI_LOADER || UFS || EFI_APP - help - Enables support for various conversions between different - character sets, such as between unicode representations and - different 'code pages'. config DYNAMIC_CRC_TABLE bool "Enable Dynamic tables for CRC" diff --git a/lib/efi/Kconfig b/lib/efi/Kconfig index 15ce99e1a7..c2b9bb73f7 100644 --- a/lib/efi/Kconfig +++ b/lib/efi/Kconfig @@ -14,6 +14,7 @@ choice config EFI_APP bool "Support running as an EFI application" + select CHARSET help Build U-Boot as an application which can be started from EFI. This is useful for examining a platform in the early stages of porting diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig index 6b245f50a7..eb2d6fddc4 100644 --- a/lib/efi_loader/Kconfig +++ b/lib/efi_loader/Kconfig @@ -14,6 +14,7 @@ config EFI_LOADER depends on DM_ETH || !NET depends on !EFI_APP default y if !ARM || SYS_CPU = armv7 || SYS_CPU = armv8 + select CHARSET select DM_EVENT select EVENT_DYNAMIC select LIB_UUID diff --git a/test/Kconfig b/test/Kconfig index e15ba239eb..7f3447ae5a 100644 --- a/test/Kconfig +++ b/test/Kconfig @@ -91,6 +91,7 @@ config UT_UNICODE bool "Unit tests for Unicode functions" depends on UNIT_TEST default y + select CHARSET help Enables the 'ut unicode' command which tests that the functions for manipulating Unicode strings work correctly. -- 2.34.1

1 0

[PATCH 1/1] cmd: simplify bootmenu
by Heinrich Schuchardt 01 May '22

01 May '22

* correct output for timeout > 99 s * don't use spaces to advance to the output column Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- cmd/bootmenu.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/cmd/bootmenu.c b/cmd/bootmenu.c index d573487272..fe35607472 100644 --- a/cmd/bootmenu.c +++ b/cmd/bootmenu.c @@ -68,9 +68,7 @@ static void bootmenu_print_entry(void *data) * Move cursor to line where the entry will be drown (entry->num) * First 3 lines contain bootmenu header + 1 empty line */ - printf(ANSI_CURSOR_POSITION, entry->num + 4, 1); - - puts(" "); + printf(ANSI_CURSOR_POSITION, entry->num + 4, 7); if (reverse) puts(ANSI_COLOR_REVERSE); @@ -86,12 +84,9 @@ static void bootmenu_autoboot_loop(struct bootmenu_data *menu, { int i, c; - if (menu->delay > 0) { - printf(ANSI_CURSOR_POSITION, menu->count + 5, 1); - printf(" Hit any key to stop autoboot: %2d ", menu->delay); - } - while (menu->delay > 0) { + printf(ANSI_CURSOR_POSITION, menu->count + 5, 3); + printf("Hit any key to stop autoboot: %d ", menu->delay); for (i = 0; i < 100; ++i) { if (!tstc()) { WATCHDOG_RESET(); @@ -125,7 +120,6 @@ static void bootmenu_autoboot_loop(struct bootmenu_data *menu, break; --menu->delay; - printf("\b\b\b%2d ", menu->delay); } printf(ANSI_CURSOR_POSITION, menu->count + 5, 1); @@ -407,8 +401,8 @@ static void menu_display_statusline(struct menu *m) printf(ANSI_CURSOR_POSITION, 1, 1); puts(ANSI_CLEAR_LINE); - printf(ANSI_CURSOR_POSITION, 2, 1); - puts(" *** U-Boot Boot Menu ***"); + printf(ANSI_CURSOR_POSITION, 2, 3); + puts("*** U-Boot Boot Menu ***"); puts(ANSI_CLEAR_LINE_TO_END); printf(ANSI_CURSOR_POSITION, 3, 1); puts(ANSI_CLEAR_LINE); @@ -416,8 +410,8 @@ static void menu_display_statusline(struct menu *m) /* First 3 lines are bootmenu header + 2 empty lines between entries */ printf(ANSI_CURSOR_POSITION, menu->count + 5, 1); puts(ANSI_CLEAR_LINE); - printf(ANSI_CURSOR_POSITION, menu->count + 6, 1); - puts(" Press UP/DOWN to move, ENTER to select, ESC/CTRL+C to quit"); + printf(ANSI_CURSOR_POSITION, menu->count + 6, 3); + puts("Press UP/DOWN to move, ENTER to select, ESC/CTRL+C to quit"); puts(ANSI_CLEAR_LINE_TO_END); printf(ANSI_CURSOR_POSITION, menu->count + 7, 1); puts(ANSI_CLEAR_LINE); -- 2.34.1

1 0

[PATCH] powerpc: mmu: Fix FSL_BOOKE_MAS2() macro
by Pali Rohár 01 May '22

01 May '22

Effective page number mask for MAS2 register is stored in macro MAS2_EPN. Fixes: 2146cf56821c ("Reworked FSL Book-E TLB macros to be more readable") Signed-off-by: Pali Rohár <pali(a)kernel.org> --- arch/powerpc/include/asm/mmu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/include/asm/mmu.h b/arch/powerpc/include/asm/mmu.h index 2e6255f0d606..b0aafdcdae10 100644 --- a/arch/powerpc/include/asm/mmu.h +++ b/arch/powerpc/include/asm/mmu.h @@ -447,7 +447,7 @@ extern void print_bats(void); (((ts) << 12) & MAS1_TS) |\ (MAS1_TSIZE(tsize))) #define FSL_BOOKE_MAS2(epn, wimge) \ - (((epn) & MAS3_RPN) | (wimge)) + (((epn) & MAS2_EPN) | (wimge)) #define FSL_BOOKE_MAS3(rpn, user, perms) \ (((rpn) & MAS3_RPN) | (user) | (perms)) #define FSL_BOOKE_MAS7(rpn) \ -- 2.20.1

1 0

Pull request for efi-2022-07-rc2
by Heinrich Schuchardt 01 May '22

01 May '22

Dear Tom, The following changes since commit 8b2b125e95c44bb007b4573945f4aedb8a56222c: Merge https://gitlab.denx.de/u-boot/custodians/u-boot-mpc85xx (2022-04-27 09:19:41 -0400) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-efi.git tags/efi-2022-07-rc2 for you to fetch changes up to 5e847f7729b3cc34b572b4f59ee7d468b3b76ccc: efi_loader: call efi_init_early() earlier ---------------------------------------------------------------- Pull request for efi-2022-07-rc2 UEFI: * fix UEFI booting after integration of UEFI sub-system with driver model * avoid random return values from devpath_is_partition() * minor code clean ups ---------------------------------------------------------------- AKASHI Takahiro (1): efi_loader: disk: allow blk devices even without UCLASS_PARTITION Heinrich Schuchardt (5): efi_loader: don't call log with __func__ as parameter efi: fix devpath_is_partition() efi_loader: simplify try_load_entry() efi_loader: simplify efi_add_conventional_memory_map() efi_loader: call efi_init_early() earlier common/board_r.c | 6 +++--- lib/efi/efi_app.c | 2 +- lib/efi_loader/efi_bootmgr.c | 15 +++++---------- lib/efi_loader/efi_disk.c | 29 +++++++++++++++-------------- lib/efi_loader/efi_memory.c | 2 +- 5 files changed, 25 insertions(+), 29 deletions(-)

2 1

[PATCH] powerpc: fsl_law: Add definition for first PCIe target interface
by Pali Rohár 01 May '22

01 May '22

Header file asm/fsl_law.h already provides correct definition for second and third PCIe controller (LAW_TRGT_IF_PCIE_2 and LAW_TRGT_IF_PCIE_3). But is missing definition for the first PCIe controller (LAW_TRGT_IF_PCIE_1). Note that existing definition for LAW_TRGT_IF_PCIE_2 and LAW_TRGT_IF_PCIE_3 are slightly complicated, but are really correct for P2020 platform. Signed-off-by: Pali Rohár <pali(a)kernel.org> --- arch/powerpc/include/asm/fsl_law.h | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/powerpc/include/asm/fsl_law.h b/arch/powerpc/include/asm/fsl_law.h index 39fbc04e4744..9e2f2d5370d9 100644 --- a/arch/powerpc/include/asm/fsl_law.h +++ b/arch/powerpc/include/asm/fsl_law.h @@ -78,6 +78,7 @@ enum law_trgt_if { enum law_trgt_if { LAW_TRGT_IF_PCI = 0x00, LAW_TRGT_IF_PCI_2 = 0x01, + LAW_TRGT_IF_PCIE_1 = 0x02, #if defined(CONFIG_ARCH_BSC9131) || defined(CONFIG_ARCH_BSC9132) LAW_TRGT_IF_OCN_DSP = 0x03, #else -- 2.20.1

1 0

[RFC 0/3] imx8m: Remove manual UART clock initialization
by Adam Ford 01 May '22

01 May '22

This series is an RFC focussing on only the i.MX8M Mini until feedback is received when the series can be expanded to other imx boards. This series adds the UART clocks to the CCF, adds functions to the serial driver to fetch, enable, and query the clock(s), and finally removes the manual clock intialization from SPL. Once feedback is received and final method is accepted, it can be expanded to other boards. Adam Ford (3): clk: imx8mm: Add UART clocks serial: mxc: Enable getting and enabling clocks with CCF Composite imx8: imx8mm_beacon: Remove manual UART clock initialization board/beacon/imx8mm/spl.c | 2 -- drivers/clk/imx/clk-imx8mm.c | 30 +++++++++++++++++++++ drivers/serial/serial_mxc.c | 39 ++++++++++++++++++++++++++- include/dm/platform_data/serial_mxc.h | 2 ++ 4 files changed, 70 insertions(+), 3 deletions(-) -- 2.34.1

2 5

[PATCH] board: freescale: p1_p2_rdb_pc: Enable TDM function only for P1010
by Pali Rohár 01 May '22

01 May '22

TDM function is supported only on P1010. P2020 does not have PMUXCR_TDM_ENA register, so do not enable it. Signed-off-by: Pali Rohár <pali(a)kernel.org> --- board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c index e559a77b2dac..2e1aff59b15b 100644 --- a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c +++ b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c @@ -154,7 +154,9 @@ int board_early_init_f(void) clrbits_be32(&gur->sdhcdcr, SDHCDCR_CD_INV); clrbits_be32(&gur->pmuxcr, MPC85xx_PMUXCR_SD_DATA); +#if defined(CONFIG_TARGET_P1020RDB_PD) || defined(CONFIG_TARGET_P1020RDB_PC) setbits_be32(&gur->pmuxcr, MPC85xx_PMUXCR_TDM_ENA); +#endif board_gpio_init(); board_cpld_init(); -- 2.20.1

1 0

[PATCH 1/1] efi_selftest: error handling in efi_selftest_tcg2
by Heinrich Schuchardt 01 May '22

01 May '22

If memory allocation fails, write an error message. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- lib/efi_selftest/efi_selftest_tcg2.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/efi_selftest/efi_selftest_tcg2.c b/lib/efi_selftest/efi_selftest_tcg2.c index a2b4a79e9b..67a886efaa 100644 --- a/lib/efi_selftest/efi_selftest_tcg2.c +++ b/lib/efi_selftest/efi_selftest_tcg2.c @@ -631,8 +631,10 @@ static int efi_st_tcg2_setup(const efi_handle_t img_handle, sizeof(struct efi_tcg2_event) + sizeof(struct uefi_image_load_event), (void **)&efi_tcg2_event); - if (!efi_tcg2_event) + if (ret != EFI_SUCCESS) { + efi_st_error("Out of memory\n"); return EFI_ST_FAILURE; + } efi_tcg2_event->size = sizeof(struct efi_tcg2_event) + sizeof(struct uefi_image_load_event); @@ -659,8 +661,10 @@ static int efi_st_tcg2_setup(const efi_handle_t img_handle, (EFI_TCG2_MAX_PCR_INDEX + 1) * TPM2_SHA256_DIGEST_SIZE, (void **)&pcrs); - if (!pcrs) + if (ret != EFI_SUCCESS) { + efi_st_error("Out of memory\n"); return EFI_ST_FAILURE; + } boottime->set_mem(pcrs, (EFI_TCG2_MAX_PCR_INDEX + 1) * TPM2_SHA256_DIGEST_SIZE, 0); -- 2.34.1

1 0

[PATCH 1/1] efi_selftest: clean up unaligned unit test
by Heinrich Schuchardt 01 May '22

01 May '22

* fix typo %s/give/given/ * don't use void * in pointer arithmetic Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- lib/efi_selftest/efi_selftest_unaligned.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/efi_selftest/efi_selftest_unaligned.c b/lib/efi_selftest/efi_selftest_unaligned.c index 6fce110b76..7c6bf2d6e8 100644 --- a/lib/efi_selftest/efi_selftest_unaligned.c +++ b/lib/efi_selftest/efi_selftest_unaligned.c @@ -14,14 +14,14 @@ struct aligned_buffer { }; /* - * Return an u32 at a give address. + * Return an u32 at a given address. * If the address is not four byte aligned, an unaligned memory access * occurs. * * @addr: address to read * Return: value at the address */ -static inline u32 deref(u32 *addr) +static inline u32 deref(void *addr) { int ret; @@ -43,12 +43,11 @@ static int execute(void) { struct aligned_buffer buf = { {0, 1, 2, 3, 4, 5, 6, 7}, - }; - void *v = &buf; + }; u32 r = 0; /* Read an unaligned address */ - r = deref(v + 1); + r = deref(&buf.a[1]); /* UEFI only supports low endian systems */ if (r != 0x04030201) { -- 2.34.1

1 0

[PATCH 1/1] efi_selftest: buildefi_selftest_unaligned.c
by Heinrich Schuchardt 01 May '22

01 May '22

The unit test has not been built since CPU_V7 was rename CPU_V7A. Fixes: acf1500138bb ("arm: v7: Kconfig: Rename CPU_V7 as CPU_V7A") Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- lib/efi_selftest/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/efi_selftest/Makefile b/lib/efi_selftest/Makefile index be8040d1c7..33536c9ec0 100644 --- a/lib/efi_selftest/Makefile +++ b/lib/efi_selftest/Makefile @@ -55,7 +55,9 @@ obj-$(CONFIG_EFI_DEVICE_PATH_TO_TEXT) += efi_selftest_devicepath.o obj-$(CONFIG_EFI_UNICODE_COLLATION_PROTOCOL2) += \ efi_selftest_unicode_collation.o -obj-$(CONFIG_CPU_V7) += efi_selftest_unaligned.o +ifeq ($(CONFIG_CPU_V7A)$(CONFIG_CPU_V7M)$(CONFIG_CPU_V7R),y) +obj-y += efi_selftest_unaligned.o +endif obj-$(CONFIG_EFI_LOADER_HII) += efi_selftest_hii.o obj-$(CONFIG_EFI_RNG_PROTOCOL) += efi_selftest_rng.o obj-$(CONFIG_EFI_GET_TIME) += efi_selftest_rtc.o -- 2.34.1

1 0