November 2018 - U-Boot

[U-Boot] [PATCH v2 00/29] General fixes / cleanup for RISC-V and improvements to qemu-riscv
by Lukas Auer 13 Nov '18

13 Nov '18

This patch series includes general fixes and cleanup for RISC-V. It also adds support for booting Linux on qemu-riscv. At the moment, only single-core systems are supported. Support for multi-core systems will be added with a future patch series. To boot Linux on qemu-riscv, Linux must be compiled into BBL as a payload. BBL must be included in a FIT image and supplied to QEMU with the -kernel parameter. Its location in memory is embedded in the device tree, which QEMU passes to u-boot. To test this, QEMU and riscv-pk (BBL) must be modified. QEMU is modified to add support for loading binary files (FIT images in this case) in addition to ELF files. riscv-pk must be modified to adjust the link address. A pull request for QEMU, which implements this, is available at [1]. A modified version of riscv-pk is available at [2]. This series applies on top of u-boot-dm/next. [1]: https://github.com/riscv/riscv-qemu/pull/175 [2]: https://github.com/lukasauer/riscv-pk/tree/riscv-u-boot Changes in v2: - Replace the description of RISCV_ISA_C with that of the Linux kernel, as suggested by Bin Meng - Change ISA string construction, as suggested by Bin Meng - Change ISA string construction, as suggested by Bin Meng - Remove 0-padding in the format string to avoid printing 16 digits on RV32I systems - Clarify reasoning behind patch in commit message - New patch to replace patch "riscv: remove CONFIG_INIT_CRITICAL" - Drop removal of code that stores the contents of a2; this broke the board ax25-ae350. The code will be removed again in a future patch. - Rebase onto u-boot-dm/next - New patch - Rebase onto u-boot-dm/next - Move prototype location to match the location of the function in ofnode.c - Rebase onto u-boot-dm/next - Boot Linux with the device tree provided by the prior boot stage - New patch Bin Meng (1): Drop CONFIG_INIT_CRITICAL Lukas Auer (28): tools: .gitignore: add prelink-riscv dts: riscv: update makefile to also clean the RISC-V dts directory riscv: rename CPU_RISCV_32/64 to match architecture names ARCH_RV32I/64I riscv: select CONFIG_PHYS_64BIT on RV64I systems riscv: add Kconfig entries for the C and A ISA extensions riscv: set -march and -mabi based on the Kconfig configuration riscv: add Kconfig entries for the code model riscv: enable -fdata-sections riscv: fix use of incorrectly sized variables riscv: make use of the barrier functions from Linux riscv: do not reimplement generic io functions riscv: complete the list of exception codes riscv: treat undefined exception codes as reserved riscv: hang on unhandled exceptions riscv: implement the invalidate_icache_* functions riscv: invalidate the instruction cache before jumping to Linux riscv: fix inconsistent use of spaces and tabs in start.S riscv: align mtvec on a 4-byte boundary riscv: remove unused labels in start.S riscv: do not blindly modify the mstatus CSR riscv: save hart ID and device tree passed by prior boot stage riscv: qemu: use device tree passed by prior boot stage riscv: store device tree passed by prior boot stage in environment riscv: qemu: support booting Linux riscv: align bootm implementation with that of other architectures dm: core: add missing prototype for ofnode_read_u64 riscv: qemu: detect and boot the kernel passed by QEMU riscv: qemu: clear kernel-start/-end in device tree as workaround for BBL arch/Kconfig | 1 + arch/nds32/cpu/n1213/start.S | 51 ---- arch/riscv/Kconfig | 47 +++- arch/riscv/Makefile | 27 ++ arch/riscv/config.mk | 7 +- arch/riscv/cpu/cpu.c | 13 + arch/riscv/cpu/start.S | 342 ++++++++++++------------ arch/riscv/include/asm/barrier.h | 67 +++++ arch/riscv/include/asm/io.h | 48 +--- arch/riscv/include/asm/posix_types.h | 6 +- arch/riscv/include/asm/types.h | 4 + arch/riscv/include/asm/u-boot-riscv.h | 1 + arch/riscv/lib/bootm.c | 98 +++++-- arch/riscv/lib/cache.c | 10 + arch/riscv/lib/interrupts.c | 31 ++- arch/riscv/lib/setjmp.S | 2 +- board/armltd/integrator/README | 4 +- board/emulation/qemu-riscv/Kconfig | 2 + board/emulation/qemu-riscv/qemu-riscv.c | 73 ++++- configs/ax25-ae350_defconfig | 2 +- configs/qemu-riscv32_defconfig | 4 +- configs/qemu-riscv64_defconfig | 6 +- dts/Makefile | 2 +- include/common.h | 5 - include/config_distro_bootcmd.h | 8 +- include/configs/qemu-riscv.h | 14 + include/dm/ofnode.h | 10 + scripts/config_whitelist.txt | 1 - tools/.gitignore | 1 + 29 files changed, 543 insertions(+), 344 deletions(-) create mode 100644 arch/riscv/include/asm/barrier.h -- 2.17.2

5 54

[U-Boot] [PATCH 1/2] spl: define kernel and dtb name for falcon mode from menuconfig
by Fabien Lahoudere 13 Nov '18

13 Nov '18

If we use falcon mode with ext or fat filesystem, we have to define CONFIG_SPL_FS_LOAD_KERNEL_NAME and CONFIG_SPL_FS_LOAD_ARGS_NAME in the board header. However a header can be used for different boards (e.g Marsboard and riotboardlike use embestmx6boards.h). We can aslo have some project with binaries in different places. The two previous problem let me think that it can be easier to add this information in the config file and have an entry in menuconfig to define them, instead of patching source code. This patch propose a solution. Signed-off-by: Fabien Lahoudere <fabien.lahoudere(a)collabora.com> --- common/spl/Kconfig | 18 ++++++++++++++++++ configs/riotboard_spl_defconfig | 2 +- include/configs/embestmx6boards.h | 2 -- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/common/spl/Kconfig b/common/spl/Kconfig index d0564621d4..dd0c4eb8ac 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -551,6 +551,24 @@ config SPL_OS_BOOT Enable booting directly to an OS from SPL. for more info read doc/README.falcon +config SPL_FS_LOAD_KERNEL_NAME + string "Falcon mode image name" + depends on (SPL_OS_BOOT && (SPL_EXT_SUPPORT || SPL_FAT_SUPPORT)) + default "uImage" + help + If falcon mode is enabled (SPL_OS_BOOT) and you chose to boot + from ext or fat partition, you need to define the name of the + kernel to boot. + +config SPL_FS_LOAD_ARGS_NAME + string "Falcon mode device tree name" + depends on (SPL_OS_BOOT && SPL_OF_LIBFDT && (SPL_EXT_SUPPORT || SPL_FAT_SUPPORT)) + default "args" + help + If falcon mode is enabled (SPL_OS_BOOT) and you need a device + tree to bootchose to boot from ext or fat partition, define here + the name of the dtb. + if SPL_OS_BOOT config SYS_OS_BASE hex "addr, where OS is found" diff --git a/configs/riotboard_spl_defconfig b/configs/riotboard_spl_defconfig index 8b5459aa1a..6561cc91f9 100644 --- a/configs/riotboard_spl_defconfig +++ b/configs/riotboard_spl_defconfig @@ -17,9 +17,9 @@ CONFIG_BOOTCOMMAND="run finduuid; run distro_bootcmd" CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y CONFIG_BOARD_EARLY_INIT_F=y -CONFIG_SPL_RAW_IMAGE_SUPPORT=y CONFIG_SPL_EXT_SUPPORT=y CONFIG_SPL_OS_BOOT=y +CONFIG_SPL_FS_LOAD_ARGS_NAME="imx6dl-riotboard.dtb" # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h index 7e7de4dae6..98681fb3e0 100644 --- a/include/configs/embestmx6boards.h +++ b/include/configs/embestmx6boards.h @@ -113,8 +113,6 @@ #include "imx6_spl.h" /* RiOTboard */ #define CONFIG_SYS_SPL_ARGS_ADDR 0x13000000 -#define CONFIG_SPL_FS_LOAD_KERNEL_NAME "uImage" -#define CONFIG_SPL_FS_LOAD_ARGS_NAME "imx6dl-riotboard.dtb" #define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR 0 /* offset 69KB */ #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0 /* offset 69KB */ -- 2.19.1

1 1

[U-Boot] [PATCH v2] fsl-lsch3: Add FlexSPI address space in immap_lsch3
by Ashish Kumar 13 Nov '18

13 Nov '18

Signed-off-by: Priyanka Jain <priyanka.jain(a)nxp.com> Signed-off-by: Sriram Dash <sriram.dash(a)nxp.com> Signed-off-by: Ashish Kumar <Ashish.Kumar(a)nxp.com> --- v2: 1. Rename SYS_FSL_FSPI_ADDR SYS_NXP_FSPI_ADDR 2. Add mcaro for lutkey base addr and LUTa base addr arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h index b0cec74db0..a2aea18838 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h @@ -19,7 +19,13 @@ #define CONFIG_SYS_FSL_CH3_CLK_GRPA_ADDR (CONFIG_SYS_IMMR + 0x00300000) #define CONFIG_SYS_FSL_CH3_CLK_GRPB_ADDR (CONFIG_SYS_IMMR + 0x00310000) #define CONFIG_SYS_FSL_CH3_CLK_CTRL_ADDR (CONFIG_SYS_IMMR + 0x00370000) +#ifndef CONFIG_NXP_LSCH3_2 #define SYS_FSL_QSPI_ADDR (CONFIG_SYS_IMMR + 0x010c0000) +#else +#define SYS_NXP_FSPI_ADDR (CONFIG_SYS_IMMR + 0x010c0000) +#define SYS_NXP_FSPI_LUTKEY_BASE_ADDR 0x18 +#define SYS_NXP_FSPI_LUT_BASE_ADDR 0x200 +#endif #define CONFIG_SYS_FSL_ESDHC_ADDR (CONFIG_SYS_IMMR + 0x01140000) #define CONFIG_SYS_IFC_ADDR (CONFIG_SYS_IMMR + 0x01240000) #define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_IMMR + 0x011C0500) -- 2.17.1

3 4

[U-Boot] [PATCH v2] ARM: Samsung: Add Exynos5422-based Odroid HC2 support
by Dirk Meul 13 Nov '18

13 Nov '18

From: Dirk Meul <dirk.meul(a)rwth-aachen.de> Date: Sun, 14 Oct 2018 17:14:17 +0200 Odroid HC2 board is based on Odroid XU4 board, like the Odroid HC1. The linux kernel does not provide a hc2 DTB so the hc1 DTB is also used for the Odroid HC2. Resend because MUA changed whitespace. Signed-off-by: Dirk Meul <dirk.meul(a)rwth-aachen.de> Acked-by: Marek Szyprowski <m.szyprowski(a)samsung.com> Reviewed-by: Lukasz Majewski <lukma(a)denx.de> --- board/samsung/common/exynos5-dt-types.c | 16 +++++++++++++--- board/samsung/common/exynos5-dt.c | 4 ++-- configs/odroid-xu3_defconfig | 2 +- include/samsung/exynos5-dt-types.h | 2 ++ 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/board/samsung/common/exynos5-dt-types.c b/board/samsung/common/exynos5-dt-types.c index 4473968db6..7a86e91877 100644 --- a/board/samsung/common/exynos5-dt-types.c +++ b/board/samsung/common/exynos5-dt-types.c @@ -24,14 +24,15 @@ static const struct udevice_id board_ids[] = { }; /** - * Odroix XU3/XU4/HC1 board revisions (from HC1_MAIN_REV0.1_20170630.pdf): + * Odroix XU3/XU4/HC1/HC2 board revisions (from HC1+_HC2_MAIN_REV0.1_20171017.pdf): * Rev ADCmax Board * 0.1 0 XU3 0.1 * 0.2 372 XU3 0.2 | XU3L - no DISPLAYPORT (probe I2C0:0x40 / INA231) * 0.3 1280 XU4 0.1 * 0.4 739 XU4 0.2 * 0.5 1016 XU4+Air0.1 (Passive cooling) - * 0.6 1308 XU4S 0.1 (HC1) + * 0.6 1309 XU4-HC1 0.1 + * 0.7 1470 XU4-HC1+ 0.1 (HC2) * Use +1% for ADC value tolerance in the array below, the code loops until * the measured ADC value is lower than then ADCmax from the array. */ @@ -39,7 +40,8 @@ struct odroid_rev_info odroid_info[] = { { EXYNOS5_BOARD_ODROID_XU3_REV01, 1, 10, "xu3" }, { EXYNOS5_BOARD_ODROID_XU3_REV02, 2, 375, "xu3" }, { EXYNOS5_BOARD_ODROID_XU4_REV01, 1, 1293, "xu4" }, - { EXYNOS5_BOARD_ODROID_HC1_REV01, 1, 1321, "hc1" }, + { EXYNOS5_BOARD_ODROID_HC1_REV01, 1, 1322, "hc1" }, + { EXYNOS5_BOARD_ODROID_HC2_REV01, 1, 1484, "hc1" }, { EXYNOS5_BOARD_ODROID_UNKNOWN, 0, 4095, "unknown" }, }; @@ -144,6 +146,14 @@ bool board_is_odroidhc1(void) return false; } +bool board_is_odroidhc2(void) +{ + if (gd->board_type == EXYNOS5_BOARD_ODROID_HC2_REV01) + return true; + + return false; +} + bool board_is_generic(void) { if (gd->board_type == EXYNOS5_BOARD_GENERIC) diff --git a/board/samsung/common/exynos5-dt.c b/board/samsung/common/exynos5-dt.c index 8c3a9ea564..c183965b92 100644 --- a/board/samsung/common/exynos5-dt.c +++ b/board/samsung/common/exynos5-dt.c @@ -179,7 +179,7 @@ char *get_dfu_alt_system(char *interface, char *devstr) { char *info = "Not supported!"; - if (board_is_odroidxu4() || board_is_odroidhc1()) + if (board_is_odroidxu4() || board_is_odroidhc1() || board_is_odroidhc2()) return info; return env_get("dfu_alt_system"); @@ -192,7 +192,7 @@ char *get_dfu_alt_boot(char *interface, char *devstr) char *alt_boot; int dev_num; - if (board_is_odroidxu4() || board_is_odroidhc1()) + if (board_is_odroidxu4() || board_is_odroidhc1() || board_is_odroidhc2()) return info; dev_num = simple_strtoul(devstr, NULL, 10); diff --git a/configs/odroid-xu3_defconfig b/configs/odroid-xu3_defconfig index 258b9781cc..d5c7cc7129 100644 --- a/configs/odroid-xu3_defconfig +++ b/configs/odroid-xu3_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_EXYNOS=y CONFIG_SYS_TEXT_BASE=0x43E00000 CONFIG_ARCH_EXYNOS5=y -CONFIG_IDENT_STRING=" for ODROID-XU3/XU4/HC1" +CONFIG_IDENT_STRING=" for ODROID-XU3/XU4/HC1/HC2" CONFIG_DISTRO_DEFAULTS=y CONFIG_NR_DRAM_BANKS=8 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set diff --git a/include/samsung/exynos5-dt-types.h b/include/samsung/exynos5-dt-types.h index 8e11af30d1..8fe08fe211 100644 --- a/include/samsung/exynos5-dt-types.h +++ b/include/samsung/exynos5-dt-types.h @@ -9,6 +9,7 @@ enum { EXYNOS5_BOARD_ODROID_XU3_REV02, EXYNOS5_BOARD_ODROID_XU4_REV01, EXYNOS5_BOARD_ODROID_HC1_REV01, + EXYNOS5_BOARD_ODROID_HC2_REV01, EXYNOS5_BOARD_ODROID_UNKNOWN, EXYNOS5_BOARD_COUNT, @@ -25,5 +26,6 @@ bool board_is_generic(void); bool board_is_odroidxu3(void); bool board_is_odroidxu4(void); bool board_is_odroidhc1(void); +bool board_is_odroidhc2(void); #endif -- 2.17.2

3 4

[U-Boot] [PATCH] qemu-arm: Enable VirtIO distro target
by Sumit Garg 13 Nov '18

13 Nov '18

With -device virtio-blk-device,drive=hd0, it could detect distro boot target. Signed-off-by: Sumit Garg <sumit.garg(a)linaro.org> --- Depends on https://patchwork.ozlabs.org/patch/995524/ which adds VirtIO distro boot command. include/configs/qemu-arm.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/configs/qemu-arm.h b/include/configs/qemu-arm.h index fedc466..437c3ae 100644 --- a/include/configs/qemu-arm.h +++ b/include/configs/qemu-arm.h @@ -25,7 +25,8 @@ #define BOOT_TARGET_DEVICES(func) \ func(SCSI, scsi, 0) \ - func(DHCP, dhcp, na) + func(DHCP, dhcp, na) \ + func(VIRTIO, virtio, 0) #include <config_distro_bootcmd.h> -- 2.7.4

2 2

[U-Boot] [PULL] Please pull u-boot-imx: u-boot-imx-20181112
by Stefano Babic 12 Nov '18

12 Nov '18

Hi Tom, still a couple of fixes (colibri_vf could not be built): The following changes since commit c5bbfaf05dc8592b479a44df6abaadbab54fec2b: imx8qxp_mek: Disable CONFIG_DISPLAY_CPUINFO (2018-11-07 12:13:45 -0500) are available in the Git repository at: git://www.denx.de/git/u-boot-imx.git tags/u-boot-imx-20181112 for you to fetch changes up to 43e6f94cbcaf193aeedcf86e85a3ff4c79f66773: imx: mkimage: add size check to the u-boot.imx make target (2018-11-12 11:08:53 +0100) ---------------------------------------------------------------- Fix build vf boards + fix gpr_init() ---------------------------------------------------------------- Christoph Niedermaier (1): imx: imx6: perform gpr_init only on suitable cpu types Marcel Ziswiler (4): board: toradex: colibri_vf: efi_loader: unset CONFIG_EFI_UNICODE_CAPITALIZATION board: toradex: colibri_vf: unset CONFIG_CMDLINE_EDITING board: toradex: colibri_vf: drop SPI support imx: mkimage: add size check to the u-boot.imx make target arch/arm/mach-imx/Makefile | 16 ++++++++++++++++ arch/arm/mach-imx/mx6/soc.c | 8 ++++++++ configs/colibri_vf_defconfig | 6 ++---- 3 files changed, 26 insertions(+), 4 deletions(-) Best regards, Stefano -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de =====================================================================

2 1

[U-Boot] [PATCH 1/1] efi_selftest: don't hang on missing timer
by Heinrich Schuchardt 12 Nov '18

12 Nov '18

qemu-riscv32_defconfig and qemu-riscv64_defconfig do not supply a timer. This causes the EFI selftest to hang on tests which require a timer. So let's disable CONFIG_TIMER for these boards and use this variable to decide which tests have to be disabled. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- configs/qemu-riscv32_defconfig | 1 + configs/qemu-riscv64_defconfig | 1 + lib/efi_selftest/Makefile | 9 ++++++--- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/configs/qemu-riscv32_defconfig b/configs/qemu-riscv32_defconfig index ff1fb1f30ec..70da323bdc1 100644 --- a/configs/qemu-riscv32_defconfig +++ b/configs/qemu-riscv32_defconfig @@ -3,4 +3,5 @@ CONFIG_TARGET_QEMU_VIRT=y CONFIG_NR_DRAM_BANKS=1 CONFIG_DISPLAY_CPUINFO=y CONFIG_DISPLAY_BOARDINFO=y +# CONFIG_TIMER is not set CONFIG_OF_BOARD=y diff --git a/configs/qemu-riscv64_defconfig b/configs/qemu-riscv64_defconfig index d6c1a5d646a..258f395b9d5 100644 --- a/configs/qemu-riscv64_defconfig +++ b/configs/qemu-riscv64_defconfig @@ -4,4 +4,5 @@ CONFIG_CPU_RISCV_64=y CONFIG_NR_DRAM_BANKS=1 CONFIG_DISPLAY_CPUINFO=y CONFIG_DISPLAY_BOARDINFO=y +# CONFIG_TIMER is not set CONFIG_OF_BOARD=y diff --git a/lib/efi_selftest/Makefile b/lib/efi_selftest/Makefile index 743b4820449..8f2f09522e6 100644 --- a/lib/efi_selftest/Makefile +++ b/lib/efi_selftest/Makefile @@ -19,7 +19,6 @@ efi_selftest_console.o \ efi_selftest_crc32.o \ efi_selftest_devicepath.o \ efi_selftest_devicepath_util.o \ -efi_selftest_events.o \ efi_selftest_event_groups.o \ efi_selftest_exception.o \ efi_selftest_exitbootservices.o \ @@ -33,11 +32,15 @@ efi_selftest_snp.o \ efi_selftest_textinput.o \ efi_selftest_textinputex.o \ efi_selftest_textoutput.o \ -efi_selftest_tpl.o \ efi_selftest_unicode_collation.o \ efi_selftest_util.o \ -efi_selftest_variables.o \ +efi_selftest_variables.o + +ifeq ($(CONFIG_TIMER),) +efi_selftest_events.o \ +efi_selftest_tpl.o \ efi_selftest_watchdog.o +endif obj-$(CONFIG_CPU_V7) += efi_selftest_unaligned.o -- 2.19.1

1 0

[U-Boot] [PATCH V2 1/6] rsa: use new openssl API to create signature
by Philippe Reynes 12 Nov '18

12 Nov '18

Previous implementation of the rsa signature was using the openssl API EVP_Sign*, but the new openssl API EVP_DigestSign* is more flexible. So we move to this new API. Signed-off-by: Philippe Reynes <philippe.reynes(a)softathome.com> Reviewed-by: Simon Glass <sjg(a)chromium.org> --- lib/rsa/rsa-sign.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) Changelog: v2: - no change diff --git a/lib/rsa/rsa-sign.c b/lib/rsa/rsa-sign.c index 05ac67b..78e348e 100644 --- a/lib/rsa/rsa-sign.c +++ b/lib/rsa/rsa-sign.c @@ -393,7 +393,8 @@ static int rsa_sign_with_key(RSA *rsa, struct checksum_algo *checksum_algo, { EVP_PKEY *key; EVP_MD_CTX *context; - int size, ret = 0; + int ret = 0; + size_t size; uint8_t *sig; int i; @@ -409,7 +410,7 @@ static int rsa_sign_with_key(RSA *rsa, struct checksum_algo *checksum_algo, size = EVP_PKEY_size(key); sig = malloc(size); if (!sig) { - fprintf(stderr, "Out of memory for signature (%d bytes)\n", + fprintf(stderr, "Out of memory for signature (%zu bytes)\n", size); ret = -ENOMEM; goto err_alloc; @@ -421,22 +422,26 @@ static int rsa_sign_with_key(RSA *rsa, struct checksum_algo *checksum_algo, goto err_create; } EVP_MD_CTX_init(context); - if (!EVP_SignInit(context, checksum_algo->calculate_sign())) { + if (EVP_DigestSignInit(context, NULL, + checksum_algo->calculate_sign(), + NULL, key) <= 0) { ret = rsa_err("Signer setup failed"); goto err_sign; } for (i = 0; i < region_count; i++) { - if (!EVP_SignUpdate(context, region[i].data, region[i].size)) { + if (!EVP_DigestSignUpdate(context, region[i].data, + region[i].size)) { ret = rsa_err("Signing data failed"); goto err_sign; } } - if (!EVP_SignFinal(context, sig, sig_size, key)) { + if (!EVP_DigestSignFinal(context, sig, &size)) { ret = rsa_err("Could not obtain signature"); goto err_sign; } + #if OPENSSL_VERSION_NUMBER < 0x10100000L || \ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02070000fL) EVP_MD_CTX_cleanup(context); @@ -446,7 +451,7 @@ static int rsa_sign_with_key(RSA *rsa, struct checksum_algo *checksum_algo, EVP_MD_CTX_destroy(context); EVP_PKEY_free(key); - debug("Got signature: %d bytes, expected %d\n", *sig_size, size); + debug("Got signature: %d bytes, expected %zu\n", *sig_size, size); *sigp = sig; *sig_size = size; -- 2.7.4

4 11

[U-Boot] [PATCH 1/2] Revert "board_f: Use static print_cpuinfo if CONFIG_CPU is active"
by Bin Meng 12 Nov '18

12 Nov '18

This reverts commit c0434407b595f785fc7401237896c48c791b45fd. It turns out commit c0434407b595 broke some boards which have DM CPU driver with CONFIG_DISPLAY_CPUINFO option on. These boards just fail to boot when print_cpuinfo() is called during boot. Fixes are already sent to ML and in u-boot-dm/next, however since we are getting close to the v2018.11 release, it's safer we revert the original commit. This commit should be reverted after v2018.11 release. Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> --- common/board_f.c | 28 ---------------------------- include/init.h | 7 ------- 2 files changed, 35 deletions(-) diff --git a/common/board_f.c b/common/board_f.c index 213d044..afafec5 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -11,7 +11,6 @@ #include <common.h> #include <console.h> -#include <cpu.h> #include <dm.h> #include <environment.h> #include <fdtdec.h> @@ -166,33 +165,6 @@ static int print_resetinfo(void) } #endif -#if defined(CONFIG_DISPLAY_CPUINFO) && CONFIG_IS_ENABLED(CPU) -static int print_cpuinfo(void) -{ - struct udevice *dev; - char desc[512]; - int ret; - - ret = uclass_first_device_err(UCLASS_CPU, &dev); - if (ret) { - debug("%s: Could not get CPU device (err = %d)\n", - __func__, ret); - return ret; - } - - ret = cpu_get_desc(dev, desc, sizeof(desc)); - if (ret) { - debug("%s: Could not get CPU description (err = %d)\n", - dev->name, ret); - return ret; - } - - printf("%s", desc); - - return 0; -} -#endif - static int announce_dram_init(void) { puts("DRAM: "); diff --git a/include/init.h b/include/init.h index afc953d..a58d7a6 100644 --- a/include/init.h +++ b/include/init.h @@ -109,14 +109,7 @@ int arch_reserve_stacks(void); */ int init_cache_f_r(void); -#if !CONFIG_IS_ENABLED(CPU) -/** - * print_cpuinfo() - Display information about the CPU - * - * Return: 0 if OK, -ve on error - */ int print_cpuinfo(void); -#endif int timer_init(void); int reserve_mmu(void); int misc_init_f(void); -- 2.7.4

4 12

[U-Boot] Pull request, v2018.11: u-boot-spi/master
by Jagan Teki 12 Nov '18

12 Nov '18

Hi Tom, Please pull this PR for v2018.11 thanks, Jagan. The following changes since commit 6b0afcc85092650ce386868254c4a607ca7f1a26: common: Compile error with CONFIG_MULTI_DTB_FIT and not SPL (2018-11-09 10:44:50 -0500) are available in the Git repository at: git://git.denx.de/u-boot-spi.git master for you to fetch changes up to 596330db350d4d428256f96eee8017a5741390a6: mtd: Drop duplicate MTD_PARTITIONS Kconfig option (2018-11-12 10:10:45 +0530) ---------------------------------------------------------------- Boris Brezillon (3): mtd: Use default mtdparts/mtids when not defined in the environment cmd: ubi: Remove useless call to mtdparts_init() mtd: Drop duplicate MTD_PARTITIONS Kconfig option cmd/Kconfig | 5 ++-- cmd/ubi.c | 5 ---- drivers/dfu/Kconfig | 1 + drivers/mtd/Kconfig | 6 ----- drivers/mtd/mtd_uboot.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++-- 5 files changed, 63 insertions(+), 16 deletions(-)

1 1