January 2019 - U-Boot

[U-Boot] [PATCH 1/2] arm64: versal: Enable i2c cadence controller and i2c command
by Michal Simek 17 Jan '19

17 Jan '19

Enable communication over i2c. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- configs/xilinx_versal_virt_defconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/xilinx_versal_virt_defconfig b/configs/xilinx_versal_virt_defconfig index e1797db9821b..3f26163913b7 100644 --- a/configs/xilinx_versal_virt_defconfig +++ b/configs/xilinx_versal_virt_defconfig @@ -20,6 +20,7 @@ CONFIG_CMD_BOOTMENU=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_ALT_MEMTEST=y # CONFIG_CMD_FLASH is not set +CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_SF=y CONFIG_CMD_DHCP=y @@ -42,6 +43,8 @@ CONFIG_OF_BOARD=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_DM_GPIO=y +CONFIG_DM_I2C=y +CONFIG_SYS_I2C_CADENCE=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ZYNQ=y CONFIG_DM_SPI_FLASH=y -- 1.9.1

1 1

[U-Boot] [PATCH 1/2] efi_loader: implement GetNextVariableName()
by AKASHI Takahiro 17 Jan '19

17 Jan '19

The current GetNextVariableName() is a placeholder. With this patch, it works well as expected. Signed-off-by: AKASHI Takahiro <takahiro.akashi(a)linaro.org> --- lib/efi_loader/efi_variable.c | 116 +++++++++++++++++++++++++++++++++- 1 file changed, 115 insertions(+), 1 deletion(-) diff --git a/lib/efi_loader/efi_variable.c b/lib/efi_loader/efi_variable.c index 19d9cb865f25..dac2f49aa1cc 100644 --- a/lib/efi_loader/efi_variable.c +++ b/lib/efi_loader/efi_variable.c @@ -8,6 +8,9 @@ #include <malloc.h> #include <charset.h> #include <efi_loader.h> +#include <environment.h> +#include <search.h> +#include <uuid.h> #define READ_ONLY BIT(31) @@ -241,14 +244,125 @@ efi_status_t EFIAPI efi_get_variable(u16 *variable_name, efi_guid_t *vendor, return EFI_EXIT(EFI_SUCCESS); } +static char *efi_variables_list; +static char *efi_cur_variable; + +static efi_status_t parse_uboot_variable(char *variable, + efi_uintn_t *variable_name_size, + u16 *variable_name, + efi_guid_t *vendor, + u32 *attribute) +{ + char *guid, *name, *end, c; + unsigned long name_size; + u16 *p; + + guid = strchr(variable, '_'); + if (!guid) + return EFI_NOT_FOUND; + guid++; + name = strchr(guid, '_'); + if (!name) + return EFI_NOT_FOUND; + name++; + end = strchr(name, '='); + if (!end) + return EFI_NOT_FOUND; + + /* FIXME: size is in byte or u16? */ + name_size = end - name; + if (*variable_name_size < (name_size + 1)) { + *variable_name_size = name_size + 1; + return EFI_BUFFER_TOO_SMALL; + } + end++; /* point to value */ + + p = variable_name; + utf8_utf16_strncpy(&p, name, name_size); + variable_name[name_size] = 0; + + c = *(name - 1); + *(name - 1) = '\0'; /* guid need be null-terminated here */ + uuid_str_to_bin(guid, (unsigned char *)vendor, UUID_STR_FORMAT_GUID); + *(name - 1) = c; + + parse_attr(end, attribute); + + return EFI_SUCCESS; +} + /* http://wiki.phoenix.com/wiki/index.php/EFI_RUNTIME_SERVICES#GetNextVariable… */ efi_status_t EFIAPI efi_get_next_variable_name(efi_uintn_t *variable_name_size, u16 *variable_name, efi_guid_t *vendor) { + char *native_name, *variable; + ssize_t name_len, list_len; + char regex[256]; + char * const regexlist[] = {regex}; + u32 attribute; + int i; + efi_status_t ret; + EFI_ENTRY("%p \"%ls\" %pUl", variable_name_size, variable_name, vendor); - return EFI_EXIT(EFI_DEVICE_ERROR); + if (!variable_name_size || !variable_name || !vendor) + EFI_EXIT(EFI_INVALID_PARAMETER); + + if (variable_name[0]) { + /* check null-terminated string */ + for (i = 0; i < *variable_name_size; i++) + if (!variable_name[i]) + break; + if (i >= *variable_name_size) + return EFI_EXIT(EFI_INVALID_PARAMETER); + + /* search for the last-returned variable */ + ret = efi_to_native(&native_name, variable_name, vendor); + if (ret) + return EFI_EXIT(ret); + + name_len = strlen(native_name); + for (variable = efi_variables_list; variable && *variable;) { + if (!strncmp(variable, native_name, name_len) && + variable[name_len] == '=') + break; + + variable = strchr(variable, '\n'); + if (variable) + variable++; + } + + free(native_name); + if (!(variable && *variable)) + return EFI_EXIT(EFI_INVALID_PARAMETER); + + /* next variable */ + variable = strchr(variable, '\n'); + if (variable) + variable++; + if (!(variable && *variable)) + return EFI_EXIT(EFI_NOT_FOUND); + } else { + /* new search */ + free(efi_variables_list); + efi_variables_list = NULL; + efi_cur_variable = NULL; + + snprintf(regex, 256, "efi_.*-.*-.*-.*-.*_.*"); + list_len = hexport_r(&env_htab, '\n', + H_MATCH_REGEX | H_MATCH_KEY, + &efi_variables_list, 0, 1, regexlist); + if (list_len <= 0) + return EFI_EXIT(EFI_NOT_FOUND); + + variable = efi_variables_list; + } + + ret = parse_uboot_variable(variable, variable_name_size, variable_name, + vendor, &attribute); + + return EFI_EXIT(ret); } /* http://wiki.phoenix.com/wiki/index.php/EFI_RUNTIME_SERVICES#SetVariable.28.… */ -- 2.19.1

2 7

[U-Boot] [PATCH] arm64: zynqmp: Move SoC sources to mach-zynqmp
by Michal Simek 17 Jan '19

17 Jan '19

Similar changes was done for Zynq in past and this patch just follow this pattern to separate cpu code from SoC code. Move arch/arm/cpu/armv8/zynqmp/* -> arch/arm/mach-zynqmp/* And also fix references to these files. Based on "ARM: zynq: move SoC sources to mach-zynq" (sha1: 0107f2403669f764ab726d0d404e35bb9447bbcc) Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- MAINTAINERS | 2 +- arch/arm/Kconfig | 4 ++-- arch/arm/Makefile | 1 + arch/arm/cpu/armv8/Makefile | 1 - arch/arm/mach-k3/arm64-mmu.c | 2 +- arch/arm/mach-tegra/arm64-mmu.c | 2 +- arch/arm/{cpu/armv8/zynqmp => mach-zynqmp}/Kconfig | 0 arch/arm/{cpu/armv8/zynqmp => mach-zynqmp}/Makefile | 0 arch/arm/{cpu/armv8/zynqmp => mach-zynqmp}/clk.c | 0 arch/arm/{cpu/armv8/zynqmp => mach-zynqmp}/cpu.c | 0 arch/arm/{cpu/armv8/zynqmp => mach-zynqmp}/handoff.c | 0 arch/arm/{include/asm/arch-zynqmp => mach-zynqmp/include/mach}/clk.h | 0 arch/arm/{include/asm/arch-zynqmp => mach-zynqmp/include/mach}/gpio.h | 0 .../{include/asm/arch-zynqmp => mach-zynqmp/include/mach}/hardware.h | 0 .../asm/arch-zynqmp => mach-zynqmp/include/mach}/psu_init_gpl.h | 0 .../{include/asm/arch-zynqmp => mach-zynqmp/include/mach}/sys_proto.h | 0 arch/arm/{cpu/armv8/zynqmp => mach-zynqmp}/mp.c | 0 arch/arm/{cpu/armv8/zynqmp => mach-zynqmp}/psu_spl_init.c | 0 arch/arm/{cpu/armv8/zynqmp => mach-zynqmp}/spl.c | 0 19 files changed, 6 insertions(+), 6 deletions(-) rename arch/arm/{cpu/armv8/zynqmp => mach-zynqmp}/Kconfig (100%) rename arch/arm/{cpu/armv8/zynqmp => mach-zynqmp}/Makefile (100%) rename arch/arm/{cpu/armv8/zynqmp => mach-zynqmp}/clk.c (100%) rename arch/arm/{cpu/armv8/zynqmp => mach-zynqmp}/cpu.c (100%) rename arch/arm/{cpu/armv8/zynqmp => mach-zynqmp}/handoff.c (100%) rename arch/arm/{include/asm/arch-zynqmp => mach-zynqmp/include/mach}/clk.h (100%) rename arch/arm/{include/asm/arch-zynqmp => mach-zynqmp/include/mach}/gpio.h (100%) rename arch/arm/{include/asm/arch-zynqmp => mach-zynqmp/include/mach}/hardware.h (100%) rename arch/arm/{include/asm/arch-zynqmp => mach-zynqmp/include/mach}/psu_init_gpl.h (100%) rename arch/arm/{include/asm/arch-zynqmp => mach-zynqmp/include/mach}/sys_proto.h (100%) rename arch/arm/{cpu/armv8/zynqmp => mach-zynqmp}/mp.c (100%) rename arch/arm/{cpu/armv8/zynqmp => mach-zynqmp}/psu_spl_init.c (100%) rename arch/arm/{cpu/armv8/zynqmp => mach-zynqmp}/spl.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index e192db075489..2386bebaea68 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -354,7 +354,7 @@ ARM ZYNQMP M: Michal Simek <michal.simek(a)xilinx.com> S: Maintained T: git git://git.denx.de/u-boot-microblaze.git -F: arch/arm/cpu/armv8/zynqmp/ +F: arch/arm/mach-zynqmp/ F: drivers/clk/clk_zynqmp.c F: drivers/fpga/zynqpl.c F: drivers/gpio/zynq_gpio.c diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index a65e0c52116c..2298e6e7d750 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1503,14 +1503,14 @@ source "arch/arm/cpu/armv7/vf610/Kconfig" source "arch/arm/mach-zynq/Kconfig" +source "arch/arm/mach-zynqmp/Kconfig" + source "arch/arm/mach-versal/Kconfig" source "arch/arm/mach-zynqmp-r5/Kconfig" source "arch/arm/cpu/armv7/Kconfig" -source "arch/arm/cpu/armv8/zynqmp/Kconfig" - source "arch/arm/cpu/armv8/Kconfig" source "arch/arm/mach-imx/Kconfig" diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 87d9d4b9f744..817302523aec 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -81,6 +81,7 @@ machine-$(CONFIG_ARCH_STM32MP) += stm32mp machine-$(CONFIG_TEGRA) += tegra machine-$(CONFIG_ARCH_UNIPHIER) += uniphier machine-$(CONFIG_ARCH_ZYNQ) += zynq +machine-$(CONFIG_ARCH_ZYNQMP) += zynqmp machine-$(CONFIG_ARCH_VERSAL) += versal machine-$(CONFIG_ARCH_ZYNQMP_R5) += zynqmp-r5 diff --git a/arch/arm/cpu/armv8/Makefile b/arch/arm/cpu/armv8/Makefile index 52c8daa04962..4c4b13c9e759 100644 --- a/arch/arm/cpu/armv8/Makefile +++ b/arch/arm/cpu/armv8/Makefile @@ -29,7 +29,6 @@ obj-$(CONFIG_$(SPL_)ARMV8_SEC_FIRMWARE_SUPPORT) += sec_firmware.o sec_firmware_a obj-$(CONFIG_FSL_LAYERSCAPE) += fsl-layerscape/ obj-$(CONFIG_S32V234) += s32v234/ -obj-$(CONFIG_ARCH_ZYNQMP) += zynqmp/ obj-$(CONFIG_TARGET_HIKEY) += hisilicon/ obj-$(CONFIG_ARMV8_PSCI) += psci.o obj-$(CONFIG_ARCH_SUNXI) += lowlevel_init.o diff --git a/arch/arm/mach-k3/arm64-mmu.c b/arch/arm/mach-k3/arm64-mmu.c index f8b93fe45849..a75ba1ffdba0 100644 --- a/arch/arm/mach-k3/arm64-mmu.c +++ b/arch/arm/mach-k3/arm64-mmu.c @@ -4,7 +4,7 @@ * * Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/ * Lokesh Vutla <lokeshvutla(a)ti.com> - * (This file is derived from arch/arm/cpu/armv8/zynqmp/cpu.c) + * (This file is derived from arch/arm/mach-zynqmp/cpu.c) * */ diff --git a/arch/arm/mach-tegra/arm64-mmu.c b/arch/arm/mach-tegra/arm64-mmu.c index 702fde1dea1d..d45b1faaa2c2 100644 --- a/arch/arm/mach-tegra/arm64-mmu.c +++ b/arch/arm/mach-tegra/arm64-mmu.c @@ -2,7 +2,7 @@ /* * (C) Copyright 2014 - 2015 Xilinx, Inc. * Michal Simek <michal.simek(a)xilinx.com> - * (This file derived from arch/arm/cpu/armv8/zynqmp/cpu.c) + * (This file derived from arch/arm/mach-zynqmp/cpu.c) * * Copyright (c) 2015, NVIDIA CORPORATION. All rights reserved. */ diff --git a/arch/arm/cpu/armv8/zynqmp/Kconfig b/arch/arm/mach-zynqmp/Kconfig similarity index 100% rename from arch/arm/cpu/armv8/zynqmp/Kconfig rename to arch/arm/mach-zynqmp/Kconfig diff --git a/arch/arm/cpu/armv8/zynqmp/Makefile b/arch/arm/mach-zynqmp/Makefile similarity index 100% rename from arch/arm/cpu/armv8/zynqmp/Makefile rename to arch/arm/mach-zynqmp/Makefile diff --git a/arch/arm/cpu/armv8/zynqmp/clk.c b/arch/arm/mach-zynqmp/clk.c similarity index 100% rename from arch/arm/cpu/armv8/zynqmp/clk.c rename to arch/arm/mach-zynqmp/clk.c diff --git a/arch/arm/cpu/armv8/zynqmp/cpu.c b/arch/arm/mach-zynqmp/cpu.c similarity index 100% rename from arch/arm/cpu/armv8/zynqmp/cpu.c rename to arch/arm/mach-zynqmp/cpu.c diff --git a/arch/arm/cpu/armv8/zynqmp/handoff.c b/arch/arm/mach-zynqmp/handoff.c similarity index 100% rename from arch/arm/cpu/armv8/zynqmp/handoff.c rename to arch/arm/mach-zynqmp/handoff.c diff --git a/arch/arm/include/asm/arch-zynqmp/clk.h b/arch/arm/mach-zynqmp/include/mach/clk.h similarity index 100% rename from arch/arm/include/asm/arch-zynqmp/clk.h rename to arch/arm/mach-zynqmp/include/mach/clk.h diff --git a/arch/arm/include/asm/arch-zynqmp/gpio.h b/arch/arm/mach-zynqmp/include/mach/gpio.h similarity index 100% rename from arch/arm/include/asm/arch-zynqmp/gpio.h rename to arch/arm/mach-zynqmp/include/mach/gpio.h diff --git a/arch/arm/include/asm/arch-zynqmp/hardware.h b/arch/arm/mach-zynqmp/include/mach/hardware.h similarity index 100% rename from arch/arm/include/asm/arch-zynqmp/hardware.h rename to arch/arm/mach-zynqmp/include/mach/hardware.h diff --git a/arch/arm/include/asm/arch-zynqmp/psu_init_gpl.h b/arch/arm/mach-zynqmp/include/mach/psu_init_gpl.h similarity index 100% rename from arch/arm/include/asm/arch-zynqmp/psu_init_gpl.h rename to arch/arm/mach-zynqmp/include/mach/psu_init_gpl.h diff --git a/arch/arm/include/asm/arch-zynqmp/sys_proto.h b/arch/arm/mach-zynqmp/include/mach/sys_proto.h similarity index 100% rename from arch/arm/include/asm/arch-zynqmp/sys_proto.h rename to arch/arm/mach-zynqmp/include/mach/sys_proto.h diff --git a/arch/arm/cpu/armv8/zynqmp/mp.c b/arch/arm/mach-zynqmp/mp.c similarity index 100% rename from arch/arm/cpu/armv8/zynqmp/mp.c rename to arch/arm/mach-zynqmp/mp.c diff --git a/arch/arm/cpu/armv8/zynqmp/psu_spl_init.c b/arch/arm/mach-zynqmp/psu_spl_init.c similarity index 100% rename from arch/arm/cpu/armv8/zynqmp/psu_spl_init.c rename to arch/arm/mach-zynqmp/psu_spl_init.c diff --git a/arch/arm/cpu/armv8/zynqmp/spl.c b/arch/arm/mach-zynqmp/spl.c similarity index 100% rename from arch/arm/cpu/armv8/zynqmp/spl.c rename to arch/arm/mach-zynqmp/spl.c -- 1.9.1

1 0

[U-Boot] [PATCH v2] travis: Wire Xilinx Versal Virt platform
by Michal Simek 17 Jan '19

17 Jan '19

Test Xilinx Versal Virt platform running on the v3.1.0 Qemu. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- Changes in v2: - Rebased on the top of https://lists.denx.de/pipermail/u-boot/2019-January/354857.html .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml index 8991e12d6a1a..8daebdc8c157 100644 --- a/.travis.yml +++ b/.travis.yml @@ -448,6 +448,13 @@ matrix: QEMU_TARGET="arm-softmmu" TEST_PY_ID="--id qemu" BUILDMAN="^zynq_zc702$" + - name: "test/py xilinx_versal_virt" + env: + - TEST_PY_BD="xilinx_versal_virt" + TEST_PY_TEST_SPEC="not sleep" + QEMU_TARGET="aarch64-softmmu" + TEST_PY_ID="--id qemu" + BUILDMAN="^xilinx_versal_virt$" - name: "test/py xtfpga" env: - TEST_PY_BD="xtfpga" -- 1.9.1

1 0

[U-Boot] [PATCH v2 1/4] tools: zynqmpimage: Align image_size/image_stored_size
by Michal Simek 17 Jan '19

17 Jan '19

Bootrom is not capable to work with non aligned bootloader sizes. SPL with OF_SEPARATE generates non-align images quite often that's why this change is required before OF_SEPARATE enableding. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- Changes in v2: - Remove zynqmpimage.c changes - Fix subject tools/zynqmpbif.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/zynqmpbif.c b/tools/zynqmpbif.c index a33c15e1f018..8c47107c7b94 100644 --- a/tools/zynqmpbif.c +++ b/tools/zynqmpbif.c @@ -425,8 +425,8 @@ static int bif_add_part(struct bif_entry *bf, const char *data, size_t len) if (!bif_output.header->image_offset) bif_output.header->image_offset = cpu_to_le32(bf->offset); - bif_output.header->image_size = cpu_to_le32(len); - bif_output.header->image_stored_size = cpu_to_le32(len); + bif_output.header->image_size = cpu_to_le32(len_padded); + bif_output.header->image_stored_size = cpu_to_le32(len_padded); bif_output.header->image_attributes &= ~HEADER_CPU_SELECT_MASK; switch (bf->dest_cpu) { -- 1.9.1

2 5

[U-Boot] [PATCH v2] efi_loader: move efi_init_obj_list() to a new efi_setup.c
by AKASHI Takahiro 17 Jan '19

17 Jan '19

# removed unnecessary "#if" statements from v1 The function, efi_init_obj_list(), can be shared in different pseudo efi applications, like bootefi/bootmgr as well as my efishell. Moreover, it will be utilized to extend efi initialization, for example, my "removable disk support" patch and "capsule-on-disk support" patch in the future. So with this patch, it will be moved to a new file, efi_setup.c, under lib/efi_loader and exported, making no changes in functionality. Signed-off-by: AKASHI Takahiro <takahiro.akashi(a)linaro.org> --- cmd/bootefi.c | 75 -------------------------------- include/efi_loader.h | 2 + lib/efi_loader/Makefile | 1 + lib/efi_loader/efi_setup.c | 89 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 92 insertions(+), 75 deletions(-) create mode 100644 lib/efi_loader/efi_setup.c diff --git a/cmd/bootefi.c b/cmd/bootefi.c index 38679ffc56a9..7012d72ab50d 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -30,84 +30,9 @@ DECLARE_GLOBAL_DATA_PTR; #define OBJ_LIST_NOT_INITIALIZED 1 -static efi_status_t efi_obj_list_initialized = OBJ_LIST_NOT_INITIALIZED; - static struct efi_device_path *bootefi_image_path; static struct efi_device_path *bootefi_device_path; -/* Initialize and populate EFI object list */ -efi_status_t efi_init_obj_list(void) -{ - efi_status_t ret = EFI_SUCCESS; - - /* - * On the ARM architecture gd is mapped to a fixed register (r9 or x18). - * As this register may be overwritten by an EFI payload we save it here - * and restore it on every callback entered. - */ - efi_save_gd(); - - /* Initialize once only */ - if (efi_obj_list_initialized != OBJ_LIST_NOT_INITIALIZED) - return efi_obj_list_initialized; - - /* Initialize system table */ - ret = efi_initialize_system_table(); - if (ret != EFI_SUCCESS) - goto out; - - /* Initialize root node */ - ret = efi_root_node_register(); - if (ret != EFI_SUCCESS) - goto out; - - /* Initialize EFI driver uclass */ - ret = efi_driver_init(); - if (ret != EFI_SUCCESS) - goto out; - - ret = efi_console_register(); - if (ret != EFI_SUCCESS) - goto out; -#ifdef CONFIG_PARTITIONS - ret = efi_disk_register(); - if (ret != EFI_SUCCESS) - goto out; -#endif -#if defined(CONFIG_LCD) || defined(CONFIG_DM_VIDEO) - ret = efi_gop_register(); - if (ret != EFI_SUCCESS) - goto out; -#endif -#ifdef CONFIG_NET - ret = efi_net_register(); - if (ret != EFI_SUCCESS) - goto out; -#endif -#ifdef CONFIG_GENERATE_ACPI_TABLE - ret = efi_acpi_register(); - if (ret != EFI_SUCCESS) - goto out; -#endif -#ifdef CONFIG_GENERATE_SMBIOS_TABLE - ret = efi_smbios_register(); - if (ret != EFI_SUCCESS) - goto out; -#endif - ret = efi_watchdog_register(); - if (ret != EFI_SUCCESS) - goto out; - - /* Initialize EFI runtime services */ - ret = efi_reset_system_init(); - if (ret != EFI_SUCCESS) - goto out; - -out: - efi_obj_list_initialized = ret; - return ret; -} - /* * Allow unaligned memory access. * diff --git a/include/efi_loader.h b/include/efi_loader.h index 16633d6da0d5..dd68cfce5c65 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -252,6 +252,8 @@ extern struct list_head efi_obj_list; /* List of all events */ extern struct list_head efi_events; +/* Initialize efi execution environment */ +efi_status_t efi_init_obj_list(void); /* Called by bootefi to initialize root node */ efi_status_t efi_root_node_register(void); /* Called by bootefi to initialize runtime */ diff --git a/lib/efi_loader/Makefile b/lib/efi_loader/Makefile index 26b999bf7c51..3ba539314aee 100644 --- a/lib/efi_loader/Makefile +++ b/lib/efi_loader/Makefile @@ -29,6 +29,7 @@ obj-y += efi_image_loader.o obj-y += efi_memory.o obj-y += efi_root_node.o obj-y += efi_runtime.o +obj-y += efi_setup.o obj-y += efi_unicode_collation.o obj-y += efi_variable.o obj-y += efi_watchdog.o diff --git a/lib/efi_loader/efi_setup.c b/lib/efi_loader/efi_setup.c new file mode 100644 index 000000000000..38569af1f2c8 --- /dev/null +++ b/lib/efi_loader/efi_setup.c @@ -0,0 +1,89 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * EFI setup code + * + * Copyright (c) 2016 Alexander Graf + * Copyright (c) 2018 AKASHI Takahiro, Linaro Limited + */ + +#include <common.h> +#include <efi_loader.h> + +DECLARE_GLOBAL_DATA_PTR; + +#define OBJ_LIST_NOT_INITIALIZED 1 + +static efi_status_t efi_obj_list_initialized = OBJ_LIST_NOT_INITIALIZED; + +/* Initialize and populate EFI object list */ +efi_status_t efi_init_obj_list(void) +{ + efi_status_t ret = EFI_SUCCESS; + + /* + * On the ARM architecture gd is mapped to a fixed register (r9 or x18). + * As this register may be overwritten by an EFI payload we save it here + * and restore it on every callback entered. + */ + efi_save_gd(); + + /* Initialize once only */ + if (efi_obj_list_initialized != OBJ_LIST_NOT_INITIALIZED) + return efi_obj_list_initialized; + + /* Initialize system table */ + ret = efi_initialize_system_table(); + if (ret != EFI_SUCCESS) + goto out; + + /* Initialize root node */ + ret = efi_root_node_register(); + if (ret != EFI_SUCCESS) + goto out; + + /* Initialize EFI driver uclass */ + ret = efi_driver_init(); + if (ret != EFI_SUCCESS) + goto out; + + ret = efi_console_register(); + if (ret != EFI_SUCCESS) + goto out; +#ifdef CONFIG_PARTITIONS + ret = efi_disk_register(); + if (ret != EFI_SUCCESS) + goto out; +#endif +#if defined(CONFIG_LCD) || defined(CONFIG_DM_VIDEO) + ret = efi_gop_register(); + if (ret != EFI_SUCCESS) + goto out; +#endif +#ifdef CONFIG_NET + ret = efi_net_register(); + if (ret != EFI_SUCCESS) + goto out; +#endif +#ifdef CONFIG_GENERATE_ACPI_TABLE + ret = efi_acpi_register(); + if (ret != EFI_SUCCESS) + goto out; +#endif +#ifdef CONFIG_GENERATE_SMBIOS_TABLE + ret = efi_smbios_register(); + if (ret != EFI_SUCCESS) + goto out; +#endif + ret = efi_watchdog_register(); + if (ret != EFI_SUCCESS) + goto out; + + /* Initialize EFI runtime services */ + ret = efi_reset_system_init(); + if (ret != EFI_SUCCESS) + goto out; + +out: + efi_obj_list_initialized = ret; + return ret; +} -- 2.19.1

2 2

[U-Boot] [PATCH v2 00/11] samsung: Tidy up sound, DM_MMC drop dead code
by Simon Glass 17 Jan '19

17 Jan '19

This series was previously sent as a v1 without a cover letter. Since then I have added a few more patches: - Support for spring's audio codec - Dropping unused MMC and audio code - Removing unused fdt_compat_id values Changes in v2: - Add new patch to resync defconfigs for odroid - Remove stranded comments in the header files - Update to convert s5p_goni also - Add new patches as per the cover letter Simon Glass (11): odroid: Resync defconfigs Convert CONFIG_BOARD_TYPES to Kconfig exynos: Drop duplicate 'model' line exynos: Convert to use CONFIG_BLK sound: Add a driver for max98088 spring: Update sound to use max98088 codec spring: Update flashmap details samsung: Drop board_enable_audio_codec() samsung: mmc: Drop old MMC init code fdt: samsung: Drop unused fdt_compat_id values fdt: tegra: Drop COMPAT_AMS_AS3722 arch/arm/dts/exynos5250-spring.dts | 77 +++-- arch/arm/mach-exynos/Kconfig | 7 + arch/arm/mach-exynos/include/mach/mmc.h | 2 - arch/arm/mach-s5pc1xx/Kconfig | 2 + arch/arm/mach-s5pc1xx/Makefile | 1 + arch/arm/mach-s5pc1xx/pinmux.c | 20 ++ board/samsung/common/board.c | 52 +-- board/samsung/common/exynos5-dt.c | 29 -- common/Kconfig | 8 + configs/axs101_defconfig | 1 + configs/axs103_defconfig | 1 + configs/odroid-xu3_defconfig | 2 +- configs/odroid_defconfig | 2 +- configs/spring_defconfig | 1 + drivers/mmc/s5p_sdhci.c | 50 --- drivers/sound/Kconfig | 8 + drivers/sound/Makefile | 1 + drivers/sound/max98088.c | 431 ++++++++++++++++++++++++ drivers/sound/max98088.h | 192 +++++++++++ drivers/sound/samsung_sound.c | 2 +- include/configs/axs10x.h | 5 - include/configs/hsdk.h | 5 - include/configs/odroid.h | 1 - include/configs/odroid_xu3.h | 1 - include/fdtdec.h | 7 - include/samsung/misc.h | 2 - lib/fdtdec.c | 7 - scripts/config_whitelist.txt | 1 - 28 files changed, 739 insertions(+), 179 deletions(-) create mode 100644 arch/arm/mach-s5pc1xx/pinmux.c create mode 100644 drivers/sound/max98088.c create mode 100644 drivers/sound/max98088.h -- 2.20.0.405.gbc1bbc6f85-goog

3 26

[U-Boot] [PATCH 1/1] efi_loader: use u16* for file name
by Heinrich Schuchardt 16 Jan '19

16 Jan '19

UTF-16 strings in our code should all be u16 *. Fix an inconsistency for file names which may lead to a warning for printf("%ls", ). Simon Glass <sjg(a)chromium.org> Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- v2 additionally correct efi_selftest_block_device.c --- include/efi_api.h | 2 +- lib/efi_loader/efi_file.c | 14 +++++++------- lib/efi_selftest/efi_selftest_block_device.c | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/efi_api.h b/include/efi_api.h index 1d3774729d..d899af5e48 100644 --- a/include/efi_api.h +++ b/include/efi_api.h @@ -909,7 +909,7 @@ struct efi_file_handle { u64 rev; efi_status_t (EFIAPI *open)(struct efi_file_handle *file, struct efi_file_handle **new_handle, - s16 *file_name, u64 open_mode, u64 attributes); + u16 *file_name, u64 open_mode, u64 attributes); efi_status_t (EFIAPI *close)(struct efi_file_handle *file); efi_status_t (EFIAPI *delete)(struct efi_file_handle *file); efi_status_t (EFIAPI *read)(struct efi_file_handle *file, diff --git a/lib/efi_loader/efi_file.c b/lib/efi_loader/efi_file.c index 128cb0a627..dfa61bc2bc 100644 --- a/lib/efi_loader/efi_file.c +++ b/lib/efi_loader/efi_file.c @@ -148,7 +148,7 @@ static int sanitize_path(char *path) * Returns: handle to the opened file or NULL */ static struct efi_file_handle *file_open(struct file_system *fs, - struct file_handle *parent, s16 *file_name, u64 mode, + struct file_handle *parent, u16 *file_name, u64 mode, u64 attributes) { struct file_handle *fh; @@ -157,8 +157,8 @@ static struct efi_file_handle *file_open(struct file_system *fs, int flen = 0; if (file_name) { - utf16_to_utf8((u8 *)f0, (u16 *)file_name, 1); - flen = u16_strlen((u16 *)file_name); + utf16_to_utf8((u8 *)f0, file_name, 1); + flen = u16_strlen(file_name); } /* we could have a parent, but also an absolute path: */ @@ -183,7 +183,7 @@ static struct efi_file_handle *file_open(struct file_system *fs, *p++ = '/'; } - utf16_to_utf8((u8 *)p, (u16 *)file_name, flen); + utf16_to_utf8((u8 *)p, file_name, flen); if (sanitize_path(fh->path)) goto error; @@ -216,7 +216,7 @@ error: static efi_status_t EFIAPI efi_file_open(struct efi_file_handle *file, struct efi_file_handle **new_handle, - s16 *file_name, u64 open_mode, u64 attributes) + u16 *file_name, u64 open_mode, u64 attributes) { struct file_handle *fh = to_fh(file); efi_status_t ret; @@ -375,7 +375,7 @@ static efi_status_t dir_read(struct file_handle *fh, u64 *buffer_size, if (dent->type == FS_DT_DIR) info->attribute |= EFI_FILE_DIRECTORY; - ascii2unicode((u16 *)info->file_name, dent->name); + ascii2unicode(info->file_name, dent->name); fh->offset++; @@ -666,7 +666,7 @@ struct efi_file_handle *efi_file_from_path(struct efi_device_path *fp) return NULL; } - EFI_CALL(ret = f->open(f, &f2, (s16 *)fdp->str, + EFI_CALL(ret = f->open(f, &f2, fdp->str, EFI_FILE_MODE_READ, 0)); if (ret != EFI_SUCCESS) return NULL; diff --git a/lib/efi_selftest/efi_selftest_block_device.c b/lib/efi_selftest/efi_selftest_block_device.c index f038da9f19..1cdd8307f4 100644 --- a/lib/efi_selftest/efi_selftest_block_device.c +++ b/lib/efi_selftest/efi_selftest_block_device.c @@ -387,7 +387,7 @@ static int execute(void) } /* Read file */ - ret = root->open(root, &file, (s16 *)L"hello.txt", EFI_FILE_MODE_READ, + ret = root->open(root, &file, L"hello.txt", EFI_FILE_MODE_READ, 0); if (ret != EFI_SUCCESS) { efi_st_error("Failed to open file\n"); @@ -431,7 +431,7 @@ static int execute(void) #ifdef CONFIG_FAT_WRITE /* Write file */ - ret = root->open(root, &file, (s16 *)L"u-boot.txt", EFI_FILE_MODE_READ | + ret = root->open(root, &file, L"u-boot.txt", EFI_FILE_MODE_READ | EFI_FILE_MODE_WRITE | EFI_FILE_MODE_CREATE, 0); if (ret != EFI_SUCCESS) { efi_st_error("Failed to open file\n"); @@ -463,7 +463,7 @@ static int execute(void) /* Verify file */ boottime->set_mem(buf, sizeof(buf), 0); - ret = root->open(root, &file, (s16 *)L"u-boot.txt", EFI_FILE_MODE_READ, + ret = root->open(root, &file, L"u-boot.txt", EFI_FILE_MODE_READ, 0); if (ret != EFI_SUCCESS) { efi_st_error("Failed to open file\n"); -- 2.20.1

2 1

[U-Boot] [PATCH] dm: pinctrl: Prevent (re-)configuring pins when already done before relocation
by Lukasz Majewski 16 Jan '19

16 Jan '19

This commit prevents from re-configuring pins if those were configured before relocation. Some pins - like UART or DDR must be setup before relocation (as they have 'u-boot,dm-pre-reloc' property set in DTS). Without this change, those pins are re-configured after relocation (pre_reloc_only = 0, so we do not "continue"). Such behavior may be a problem for DDR PAD configuration, as they might be already leveled/tuned with original setup). Signed-off-by: Lukasz Majewski <lukma(a)denx.de> --- drivers/pinctrl/pinctrl-uclass.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pinctrl/pinctrl-uclass.c b/drivers/pinctrl/pinctrl-uclass.c index 6db0445067..29c910c55f 100644 --- a/drivers/pinctrl/pinctrl-uclass.c +++ b/drivers/pinctrl/pinctrl-uclass.c @@ -117,9 +117,9 @@ static int pinconfig_post_bind(struct udevice *dev) int ret; dev_for_each_subnode(node, dev) { - if (pre_reloc_only && - !ofnode_pre_reloc(node)) + if (pre_reloc_only ^ ofnode_pre_reloc(node)) continue; + /* * If this node has "compatible" property, this is not * a pin configuration node, but a normal device. skip. -- 2.11.0

4 8

[U-Boot] Please pull u-boot-dm
by Simon Glass 16 Jan '19

16 Jan '19

Hi Tom, https://travis-ci.org/sglass68/u-boot/builds The following changes since commit d3689267f92c5956e09cc7d1baa4700141662bff: Prepare v2019.01 (2019-01-14 17:02:36 -0500) are available in the Git repository at: git://git.denx.de/u-boot-dm.git tags/dm-pull-15jan19 for you to fetch changes up to f51f6715a5013f37620c38f0430e21d4736e235a: lib: fdtdec: fdtdec_get_addr_size_fixed remove checks (2019-01-14 17:47:20 -0700) ---------------------------------------------------------------- Fix recent changes to serial API for driver model Buildman clang support and a few fixes Small fixes to 'dm tree' and regmap test Improve sandbox build compatibility A few other minor fixes ---------------------------------------------------------------- Christian GMEINER (1): sandbox: add memset_io(..), memcpy_fromio(..) and memcpy_toio(..) Heinrich Schuchardt (1): sandbox: i2c_emul_find() No emulators for device 'rtc@43' Keerthy (1): lib: fdtdec: fdtdec_get_addr_size_fixed remove checks Sekhar Nori (1): common: fdt_support: print hexadecimal numbers in debug Simon Glass (16): buildman: Drop comment about Ctrl-C problem dm: Tidy up 'dm tree' output when there are many devices test: dm: regmap: Fix the long test delay buildman: Deal nicely with invalid build-status file sandbox: Correct SDL build flags efi_loader: Add a wchar_t cast in efi_file_open() log: Check printf() arguments buildman: Add support for building with clang travis: Use buildman for building with clang net: Fix error handling in sb_eth_raw_ofdata_to_platdata() buildman: Fix tabs in GetWrapper() serial: Move new functions to serial.h dm: serial: Adjust serial_getconfig() to use proper API dm: serial: Adjust serial_setconfig() to use proper API dm: serial: Adjust serial_getinfo() to use proper API dm: serial: Tidy up header file comments .travis.yml | 13 +++---------- arch/sandbox/config.mk | 2 -- arch/sandbox/cpu/sdl.c | 2 +- arch/sandbox/dts/sandbox.dts | 10 ++++------ arch/sandbox/dts/sandbox64.dts | 6 ++++-- arch/sandbox/include/asm/io.h | 12 ++++++++++++ arch/x86/lib/acpi_table.c | 12 ++++++++---- common/fdt_support.c | 4 ++-- drivers/core/dump.c | 4 ++-- drivers/net/sandbox-raw.c | 9 ++++----- drivers/serial/serial-uclass.c | 27 +++++++++------------------ include/common.h | 5 ----- include/log.h | 3 ++- include/regmap.h | 14 +++++++++++++- include/serial.h | 38 +++++++++++++++++++++++++++++++++++--- lib/efi_loader/efi_file.c | 4 ++-- lib/fdtdec.c | 10 ---------- test/dm/regmap.c | 7 ++++--- test/dm/serial.c | 19 +++++++++++-------- test/py/tests/test_bind.py | 3 ++- tools/buildman/README | 12 ++++++++++-- tools/buildman/builderthread.py | 8 +++++++- tools/buildman/cmdline.py | 2 ++ tools/buildman/control.py | 2 +- tools/buildman/toolchain.py | 42 ++++++++++++++++++++++++++++++++++++------ 25 files changed, 174 insertions(+), 96 deletions(-) Regards, Simon

2 1