August 2018 - U-Boot

[U-Boot] [PATCH] MAINTAINERS: Add more sources to Arch Snapdragon
by Ramon Fried 14 Aug '18

14 Aug '18

Add scattered driver files around the source tree that belongs to Snapdragon arch. Not sure why they were not included in the first place. Signed-off-by: Ramon Fried <ramon.fried(a)gmail.com> --- MAINTAINERS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 1bd583c975..0434dbd920 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -207,7 +207,11 @@ ARM SNAPDRAGON M: Ramon Fried <ramon.fried(a)gmail.com> S: Maintained F: arch/arm/mach-snapdragon/ +F: drivers/gpio/msm_gpio.c +F: drivers/mmc/msm_sdhci.c +F: drivers/serial/serial_msm.c F: drivers/smem/msm_smem.c +F: drivers/usb/host/ehci-msm.c ARM STI M: Patrice Chotard <patrice.chotard(a)st.com> -- 2.18.0

2 1

[U-Boot] [PATCH] db410c: add FIT support
by Ramon Fried 14 Aug '18

14 Aug '18

1. Add FIT support for DB410c defconfig. 2. Don't overwrite bootargs (they're already defined in Linux device tree for DB410c. Signed-off-by: Ramon Fried <ramon.fried(a)gmail.com> --- configs/dragonboard410c_defconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configs/dragonboard410c_defconfig b/configs/dragonboard410c_defconfig index ae8a8da554..25137f94de 100644 --- a/configs/dragonboard410c_defconfig +++ b/configs/dragonboard410c_defconfig @@ -4,9 +4,8 @@ CONFIG_SYS_TEXT_BASE=0x80080000 CONFIG_IDENT_STRING="\nQualcomm-DragonBoard 410C" CONFIG_DEFAULT_DEVICE_TREE="dragonboard410c" CONFIG_DISTRO_DEFAULTS=y +CONFIG_FIT=y CONFIG_OF_BOARD_SETUP=y -CONFIG_USE_BOOTARGS=y -CONFIG_BOOTARGS="console=ttyMSM0,115200n8" # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="dragonboard410c => " -- 2.18.0

2 1

[U-Boot] [PATCH v1 0/3] Let U-Boot generate MAC address for db410
by Ramon Fried 14 Aug '18

14 Aug '18

This patchset gives U-boot ownership on generating WLAN/BT mac addresses for WCNSS chip on Dragonboard410. Previously, this was done by LK and U-boot only read the results from the patched DTB LK fixed-up. This is is part of my ongoing effort to get rid of LK once and for all for Snapdragon ARCH. Ramon Fried (3): snapdragon: added msm_board_serial() func snapdragon: added MAC generation functions db410: alter WLAN/BT MAC address fixup arch/arm/mach-snapdragon/Makefile | 1 + arch/arm/mach-snapdragon/include/mach/misc.h | 13 +++++ arch/arm/mach-snapdragon/misc.c | 53 ++++++++++++++++++ .../dragonboard410c/dragonboard410c.c | 54 +++++++++---------- 4 files changed, 94 insertions(+), 27 deletions(-) create mode 100644 arch/arm/mach-snapdragon/include/mach/misc.h create mode 100644 arch/arm/mach-snapdragon/misc.c -- 2.18.0

2 7

[U-Boot] [PATCH v2] stm32f7: board: Fix memory init
by Patrice Chotard 14 Aug '18

14 Aug '18

Commit 1473b12ad0b3 ("lib: fdtdec: Update ram_base to store ram start adddress") brings regression on STM32F7 which can't boot. Use fdtdec_setup_mem_size_base() to setup memory base and size. Use fdtdec_setup_memory_banksize() to setup memory bank base and size. Reported-by: Mark Olsson <mark(a)markolsson.se> Signed-off-by: Patrice Chotard <patrice.chotard(a)st.com> Cc: Mark Olsson <mark(a)markolsson.se> Reviewed-by: Vikas Manocha <vikas.manocha(a)st.com> --- Changes in v2: _ Update value returned by dram_init() and dram_init_banksize board/st/stm32f746-disco/stm32f746-disco.c | 35 +++--------------------------- 1 file changed, 3 insertions(+), 32 deletions(-) diff --git a/board/st/stm32f746-disco/stm32f746-disco.c b/board/st/stm32f746-disco/stm32f746-disco.c index e21cfc6e4955..7c9b1ad82aa1 100644 --- a/board/st/stm32f746-disco/stm32f746-disco.c +++ b/board/st/stm32f746-disco/stm32f746-disco.c @@ -21,25 +21,10 @@ DECLARE_GLOBAL_DATA_PTR; -int get_memory_base_size(fdt_addr_t *mr_base, fdt_addr_t *mr_size) -{ - int mr_node; - - mr_node = fdt_path_offset(gd->fdt_blob, "/memory"); - if (mr_node < 0) - return mr_node; - *mr_base = fdtdec_get_addr_size_auto_noparent(gd->fdt_blob, mr_node, - "reg", 0, mr_size, false); - debug("mr_base = %lx, mr_size= %lx\n", *mr_base, *mr_size); - - return 0; -} int dram_init(void) { - int rv; - fdt_addr_t mr_base, mr_size; - #ifndef CONFIG_SUPPORT_SPL + int rv; struct udevice *dev; rv = uclass_get_device(UCLASS_RAM, 0, &dev); if (rv) { @@ -48,26 +33,12 @@ int dram_init(void) } #endif - rv = get_memory_base_size(&mr_base, &mr_size); - if (rv) - return rv; - gd->ram_size = mr_size; - gd->ram_top = mr_base; - - return rv; + return fdtdec_setup_mem_size_base(); } int dram_init_banksize(void) { - fdt_addr_t mr_base, mr_size; - get_memory_base_size(&mr_base, &mr_size); - /* - * Fill in global info with description of SRAM configuration - */ - gd->bd->bi_dram[0].start = mr_base; - gd->bd->bi_dram[0].size = mr_size; - - return 0; + return fdtdec_setup_memory_banksize(); } int board_early_init_f(void) -- 1.9.1

2 1

[U-Boot] [PATCH v1 00/11] Update STM32 MCU configs
by Patrice Chotard 14 Aug '18

14 Aug '18

This series : - Remove unused configs flags in include/configs/stm32fxx files - Enable instruction and data caches for stm32f4 _ Migrate CMD_CACHE flag from include/configs/ to defconfig for stm32f746 and stm32h7 - Add DISTRO_DEFAULT support for stm32f4 and stm32h7 boards Patrice Chotard (11): board: stm32: use bi_dram[0].start instead of hardcoded value configs: stm32fxxx: Remove CONFIG_SYS_CLK_FREQ configs: stm32f429-disco: Remove CONFIG_SYS_RAM_CS configs: stm32f4xx: Enable ICACHE and DCACHE configs: stm32f746-disco: Migrate CONFIG_CMD_CACHE to defconfig configs: stm32h7xx: Migrate CONFIG_CMD_CACHE to defconfig configs: stm32f4xx: Remove CONFIG_SYS_RAM_FREQ_DIV configs: stm32h743-evaluation: Add DISTRO_DEFAULT support configs: stm32h743-discovery: Add DISTRO_DEFAULT support configs: stm32f469-discovery: Add DISTRO_DEFAULT support configs: stm32f429-evaluation: Add DISTRO_DEFAULT support board/st/stm32f429-discovery/stm32f429-discovery.c | 2 +- .../st/stm32f429-evaluation/stm32f429-evaluation.c | 2 +- board/st/stm32f469-discovery/stm32f469-discovery.c | 2 +- configs/stm32f429-evaluation_defconfig | 11 ++++----- configs/stm32f469-discovery_defconfig | 11 ++++----- configs/stm32f746-disco_defconfig | 1 + configs/stm32h743-disco_defconfig | 13 ++++------- configs/stm32h743-eval_defconfig | 13 ++++------- include/configs/stm32f429-discovery.h | 9 -------- include/configs/stm32f429-evaluation.h | 26 ++++++++++++---------- include/configs/stm32f469-discovery.h | 26 ++++++++++++---------- include/configs/stm32f746-disco.h | 2 -- include/configs/stm32h743-disco.h | 19 +++++++++++----- include/configs/stm32h743-eval.h | 19 +++++++++++----- 14 files changed, 76 insertions(+), 80 deletions(-) -- 1.9.1

2 22

[U-Boot] [PATCH] clk: at91: utmi: add timeout for utmi lock
by Eugen Hristev 14 Aug '18

14 Aug '18

In case the slow clock is not properly configured, the UTMI clock cannot lock the PLL, because UPLLCOUNT will "wait X slow clock cycles". In this case U-boot will loop indefinitely. Added a timeout in this case, to start U-boot even if UTMI clock is not enabled, so the user can use different media if needed, or investigate. Signed-off-by: Eugen Hristev <eugen.hristev(a)microchip.com> --- drivers/clk/at91/clk-utmi.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/clk/at91/clk-utmi.c b/drivers/clk/at91/clk-utmi.c index 0b56261..e850609 100644 --- a/drivers/clk/at91/clk-utmi.c +++ b/drivers/clk/at91/clk-utmi.c @@ -28,6 +28,7 @@ static int utmi_clk_enable(struct clk *clk) u32 utmi_ref_clk_freq; u32 tmp; int err; + int timeout = 2000000; if (readl(&pmc->sr) & AT91_PMC_LOCKU) return 0; @@ -85,8 +86,12 @@ static int utmi_clk_enable(struct clk *clk) AT91_PMC_BIASEN; writel(tmp, &pmc->uckr); - while (!(readl(&pmc->sr) & AT91_PMC_LOCKU)) + while ((--timeout) && !(readl(&pmc->sr) & AT91_PMC_LOCKU)) ; + if (!timeout) { + printf("UTMICK: timeout waiting for UPLL lock\n"); + return -ETIMEDOUT; + } return 0; } -- 2.7.4

2 1

[U-Boot] [PATCH] arm: bcm7445: Fix parallel make race condition
by Thomas Fitzsimmons 14 Aug '18

14 Aug '18

Move the contents of prior_stage.h into bcmstb.h to prevent a build failure when bcmstb.h is #include'ed before the asm/arch symbolic link is present. Signed-off-by: Thomas Fitzsimmons <fitzsim(a)fitzsim.org> --- arch/arm/mach-bcmstb/include/mach/prior_stage.h | 30 ------------------------- include/configs/bcmstb.h | 20 ++++++++++++++++- 2 files changed, 19 insertions(+), 31 deletions(-) delete mode 100644 arch/arm/mach-bcmstb/include/mach/prior_stage.h diff --git a/arch/arm/mach-bcmstb/include/mach/prior_stage.h b/arch/arm/mach-bcmstb/include/mach/prior_stage.h deleted file mode 100644 index 6c36c68..0000000 --- a/arch/arm/mach-bcmstb/include/mach/prior_stage.h +++ /dev/null @@ -1,30 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * (C) Copyright 2018 Cisco Systems, Inc. - * - * Author: Thomas Fitzsimmons <fitzsim(a)fitzsim.org> - */ - -#ifndef _BCMSTB_PRIOR_STAGE_H -#define _BCMSTB_PRIOR_STAGE_H - -#ifndef __ASSEMBLY__ - -#include <linux/types.h> - -struct bcmstb_boot_parameters { - u32 r0; - u32 r1; - u32 r2; - u32 r3; - u32 sp; - u32 lr; -}; - -extern struct bcmstb_boot_parameters bcmstb_boot_parameters; - -extern phys_addr_t prior_stage_fdt_address; - -#endif /* __ASSEMBLY__ */ - -#endif /* _BCMSTB_PRIOR_STAGE_H */ diff --git a/include/configs/bcmstb.h b/include/configs/bcmstb.h index 8c61780..262ef54 100644 --- a/include/configs/bcmstb.h +++ b/include/configs/bcmstb.h @@ -12,7 +12,25 @@ #include "version.h" #include <linux/sizes.h> -#include <asm/arch/prior_stage.h> + +#ifndef __ASSEMBLY__ + +#include <linux/types.h> + +struct bcmstb_boot_parameters { + u32 r0; + u32 r1; + u32 r2; + u32 r3; + u32 sp; + u32 lr; +}; + +extern struct bcmstb_boot_parameters bcmstb_boot_parameters; + +extern phys_addr_t prior_stage_fdt_address; + +#endif /* __ASSEMBLY__ */ /* * Generic board configuration. -- 1.8.3.1

2 1

[U-Boot] [PATCH] Fix LibreSSL before v2.7.0
by nomble＠palism.com 14 Aug '18

14 Aug '18

From: Nomble <nomble(a)palism.com> Signed-off-by: Nomble <nomble(a)palism.com> Signed-off-by: Caliph Nomble <nomble(a)palism.com> --- lib/rsa/rsa-sign.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/rsa/rsa-sign.c b/lib/rsa/rsa-sign.c index cfe09cc94c..ab8572894d 100644 --- a/lib/rsa/rsa-sign.c +++ b/lib/rsa/rsa-sign.c @@ -20,7 +20,7 @@ #define HAVE_ERR_REMOVE_THREAD_STATE #endif -#if OPENSSL_VERSION_NUMBER < 0x10100000L +#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02070000fL) static void RSA_get0_key(const RSA *r, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d) { @@ -299,7 +299,7 @@ static int rsa_init(void) { int ret; -#if OPENSSL_VERSION_NUMBER < 0x10100000L +#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ret = SSL_library_init(); #else ret = OPENSSL_init_ssl(0, NULL); @@ -308,7 +308,7 @@ static int rsa_init(void) fprintf(stderr, "Failure to init SSL library\n"); return -1; } -#if OPENSSL_VERSION_NUMBER < 0x10100000L +#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) SSL_load_error_strings(); OpenSSL_add_all_algorithms(); @@ -354,7 +354,7 @@ err_set_rsa: err_engine_init: ENGINE_free(e); err_engine_by_id: -#if OPENSSL_VERSION_NUMBER < 0x10100000L +#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02070000fL) ENGINE_cleanup(); #endif return ret; @@ -362,7 +362,7 @@ err_engine_by_id: static void rsa_remove(void) { -#if OPENSSL_VERSION_NUMBER < 0x10100000L +#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02070000fL) CRYPTO_cleanup_all_ex_data(); ERR_free_strings(); #ifdef HAVE_ERR_REMOVE_THREAD_STATE @@ -432,7 +432,8 @@ static int rsa_sign_with_key(RSA *rsa, struct checksum_algo *checksum_algo, ret = rsa_err("Could not obtain signature"); goto err_sign; } - #if OPENSSL_VERSION_NUMBER < 0x10100000L + + #if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02070000fL) EVP_MD_CTX_cleanup(context); #else EVP_MD_CTX_reset(context); -- 2.16.4

3 4

[U-Boot] [PATCH 1/1] fs: fix typo 'dumm'
by Heinrich Schuchardt 14 Aug '18

14 Aug '18

%s/dumm /dummy / Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- fs/fs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/fs.c b/fs/fs.c index 33808d549e..cb68e81cd3 100644 --- a/fs/fs.c +++ b/fs/fs.c @@ -112,7 +112,7 @@ struct fstype_info { * Is it legal to pass NULL as .probe()'s fs_dev_desc parameter? This * should be false in most cases. For "virtual" filesystems which * aren't based on a U-Boot block device (e.g. sandbox), this can be - * set to true. This should also be true for the dumm entry at the end + * set to true. This should also be true for the dummy entry at the end * of fstypes[], since that is essentially a "virtual" (non-existent) * filesystem. */ -- 2.18.0

2 1

[U-Boot] [PATCH v3 1/1] avb2.0: add get_size_of_partition()
by Igor Opaniuk 14 Aug '18

14 Aug '18

Implement get_size_of_partition() operation, which is required by the latest upstream libavb [1]. [1] https://android.googlesource.com/platform/external/avb/+/android-p-preview-5 Signed-off-by: Igor Opaniuk <igor.opaniuk(a)linaro.org> --- Changes for v3: - reword commit message, added avblib repository link, that stick to specific tag - fix get_size_of_partition() function description. Changes for v2: - change the return code for the case when out_size_num_bytes is NULL (s/AVB_IO_RESULT_ERROR_IO/AVB_IO_RESULT_ERROR_INSUFFICIENT_SPACE/g) common/avb_verify.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/common/avb_verify.c b/common/avb_verify.c index 20e35ad..82ddebc 100644 --- a/common/avb_verify.c +++ b/common/avb_verify.c @@ -700,6 +700,37 @@ static AvbIOResult get_unique_guid_for_partition(AvbOps *ops, } /** + * get_size_of_partition() - gets the size of a partition identified + * by a string name + * + * @ops: contains AVB ops handlers + * @partition: partition name (NUL-terminated UTF-8 string) + * @out_size_num_bytes: returns the value of a partition size + * + * @return: + * AVB_IO_RESULT_OK, on success (GUID found) + * AVB_IO_RESULT_ERROR_INSUFFICIENT_SPACE, out_size_num_bytes is NULL + * AVB_IO_RESULT_ERROR_NO_SUCH_PARTITION, if partition was not found + */ +static AvbIOResult get_size_of_partition(AvbOps *ops, + const char *partition, + u64 *out_size_num_bytes) +{ + struct mmc_part *part; + + if (!out_size_num_bytes) + return AVB_IO_RESULT_ERROR_INSUFFICIENT_SPACE; + + part = get_partition(ops, partition); + if (!part) + return AVB_IO_RESULT_ERROR_NO_SUCH_PARTITION; + + *out_size_num_bytes = part->info.blksz * part->info.size; + + return AVB_IO_RESULT_OK; +} + +/** * ============================================================================ * AVB2.0 AvbOps alloc/initialisation/free * ============================================================================ @@ -722,7 +753,7 @@ AvbOps *avb_ops_alloc(int boot_device) ops_data->ops.read_is_device_unlocked = read_is_device_unlocked; ops_data->ops.get_unique_guid_for_partition = get_unique_guid_for_partition; - + ops_data->ops.get_size_of_partition = get_size_of_partition; ops_data->mmc_dev = boot_device; return &ops_data->ops; -- 2.7.4

4 4