September 2019 - U-Boot

[U-Boot] [PATCH 1/1] efi_loader: SetVariable() deleting variables
by Heinrich Schuchardt 23 Sep '19

23 Sep '19

APPEND_WRITE with data length zero is allowable according to the UEFI specification. The EDK2 interpretation of no access attributes is attributes = 0. As the UEFI specification is vague in this respect let's stick to EDK2 here. Fixes: commit 6d2f27c5fd60 ("efi_loader: variable: support APPEND_WRITE") Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_loader/efi_variable.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/efi_loader/efi_variable.c b/lib/efi_loader/efi_variable.c index 22ad271bd8..4c554c546b 100644 --- a/lib/efi_loader/efi_variable.c +++ b/lib/efi_loader/efi_variable.c @@ -443,8 +443,6 @@ efi_status_t EFIAPI efi_set_variable(u16 *variable_name, if (ret) goto out; -#define ACCESS_ATTR (EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_BOOTSERVICE_ACCESS) - old_val = env_get(native_name); if (old_val) { old_val = parse_attr(old_val, &attr); @@ -455,7 +453,9 @@ efi_status_t EFIAPI efi_set_variable(u16 *variable_name, goto out; } - if ((data_size == 0) || !(attributes & ACCESS_ATTR)) { + if ((data_size == 0 && + !(attributes & EFI_VARIABLE_APPEND_WRITE)) || + !attributes) { /* delete the variable: */ env_set(native_name, NULL); ret = EFI_SUCCESS; @@ -478,8 +478,9 @@ efi_status_t EFIAPI efi_set_variable(u16 *variable_name, old_size = 0; } } else { - if ((data_size == 0) || !(attributes & ACCESS_ATTR) || - (attributes & EFI_VARIABLE_APPEND_WRITE)) { + if ((data_size == 0 && + !(attributes & EFI_VARIABLE_APPEND_WRITE)) || + !attributes) { /* delete, but nothing to do */ ret = EFI_NOT_FOUND; goto out; -- 2.23.0

1 0

[U-Boot] [PATCH 1/1] efi_loader: SetVariable() fix illegal return
by Heinrich Schuchardt 23 Sep '19

23 Sep '19

We always have to return via EFI_EXIT() from EFIAPI functions. Coverity reported an unreachable line and a resource leak. Fixes: commit 6d2f27c5fd60 ("efi_loader: variable: support APPEND_WRITE") Reported-by: Coverity Scan CID 253575, CID 184095 Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_loader/efi_variable.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/efi_loader/efi_variable.c b/lib/efi_loader/efi_variable.c index 48ee255f87..22ad271bd8 100644 --- a/lib/efi_loader/efi_variable.c +++ b/lib/efi_loader/efi_variable.c @@ -470,7 +470,7 @@ efi_status_t EFIAPI efi_set_variable(u16 *variable_name, if (attributes & EFI_VARIABLE_APPEND_WRITE) { if (!prefix(old_val, "(blob)")) { - return EFI_DEVICE_ERROR; + ret = EFI_DEVICE_ERROR; goto out; } old_size = strlen(old_val); -- 2.23.0

1 0

[U-Boot] [Buildman] libmpfr.so.4 error when running buildman in Ubuntu 18.04
by Breno Matheus Lima 23 Sep '19

23 Sep '19

Hi All, I'm trying to run buildman in Ubuntu 18.04 and I met the following build issue in most of the archs: +/home/breno/.buildman-toolchains/gcc-7.3.0-nolibc/powerpc-linux/bin/../libexec/gcc/powerpc-linux/7.3.0/cc1: error while loading shared libraries: libmpfr.so.4: cannot open shared object file: No such file or directory +make[2]: *** [u-boot.cfg] Error 1 +make[1]: *** No rule to make target 'include/config/auto.conf', needed by 'include/config/uboot.release'. Stop. +make: *** [sub-make] Error 2 According to link [1] libmpfr4 has been dropped in Ubuntu 18.04 It was replaced by the package libmpfr6, seems that the toolchains being used by buildman requires libmpfr4 package. Has anyone seen similar issue? I could solve this issue after following link [2] and creating a symbolical link for libmpfr.so.4 as below: $ sudo ln -s /usr/lib/x86_64-linux-gnu/libmpfr.so.6 /usr/lib/x86_64-linux-gnu/libmpfr.so.4 Just wondering if someone found a better workaround for this issue :) Thanks, Breno Lima [1]: https://askubuntu.com/questions/1054236/cannot-open-libmpfr-so-4-after-upda… [2]: https://github.com/GreenWaves-Technologies/gap_sdk/issues/4

2 2

[U-Boot] [PATCH v2] imx: wandboard: convert FEC support to DM_ETH
by Anatolij Gustschin 23 Sep '19

23 Sep '19

Remove CONFIG_DM_ETH conversion warning to avoid board removal. Signed-off-by: Anatolij Gustschin <agust(a)denx.de> --- Changes in v2: - drop legacy board_eth_init() - drop IOMUX_PADS() table for enet pads, these are already in dts arch/arm/dts/imx6qdl-wandboard.dtsi | 10 ++++++++++ board/wandboard/wandboard.c | 23 +---------------------- configs/wandboard_defconfig | 5 ++++- include/configs/wandboard.h | 8 -------- 4 files changed, 15 insertions(+), 31 deletions(-) diff --git a/arch/arm/dts/imx6qdl-wandboard.dtsi b/arch/arm/dts/imx6qdl-wandboard.dtsi index 90aa43d21b..35a88bf5a7 100644 --- a/arch/arm/dts/imx6qdl-wandboard.dtsi +++ b/arch/arm/dts/imx6qdl-wandboard.dtsi @@ -229,11 +229,21 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet>; phy-mode = "rgmii-id"; + phy-handle = <&ethphy>; phy-reset-gpios = <&gpio3 29 GPIO_ACTIVE_LOW>; interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; fsl,err006687-workaround-present; status = "okay"; + + mdio { + #address-cells = <1>; + #size-cells = <0>; + + ethphy: ethernet-phy@1 { + reg = <1>; + }; + }; }; &spdif { diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c index 69cdf3e9c9..11acbad78b 100644 --- a/board/wandboard/wandboard.c +++ b/board/wandboard/wandboard.c @@ -71,21 +71,6 @@ static iomux_v3_cfg_t const uart1_pads[] = { }; static iomux_v3_cfg_t const enet_pads[] = { - IOMUX_PADS(PAD_ENET_MDIO__ENET_MDIO | MUX_PAD_CTRL(ENET_PAD_CTRL)), - IOMUX_PADS(PAD_ENET_MDC__ENET_MDC | MUX_PAD_CTRL(ENET_PAD_CTRL)), - IOMUX_PADS(PAD_RGMII_TXC__RGMII_TXC | MUX_PAD_CTRL(ENET_PAD_CTRL)), - IOMUX_PADS(PAD_RGMII_TD0__RGMII_TD0 | MUX_PAD_CTRL(ENET_PAD_CTRL)), - IOMUX_PADS(PAD_RGMII_TD1__RGMII_TD1 | MUX_PAD_CTRL(ENET_PAD_CTRL)), - IOMUX_PADS(PAD_RGMII_TD2__RGMII_TD2 | MUX_PAD_CTRL(ENET_PAD_CTRL)), - IOMUX_PADS(PAD_RGMII_TD3__RGMII_TD3 | MUX_PAD_CTRL(ENET_PAD_CTRL)), - IOMUX_PADS(PAD_RGMII_TX_CTL__RGMII_TX_CTL | MUX_PAD_CTRL(ENET_PAD_CTRL)), - IOMUX_PADS(PAD_ENET_REF_CLK__ENET_TX_CLK | MUX_PAD_CTRL(ENET_PAD_CTRL)), - IOMUX_PADS(PAD_RGMII_RXC__RGMII_RXC | MUX_PAD_CTRL(ENET_PAD_CTRL)), - IOMUX_PADS(PAD_RGMII_RD0__RGMII_RD0 | MUX_PAD_CTRL(ENET_PAD_CTRL)), - IOMUX_PADS(PAD_RGMII_RD1__RGMII_RD1 | MUX_PAD_CTRL(ENET_PAD_CTRL)), - IOMUX_PADS(PAD_RGMII_RD2__RGMII_RD2 | MUX_PAD_CTRL(ENET_PAD_CTRL)), - IOMUX_PADS(PAD_RGMII_RD3__RGMII_RD3 | MUX_PAD_CTRL(ENET_PAD_CTRL)), - IOMUX_PADS(PAD_RGMII_RX_CTL__RGMII_RX_CTL | MUX_PAD_CTRL(ENET_PAD_CTRL)), /* AR8031 PHY Reset */ IOMUX_PADS(PAD_EIM_D29__GPIO3_IO29 | MUX_PAD_CTRL(NO_PAD_CTRL)), }; @@ -358,13 +343,6 @@ static void setup_display(void) } #endif /* CONFIG_VIDEO_IPUV3 */ -int board_eth_init(bd_t *bis) -{ - setup_iomux_enet(); - - return cpu_eth_init(bis); -} - int board_early_init_f(void) { setup_iomux_uart(); @@ -464,6 +442,7 @@ int board_late_init(void) else env_set("board_name", "B1"); #endif + setup_iomux_enet(); return 0; } diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig index 421f80697e..d7eb8fd4b3 100644 --- a/configs/wandboard_defconfig +++ b/configs/wandboard_defconfig @@ -12,6 +12,7 @@ CONFIG_SPL=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_CMD_HDMIDETECT=y CONFIG_AHCI=y +CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_SPL_FIT_PRINT=y @@ -25,7 +26,6 @@ CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_BOUNCE_BUFFER=y CONFIG_BOARD_EARLY_INIT_F=y -CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SPL_SEPARATE_BSS=y CONFIG_SPL_FIT_IMAGE_TINY=y CONFIG_SPL_FS_EXT4=y @@ -57,6 +57,9 @@ CONFIG_SYS_I2C_MXC_I2C3=y CONFIG_DM_MMC=y CONFIG_FSL_USDHC=y CONFIG_PHYLIB=y +CONFIG_PHY_ATHEROS=y +CONFIG_DM_ETH=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index 8faf5f0f78..a0a78eab27 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -40,14 +40,6 @@ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 -/* Ethernet Configuration */ -#define CONFIG_FEC_MXC -#define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_FEC_XCV_TYPE RGMII -#define CONFIG_ETHPRIME "FEC" -#define CONFIG_FEC_MXC_PHYADDR 1 -#define CONFIG_PHY_ATHEROS - /* Framebuffer */ #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_SPLASH_SCREEN -- 2.17.1

2 2

[U-Boot] [PATCH v2] splash: fix splash banner output
by Anatolij Gustschin 23 Sep '19

23 Sep '19

Old splash code in cfb_console driver displayed U-Boot version string by default. Restore this behaviour for DM_VIDEO enabled configurations. Signed-off-by: Anatolij Gustschin <agust(a)denx.de> --- Changes in v2: - fix build breakage with sandbox, arc, arm7, arm11, etc. - fix typos (s/raw/row/) common/splash.c | 46 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/common/splash.c b/common/splash.c index 1a5db69a7e..0bcedbb0ba 100644 --- a/common/splash.c +++ b/common/splash.c @@ -112,6 +112,42 @@ void splash_get_pos(int *x, int *y) } #endif /* CONFIG_SPLASH_SCREEN_ALIGN */ +#if defined(CONFIG_DM_VIDEO) && !defined(CONFIG_HIDE_LOGO_VERSION) + +#ifdef CONFIG_VIDEO_LOGO +#include <bmp_logo.h> +#endif +#include <dm.h> +#include <video_console.h> +#include <video_font.h> + +void splash_display_banner(void) +{ + struct udevice *dev; + char buf[DISPLAY_OPTIONS_BANNER_LENGTH]; + int col, row, ret; + + ret = uclass_get_device(UCLASS_VIDEO_CONSOLE, 0, &dev); + if (ret) + return; + +#ifdef CONFIG_VIDEO_LOGO + col = BMP_LOGO_WIDTH / VIDEO_FONT_WIDTH + 1; + row = BMP_LOGO_HEIGHT / VIDEO_FONT_HEIGHT + 1; +#else + col = 0; + row = 0; +#endif + + display_options_get_banner(false, buf, sizeof(buf)); + vidconsole_position_cursor(dev, col, 1); + vidconsole_put_string(dev, buf); + vidconsole_position_cursor(dev, 0, row); +} +#else +static inline void splash_display_banner(void) { } +#endif /* CONFIG_DM_VIDEO && !CONFIG_HIDE_LOGO_VERSION */ + /* * Common function to show a splash image if env("splashimage") is set. * Is used for both dm_video and lcd video stacks. For additional @@ -135,6 +171,14 @@ int splash_display(void) splash_get_pos(&x, &y); - return bmp_display(addr, x, y); + ret = bmp_display(addr, x, y); + + /* Skip banner output on video console if the logo is not at 0,0 */ + if (x || y) + goto end; + + splash_display_banner(); +end: + return ret; } #endif -- 2.17.1

1 1

[U-Boot] [PATCH 0/7] Fix splash logo for imx6 boards
by Anatolij Gustschin 23 Sep '19

23 Sep '19

This series enables video logo for DM_VIDEO converted imx6 boards. Before DM_VIDEO conversion display init and the logo drawing was performed by cfb_console driver. After conversion the framebuffer console device is not used, display remains uninitialized. Fix this. Anatolij Gustschin (7): splash: fix logo drawing if CONFIG_VIDEO_LOGO enabled imx: wandboard: fix splash logo drawing imx: mx6sabresd: fix splash logo drawing imx: apalis_imx6: fix splash logo drawing imx: icore: fix splash logo drawing imx: colibri_imx6: fix splash logo drawing imx: mx6sabreauto: fix splash logo drawing common/splash.c | 35 ++++++++++++++++++++++++++-- configs/imx6dl_icore_nand_defconfig | 2 ++ configs/imx6q_icore_nand_defconfig | 2 ++ configs/imx6qdl_icore_mmc_defconfig | 2 ++ configs/imx6qdl_icore_nand_defconfig | 2 ++ configs/mx6sabreauto_defconfig | 2 ++ configs/mx6sabresd_defconfig | 2 ++ configs/wandboard_defconfig | 2 ++ include/configs/apalis_imx6.h | 1 + include/configs/colibri_imx6.h | 1 + include/configs/imx6-engicam.h | 1 + include/configs/mx6sabre_common.h | 1 + include/configs/wandboard.h | 1 + 13 files changed, 52 insertions(+), 2 deletions(-) -- 2.17.1

2 11

[U-Boot] [PATCH] sunxi: video: HDMI: Fix LCD clock divider
by Mark Kettenis 23 Sep '19

23 Sep '19

Currently we may end up with an LCD clock divider that differs from the HDMI PHY clock divider if we can't exactly match the pixel clock. Fix this by using DIV_ROUND_UP to calculate the divider. This works since the PLL is chosen such that the resulting pixel clock is never higher than the requested pixel clock. Fixes: 1feed358ed15 ("sunxi: video: HDMI: Fix clock setup") Signed-off-by: Mark Kettenis <kettenis(a)openbsd.org> --- drivers/video/sunxi/sunxi_dw_hdmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/sunxi/sunxi_dw_hdmi.c b/drivers/video/sunxi/sunxi_dw_hdmi.c index cec23295b5..66a319187c 100644 --- a/drivers/video/sunxi/sunxi_dw_hdmi.c +++ b/drivers/video/sunxi/sunxi_dw_hdmi.c @@ -254,7 +254,7 @@ static void sunxi_dw_hdmi_lcdc_init(int mux, const struct display_timing *edid, { struct sunxi_ccm_reg * const ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE; - int div = clock_get_pll3() / edid->pixelclock.typ; + int div = DIV_ROUND_UP(clock_get_pll3(), edid->pixelclock.typ); struct sunxi_lcdc_reg *lcdc; if (mux == 0) { -- 2.22.0

3 2

[U-Boot] [ANN] U-Boot v2019.10-rc4 released
by Tom Rini 23 Sep '19

23 Sep '19

Hey all, So, I had said I would do -rc4 on September 9th and -rc5 on September 23rd, and now it's the 23rd and I'm doing -rc4. Why? My reminder for -rc4 got lost in the shuffle that day and I didn't remember about it until close to -rc5 time. My fault, oops. At this point, I'd really like to see pull requests that are fixing bugs or regressions. I've also today clarified on the http://www.denx.de/wiki/U-Boot/CustodianGitTrees page that the "next" branch is expected to be rebased. Why? While I'm not sure if I want to apply things directly to the next branch and then give them some sort of automated testing, I do want to try and give changes some sort of build testing and similar sooner than I have, and that was at least a related problem. In terms of a changelog, git log --merges v2019.10-rc2..v2019.10-rc3 and again, please make sure to use a tag with a changelog for your pull request or at least a changelog of sorts in the email itself. The v2019.10 release is currently scheduled for October 7th. Thanks all! -- Tom

2 2

[U-Boot] [PATCH 0/4] Improve HAB support for SPL targets
by Breno Matheus Lima 23 Sep '19

23 Sep '19

This patch set is improving the HAB support for targets that are using IH_TYPE_FIRMWARE_IVT image type. Patch 0001 is migrating CONFIG_CSF_SIZE to Kconfig so value can be configurable and used by U-Boot tools. Patch 0002 is fixing secure boot support for targets using IH_TYPE_FIRMWARE_IVT image type. Patch 0003 is verifying the SPL size to avoid a possible HAB failure event. Patch 0004 is cleaning up the code as CONFIG_SECURE_BOOT is now enabled through Kconfig. Breno Lima (4): Kconfig: Migrate CONFIG_CSF_SIZE to Kconfig habv4: tools: Avoid hardcoded CSF size for SPL targets imx6: spl: Reduce SPL limit size in case CONFIG_SECURE_BOOT is enabled imx: configs: Cleanup CONFIG_SECURE_BOOT comments arch/arm/mach-imx/Kconfig | 7 +++++++ common/image.c | 8 +++++--- configs/imx8mq_evk_defconfig | 1 + include/configs/cl-som-imx7.h | 4 ---- include/configs/imx8mq_evk.h | 4 ---- include/configs/mx6_common.h | 4 ---- include/configs/mx6sllevk.h | 6 ------ include/configs/mx6ullevk.h | 6 ------ include/configs/mx7_common.h | 4 ---- include/configs/mx7ulp_evk.h | 9 --------- scripts/config_whitelist.txt | 1 - tools/default_image.c | 5 ++++- tools/spl_size_limit.c | 3 +++ 13 files changed, 20 insertions(+), 42 deletions(-) -- 2.17.1

6 20

[U-Boot] [PATCH] imx: Kconfig: Reduce default CONFIG_CSF_SIZE
by Breno Matheus Lima 23 Sep '19

23 Sep '19

The default CSF_SIZE defined in Kconfig is too high and SPL cannot fit into the OCRAM in certain cases. The CSF cannot achieve 0x2000 length when using RSA 4K key which is the largest key size supported by HABv4. According to AN12056 "Encrypted Boot on HABv4 and CAAM Enabled Devices" it's recommended to pad CSF binary to 0x2000 and append DEK blob to deploy encrypted boot images. As the maximum DEK blob size is 0x58 we can reduce CSF_SIZE to 0x2060 which should cover both CSF and DEK blob length. Update default_image.c and image.c to align with this change and avoid a U-Boot proper authentication failure in HAB closed devices: Authenticate image from DDR location 0x877fffc0... bad magic magic=0x32 length=0x6131 version=0x38 bad length magic=0x32 length=0x6131 version=0x38 bad version magic=0x32 length=0x6131 version=0x38 spl: ERROR: image authentication fail Fixes: 96d27fb218 (Revert "habv4: tools: Avoid hardcoded CSF size for SPL targets") Reported-by: Jagan Teki <jagan(a)amarulasolutions.com> Signed-off-by: Breno Lima <breno.lima(a)nxp.com> --- arch/arm/mach-imx/Kconfig | 2 +- common/image.c | 7 ++++--- tools/default_image.c | 5 ++++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index d44f74e474..f721eaf937 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -45,7 +45,7 @@ config SECURE_BOOT config CSF_SIZE hex "Maximum size for Command Sequence File (CSF) binary" - default 0x4000 + default 0x2060 help Define the maximum size for Command Sequence File (CSF) binary this information is used to define the image boot data. diff --git a/common/image.c b/common/image.c index 179eef0bd2..62ba6b3bfe 100644 --- a/common/image.c +++ b/common/image.c @@ -61,6 +61,7 @@ static const image_header_t *image_get_ramdisk(ulong rd_addr, uint8_t arch, #endif /* !USE_HOSTCC*/ #include <u-boot/crc.h> +#include <imximage.h> #ifndef CONFIG_SYS_BARGSIZE #define CONFIG_SYS_BARGSIZE 512 @@ -378,9 +379,9 @@ void image_print_contents(const void *ptr) } } else if (image_check_type(hdr, IH_TYPE_FIRMWARE_IVT)) { printf("HAB Blocks: 0x%08x 0x0000 0x%08x\n", - image_get_load(hdr) - image_get_header_size(), - image_get_size(hdr) + image_get_header_size() - - 0x1FE0); + image_get_load(hdr) - image_get_header_size(), + (int)(image_get_size(hdr) + image_get_header_size() + + sizeof(flash_header_v2_t) - 0x2060)); } } diff --git a/tools/default_image.c b/tools/default_image.c index 4b7d1ed4a1..f7990e28c0 100644 --- a/tools/default_image.c +++ b/tools/default_image.c @@ -19,6 +19,7 @@ #include <image.h> #include <tee/optee.h> #include <u-boot/crc.h> +#include <imximage.h> static image_header_t header; @@ -106,7 +107,9 @@ static void image_set_header(void *ptr, struct stat *sbuf, int ifd, if (params->type == IH_TYPE_FIRMWARE_IVT) /* Add size of CSF minus IVT */ - imagesize = sbuf->st_size - sizeof(image_header_t) + 0x1FE0; + imagesize = sbuf->st_size - sizeof(image_header_t) + + 0x2060 - sizeof(flash_header_v2_t); + else imagesize = sbuf->st_size - sizeof(image_header_t); -- 2.17.1

1 0