March 2022 - U-Boot

[PATCH 1/1] Makefile: make clean should delete include/generated/env.in
by Heinrich Schuchardt 31 Mar '22

31 Mar '22

'make sifive_unamtched_defconfig; make clean; make' fails if file include/generated/env.in exists. 'make clean' should remove all files that stop building. Add file include/generated/env.in to the clean target. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 6998388884..c1d4702a4e 100644 --- a/Makefile +++ b/Makefile @@ -2187,8 +2187,8 @@ CLEAN_DIRS += $(MODVERDIR) \ $(filter-out include, $(shell ls -1 $d 2>/dev/null)))) CLEAN_FILES += include/bmp_logo.h include/bmp_logo_data.h \ - drivers/video/u_boot_logo.S tools/version.h \ - u-boot* MLO* SPL System.map fit-dtb.blob* \ + include/generated/env.in drivers/video/u_boot_logo.S \ + tools/version.h u-boot* MLO* SPL System.map fit-dtb.blob* \ u-boot-ivt.img.log u-boot-dtb.imx.log SPL.log u-boot.imx.log \ lpc32xx-* bl31.c bl31.elf bl31_*.bin image.map tispl.bin* \ idbloader.img flash.bin flash.log defconfig keep-syms-lto.c \ -- 2.34.1

3 2

[PATCH] video: Do not show splash and U-Boot logo simultaneously
by Fabio Estevam 31 Mar '22

31 Mar '22

From: Fabio Estevam <festevam(a)denx.de> Currently, on imx6sabresd and gwventana boards, the company logo and U-Boot logo are shown. The correct behavior is to show only the company logo, if available, and not both logos. Reported-by: Tim Harvey <tharvey(a)gateworks.com> Signed-off-by: Fabio Estevam <festevam(a)denx.de> --- drivers/video/video-uclass.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c index 88797d4a21c2..42f9245ea8c5 100644 --- a/drivers/video/video-uclass.c +++ b/drivers/video/video-uclass.c @@ -407,7 +407,8 @@ static int video_post_probe(struct udevice *dev) return ret; } - if (IS_ENABLED(CONFIG_VIDEO_LOGO) && !plat->hide_logo) { + if (IS_ENABLED(CONFIG_VIDEO_LOGO) && + !IS_ENABLED(CONFIG_SPLASH_SCREEN) && !plat->hide_logo) { ret = show_splash(dev); if (ret) { log_debug("Cannot show splash screen\n"); -- 2.25.1

3 3

[PATCH v1 1/1] Revert "x86: Move FACP table into separate functions"
by Andy Shevchenko 31 Mar '22

31 Mar '22

Before the culprit patch (see BugLink for the details): => acpi list Name Base Size Detail ---- -------- ----- ------ RSDP 000e4500 24 v02 U-BOOT RSDT 000e4530 38 v01 U-BOOT U-BOOTBL 20220401 INTL 0 XSDT 000e45e0 4c v01 U-BOOT U-BOOTBL 20220401 INTL 0 CSRT 000e5490 58 v00 U-BOOT U-BOOTBL 20220401 INTL 0 FACP 000e54f0 114 v06 U-BOOT U-BOOTBL 20220401 INTL 0 DSDT 000e4780 c06 v02 U-BOOT U-BOOTBL 10000 INTL 20200925 FACS 000e4740 40 MCFG 000e5610 3c v01 U-BOOT U-BOOTBL 20220401 INTL 0 SPCR 000e5650 50 v02 U-BOOT U-BOOTBL 20220401 INTL 0 APIC 000e56a0 48 v02 U-BOOT U-BOOTBL 20220401 INTL 0 After the culprit patch: => acpi list Name Base Size Detail ---- -------- ----- ------ RSDP 000e4500 24 v02 U-BOOT RSDT 000e4530 34 v01 U-BOOT U-BOOTBL 20220401 INTL 0 XSDT 000e45e0 44 v01 U-BOOT U-BOOTBL 20220401 INTL 0 CSRT 000e53a0 58 v00 U-BOOT U-BOOTBL 20220401 INTL 0 MCFG 000e5520 3c v01 U-BOOT U-BOOTBL 20220401 INTL 0 SPCR 000e5560 50 v02 U-BOOT U-BOOTBL 20220401 INTL 0 APIC 000e55b0 48 v02 U-BOOT U-BOOTBL 20220401 INTL 0 As a result Linux kernel can't find mandatory tables and fails to boot. Hence, revert it for good. This reverts commit 379d3c1fd6aa490b1ad5697525cfc89b615cf25a. BugLink: https://lore.kernel.org/all/20220131225930.GJ7515@bill-the-cat/ Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> --- arch/x86/cpu/apollolake/acpi.c | 17 ++++------------- arch/x86/cpu/baytrail/acpi.c | 27 ++++++++------------------- arch/x86/cpu/quark/acpi.c | 27 ++++++++------------------- arch/x86/cpu/tangier/acpi.c | 25 ++++++++----------------- arch/x86/include/asm/acpi_table.h | 2 ++ arch/x86/lib/acpi_table.c | 15 +++++++++++++++ 6 files changed, 45 insertions(+), 68 deletions(-) diff --git a/arch/x86/cpu/apollolake/acpi.c b/arch/x86/cpu/apollolake/acpi.c index a3dd7373af0d..fd21c0b49684 100644 --- a/arch/x86/cpu/apollolake/acpi.c +++ b/arch/x86/cpu/apollolake/acpi.c @@ -146,25 +146,16 @@ void fill_fadt(struct acpi_fadt *fadt) fadt->x_pm_tmr_blk.addrl = IOMAP_ACPI_BASE + PM1_TMR; } -static int apl_write_fadt(struct acpi_ctx *ctx, const struct acpi_writer *entry) +void acpi_create_fadt(struct acpi_fadt *fadt, struct acpi_facs *facs, + void *dsdt) { - struct acpi_table_header *header; - struct acpi_fadt *fadt; + struct acpi_table_header *header = &fadt->header; - fadt = ctx->current; - acpi_fadt_common(fadt, ctx->facs, ctx->dsdt); + acpi_fadt_common(fadt, facs, dsdt); intel_acpi_fill_fadt(fadt); fill_fadt(fadt); - header = &fadt->header; header->checksum = table_compute_checksum(fadt, header->length); - - acpi_add_table(ctx, fadt); - - acpi_inc(ctx, sizeof(struct acpi_fadt)); - - return 0; } -ACPI_WRITER(5fadt, "FACS", apl_write_fadt, 0); int apl_acpi_fill_dmar(struct acpi_ctx *ctx) { diff --git a/arch/x86/cpu/baytrail/acpi.c b/arch/x86/cpu/baytrail/acpi.c index 59db2e2c5d84..07757b88a305 100644 --- a/arch/x86/cpu/baytrail/acpi.c +++ b/arch/x86/cpu/baytrail/acpi.c @@ -15,24 +15,20 @@ #include <asm/arch/iomap.h> #include <dm/uclass-internal.h> -static int baytrail_write_fadt(struct acpi_ctx *ctx, - const struct acpi_writer *entry) +void acpi_create_fadt(struct acpi_fadt *fadt, struct acpi_facs *facs, + void *dsdt) { - struct acpi_table_header *header; - struct acpi_fadt *fadt; - - fadt = ctx->current; - header = &fadt->header; + struct acpi_table_header *header = &(fadt->header); u16 pmbase = ACPI_BASE_ADDRESS; - memset(fadt, '\0', sizeof(struct acpi_fadt)); + memset((void *)fadt, 0, sizeof(struct acpi_fadt)); acpi_fill_header(header, "FACP"); header->length = sizeof(struct acpi_fadt); header->revision = 4; - fadt->firmware_ctrl = (u32)ctx->facs; - fadt->dsdt = (u32)ctx->dsdt; + fadt->firmware_ctrl = (u32)facs; + fadt->dsdt = (u32)dsdt; fadt->preferred_pm_profile = ACPI_PM_MOBILE; fadt->sci_int = 9; fadt->smi_cmd = 0; @@ -79,9 +75,9 @@ static int baytrail_write_fadt(struct acpi_ctx *ctx, fadt->reset_reg.addrh = 0; fadt->reset_value = SYS_RST | RST_CPU | FULL_RST; - fadt->x_firmware_ctl_l = (u32)ctx->facs; + fadt->x_firmware_ctl_l = (u32)facs; fadt->x_firmware_ctl_h = 0; - fadt->x_dsdt_l = (u32)ctx->dsdt; + fadt->x_dsdt_l = (u32)dsdt; fadt->x_dsdt_h = 0; fadt->x_pm1a_evt_blk.space_id = ACPI_ADDRESS_SPACE_IO; @@ -141,14 +137,7 @@ static int baytrail_write_fadt(struct acpi_ctx *ctx, fadt->x_gpe1_blk.addrh = 0x0; header->checksum = table_compute_checksum(fadt, header->length); - - acpi_add_table(ctx, fadt); - - acpi_inc(ctx, sizeof(struct acpi_fadt)); - - return 0; } -ACPI_WRITER(5fadt, "FACP", baytrail_write_fadt, 0); int acpi_create_gnvs(struct acpi_global_nvs *gnvs) { diff --git a/arch/x86/cpu/quark/acpi.c b/arch/x86/cpu/quark/acpi.c index 9ce9ee3aabf9..82b776ff65f6 100644 --- a/arch/x86/cpu/quark/acpi.c +++ b/arch/x86/cpu/quark/acpi.c @@ -10,24 +10,20 @@ #include <asm/arch/global_nvs.h> #include <asm/arch/iomap.h> -static int quark_write_fadt(struct acpi_ctx *ctx, - const struct acpi_writer *entry) +void acpi_create_fadt(struct acpi_fadt *fadt, struct acpi_facs *facs, + void *dsdt) { + struct acpi_table_header *header = &(fadt->header); u16 pmbase = ACPI_PM1_BASE_ADDRESS; - struct acpi_table_header *header; - struct acpi_fadt *fadt; - fadt = ctx->current; - header = &fadt->header; - - memset(fadt, '\0', sizeof(struct acpi_fadt)); + memset((void *)fadt, 0, sizeof(struct acpi_fadt)); acpi_fill_header(header, "FACP"); header->length = sizeof(struct acpi_fadt); header->revision = 4; - fadt->firmware_ctrl = (u32)ctx->facs; - fadt->dsdt = (u32)ctx->dsdt; + fadt->firmware_ctrl = (u32)facs; + fadt->dsdt = (u32)dsdt; fadt->preferred_pm_profile = ACPI_PM_UNSPECIFIED; fadt->sci_int = 9; fadt->smi_cmd = 0; @@ -74,9 +70,9 @@ static int quark_write_fadt(struct acpi_ctx *ctx, fadt->reset_reg.addrh = 0; fadt->reset_value = SYS_RST | RST_CPU | FULL_RST; - fadt->x_firmware_ctl_l = (u32)ctx->facs; + fadt->x_firmware_ctl_l = (u32)facs; fadt->x_firmware_ctl_h = 0; - fadt->x_dsdt_l = (u32)ctx->dsdt; + fadt->x_dsdt_l = (u32)dsdt; fadt->x_dsdt_h = 0; fadt->x_pm1a_evt_blk.space_id = ACPI_ADDRESS_SPACE_IO; @@ -136,14 +132,7 @@ static int quark_write_fadt(struct acpi_ctx *ctx, fadt->x_gpe1_blk.addrh = 0x0; header->checksum = table_compute_checksum(fadt, header->length); - - acpi_add_table(ctx, fadt); - - acpi_inc(ctx, sizeof(struct acpi_fadt)); - - return 0; } -ACPI_WRITER(5fadt, "FACP", quark_write_fadt, 0); int acpi_create_gnvs(struct acpi_global_nvs *gnvs) { diff --git a/arch/x86/cpu/tangier/acpi.c b/arch/x86/cpu/tangier/acpi.c index e3a2fcea76d0..3ffba3897aad 100644 --- a/arch/x86/cpu/tangier/acpi.c +++ b/arch/x86/cpu/tangier/acpi.c @@ -16,23 +16,19 @@ #include <asm/arch/iomap.h> #include <dm/uclass-internal.h> -static int tangier_write_fadt(struct acpi_ctx *ctx, - const struct acpi_writer *entry) +void acpi_create_fadt(struct acpi_fadt *fadt, struct acpi_facs *facs, + void *dsdt) { - struct acpi_table_header *header; - struct acpi_fadt *fadt; + struct acpi_table_header *header = &(fadt->header); - fadt = ctx->current; - header = &fadt->header; - - memset(fadt, '\0', sizeof(struct acpi_fadt)); + memset((void *)fadt, 0, sizeof(struct acpi_fadt)); acpi_fill_header(header, "FACP"); header->length = sizeof(struct acpi_fadt); header->revision = 6; - fadt->firmware_ctrl = (u32)ctx->facs; - fadt->dsdt = (u32)ctx->dsdt; + fadt->firmware_ctrl = (u32)facs; + fadt->dsdt = (u32)dsdt; fadt->preferred_pm_profile = ACPI_PM_UNSPECIFIED; fadt->iapc_boot_arch = ACPI_FADT_VGA_NOT_PRESENT | @@ -45,18 +41,13 @@ static int tangier_write_fadt(struct acpi_ctx *ctx, fadt->minor_revision = 2; - fadt->x_firmware_ctl_l = (u32)ctx->facs; + fadt->x_firmware_ctl_l = (u32)facs; fadt->x_firmware_ctl_h = 0; - fadt->x_dsdt_l = (u32)ctx->dsdt; + fadt->x_dsdt_l = (u32)dsdt; fadt->x_dsdt_h = 0; header->checksum = table_compute_checksum(fadt, header->length); - - acpi_inc(ctx, sizeof(struct acpi_fadt)); - - return 0; } -ACPI_WRITER(5fadt, "FACP", tangier_write_fadt, 0); u32 acpi_fill_madt(u32 current) { diff --git a/arch/x86/include/asm/acpi_table.h b/arch/x86/include/asm/acpi_table.h index 226753b65d6a..72e1873d15dc 100644 --- a/arch/x86/include/asm/acpi_table.h +++ b/arch/x86/include/asm/acpi_table.h @@ -24,6 +24,8 @@ struct acpi_table_header; /* These can be used by the target port */ +void acpi_create_fadt(struct acpi_fadt *fadt, struct acpi_facs *facs, + void *dsdt); int acpi_create_madt_lapics(u32 current); int acpi_create_madt_ioapic(struct acpi_madt_ioapic *ioapic, u8 id, u32 addr, u32 gsi_base); diff --git a/arch/x86/lib/acpi_table.c b/arch/x86/lib/acpi_table.c index c5b33dc65de4..e3b7e9a4bbe8 100644 --- a/arch/x86/lib/acpi_table.c +++ b/arch/x86/lib/acpi_table.c @@ -458,6 +458,21 @@ int acpi_write_gnvs(struct acpi_ctx *ctx, const struct acpi_writer *entry) } ACPI_WRITER(4gnvs, "GNVS", acpi_write_gnvs, 0); +static int acpi_write_fadt(struct acpi_ctx *ctx, + const struct acpi_writer *entry) +{ + struct acpi_fadt *fadt; + + fadt = ctx->current; + acpi_create_fadt(fadt, ctx->facs, ctx->dsdt); + acpi_add_table(ctx, fadt); + + acpi_inc(ctx, sizeof(struct acpi_fadt)); + + return 0; +} +ACPI_WRITER(5fact, "FADT", acpi_write_fadt, 0); + /** * acpi_write_hpet() - Write out a HPET table * -- 2.35.1

2 1

[PATCH v2] board: gateworks: venice: determine dram size at runtime
by Tim Harvey 31 Mar '22

31 Mar '22

The SPL does not update the memory node with the dram size from EEPROM but instead we can use get_ram_size which does a simple memory test to determine the available RAM. Update PHYS_SDRAM_SIZE to 4GiB as that is the max used on the Venice boards. Signed-off-by: Tim Harvey <tharvey(a)gateworks.com> Reviewed-by: Fabio Estevam <festevam(a)denx.de> --- v2: - bump PHYS_SDRAM_SIZE for imx8mn_venice to account for boards that have more than 1GiB of DRAM - added Fabio's rb tag --- board/gateworks/venice/venice.c | 13 ++----------- include/configs/imx8mm_venice.h | 2 +- include/configs/imx8mn_venice.h | 2 +- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/board/gateworks/venice/venice.c b/board/gateworks/venice/venice.c index 4e05802b6ff1..5334500ef6a7 100644 --- a/board/gateworks/venice/venice.c +++ b/board/gateworks/venice/venice.c @@ -21,19 +21,10 @@ DECLARE_GLOBAL_DATA_PTR; int board_phys_sdram_size(phys_size_t *size) { - const fdt64_t *val; - int offset; - int len; - - /* get size from dt which SPL updated per EEPROM config */ - offset = fdt_path_offset(gd->fdt_blob, "/memory"); - if (offset < 0) + if (!size) return -EINVAL; - val = fdt_getprop(gd->fdt_blob, offset, "reg", &len); - if (len < sizeof(*val) * 2) - return -EINVAL; - *size = get_unaligned_be64(&val[1]); + *size = get_ram_size((void *)PHYS_SDRAM, PHYS_SDRAM_SIZE); return 0; } diff --git a/include/configs/imx8mm_venice.h b/include/configs/imx8mm_venice.h index 1ec27f40f2b5..a3649702e955 100644 --- a/include/configs/imx8mm_venice.h +++ b/include/configs/imx8mm_venice.h @@ -83,7 +83,7 @@ /* SDRAM configuration */ #define PHYS_SDRAM 0x40000000 -#define PHYS_SDRAM_SIZE SZ_1G /* 1GB DDR */ +#define PHYS_SDRAM_SIZE SZ_4G #define CONFIG_SYS_BOOTM_LEN SZ_256M /* UART */ diff --git a/include/configs/imx8mn_venice.h b/include/configs/imx8mn_venice.h index c01a590c8af6..c68cc96a7300 100644 --- a/include/configs/imx8mn_venice.h +++ b/include/configs/imx8mn_venice.h @@ -80,7 +80,7 @@ /* SDRAM configuration */ #define PHYS_SDRAM 0x40000000 -#define PHYS_SDRAM_SIZE SZ_1G +#define PHYS_SDRAM_SIZE SZ_4G #define CONFIG_SYS_BOOTM_LEN SZ_256M /* UART */ -- 2.17.1

3 3

[PATCH] board: gw_ventana: gsc: fix GSC read/write functions
by Tim Harvey 31 Mar '22

31 Mar '22

commit 7c84319af9c7 ("dm: gpio: Correct use of -ENODEV in drivers") changed the return code for an I2C NAK from -ENODEV to -EREMOTEIO. Update the gsc_i2c_read and gsc_i2c_write functions for this change to properly retry the transaction on a NAK meaning the GSC is busy. Fixes: 7c84319af9c7 ("dm: gpio: Correct use of -ENODEV in drivers") Signed-off-by: Tim Harvey <tharvey(a)gateworks.com> --- board/gateworks/gw_ventana/gsc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/gateworks/gw_ventana/gsc.c b/board/gateworks/gw_ventana/gsc.c index 324e5dbed2c8..a5d6de7e0e8e 100644 --- a/board/gateworks/gw_ventana/gsc.c +++ b/board/gateworks/gw_ventana/gsc.c @@ -41,7 +41,7 @@ int gsc_i2c_read(uchar chip, uint addr, int alen, uchar *buf, int len) break; debug("%s: 0x%02x 0x%02x retry%d: %d\n", __func__, chip, addr, n, ret); - if (ret != -ENODEV) + if (ret != -EREMOTEIO) break; mdelay(10); } @@ -60,7 +60,7 @@ int gsc_i2c_write(uchar chip, uint addr, int alen, uchar *buf, int len) break; debug("%s: 0x%02x 0x%02x retry%d: %d\n", __func__, chip, addr, n, ret); - if (ret != -ENODEV) + if (ret != -EREMOTEIO) break; mdelay(10); } -- 2.17.1

3 6

[PATCH v2 1/3] video: Add VIDEO_FONT_4x6 to Kconfig add fix compile waring
by qianfanguijin＠163.com 31 Mar '22

31 Mar '22

From: qianfan Zhao <qianfanguijin(a)163.com> CONFIG_VIDEO_FONT_4x6 is referenced in include/video_font.h, but doesn't has a Kconfig configuration. Add it. Signed-off-by: qianfan Zhao <qianfanguijin(a)163.com> --- drivers/video/Kconfig | 15 +++++++++++++++ include/video_font_4x6.h | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index e2cf1e752f..adc620682e 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -138,6 +138,21 @@ config CONSOLE_NORMAL CONFIG_CONSOLE_ROTATION for that). A built-in 8x16 font is used for the display. +choice + prompt "bitmap video font" + default VIDEO_FONT_8X16 + depends on CONSOLE_NORMAL + help + Select the default bitmap font. + +config VIDEO_FONT_4X6 + bool "4x6" + +config VIDEO_FONT_8X16 + bool "8x16" + +endchoice + config CONSOLE_ROTATION bool "Support rotated displays" depends on DM_VIDEO diff --git a/include/video_font_4x6.h b/include/video_font_4x6.h index c7e6351b64..65dd5e8c1d 100644 --- a/include/video_font_4x6.h +++ b/include/video_font_4x6.h @@ -46,7 +46,7 @@ __END__; #define VIDEO_FONT_HEIGHT 6 #define VIDEO_FONT_SIZE (VIDEO_FONT_CHARS * VIDEO_FONT_HEIGHT) -static unsigned char video_fontdata[VIDEO_FONT_SIZE] = { +static unsigned char __maybe_unused video_fontdata[VIDEO_FONT_SIZE] = { /*{*/ /* Char 0: ' ' */ -- 2.17.1

1 2

[PATCH v3 0/9] efi: capsule: Capsule Update fixes and enhancements
by Sughosh Ganu 31 Mar '22

31 Mar '22

This series is cleaning up the usage of the image GUIDs that are used in capsule update and the EFI System Resource Table(ESRT). There are some other enhancements being made to the capsule update code to make it more robust. Firstly, an overview of the fixes being made. Currently, there are two instances of the Firmware Management Protocol(FMP), one defined for updating the FIT images, and the other for updating raw images. The FMP code defines two GUID values, one for all FIT images, and one for raw images. Depending on the FMP instance used on a platform, the platform needs to use the corresponding image GUID value for all images on the platform, and also across platforms. A few issues are being fixed through the patch series. One, that an image for a different platform can be flashed on another platform if both the platforms are using the same FMP instance. So, for e.g. a capsule generated for the Socionext DeveloperBox platform can be flashed on the ZynqMP platform, since both the platforms use the CONFIG_EFI_CAPSULE_FIRMWARE_RAW instance of the FMP. This can be corrected if each firmware image that can be updated through the capsule update mechanism has it's own unique image GUID. The second issue that this patch series fixes is the value of FwClass in the ESRT. With the current logic, all firmware image entries in the ESRT display the same GUID value -- either the FIT GUID or the raw GUID. This is not in compliance with the UEFI specification, as the specification requires all entries to have unique GUID values. The third issue being fixed is the population of the EFI_FIRMWARE_IMAGE_DESCRIPTOR array. The current code uses the dfu framework for populating the image descriptor array. However, there might be other images that are not to be updated through the capsule update mechanism also registered with the dfu framework. As a result of this, the ESRT will show up entries of images that are not to be targeted by the capsule update mechanism. These issues are being fixed by defining a structure, efi_fw_images. A platform can then define image related information like the image GUID and image name. Every platform that uses capsule update mechanism needs to define fw_images array. This array will then be used to populate the image descriptor array, and also in determining if a particular capsule's payload can be used for updating an image on the platform. The other part of the patches are some enhancements being made to the capsule update code to make it more robust. The first enhancement being made is to have a check for the image index being passed through the capsule header. The capsule update code uses the image index value as the dfu alt number, which points to the partition to which the update must be made. The platform is supposed to define the image index value for the updatable firmare images as part of the fw_images array. This value must correspond to the dfu alt num for the corresponding image, and can be obtained by checking the output of the 'dfu list' u-boot command. At the time of update, the image index being passed through the capsule is checked against the image index value obtained from the platform. The second enhancement made is the retrieval of the dfu_alt_info variable from the set_dfu_alt_info function defined in the board file. The dfu framework checks for the existence of this function, and if the function is not defined, gets the value from the environment. This can cause in an incorrect update if the environment variable value is incorrect. By mandating all the platforms which enable the capsule update feature to define set_dfu_alt_info function, the variable is then obtained from the board file rather than the environment. Changes since V2: * Add a new member image_index to the struct efi_fw_images to allow the platforms to define the values for images. * Address review comments from Michal Simek for the xilinx boards. * Fix double inclusion of efi_loader.h as was pointed out by Heiko Thiery. * Use the image index values defined in the platform's fw_images array for the image descriptors * Add a description for adding image index value and definition of set_dfu_alt_info function for the capsule updates. The first patch adds the structure efi_fw_images and defines an array fw_images on all platforms which enable capsule update feature The second patch populates the image descriptor array in the GetImageInfo function with the values from the fw_images array The third patch adds a check for the image index value from the capsule header against the value obtained from the fw_images array for the corresponding image The fourth patch defines the function set_dfu_alt_info for all the platforms which enable capsule update feature. The fifth patch selects SET_DFU_ALT_INFO config symbol for all platforms that enable capsule update feature. The sixth patch splits the capsule update test script into two, one for FMP for raw images, and one for FMP for FIT images. The test for FIT images is being enabled on the sandbox_flattree variant. The seventh patch removes the now unused FIT and raw image GUID values from the FMP module. The eighth patch removes the --raw and --fit command line parameters in the mkeficapsule utility. The ninth patch makes corresponding changes in the capsule update related documentation. Sughosh Ganu (9): capsule: Add Image GUIDs and image index for platforms using capsule updates capsule: FMP: Populate the image descriptor array from platform data capsule: Put a check for image index before the update board: Define set_dfu_alt_info() for boards with UEFI capsule update enabled capsule: kconfig: Select SET_DFU_ALT_INFO config symbol for capsule update test: capsule: Modify the capsule tests to use GUID values for sandbox FMP: Remove GUIDs for FIT and raw images mkeficapsule: Remove raw and FIT GUID types doc: uefi: Update the capsule update related documentation .../imx8mp_rsb3720a1/imx8mp_rsb3720a1.c | 44 +++++ .../imx8mm-cl-iot-gate/imx8mm-cl-iot-gate.c | 43 ++++ board/emulation/common/qemu_dfu.c | 6 +- board/emulation/qemu-arm/qemu-arm.c | 20 ++ board/kontron/pitx_imx8m/pitx_imx8m.c | 40 +++- board/kontron/sl-mx8mm/sl-mx8mm.c | 39 ++++ board/kontron/sl28/sl28.c | 40 ++++ board/sandbox/sandbox.c | 54 +++++ board/socionext/developerbox/developerbox.c | 52 +++++ board/xilinx/common/board.c | 24 +++ board/xilinx/zynq/board.c | 5 +- board/xilinx/zynqmp/zynqmp.c | 5 +- configs/sandbox64_defconfig | 1 - configs/sandbox_defconfig | 1 - configs/sandbox_flattree_defconfig | 5 + doc/develop/uefi/uefi.rst | 22 ++- include/configs/imx8mm-cl-iot-gate.h | 11 +- include/configs/imx8mp_rsb3720.h | 11 +- include/configs/kontron-sl-mx8mm.h | 7 +- include/configs/kontron_pitx_imx8m.h | 7 +- include/configs/kontron_sl28.h | 8 +- include/configs/qemu-arm.h | 10 + include/configs/sandbox.h | 14 ++ include/configs/synquacer.h | 18 +- include/configs/xilinx_versal.h | 6 + include/configs/xilinx_zynqmp.h | 10 + include/configs/zynq-common.h | 10 + include/efi_api.h | 8 - include/efi_loader.h | 21 ++ lib/efi_loader/Kconfig | 2 + lib/efi_loader/efi_capsule.c | 8 +- lib/efi_loader/efi_firmware.c | 95 +++------ test/py/tests/test_efi_capsule/conftest.py | 21 +- .../test_capsule_firmware_fit.py | 186 ++++++++++++++++++ ...rmware.py => test_capsule_firmware_raw.py} | 159 +++++---------- tools/eficapsule.h | 8 - tools/mkeficapsule.c | 26 +-- 37 files changed, 799 insertions(+), 248 deletions(-) create mode 100644 test/py/tests/test_efi_capsule/test_capsule_firmware_fit.py rename test/py/tests/test_efi_capsule/{test_capsule_firmware.py => test_capsule_firmware_raw.py} (75%) -- 2.25.1

3 20

[PATCH v1 1/2] video: Add VIDEO_FONT_4x6 to Kconfig add fix compile waring
by qianfanguijin＠163.com 31 Mar '22

31 Mar '22

From: qianfan Zhao <qianfanguijin(a)163.com> CONFIG_VIDEO_FONT_4x6 is referenced in include/video_font.h, but doesn't has a Kconfig configuration. Add it. Signed-off-by: qianfan Zhao <qianfanguijin(a)163.com> --- drivers/video/Kconfig | 8 ++++++++ include/video_font_4x6.h | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index e2cf1e752f..7b2efdfd8a 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -138,6 +138,14 @@ config CONSOLE_NORMAL CONFIG_CONSOLE_ROTATION for that). A built-in 8x16 font is used for the display. +config VIDEO_FONT_4X6 + bool "Minuscule 4x6 font" + depends on CONSOLE_NORMAL + default n + help + Use Minuscule 4x6 font for code page 437, 8x16 bitmap font is used + by default if this options is not selected. + config CONSOLE_ROTATION bool "Support rotated displays" depends on DM_VIDEO diff --git a/include/video_font_4x6.h b/include/video_font_4x6.h index c7e6351b64..65dd5e8c1d 100644 --- a/include/video_font_4x6.h +++ b/include/video_font_4x6.h @@ -46,7 +46,7 @@ __END__; #define VIDEO_FONT_HEIGHT 6 #define VIDEO_FONT_SIZE (VIDEO_FONT_CHARS * VIDEO_FONT_HEIGHT) -static unsigned char video_fontdata[VIDEO_FONT_SIZE] = { +static unsigned char __maybe_unused video_fontdata[VIDEO_FONT_SIZE] = { /*{*/ /* Char 0: ' ' */ -- 2.17.1

1 1

[PATCH v7 0/4] add TCB driver for sama5d2
by Clément Léger 31 Mar '22

31 Mar '22

When booting under OP-TEE, the SYSC is secured which means the PIT is also not accessible by non-secure world. The TCB 0 however is always available for non-secure world and thus can be used. This series add a TCB driver and enables it in sama5d2 configs. --- Changes in v7: - Keep the exact same Linux aic node definition - Fixed a few constant definition to use (1 << x) Changes in V6: - Fix node ordering in device tree - Disable CONFIG_PIT_TIMER in sama5d2 configuration file - Fixed mach-at91/armv7/Makefile to allow building with TCB Changes in v5: - Fixed missing include in .dts file for IRQ defines - Add aic interrupt controller node to avoid DTC warnings Changes in v4: - Add missing interrupts property to tcb node Changes in v3: - Remove useless defines - Add printf in case of unsupported timers specified in device-tree - Add "syscon" compatible to tcb node Changes in v2: - Reworked driver to use existing Linux bindings Clément Léger (4): timer: atmel_tcb_timer: add atmel_tcb driver ARM: dts: at91: sama5d2: add AIC node ARM: dts: at91: sama5d2: add TCB node configs: sama5d2: enable option CONFIG_ATMEL_TCB_TIMER MAINTAINERS | 1 + arch/arm/dts/sama5d2.dtsi | 25 +++ arch/arm/mach-at91/armv7/Makefile | 2 + configs/sama5d2_icp_mmc_defconfig | 2 +- configs/sama5d2_ptc_ek_mmc_defconfig | 2 +- configs/sama5d2_ptc_ek_nandflash_defconfig | 2 +- configs/sama5d2_xplained_emmc_defconfig | 2 +- configs/sama5d2_xplained_mmc_defconfig | 2 +- configs/sama5d2_xplained_qspiflash_defconfig | 2 +- configs/sama5d2_xplained_spiflash_defconfig | 2 +- drivers/timer/Kconfig | 8 + drivers/timer/Makefile | 1 + drivers/timer/atmel_tcb_timer.c | 154 +++++++++++++++++++ 13 files changed, 198 insertions(+), 7 deletions(-) create mode 100644 drivers/timer/atmel_tcb_timer.c -- 2.34.1

2 10

[PATCH 00/52] mips: octeon: Add ethernet support
by Stefan Roese 31 Mar '22

31 Mar '22

This patchset adds the networking files and drivers including device helper headers and C files. Please excuse the massive amount of files in this patch series. Also the sometimes huge files (mostly headers with register definitions) that I needed to include. The infrastructure code with all the headers is ported mistly without any intended functional changes from the 2013 Cavium / Marvell U-Boot version. It has undergone many hours of extensive code cleanup and reformatting. Some of it done by using tools (checkpatch, Lindent, clang format etc) and also some of it done manually, as I couldn't find some tools that could do the needed work in a reliable and functional way. The result is that checkpatch now only throws a "few" warnings that are left. Some of those can't be removed without an even more extensive cleanup / rewrite of the code, like the addition of typedefs. The added header, helper and infrastructure files in the first part of the patch-series (patches 1-43) are the foundation, that is used by the main Octeon U-Boot ethernet driver (patch 50/52). Patches 47-49 add the DT nodes and properties to the corresponding dtsi / dts files. Patches 51 & 52 finally enable the ethernet support both MIPS Octeon boards, EBB7304 & NIC23. All this is tested on the 2 Cavium / Marvell MIPS Octeon boards: EBB7304 & NIC23 This patchset including the small Marvell PHY patches is available in this gitlab branch: https://source.denx.de/u-boot/custodians/u-boot-marvell/-/tree/mips-octeon-… Thanks, Stefan Aaron Williams (40): mips: octeon: Add misc cvmx-* header files mips: octeon: Add cvmx-ilk-defs.h header file mips: octeon: Add cvmx-iob-defs.h header file mips: octeon: Add cvmx-lbk-defs.h header file mips: octeon: Add cvmx-npei-defs.h header file mips: octeon: Add cvmx-pcsxx-defs.h header file mips: octeon: Add cvmx-xcv-defs.h header file mips: octeon: Add cvmx-helper-agl.c mips: octeon: Add cvmx-helper-bgx.c mips: octeon: Add cvmx-helper-board.c mips: octeon: Add cvmx-helper-fpa.c mips: octeon: Add cvmx-helper-igl.c mips: octeon: Add cvmx-helper-ipd.c mips: octeon: Add cvmx-helper-loop.c mips: octeon: Add cvmx-helper-npi.c mips: octeon: Add cvmx-helper-pki.c mips: octeon: Add cvmx-helper-pko.c mips: octeon: Add cvmx-helper-pko3.c mips: octeon: Add cvmx-helper-rgmii.c mips: octeon: Add cvmx-helper-sgmii.c mips: octeon: Add cvmx-helper-sfp.c mips: octeon: Add cvmx-helper-xaui.c mips: octeon: Add cvmx-agl.c mips: octeon: Add cvmx-cmd-queue.c mips: octeon: Add cvmx-fau-compat.c mips: octeon: Add cvmx-fpa.c mips: octeon: Add cvmx-fpa-resource.c mips: octeon: Add cvmx-global-resource.c mips: octeon: Add cvmx-ilk.c mips: octeon: Add cvmx-ipd.c mips: octeon: Add cvmx-pki.c mips: octeon: Add cvmx-pki-resources.c mips: octeon: Add cvmx-pko.c mips: octeon: Add cvmx-pko3.c mips: octeon: Add cvmx-pko3-queue.c mips: octeon: Add cvmx-pko3-compat.c mips: octeon: Add cvmx-pko3-resources.c mips: octeon: Add cvmx-pko-internal-ports-range.c mips: octeon: Add cvmx-qlm-tables.c mips: octeon: Add cvmx-range.c Stefan Roese (12): mips: octeon: Misc changes to existing headers for upcoming eth support mips: octeon: Misc changes to existing C files for upcoming eth support mips: octeon: Makefile: Enable building of the newly added C files mips: octeon: cpu.c: Move bootmem init to arch_early_init_r() mips: octeon: cpu.c: Implement configure_lmtdma_window() mips: octeon: octeon_common.h: Move init SP because of increased image size mips: octeon: mrvl,cn73xx.dtsi: Add ethernet (BGX) and SMI DT nodes mips: octeon: mrvl,octeon-ebb7304.dts: Add ethernet DT support mips: octeon: mrvl,octeon-nic23.dts: Add ethernet DT support net: Add ethernet support for MIPS Octeon mips: octeon: ebb7304: Enable ethernet support mips: octeon: nic23: Enable ethernet support arch/mips/Kconfig | 1 + arch/mips/dts/mrvl,cn73xx.dtsi | 35 + arch/mips/dts/mrvl,octeon-ebb7304.dts | 45 + arch/mips/dts/mrvl,octeon-nic23.dts | 238 ++ arch/mips/mach-octeon/Makefile | 35 +- arch/mips/mach-octeon/cpu.c | 47 +- arch/mips/mach-octeon/cvmx-agl.c | 216 + arch/mips/mach-octeon/cvmx-bootmem.c | 3 +- arch/mips/mach-octeon/cvmx-cmd-queue.c | 449 +++ arch/mips/mach-octeon/cvmx-fau-compat.c | 53 + arch/mips/mach-octeon/cvmx-fpa-resource.c | 305 ++ arch/mips/mach-octeon/cvmx-fpa.c | 1672 ++++++++ arch/mips/mach-octeon/cvmx-global-resources.c | 639 +++ arch/mips/mach-octeon/cvmx-helper-agl.c | 231 ++ arch/mips/mach-octeon/cvmx-helper-bgx.c | 3215 +++++++++++++++ arch/mips/mach-octeon/cvmx-helper-board.c | 2030 ++++++++++ arch/mips/mach-octeon/cvmx-helper-cfg.c | 67 +- arch/mips/mach-octeon/cvmx-helper-fdt.c | 645 ++- arch/mips/mach-octeon/cvmx-helper-fpa.c | 329 ++ arch/mips/mach-octeon/cvmx-helper-ilk.c | 926 +++++ arch/mips/mach-octeon/cvmx-helper-ipd.c | 313 ++ arch/mips/mach-octeon/cvmx-helper-loop.c | 178 + arch/mips/mach-octeon/cvmx-helper-npi.c | 146 + arch/mips/mach-octeon/cvmx-helper-pki.c | 2156 ++++++++++ arch/mips/mach-octeon/cvmx-helper-pko.c | 312 ++ arch/mips/mach-octeon/cvmx-helper-pko3.c | 1252 ++++++ arch/mips/mach-octeon/cvmx-helper-rgmii.c | 431 ++ arch/mips/mach-octeon/cvmx-helper-sfp.c | 1877 +++++++++ arch/mips/mach-octeon/cvmx-helper-sgmii.c | 781 ++++ arch/mips/mach-octeon/cvmx-helper-xaui.c | 587 +++ arch/mips/mach-octeon/cvmx-helper.c | 45 +- arch/mips/mach-octeon/cvmx-ilk.c | 1618 ++++++++ arch/mips/mach-octeon/cvmx-ipd.c | 690 ++++ arch/mips/mach-octeon/cvmx-pki-resources.c | 519 +++ arch/mips/mach-octeon/cvmx-pki.c | 1619 ++++++++ .../cvmx-pko-internal-ports-range.c | 164 + arch/mips/mach-octeon/cvmx-pko.c | 1110 ++++++ arch/mips/mach-octeon/cvmx-pko3-compat.c | 656 +++ arch/mips/mach-octeon/cvmx-pko3-queue.c | 1331 ++++++ arch/mips/mach-octeon/cvmx-pko3-resources.c | 229 ++ arch/mips/mach-octeon/cvmx-pko3.c | 2143 ++++++++++ arch/mips/mach-octeon/cvmx-qlm-tables.c | 292 ++ arch/mips/mach-octeon/cvmx-range.c | 344 ++ arch/mips/mach-octeon/include/mach/cvmx-agl.h | 45 + .../mach-octeon/include/mach/cvmx-bootmem.h | 3 +- .../mach-octeon/include/mach/cvmx-config.h | 128 + arch/mips/mach-octeon/include/mach/cvmx-fau.h | 581 +++ arch/mips/mach-octeon/include/mach/cvmx-fpa.h | 3 +- .../mips/mach-octeon/include/mach/cvmx-fpa3.h | 37 - .../include/mach/cvmx-helper-board.h | 6 +- .../include/mach/cvmx-helper-fdt.h | 40 +- .../include/mach/cvmx-helper-pko.h | 2 +- .../mach-octeon/include/mach/cvmx-helper.h | 20 + .../mach-octeon/include/mach/cvmx-ilk-defs.h | 2269 +++++++++++ .../mach-octeon/include/mach/cvmx-iob-defs.h | 1328 ++++++ .../mach-octeon/include/mach/cvmx-lbk-defs.h | 157 + .../mips/mach-octeon/include/mach/cvmx-mdio.h | 516 +++ .../mach-octeon/include/mach/cvmx-npei-defs.h | 3550 +++++++++++++++++ .../include/mach/cvmx-pcsxx-defs.h | 787 ++++ .../include/mach/cvmx-pki-cluster.h | 343 ++ arch/mips/mach-octeon/include/mach/cvmx-pko.h | 213 + .../include/mach/cvmx-pko3-resources.h | 36 + .../mips/mach-octeon/include/mach/cvmx-pko3.h | 1052 +++++ .../mach-octeon/include/mach/cvmx-range.h | 23 + .../mips/mach-octeon/include/mach/cvmx-regs.h | 100 +- .../mach-octeon/include/mach/cvmx-xcv-defs.h | 226 ++ .../mach-octeon/include/mach/octeon_eth.h | 54 +- board/Marvell/octeon_nic23/board.c | 87 +- configs/octeon_ebb7304_defconfig | 7 + configs/octeon_nic23_defconfig | 10 +- drivers/net/Kconfig | 7 + drivers/net/Makefile | 1 + drivers/net/octeon/Makefile | 6 + drivers/net/octeon/octeon_eth.c | 1060 +++++ drivers/net/octeon/octeon_mdio.c | 226 ++ include/configs/octeon_common.h | 2 +- include/configs/octeon_ebb7304.h | 2 + 77 files changed, 42315 insertions(+), 586 deletions(-) create mode 100644 arch/mips/mach-octeon/cvmx-agl.c create mode 100644 arch/mips/mach-octeon/cvmx-cmd-queue.c create mode 100644 arch/mips/mach-octeon/cvmx-fau-compat.c create mode 100644 arch/mips/mach-octeon/cvmx-fpa-resource.c create mode 100644 arch/mips/mach-octeon/cvmx-fpa.c create mode 100644 arch/mips/mach-octeon/cvmx-global-resources.c create mode 100644 arch/mips/mach-octeon/cvmx-helper-agl.c create mode 100644 arch/mips/mach-octeon/cvmx-helper-bgx.c create mode 100644 arch/mips/mach-octeon/cvmx-helper-board.c create mode 100644 arch/mips/mach-octeon/cvmx-helper-fpa.c create mode 100644 arch/mips/mach-octeon/cvmx-helper-ilk.c create mode 100644 arch/mips/mach-octeon/cvmx-helper-ipd.c create mode 100644 arch/mips/mach-octeon/cvmx-helper-loop.c create mode 100644 arch/mips/mach-octeon/cvmx-helper-npi.c create mode 100644 arch/mips/mach-octeon/cvmx-helper-pki.c create mode 100644 arch/mips/mach-octeon/cvmx-helper-pko.c create mode 100644 arch/mips/mach-octeon/cvmx-helper-pko3.c create mode 100644 arch/mips/mach-octeon/cvmx-helper-rgmii.c create mode 100644 arch/mips/mach-octeon/cvmx-helper-sfp.c create mode 100644 arch/mips/mach-octeon/cvmx-helper-sgmii.c create mode 100644 arch/mips/mach-octeon/cvmx-helper-xaui.c create mode 100644 arch/mips/mach-octeon/cvmx-ilk.c create mode 100644 arch/mips/mach-octeon/cvmx-ipd.c create mode 100644 arch/mips/mach-octeon/cvmx-pki-resources.c create mode 100644 arch/mips/mach-octeon/cvmx-pki.c create mode 100644 arch/mips/mach-octeon/cvmx-pko-internal-ports-range.c create mode 100644 arch/mips/mach-octeon/cvmx-pko.c create mode 100644 arch/mips/mach-octeon/cvmx-pko3-compat.c create mode 100644 arch/mips/mach-octeon/cvmx-pko3-queue.c create mode 100644 arch/mips/mach-octeon/cvmx-pko3-resources.c create mode 100644 arch/mips/mach-octeon/cvmx-pko3.c create mode 100644 arch/mips/mach-octeon/cvmx-qlm-tables.c create mode 100644 arch/mips/mach-octeon/cvmx-range.c create mode 100644 arch/mips/mach-octeon/include/mach/cvmx-agl.h create mode 100644 arch/mips/mach-octeon/include/mach/cvmx-config.h create mode 100644 arch/mips/mach-octeon/include/mach/cvmx-fau.h create mode 100644 arch/mips/mach-octeon/include/mach/cvmx-ilk-defs.h create mode 100644 arch/mips/mach-octeon/include/mach/cvmx-iob-defs.h create mode 100644 arch/mips/mach-octeon/include/mach/cvmx-lbk-defs.h create mode 100644 arch/mips/mach-octeon/include/mach/cvmx-mdio.h create mode 100644 arch/mips/mach-octeon/include/mach/cvmx-npei-defs.h create mode 100644 arch/mips/mach-octeon/include/mach/cvmx-pcsxx-defs.h create mode 100644 arch/mips/mach-octeon/include/mach/cvmx-pki-cluster.h create mode 100644 arch/mips/mach-octeon/include/mach/cvmx-pko.h create mode 100644 arch/mips/mach-octeon/include/mach/cvmx-pko3-resources.h create mode 100644 arch/mips/mach-octeon/include/mach/cvmx-pko3.h create mode 100644 arch/mips/mach-octeon/include/mach/cvmx-range.h create mode 100644 arch/mips/mach-octeon/include/mach/cvmx-xcv-defs.h create mode 100644 drivers/net/octeon/Makefile create mode 100644 drivers/net/octeon/octeon_eth.c create mode 100644 drivers/net/octeon/octeon_mdio.c -- 2.35.1

2 51