September 2018 - U-Boot

[U-Boot] [PATCH 1/1] efi_loader: check parameter new_handle of efi_file_open()
by Heinrich Schuchardt 15 Sep '18

15 Sep '18

We should not check parameter file twice. We should check parameter new_handle. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- fs/fat/fat_write.c | 2 ++ lib/efi_loader/efi_file.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/fat/fat_write.c b/fs/fat/fat_write.c index fc211e74bc..eb14018560 100644 --- a/fs/fat/fat_write.c +++ b/fs/fat/fat_write.c @@ -5,6 +5,8 @@ * R/W (V)FAT 12/16/32 filesystem implementation by Donggeun Kim */ +#define DEBUG 1 + #include <common.h> #include <command.h> #include <config.h> diff --git a/lib/efi_loader/efi_file.c b/lib/efi_loader/efi_file.c index ef34cc6cd7..40ae7e4b38 100644 --- a/lib/efi_loader/efi_file.c +++ b/lib/efi_loader/efi_file.c @@ -218,7 +218,7 @@ static efi_status_t EFIAPI efi_file_open(struct efi_file_handle *file, open_mode, attributes); /* Check parameters */ - if (!file || !file || !file_name) { + if (!file || !new_handle || !file_name) { ret = EFI_INVALID_PARAMETER; goto out; } -- 2.18.0

2 1

[U-Boot] [PATCH v10 00/10] efi: Enable sandbox support for EFI loader
by Simon Glass 15 Sep '18

15 Sep '18

A limitation of the EFI loader at present is that it does not build with sandbox. This makes it hard to write tests, since sandbox is used for most testing in U-Boot. This series enables the EFI loader feature. It allows sandbox to build and run a trivial function which calls the EFI API to output a message. Also included in v8 is support for running the full EFI self tests. These run OK with some tweaks to a few parts of the code. With v9, various EFI patches have been applied which change things. This series includes a partial review of one, which makes 'bootefi test' work. But there are still problems with 'bootefi selftest': As of v10 two selftests fail. I fixed another one in this series. I think have removed all paches not essential to getting things running. The refactoring patches will be sent separately once these are sorted out. $ sandbox/u-boot -D -c "bootefi selftest" ... Executing 'real time clock' /home/sjg/c/src/third_party/u-boot/files/lib/efi_selftest/efi_selftest_rtc.c(46): ERROR: Could not read real time clock /home/sjg/c/src/third_party/u-boot/files/lib/efi_selftest/efi_selftest.c(109): ERROR: Executing 'real time clock' failed Setting up 'simple network protocol' /home/sjg/c/src/third_party/u-boot/files/lib/efi_selftest/efi_selftest_snp.c(209): ERROR: Failed to locate simple network protocol /home/sjg/c/src/third_party/u-boot/files/lib/efi_selftest/efi_selftest.c(84): ERROR: Setting up 'simple network protocol' failed This series is at u-boot-dm/efi-working Changes in v10: - Try to use compiler pre-defines to get the right settings for sandbox - Explain the padding of the returned pointer in the commit message - Add new patch to correct the operation of efi_file_write() - Drop patches not essential to getting things working Changes in v9: - Fix 'thi' typo - Drop fdt_end variable in efi_install_fdt() Changes in v8: - Rebase to master, bringing in all EFI changes - Drop 'efi: sandbox: Add relocation constants' - Drop 'efi: Adjust memory handling to support sandbox' - Drop 'sandbox: smbios: Update to support sandbox' - Expand series substantially to support bootefi selftest - Rebase to master Changes in v7: - Drop an unnecessary comment - Update patch subject s/builder/build/ Changes in v6: - Warn about building sandbox EFI support on something other than __x86_64__ Changes in v4: - Rebase to master - Update SPDX tags Changes in v3: - Init the 'rows' and 'cols' vars to avoid a compiler error (gcc 4.8.4) - Rebase to master Changes in v2: - Rebase to master Alexander Graf (1): efi_loader: Pass address to fs_read() Simon Glass (9): efi: sandbox: Add distroboot support efi: sandbox: Enable EFI loader build for sandbox sandbox: Align RAM buffer to the machine page size sandbox: Add support for calling abort() sandbox: Enhance map_to_sysmem() to handle foreign pointers efi: Relocate FDT to 127MB instead of 128MB efi: sandbox: Tidy up copy_fdt() to work with sandbox efi: Correct the operation of efi_file_write() efi: sandbox: Enable selftest command arch/sandbox/cpu/cpu.c | 141 +++++++++++++++++++++++++++++-- arch/sandbox/cpu/os.c | 12 ++- arch/sandbox/cpu/state.c | 8 ++ arch/sandbox/include/asm/state.h | 21 +++++ cmd/bootefi.c | 83 +++++++++++------- configs/sandbox_defconfig | 1 + include/config_distro_bootcmd.h | 16 ++-- include/os.h | 4 + lib/efi_loader/Kconfig | 2 +- lib/efi_loader/efi_file.c | 5 +- 10 files changed, 241 insertions(+), 52 deletions(-) -- 2.19.0.397.gdd90340f6a-goog

2 20

[U-Boot] [PATCH 1/1] efi_loader: more debug info for efi_file_getinfo()
by Heinrich Schuchardt 14 Sep '18

14 Sep '18

efi_file_getinfo() is called with a GUID. In EFI_ENTRY use %pUl as format type. This way the GUID is printed in debug mode. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_loader/efi_file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/efi_loader/efi_file.c b/lib/efi_loader/efi_file.c index 84be0d5818..ef34cc6cd7 100644 --- a/lib/efi_loader/efi_file.c +++ b/lib/efi_loader/efi_file.c @@ -500,7 +500,7 @@ static efi_status_t EFIAPI efi_file_getinfo(struct efi_file_handle *file, struct file_handle *fh = to_fh(file); efi_status_t ret = EFI_SUCCESS; - EFI_ENTRY("%p, %p, %p, %p", file, info_type, buffer_size, buffer); + EFI_ENTRY("%p, %pUl, %p, %p", file, info_type, buffer_size, buffer); if (!guidcmp(info_type, &efi_file_info_guid)) { struct efi_file_info *info = buffer; -- 2.18.0

1 0

[U-Boot] [PATCH 1/6] pico-imx6ul: Fix TechNexion spelling on MAINTAINERS file
by Otavio Salvador 14 Sep '18

14 Sep '18

Signed-off-by: Otavio Salvador <otavio(a)ossystems.com.br> --- board/technexion/pico-imx6ul/MAINTAINERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/technexion/pico-imx6ul/MAINTAINERS b/board/technexion/pico-imx6ul/MAINTAINERS index 334847cf71..fec5868015 100644 --- a/board/technexion/pico-imx6ul/MAINTAINERS +++ b/board/technexion/pico-imx6ul/MAINTAINERS @@ -1,4 +1,4 @@ -Technexion PICO-IMX6UL board +TechNexion PICO-IMX6UL board M: Richard Hu <richard.hu(a)technexion.com> M: Fabio Estevam <fabio.estevam(a)nxp.com> S: Maintained @@ -6,7 +6,7 @@ F: board/technexion/pico-imx6ul/ F: include/configs/pico-imx6ul.h F: configs/pico-imx6ul_defconfig -Technexion PICO-HOBBIT-IMX6UL +TechNexion PICO-HOBBIT-IMX6UL M: Otavio Salvador <otavio(a)ossystems.com.br> S: Maintained F: configs/pico-hobbit-imx6ul_defconfig -- 2.19.0

1 5

[U-Boot] Please pull from u-boot-i2c
by Heiko Schocher 14 Sep '18

14 Sep '18

Hello Tom, please pull from u-boot-i2c.git master The following changes since commit d1e15041abf3ccd38169ae7aa8736f78200f8ee3: Merge branch 'master' of git://git.denx.de/u-boot-uniphier (2018-09-11 08:50:10 -0400) are available in the Git repository at: git://git.denx.de/u-boot-i2c.git master for you to fetch changes up to ca1d6ca3653c5aa7679a55fd84a20e175d3b8e64: i2c: Drop CONFIG_SYS_I2C_MXS (2018-09-14 06:30:29 +0200) ---------------------------------------------------------------- Tuomas Tynkkynen (1): i2c: Drop CONFIG_SYS_I2C_MXS drivers/i2c/Makefile | 1 - drivers/i2c/mxs_i2c.c | 319 ------------------------------------------------------------------------------------------------------------------------------------------ 2 files changed, 320 deletions(-) delete mode 100644 drivers/i2c/mxs_i2c.c Travis build is fine: https://travis-ci.org/hsdenx/u-boot-i2c/builds/428462792?utm_source=email&u… bye, Heiko -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs(a)denx.de

2 1

[U-Boot] [PATCH 1/1] efi_loader: terminal left upper corner is [1, 1]
by Heinrich Schuchardt 14 Sep '18

14 Sep '18

For the VT102 and the Linux console the left upper corner is [1, 1]. EFI uses [0, 0] as left upper corner. Check parameters of the SetCursorPosition() service. Use CSI H like EDK2 for positioning. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_loader/efi_console.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/lib/efi_loader/efi_console.c b/lib/efi_loader/efi_console.c index 40e33f9fd3..e1f6b2b887 100644 --- a/lib/efi_loader/efi_console.c +++ b/lib/efi_loader/efi_console.c @@ -372,13 +372,31 @@ static efi_status_t EFIAPI efi_cout_set_cursor_position( struct efi_simple_text_output_protocol *this, unsigned long column, unsigned long row) { + efi_status_t ret = EFI_SUCCESS; + struct simple_text_output_mode *con = &efi_con_mode; + struct cout_mode *mode = &efi_cout_modes[con->mode]; + EFI_ENTRY("%p, %ld, %ld", this, column, row); - printf(ESC"[%d;%df", (int)row, (int)column); + /* Check parameters */ + if (!this) { + ret = EFI_INVALID_PARAMETER; + goto out; + } + if (row >= mode->rows || column >= mode->columns) { + ret = EFI_UNSUPPORTED; + goto out; + } + + /* + * Set cursor position by sending CSI H. + * EFI origin is [0, 0], terminal origin is [1, 1]. + */ + printf(ESC "[%d;%dH", (int)row + 1, (int)column + 1); efi_con_mode.cursor_column = column; efi_con_mode.cursor_row = row; - - return EFI_EXIT(EFI_SUCCESS); +out: + return EFI_EXIT(ret); } static efi_status_t EFIAPI efi_cout_enable_cursor( -- 2.18.0

1 0

[U-Boot] [PATCH v3 01/14] pico-imx6ul: Convert to distro config
by Otavio Salvador 14 Sep '18

14 Sep '18

From: Fabio Estevam <festevam(a)gmail.com> Instead of keeping a custom environment, use a more generic approach by switching to disto config. Signed-off-by: Fabio Estevam <festevam(a)gmail.com> Signed-off-by: Otavio Salvador <otavio(a)ossystems.com.br> --- Changes in v3: None Changes in v2: None configs/pico-imx6ul_defconfig | 2 + include/configs/pico-imx6ul.h | 69 ++++++++++------------------------- 2 files changed, 21 insertions(+), 50 deletions(-) diff --git a/configs/pico-imx6ul_defconfig b/configs/pico-imx6ul_defconfig index 59ef7b7f22..3f969a2d6e 100644 --- a/configs/pico-imx6ul_defconfig +++ b/configs/pico-imx6ul_defconfig @@ -4,7 +4,9 @@ CONFIG_SYS_TEXT_BASE=0x87800000 CONFIG_TARGET_PICO_IMX6UL=y # CONFIG_CMD_BMODE is not set CONFIG_NR_DRAM_BANKS=1 +CONFIG_DISTRO_DEFAULTS=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/technexion/pico-imx6ul/imximage.cfg" +CONFIG_BOOTCOMMAND="run finduuid; run distro_bootcmd" CONFIG_BOOTDELAY=3 CONFIG_SUPPORT_RAW_INITRD=y CONFIG_DEFAULT_FDT_FILE="imx6ul-pico-hobbit.dtb" diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h index 80a2d1fbdb..1a148bf1a6 100644 --- a/include/configs/pico-imx6ul.h +++ b/include/configs/pico-imx6ul.h @@ -52,64 +52,33 @@ #define CONFIG_SYS_MMC_IMG_LOAD_PART 1 #define CONFIG_EXTRA_ENV_SETTINGS \ + "script=boot.scr\0" \ "image=zImage\0" \ "console=ttymxc5\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ - "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ + "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ "fdt_addr=0x83000000\0" \ - "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \ - "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \ + "fdt_addr_r=0x83000000\0" \ + "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ + "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ + "ramdisk_addr_r=0x83000000\0" \ + "ramdiskaddr=0x83000000\0" \ + "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \ CONFIG_DFU_ENV_SETTINGS \ - "finduuid=part uuid mmc 0:2 uuid\0" \ + "finduuid=part uuid mmc 0:1 uuid\0" \ "partitions=" \ "uuid_disk=${uuid_gpt_disk};" \ - "name=boot,size=16MiB;name=rootfs,size=0,uuid=${uuid_gpt_rootfs}\0" \ - "setup_emmc=gpt write mmc 0 $partitions; reset;\0" \ - "mmcargs=setenv bootargs console=${console},${baudrate} " \ - "root=PARTUUID=${uuid} rootwait rw\0" \ - "loadimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ - "loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ - "mmcboot=echo Booting from mmc ...; " \ - "run finduuid; " \ - "run mmcargs; " \ - "if run loadfdt; then " \ - "bootz ${loadaddr} - ${fdt_addr}; " \ - "else " \ - "echo WARN: Cannot load the DT; " \ - "fi;\0" \ - "netargs=setenv bootargs console=${console},${baudrate} " \ - "root=/dev/nfs " \ - "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ - "netboot=echo Booting from net ...; " \ - "run netargs; " \ - "if test ${ip_dyn} = yes; then " \ - "setenv get_cmd dhcp; " \ - "else " \ - "setenv get_cmd tftp; " \ - "fi; " \ - "${get_cmd} ${image}; " \ - "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ - "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ - "bootz ${loadaddr} - ${fdt_addr}; " \ - "else " \ - "if test ${boot_fdt} = try; then " \ - "bootz; " \ - "else " \ - "echo WARN: Cannot load the DT; " \ - "fi; " \ - "fi; " \ - "else " \ - "bootz; " \ - "fi;\0" \ - -#define CONFIG_BOOTCOMMAND \ - "if mmc rescan; then " \ - "if run loadimage; then " \ - "run mmcboot; " \ - "else run netboot; " \ - "fi; " \ - "else run netboot; fi" + "name=rootfs,size=0,uuid=${uuid_gpt_rootfs}\0" \ + "fastboot_partition_alias_system=rootfs\0" \ + "setup_emmc=mmc dev 0; gpt write mmc 0 $partitions; reset;\0" \ + BOOTENV + +#define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 0) \ + func(DHCP, dhcp, na) + +#include <config_distro_bootcmd.h> #define CONFIG_SYS_MEMTEST_START 0x80000000 #define CONFIG_SYS_MEMTEST_END CONFIG_SYS_MEMTEST_START + SZ_128M -- 2.19.0

4 23

[U-Boot] [RFC PATCH 1/2] Makefile: Use -fno-strict-aliasing globally
by Bin Meng 14 Sep '18

14 Sep '18

The -fstrict-aliasing option is implicitly enabled at levels -O2, -O3, -Os by GCC. This option allows the compiler to assume the strictest aliasing rules applicable to the language being compiled. For example, the practice of reading from a different union member than the one most recently written to (called "type-punning") is common. In this case, "type-punning" only works if the memory is accessed through the union type, but might not work by taking the address, casting the resulting pointer and dereferencing the result, which is an undefined behavior per the "strict aliasing rules". GCC's -Wstrict-aliasing (included in -Wall) option does not catch all cases, but does attempt to catch the more common pitfalls. So there are cases that GCC does not report but the codes are violating the "strict aliasing rules". Given lots of codes that may be written to rely on "type-punning", and Linux kernel disables it by -fno-strict-aliasing globally, since U-Boot currently does this on nds32/riscv/x86 builds only, extend this for all architecture builds. Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f30dd8e..994d957 100644 --- a/Makefile +++ b/Makefile @@ -372,7 +372,7 @@ KBUILD_CPPFLAGS := -D__KERNEL__ -D__UBOOT__ KBUILD_CFLAGS := -Wall -Wstrict-prototypes \ -Wno-format-security \ -fno-builtin -ffreestanding $(CSTD_FLAG) -KBUILD_CFLAGS += -fshort-wchar +KBUILD_CFLAGS += -fshort-wchar -fno-strict-aliasing KBUILD_AFLAGS := -D__ASSEMBLY__ # Don't generate position independent code -- 2.7.4

3 3

[U-Boot] [PATCH 1/1] efi_loader: environment variables for terminal size
by Heinrich Schuchardt 14 Sep '18

14 Sep '18

Correct scrolling in EFI applications like the EFI Shell requires correct setting of the terminal size. Detecting the terminal size over the serial interface is often not supported. The patch introduces the environment variables LINES and COLUMNS to set the terminal size manually. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- doc/README.uefi | 14 ++++++++++++++ lib/efi_loader/efi_console.c | 15 ++++++++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/doc/README.uefi b/doc/README.uefi index 6b9759cfed..df0cf5b7ce 100644 --- a/doc/README.uefi +++ b/doc/README.uefi @@ -299,6 +299,20 @@ This driver is only available if U-Boot is configured with CONFIG_BLK=y CONFIG_PARTITIONS=y +## Setting the terminal size + +For correct scrolling the terminal size has to be known. + +The default terminal size is 80x25. + +If the environment variable 'stdout' has the value 'vidconsole', the terminal +size is determined by querying the video console driver. Else it is tried to +determine the terminal size by sending ESC '[18t' to the console which may +reply with an escape sequence indicating the terminal size. + +It is possible to override the terminal size by setting the environment +variables 'LINES' and 'COLUMNS'. + ## TODOs as of U-Boot 2018.07 * unimplemented or incompletely implemented boot services diff --git a/lib/efi_loader/efi_console.c b/lib/efi_loader/efi_console.c index 73f7ecf919..40e33f9fd3 100644 --- a/lib/efi_loader/efi_console.c +++ b/lib/efi_loader/efi_console.c @@ -224,6 +224,7 @@ static void query_console_size(void) { const char *stdout_name = env_get("stdout"); int rows = 25, cols = 80; + char *value; if (stdout_name && !strcmp(stdout_name, "vidconsole") && IS_ENABLED(CONFIG_DM_VIDEO)) { @@ -235,9 +236,21 @@ static void query_console_size(void) rows = priv->rows; cols = priv->cols; } else if (query_console_serial(&rows, &cols)) { - return; + rows = 25; + cols = 80; } + value = env_get("LINES"); + if (value) + rows = simple_strtoul(value, NULL, 10); + value = env_get("COLUMNS"); + if (value) + cols = simple_strtoul(value, NULL, 10); + if (rows <= 0) + rows = 25; + if (cols <= 0) + cols = 80; + /* Test if we can have Mode 1 */ if (cols >= 80 && rows >= 50) { efi_cout_modes[1].present = 1; -- 2.18.0

3 3

[U-Boot] [PATCH v4 0/2] arm: qemu-arm: enable PL031 (RTC)
by Akashi, Takahiro 14 Sep '18

14 Sep '18

Virtual Machines provided by qemu for arm are already equipped with RTCdevice (PL031). With this patch set, PL031 driver is converted to driver model and by default enabled on qemu-arm. It allows us not only to use date command but also to enable UEFI's GetTime/SetTime() services. This work is motivated by running UEFI SCT(Self-Certification Test) and measuring time. Heinrich has already posted UEFI's GetTime() implementation. This is a revised version of my proposal[1]. [1] https://lists.denx.de/pipermail/u-boot/2018-July/333534.html Changes in v4 (Sep 14, 2018) * rebased to v2018.09-rc as my v3 was incompletely merged * drop v3's patch#1 * remove duplicated CONFIG_RTC_PL031 and CONFIG_SYS_RTC_PL031_BASE Changes in v3 (July 11, 2018) * compile drivers/rtc/date.c if DM_RTC * rename pl031_rtc_xxx to pl031_xxx * make struct pl031_platdata private to the driver * add probe function, removing pl031_initted variable * use readl/writel() instead of private macros * add a debug message to pl031_rtc_set() * remove CONFIG_SYS_RTC_PL031_BASE from config_whitelist.txt * enable RTC_PL031 for QEMU_ARM in arch/arm/Kconfig Changes in v2 (July 4, 2018) * based on Heinrich's comments, * remove legacy mode interface * enable the driver in defconfig AKASHI Takahiro (2): rtc: pl031: convert the driver to driver model arm: qemu-arm: enable RTC (PL031) by default arch/arm/Kconfig | 2 + drivers/rtc/pl031.c | 126 ++++++++++++++++++++++------------- include/configs/qemu-arm.h | 3 - scripts/config_whitelist.txt | 1 - 4 files changed, 82 insertions(+), 50 deletions(-) -- 2.18.0

1 2