June 2019 - U-Boot

[U-Boot] [PATCH 1/1] efi_selftest: description of CMD_BOOTEFI_SELFTEST
by Heinrich Schuchardt 02 Jul '19

02 Jul '19

The current short description has a typo. Let it stand out clear that we provide unit tests. Improve the description of the CMD_BOOTEFI_SELFTEST configuration option. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_selftest/Kconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/efi_selftest/Kconfig b/lib/efi_selftest/Kconfig index 59f9f36801..52ad439220 100644 --- a/lib/efi_selftest/Kconfig +++ b/lib/efi_selftest/Kconfig @@ -1,9 +1,9 @@ config CMD_BOOTEFI_SELFTEST - bool "Allow booting an EFI efi_selftest" + bool "UEFI unit tests" depends on CMD_BOOTEFI imply FAT imply FAT_WRITE help - This adds an EFI test application to U-Boot that can be executed - with the 'bootefi selftest' command. It provides extended tests of - the EFI API implementation. + This adds an UEFI test application to U-Boot that can be executed + via the 'bootefi selftest' command. It provides extended tests of + the UEFI API implementation. -- 2.20.1

2 1

[U-Boot] [PATCH v2 8/8] x86: Skip setting up MTRRs in slimbootloader
by Park, Aiden 02 Jul '19

02 Jul '19

The setting up MTRRs have already been done in previous Slim Bootloader stages. Signed-off-by: Aiden Park <aiden.park(a)intel.com> --- arch/x86/lib/init_helpers.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/lib/init_helpers.c b/arch/x86/lib/init_helpers.c index 0481f453ca..5e19f13720 100644 --- a/arch/x86/lib/init_helpers.c +++ b/arch/x86/lib/init_helpers.c @@ -18,7 +18,8 @@ __weak ulong board_get_usable_ram_top(ulong total_size) int init_cache_f_r(void) { -#if CONFIG_IS_ENABLED(X86_32BIT_INIT) && !defined(CONFIG_HAVE_FSP) +#if CONFIG_IS_ENABLED(X86_32BIT_INIT) && !defined(CONFIG_HAVE_FSP) && \ + !defined(CONFIG_SYS_SLIMBOOTLOADER) int ret; ret = mtrr_commit(false); -- 2.20.1

2 1

[U-Boot] [PATCH] video: backlight: fix pwm invertation
by Marc Dietrich 02 Jul '19

02 Jul '19

Fixes: 57e7775413 ("video: backlight: Parse PWM polarity cell") set_pwm will always fail if pwm_set_invert is not implemented, leaving the backlight dark. Fix this by calling pwm_set_invert only if pwm is inverted. Signed-off-by: Marc Dietrich <marvin24(a)gmx.de> --- drivers/video/pwm_backlight.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/video/pwm_backlight.c b/drivers/video/pwm_backlight.c index a587977c22..26bcbeb42b 100644 --- a/drivers/video/pwm_backlight.c +++ b/drivers/video/pwm_backlight.c @@ -61,12 +61,13 @@ static int set_pwm(struct pwm_backlight_priv *priv) duty_cycle = priv->period_ns * (priv->cur_level - priv->min_level) / (priv->max_level - priv->min_level + 1); + ret = pwm_set_config(priv->pwm, priv->channel, priv->period_ns, duty_cycle); - if (ret) - return log_ret(ret); - ret = pwm_set_invert(priv->pwm, priv->channel, priv->polarity); + if (!ret && priv->polarity) + ret = pwm_set_invert(priv->pwm, priv->channel, priv->polarity); + return log_ret(ret); } -- 2.17.1

2 2

[U-Boot] [PATCH v2 0/8] x86: Add basic Slim Bootloader payload support
by Park, Aiden 02 Jul '19

02 Jul '19

This patch is to enable u-boot as a payload which runs on top of Slim Bootloader(https://github.com/slimbootloader/slimbootloader) boot firmware for x86 platforms. The Slim Bootloader is designed with multi-staqe architecture for the execution from reset vector to OS hand-off, and supports qemu, Apollolake, Whiskeylake and Coffeelake platforms consuming Intel FSP(https://github.com/IntelFsp/FSP) for silicon initialization including CAR and memory initialization. As multi-stage architecture, the Slim Bootloader adopts payload concept which is responsible for OS load from media devices and boot OS and it supports 32-bit PE32, EFI FV and ELF format payloads. The Slim Bootloader passes HOB(Hand Off Block) memory address, which has debug serial port info, memory map info, performance data info and etc., to a payload. U-boot configures serial port, dram, pci, tsc and others with the information from the HOB. The compiled u-boot ELF supports usb, sata and sd/mmc boot which have been verified on qemu and other supported platforms. Aiden Park (8): x86: Add new slimbootloader CPU type x86: slimbootloader: Add a function to access HOB x86: slimbootloader: Add memory configuration x86: slimbootloader: Add serial driver x86: slimbootloader: Set TSC information for timer driver x86: slimbootloader: Add a slimbootloader device tree board: Add new slimbootloader board x86: Skip setting up MTRRs in slimbootloader arch/x86/Kconfig | 5 + arch/x86/cpu/Makefile | 1 + arch/x86/cpu/slimbootloader/Kconfig | 23 +++ arch/x86/cpu/slimbootloader/Makefile | 5 + arch/x86/cpu/slimbootloader/car.S | 43 ++++++ arch/x86/cpu/slimbootloader/dram.c | 139 ++++++++++++++++++ arch/x86/cpu/slimbootloader/hob.c | 97 ++++++++++++ arch/x86/cpu/slimbootloader/serial.c | 62 ++++++++ arch/x86/cpu/slimbootloader/slimbootloader.c | 52 +++++++ arch/x86/dts/Makefile | 3 +- arch/x86/dts/slimbootloader.dts | 27 ++++ .../asm/arch-slimbootloader/slimbootloader.h | 122 +++++++++++++++ arch/x86/include/asm/global_data.h | 2 +- arch/x86/lib/asm-offsets.c | 2 +- arch/x86/lib/init_helpers.c | 3 +- board/slimbootloader/Kconfig | 25 ++++ board/slimbootloader/slimbootloader/Kconfig | 51 +++++++ board/slimbootloader/slimbootloader/Makefile | 5 + board/slimbootloader/slimbootloader/README | 58 ++++++++ .../slimbootloader/slimbootloader.c | 17 +++ board/slimbootloader/slimbootloader/start.S | 9 ++ configs/slimbootloader_defconfig | 64 ++++++++ include/configs/slimbootloader.h | 54 +++++++ 23 files changed, 865 insertions(+), 4 deletions(-) create mode 100644 arch/x86/cpu/slimbootloader/Kconfig create mode 100644 arch/x86/cpu/slimbootloader/Makefile create mode 100644 arch/x86/cpu/slimbootloader/car.S create mode 100644 arch/x86/cpu/slimbootloader/dram.c create mode 100644 arch/x86/cpu/slimbootloader/hob.c create mode 100644 arch/x86/cpu/slimbootloader/serial.c create mode 100644 arch/x86/cpu/slimbootloader/slimbootloader.c create mode 100644 arch/x86/dts/slimbootloader.dts create mode 100644 arch/x86/include/asm/arch-slimbootloader/slimbootloader.h create mode 100644 board/slimbootloader/Kconfig create mode 100644 board/slimbootloader/slimbootloader/Kconfig create mode 100644 board/slimbootloader/slimbootloader/Makefile create mode 100644 board/slimbootloader/slimbootloader/README create mode 100644 board/slimbootloader/slimbootloader/slimbootloader.c create mode 100644 board/slimbootloader/slimbootloader/start.S create mode 100644 configs/slimbootloader_defconfig create mode 100644 include/configs/slimbootloader.h -- 2.20.1

2 2

[U-Boot] [PATCH] rockchip: dts: rk3399: rockpro64: Provide init voltage
by Mark Kettenis 02 Jul '19

02 Jul '19

Add missing regulator-init-microvolt property to vdd_log regulator. Signed-off-by: Mark Kettenis <kettenis(a)openbsd.org> --- Without this property the pwm regulator driver prints a warning and the OpenBSD kernel crashes shortly after spinning up the big cores. arch/arm/dts/rk3399-rockpro64-u-boot.dtsi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi b/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi index dbfa4ba9f8..f7f26d584f 100644 --- a/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi +++ b/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi @@ -5,3 +5,7 @@ #include "rk3399-u-boot.dtsi" #include "rk3399-sdram-lpddr4-100.dtsi" + +&vdd_log { + regulator-init-microvolt = <950000>; +}; -- 2.21.0

4 4

[U-Boot] [PATCH] rockchip: rk3399: Fix enabling boot-on regulators
by Mark Kettenis 02 Jul '19

02 Jul '19

The new common rockchip pinctrl driver does not support explicit requests for a particular pinctrl function. As a result, the board_init() function bails out early before enabling the boot-on regulators. Fix this by simply removing the request for pwm0, pwm2 and pwm3. The generic DM code already does the necessary configuration if necessary. Reported-by: Levin Du <djw(a)t-chip.com.cn> Signed-of-by: Mark Kettenis <kettenis(a)openbsd.org> --- Without this patch the boot-on regulators are not enabled and the my firefly-rk3399 doesn't run OpenBSD stable without it. Levin Du reported similar problems with Linux. I'd say this is a critical fix that should make the 2019.07 release. This patch deliberately does not touch the code in spl_boot_init() as Jagan Teki just posted a patchset that touches those bits. board/rockchip/evb_rk3399/evb-rk3399.c | 32 +------------------------- 1 file changed, 1 insertion(+), 31 deletions(-) diff --git a/board/rockchip/evb_rk3399/evb-rk3399.c b/board/rockchip/evb_rk3399/evb-rk3399.c index bf2ad98c47..8c20bd6e11 100644 --- a/board/rockchip/evb_rk3399/evb-rk3399.c +++ b/board/rockchip/evb_rk3399/evb-rk3399.c @@ -13,39 +13,9 @@ int board_init(void) { - struct udevice *pinctrl, *regulator; + struct udevice *regulator; int ret; - /* - * The PWM do not have decicated interrupt number in dts and can - * not get periph_id by pinctrl framework, so let's init them here. - * The PWM2 and PWM3 are for pwm regulater. - */ - ret = uclass_get_device(UCLASS_PINCTRL, 0, &pinctrl); - if (ret) { - debug("%s: Cannot find pinctrl device\n", __func__); - goto out; - } - - /* Enable pwm0 for panel backlight */ - ret = pinctrl_request_noflags(pinctrl, PERIPH_ID_PWM0); - if (ret) { - debug("%s PWM0 pinctrl init fail! (ret=%d)\n", __func__, ret); - goto out; - } - - ret = pinctrl_request_noflags(pinctrl, PERIPH_ID_PWM2); - if (ret) { - debug("%s PWM2 pinctrl init fail!\n", __func__); - goto out; - } - - ret = pinctrl_request_noflags(pinctrl, PERIPH_ID_PWM3); - if (ret) { - debug("%s PWM3 pinctrl init fail!\n", __func__); - goto out; - } - ret = regulators_enable_boot_on(false); if (ret) debug("%s: Cannot enable boot on regulator\n", __func__); -- 2.21.0

2 2

[U-Boot] [PATCH] spl: atf: Fix uninitialized pointer to bl31_image_info
by Schrempf Frieder 02 Jul '19

02 Jul '19

From: Frieder Schrempf <frieder.schrempf(a)kontron.de> The pointer to struct atf_image_info in bl31_params_mem.bl31_params.bl31_image_info is not initialized before being dereferenced. This can cause U-Boot to crash right before jumping to the BL31 ATF binary. Signed-off-by: Frieder Schrempf <frieder.schrempf(a)kontron.de> Fixes: bcc1726a7bdd ("spl: add support to booting with ATF") --- common/spl/spl_atf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/common/spl/spl_atf.c b/common/spl/spl_atf.c index cddab6a735..4715f9d371 100644 --- a/common/spl/spl_atf.c +++ b/common/spl/spl_atf.c @@ -45,6 +45,7 @@ static struct bl31_params *bl2_plat_get_bl31_params(uintptr_t bl33_entry) SET_PARAM_HEAD(bl2_to_bl31_params, ATF_PARAM_BL31, ATF_VERSION_1, 0); /* Fill BL31 related information */ + bl2_to_bl31_params->bl31_image_info = &bl31_params_mem.bl31_image_info; SET_PARAM_HEAD(bl2_to_bl31_params->bl31_image_info, ATF_PARAM_IMAGE_BINARY, ATF_VERSION_1, 0); -- 2.17.1

2 2

[U-Boot] [PATCH 0/2] arm64: tidy up POSITION_INDEPENDENT feature and enable it for Socionext SoCs
by Masahiro Yamada 01 Jul '19

01 Jul '19

1/2 needs ACK from NVIDIA folks. I want to enable it in 2/2 for my platform. Masahiro Yamada (2): arm64: add an option to switch visibility of CONFIG_SYS_INIT_SP_BSS_OFFSET ARM: uniphier_v8_defconfig: make 64bit SoC image position independent Makefile | 4 ++-- arch/arm/Kconfig | 20 ++++++++++++++----- .../armv8/linux-kernel-image-header-vars.h | 2 +- arch/arm/lib/crt0_64.S | 2 +- arch/arm/mach-tegra/Kconfig | 1 + arch/arm/mach-tegra/tegra186/Kconfig | 3 --- arch/arm/mach-tegra/tegra210/Kconfig | 3 --- configs/uniphier_v8_defconfig | 4 +++- 8 files changed, 23 insertions(+), 16 deletions(-) -- 2.17.1

3 5

[U-Boot] [PATCH] poplar: increase SYS_MALLOC_F_LEN for DM_FLAG_PRE_RELOC support
by Shawn Guo 01 Jul '19

01 Jul '19

There is a regression seen on Poplar platform, which doesn't even show a U-Boot version banner on booting. It turns out that due to landing of commit 3a7c45f6a772 ("simple-bus: add DM_FLAG_PRE_RELOC flag to simple-bus driver"), we need to increase SYS_MALLOC_F_LEN from its default size 0x400, as pre-relocation requires more memory there. Let's increase SYS_MALLOC_F_LEN to 0x4000 to fix the regression. Thanks to Andreas Färber <afaerber(a)suse.de> for reporting, and Bin Meng <bmeng.cn(a)gmail.com> for trouble shooting. Reported-by: Andreas Färber <afaerber(a)suse.de> Signed-off-by: Shawn Guo <shawn.guo(a)linaro.org> --- configs/poplar_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/poplar_defconfig b/configs/poplar_defconfig index dfde6541c25a..62eaaee370f3 100644 --- a/configs/poplar_defconfig +++ b/configs/poplar_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_TARGET_POPLAR=y CONFIG_SYS_TEXT_BASE=0x37000000 +CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_NR_DRAM_BANKS=2 CONFIG_IDENT_STRING="poplar" CONFIG_DISTRO_DEFAULTS=y -- 2.18.0

4 4

[U-Boot] [PATCH] treewide: Replace CONFIG_DM_SPI_FLASH with CONFIG_IS_ENABLED(DM_SPI_FLASH)
by Marek Vasut 01 Jul '19

01 Jul '19

Perform the replacement to allow platforms use non-DM SPI flash access in SPL/TPL. This is thus far needed on platforms with size constraints. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)gmail.com> Cc: Jagan Teki <jagan(a)openedev.com> Cc: Vignesh R <vigneshr(a)ti.com> --- cmd/sf.c | 4 ++-- drivers/mtd/spi/sf_probe.c | 2 +- drivers/net/fm/fm.c | 4 ++-- env/sf.c | 2 +- include/spi_flash.h | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmd/sf.c b/cmd/sf.c index 738ef0e46d..7e92a43b2c 100644 --- a/cmd/sf.c +++ b/cmd/sf.c @@ -84,7 +84,7 @@ static int do_spi_flash_probe(int argc, char * const argv[]) unsigned int speed = CONFIG_SF_DEFAULT_SPEED; unsigned int mode = CONFIG_SF_DEFAULT_MODE; char *endp; -#ifdef CONFIG_DM_SPI_FLASH +#if CONFIG_IS_ENABLED(DM_SPI_FLASH) struct udevice *new, *bus_dev; int ret; /* In DM mode defaults will be taken from DT */ @@ -119,7 +119,7 @@ static int do_spi_flash_probe(int argc, char * const argv[]) return -1; } -#ifdef CONFIG_DM_SPI_FLASH +#if CONFIG_IS_ENABLED(DM_SPI_FLASH) /* Remove the old device, otherwise probe will just be a nop */ ret = spi_find_bus_and_cs(bus, cs, &bus_dev, &new); if (!ret) { diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c index 7f1378f494..4282d48f26 100644 --- a/drivers/mtd/spi/sf_probe.c +++ b/drivers/mtd/spi/sf_probe.c @@ -53,7 +53,7 @@ err_read_id: return ret; } -#ifndef CONFIG_DM_SPI_FLASH +#if !CONFIG_IS_ENABLED(DM_SPI_FLASH) struct spi_flash *spi_flash_probe(unsigned int busnum, unsigned int cs, unsigned int max_hz, unsigned int spi_mode) { diff --git a/drivers/net/fm/fm.c b/drivers/net/fm/fm.c index e19d7777dc..6a5c9bbc9d 100644 --- a/drivers/net/fm/fm.c +++ b/drivers/net/fm/fm.c @@ -377,7 +377,7 @@ int fm_init_common(int index, struct ccsr_fman *reg) addr = malloc(CONFIG_SYS_QE_FMAN_FW_LENGTH); int ret = 0; -#ifdef CONFIG_DM_SPI_FLASH +#if CONFIG_IS_ENABLED(DM_SPI_FLASH) struct udevice *new; /* speed and mode will be read from DT */ @@ -464,7 +464,7 @@ int fm_init_common(int index, struct ccsr_fman *reg) void *addr = malloc(CONFIG_SYS_QE_FMAN_FW_LENGTH); int ret = 0; -#ifdef CONFIG_DM_SPI_FLASH +#if CONFIG_IS_ENABLED(DM_SPI_FLASH) struct udevice *new; /* speed and mode will be read from DT */ diff --git a/env/sf.c b/env/sf.c index b3dec82c35..ee639b90fc 100644 --- a/env/sf.c +++ b/env/sf.c @@ -52,7 +52,7 @@ static struct spi_flash *env_flash; static int setup_flash_device(void) { -#ifdef CONFIG_DM_SPI_FLASH +#if CONFIG_IS_ENABLED(DM_SPI_FLASH) struct udevice *new; int ret; diff --git a/include/spi_flash.h b/include/spi_flash.h index 7f691e8559..09f3896fb9 100644 --- a/include/spi_flash.h +++ b/include/spi_flash.h @@ -51,7 +51,7 @@ struct dm_spi_flash_ops { /* Access the serial operations for a device */ #define sf_get_ops(dev) ((struct dm_spi_flash_ops *)(dev)->driver->ops) -#ifdef CONFIG_DM_SPI_FLASH +#if CONFIG_IS_ENABLED(DM_SPI_FLASH) /** * spi_flash_read_dm() - Read data from SPI flash * -- 2.19.2

3 5