January 2018 - U-Boot

[U-Boot] [PATCH 0/6] Add stmf429-evaluation board support
by patrice.chotard＠st.com 28 Jan '18

28 Jan '18

From: Patrice Chotard <patrice.chotard(a)st.com> This series add support for stmf429-evaluation board. Before adding this board support, the clk_stm32f driver must be updated to be able to retrieve external oscillator frequency (HSE) from device tree. This because stm32f429-evaluation board doesn't use a 8 Mhz external oscillator as all STM32F4 board supported (stm32f429-disco and stm32f469-disco). Patrice Chotard (6): ARM: dts: stm32: add "u-boot,dm-pre-reloc" for clk_hse in stm32f7-u-boot clk: stm32: retrieve external oscillator frequency from DT configs: stm32f: Remove STM32_HSE_HZ for all STM32F series board: stm32: Add stm32f429-evaluation board support ARM: dts: stm32: Add STM32F429 Evaluation board support ARM: dts: stm32: add stm32429-eval-u-boot dts file arch/arm/dts/Makefile | 1 + arch/arm/dts/stm32429i-eval-u-boot.dtsi | 231 +++++++++++++++++ arch/arm/dts/stm32429i-eval.dts | 276 +++++++++++++++++++++ arch/arm/dts/stm32f7-u-boot.dtsi | 4 + arch/arm/mach-stm32/stm32f4/Kconfig | 4 + board/st/stm32f429-evaluation/Kconfig | 19 ++ board/st/stm32f429-evaluation/MAINTAINERS | 6 + board/st/stm32f429-evaluation/Makefile | 8 + .../st/stm32f429-evaluation/stm32f429-evaluation.c | 74 ++++++ configs/stm32f429-evaluation_defconfig | 31 +++ drivers/clk/clk_stm32f.c | 78 ++++-- include/configs/stm32f429-discovery.h | 2 - include/configs/stm32f429-evaluation.h | 65 +++++ include/configs/stm32f469-discovery.h | 1 - include/configs/stm32f746-disco.h | 1 - 15 files changed, 776 insertions(+), 25 deletions(-) create mode 100644 arch/arm/dts/stm32429i-eval-u-boot.dtsi create mode 100644 arch/arm/dts/stm32429i-eval.dts create mode 100644 board/st/stm32f429-evaluation/Kconfig create mode 100644 board/st/stm32f429-evaluation/MAINTAINERS create mode 100644 board/st/stm32f429-evaluation/Makefile create mode 100644 board/st/stm32f429-evaluation/stm32f429-evaluation.c create mode 100644 configs/stm32f429-evaluation_defconfig create mode 100644 include/configs/stm32f429-evaluation.h -- 1.9.1

2 12

[U-Boot] [PATCH] arm: bootm-fdt.c: fix compiler warning
by Heiko Schocher 28 Jan '18

28 Jan '18

compiling U-Boot with bosch_mpcxxxxd_sd_defconfig drops warning: arch/arm/lib/bootm-fdt.c: In function ‘arch_fixup_fdt’: arch/arm/lib/bootm-fdt.c:37:6: warning: unused variable ‘ret’ [-Wunused-variable] int ret = 0; ^~~ Fix it. Signed-off-by: Heiko Schocher <hs(a)denx.de> --- arch/arm/lib/bootm-fdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/lib/bootm-fdt.c b/arch/arm/lib/bootm-fdt.c index fcc2a0e214..83409a7ece 100644 --- a/arch/arm/lib/bootm-fdt.c +++ b/arch/arm/lib/bootm-fdt.c @@ -34,7 +34,7 @@ __weak int fdt_update_ethernet_dt(void *blob) int arch_fixup_fdt(void *blob) { - int ret = 0; + __maybe_unused int ret = 0; #if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_OF_LIBFDT) bd_t *bd = gd->bd; int bank; -- 2.14.3

2 1

[U-Boot] [PATCH] arm: mach-omap2: Pass args to secure ROM in SRAM in SPL
by Andrew F. Davis 28 Jan '18

28 Jan '18

When in early SPL we make some secure ROM calls that can effect DRAM, due to this it is more stable to store the args for these calls in SRAM, but uninitialized and zero'd globals are placed in BSS, located in DRAM. Force our args into the data section which is in SRAM during SPL. Signed-off-by: Andrew F. Davis <afd(a)ti.com> --- arch/arm/mach-omap2/sec-common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-omap2/sec-common.c b/arch/arm/mach-omap2/sec-common.c index 2630e7d316..1906a126cf 100644 --- a/arch/arm/mach-omap2/sec-common.c +++ b/arch/arm/mach-omap2/sec-common.c @@ -56,7 +56,7 @@ struct ppa_tee_load_info { u32 tee_arg0; /* argument to TEE jump function, in r0 */ }; -static uint32_t secure_rom_call_args[5] __aligned(ARCH_DMA_MINALIGN); +static uint32_t secure_rom_call_args[5] __aligned(ARCH_DMA_MINALIGN) __section(".data"); u32 secure_rom_call(u32 service, u32 proc_id, u32 flag, ...) { -- 2.15.1

2 1

[U-Boot] [RESEND PATCH v2 4/4] common: board_r: Fix style violations
by Mario Six 28 Jan '18

28 Jan '18

Fix some style violations in the board_r file. Reviewed-by: Simon Glass <sjg(a)chromium.org> Signed-off-by: Mario Six <mario.six(a)gdsys.cc> --- v1 -> v2: None --- common/board_r.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/common/board_r.c b/common/board_r.c index 09167c13cc..e304bb208e 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -157,9 +157,9 @@ static int initr_reloc_global_data(void) #endif #ifdef CONFIG_OF_EMBED /* - * The fdt_blob needs to be moved to new relocation address - * incase of FDT blob is embedded with in image - */ + * The fdt_blob needs to be moved to new relocation address + * incase of FDT blob is embedded with in image + */ gd->fdt_blob += gd->reloc_off; #endif #ifdef CONFIG_EFI_LOADER @@ -351,14 +351,16 @@ static int initr_flash(void) print_size(flash_size, ""); #ifdef CONFIG_SYS_FLASH_CHECKSUM /* - * Compute and print flash CRC if flashchecksum is set to 'y' - * - * NOTE: Maybe we should add some WATCHDOG_RESET()? XXX - */ + * Compute and print flash CRC if flashchecksum is set to 'y' + * + * NOTE: Maybe we should add some WATCHDOG_RESET()? XXX + */ if (env_get_yesno("flashchecksum") == 1) { + const uchar *flash_base = (const uchar *)CONFIG_SYS_FLASH_BASE; + printf(" CRC: %08X", crc32(0, - (const unsigned char *) CONFIG_SYS_FLASH_BASE, - flash_size)); + flash_base, + flash_size)); } #endif /* CONFIG_SYS_FLASH_CHECKSUM */ putc('\n'); @@ -375,7 +377,6 @@ static int initr_flash(void) update_flash_size(flash_size); #endif - #if defined(CONFIG_OXC) || defined(CONFIG_RMU) /* flash mapped at end of memory map */ bd->bi_flashoffset = CONFIG_SYS_TEXT_BASE + flash_size; @@ -627,7 +628,7 @@ int initr_mem(void) # ifdef CONFIG_PRAM pram = env_get_ulong("pram", 10, CONFIG_PRAM); # endif - sprintf(memsz, "%ldk", (long int) ((gd->ram_size / 1024) - pram)); + sprintf(memsz, "%ldk", (long int)((gd->ram_size / 1024) - pram)); env_set("mem", memsz); return 0; @@ -680,7 +681,7 @@ static init_fnc_t init_sequence_r[] = { initr_caches, /* Note: For Freescale LS2 SoCs, new MMU table is created in DDR. * A temporary mapping of IFC high region is since removed, - * so environmental variables in NOR flash is not availble + * so environmental variables in NOR flash is not available * until board_init() is called below to remap IFC to high * region. */ @@ -743,7 +744,7 @@ static init_fnc_t init_sequence_r[] = { #if defined(CONFIG_PCI) && defined(CONFIG_SYS_EARLY_PCI_INIT) /* * Do early PCI configuration _before_ the flash gets initialised, - * because PCU ressources are crucial for flash access on some boards. + * because PCU resources are crucial for flash access on some boards. */ initr_pci, #endif -- 2.11.0

2 1

[U-Boot] [RESEND PATCH v2 3/4] common: board_f: Fix style violations
by Mario Six 28 Jan '18

28 Jan '18

Fix some style violations in the board_f file. Reviewed-by: Simon Glass <sjg(a)chromium.org> Signed-off-by: Mario Six <mario.six(a)gdsys.cc> --- v1 -> v2: None --- common/board_f.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common/board_f.c b/common/board_f.c index e46eceda7d..df589fd570 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -49,7 +49,7 @@ #ifdef XTRN_DECLARE_GLOBAL_DATA_PTR #undef XTRN_DECLARE_GLOBAL_DATA_PTR #define XTRN_DECLARE_GLOBAL_DATA_PTR /* empty = allocate here */ -DECLARE_GLOBAL_DATA_PTR = (gd_t *) (CONFIG_SYS_INIT_GD_ADDR); +DECLARE_GLOBAL_DATA_PTR = (gd_t *)(CONFIG_SYS_INIT_GD_ADDR); #else DECLARE_GLOBAL_DATA_PTR; #endif @@ -136,7 +136,7 @@ static int display_text_info(void) #endif debug("U-Boot code: %08lX -> %08lX BSS: -> %08lX\n", - text_base, bss_start, bss_end); + text_base, bss_start, bss_end); #endif return 0; @@ -413,7 +413,7 @@ static int reserve_malloc(void) { gd->start_addr_sp = gd->start_addr_sp - TOTAL_MALLOC_LEN; debug("Reserving %dk for malloc() at: %08lx\n", - TOTAL_MALLOC_LEN >> 10, gd->start_addr_sp); + TOTAL_MALLOC_LEN >> 10, gd->start_addr_sp); return 0; } @@ -443,7 +443,7 @@ static int reserve_global_data(void) gd->start_addr_sp -= sizeof(gd_t); gd->new_gd = (gd_t *)map_sysmem(gd->start_addr_sp, sizeof(gd_t)); debug("Reserving %zu Bytes for Global Data at: %08lx\n", - sizeof(gd_t), gd->start_addr_sp); + sizeof(gd_t), gd->start_addr_sp); return 0; } -- 2.11.0

2 1

[U-Boot] [RESEND PATCH v2 2/4] serial: ns16550: Fix style violation
by Mario Six 28 Jan '18

28 Jan '18

Clarify the computation precedence in two ternary operator constructions. Reviewed-by: Simon Glass <sjg(a)chromium.org> Signed-off-by: Mario Six <mario.six(a)gdsys.cc> --- v1 -> v2: None --- drivers/serial/ns16550.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c index c702304e79..6f9ce689cf 100644 --- a/drivers/serial/ns16550.c +++ b/drivers/serial/ns16550.c @@ -339,9 +339,9 @@ static int ns16550_serial_pending(struct udevice *dev, bool input) struct NS16550 *const com_port = dev_get_priv(dev); if (input) - return serial_in(&com_port->lsr) & UART_LSR_DR ? 1 : 0; + return (serial_in(&com_port->lsr) & UART_LSR_DR) ? 1 : 0; else - return serial_in(&com_port->lsr) & UART_LSR_THRE ? 0 : 1; + return (serial_in(&com_port->lsr) & UART_LSR_THRE) ? 0 : 1; } static int ns16550_serial_getc(struct udevice *dev) -- 2.11.0

2 1

[U-Boot] [RESEND PATCH v2 1/4] include: dm: Fix 'devioe'/'devuce' typos
by Mario Six 28 Jan '18

28 Jan '18

There are some typos in the documentation of some functions in read.h; fix those. Signed-off-by: Mario Six <mario.six(a)gdsys.cc> Reviewed-by: Simon Glass <sjg(a)chromium.org> --- v1 -> v2: None --- include/dm/read.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/dm/read.h b/include/dm/read.h index 8114037e97..d2f47a678f 100644 --- a/include/dm/read.h +++ b/include/dm/read.h @@ -255,7 +255,7 @@ int dev_count_phandle_with_args(struct udevice *dev, const char *list_name, * This walks back up the tree to find the closest #address-cells property * which controls the given node. * - * @dev: devioe to check + * @dev: device to check * @return number of address cells this node uses */ int dev_read_addr_cells(struct udevice *dev); @@ -266,7 +266,7 @@ int dev_read_addr_cells(struct udevice *dev); * This walks back up the tree to find the closest #size-cells property * which controls the given node. * - * @dev: devioe to check + * @dev: device to check * @return number of size cells this node uses */ int dev_read_size_cells(struct udevice *dev); @@ -276,7 +276,7 @@ int dev_read_size_cells(struct udevice *dev); * * This function matches fdt_address_cells(). * - * @dev: devioe to check + * @dev: device to check * @return number of address cells this node uses */ int dev_read_simple_addr_cells(struct udevice *dev); @@ -286,7 +286,7 @@ int dev_read_simple_addr_cells(struct udevice *dev); * * This function matches fdt_size_cells(). * - * @dev: devioe to check + * @dev: device to check * @return number of size cells this node uses */ int dev_read_simple_size_cells(struct udevice *dev); -- 2.11.0

2 1

[U-Boot] [RESEND PATCH v2 1/7] gpio: pca953x_gpio: Fix style violations
by Mario Six 28 Jan '18

28 Jan '18

Fix some style violations in the pca953x_gpio driver. Signed-off-by: Mario Six <mario.six(a)gdsys.cc> --- v1 -> v2: None --- drivers/gpio/pca953x_gpio.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/drivers/gpio/pca953x_gpio.c b/drivers/gpio/pca953x_gpio.c index 791d1d1516..5ea1e05eed 100644 --- a/drivers/gpio/pca953x_gpio.c +++ b/drivers/gpio/pca953x_gpio.c @@ -123,7 +123,8 @@ static int pca953x_read_regs(struct udevice *dev, int reg, u8 *val) ret = dm_i2c_read(dev, reg << 1, val, info->bank_count); } else if (info->gpio_count == 40) { /* Auto increment */ - ret = dm_i2c_read(dev, (reg << 3) | 0x80, val, info->bank_count); + ret = dm_i2c_read(dev, (reg << 3) | 0x80, val, + info->bank_count); } else { dev_err(dev, "Unsupported now\n"); return -EINVAL; @@ -143,7 +144,7 @@ static int pca953x_is_output(struct udevice *dev, int offset) return !(info->reg_direction[bank] & (1 << off)); } -static int pca953x_get_value(struct udevice *dev, unsigned offset) +static int pca953x_get_value(struct udevice *dev, uint offset) { int ret; u8 val = 0; @@ -157,8 +158,7 @@ static int pca953x_get_value(struct udevice *dev, unsigned offset) return (val >> off) & 0x1; } -static int pca953x_set_value(struct udevice *dev, unsigned offset, - int value) +static int pca953x_set_value(struct udevice *dev, uint offset, int value) { struct pca953x_info *info = dev_get_platdata(dev); int bank = offset / BANK_SZ; @@ -180,7 +180,7 @@ static int pca953x_set_value(struct udevice *dev, unsigned offset, return 0; } -static int pca953x_set_direction(struct udevice *dev, unsigned offset, int dir) +static int pca953x_set_direction(struct udevice *dev, uint offset, int dir) { struct pca953x_info *info = dev_get_platdata(dev); int bank = offset / BANK_SZ; @@ -202,13 +202,12 @@ static int pca953x_set_direction(struct udevice *dev, unsigned offset, int dir) return 0; } -static int pca953x_direction_input(struct udevice *dev, unsigned offset) +static int pca953x_direction_input(struct udevice *dev, uint offset) { return pca953x_set_direction(dev, offset, PCA953X_DIRECTION_IN); } -static int pca953x_direction_output(struct udevice *dev, unsigned offset, - int value) +static int pca953x_direction_output(struct udevice *dev, uint offset, int value) { /* Configure output value. */ pca953x_set_value(dev, offset, value); @@ -219,7 +218,7 @@ static int pca953x_direction_output(struct udevice *dev, unsigned offset, return 0; } -static int pca953x_get_function(struct udevice *dev, unsigned offset) +static int pca953x_get_function(struct udevice *dev, uint offset) { if (pca953x_is_output(dev, offset)) return GPIOF_OUTPUT; @@ -231,7 +230,7 @@ static int pca953x_xlate(struct udevice *dev, struct gpio_desc *desc, struct ofnode_phandle_args *args) { desc->offset = args->args[0]; - desc->flags = args->args[1] & GPIO_ACTIVE_LOW ? GPIOD_ACTIVE_LOW : 0; + desc->flags = args->args[1] & (GPIO_ACTIVE_LOW ? GPIOD_ACTIVE_LOW : 0); return 0; } -- 2.11.0

2 13

[U-Boot] [PATCH] Initialize SHA buffer size var in passwd_abort
by Martin Etnestad 28 Jan '18

28 Jan '18

The call to hash_block in passwd_abort fails with error ENOSPC on some systems. The reason is that the variable which specifies the size of the buffer to contain the computed hash does not get initialized. This patch initializes the variable with the size of the buffer. Signed-off-by: Martin Etnestad <martin.etnestad(a)appeartv.com> --- common/autoboot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/autoboot.c b/common/autoboot.c index a011865028..2eef7a04cc 100644 --- a/common/autoboot.c +++ b/common/autoboot.c @@ -57,7 +57,7 @@ static int passwd_abort(uint64_t etime) const char *algo_name = "sha256"; u_int presskey_len = 0; int abort = 0; - int size; + int size = sizeof(sha); int ret; if (sha_env_str == NULL) -- 2.15.1

2 1

[U-Boot] [PULL] u-boot-usb/master
by Marek Vasut 28 Jan '18

28 Jan '18

The following changes since commit 1a7f6d4597646662022f3e67ceaaeff7a23459e5: Merge git://git.denx.de/u-boot-uniphier (2018-01-27 21:55:04 -0500) are available in the Git repository at: git://git.denx.de/u-boot-usb.git master for you to fetch changes up to 40b61180c1b0fcfceb82e80fb03ce0e88b31e7ab: usb: host: Drop unused hcd_name from r8a66597-hcd.c (2018-01-28 04:00:59 +0100) ---------------------------------------------------------------- Tom Rini (2): usb: Remove isp116x-hcd support usb: host: Drop unused hcd_name from r8a66597-hcd.c drivers/usb/host/Makefile | 1 - drivers/usb/host/isp116x-hcd.c | 1323 ---------------------------------------------------------------------------------------------------------------------------------------------------------- drivers/usb/host/isp116x.h | 476 -------------------------------------------------------- drivers/usb/host/r8a66597-hcd.c | 1 - 4 files changed, 1801 deletions(-) delete mode 100644 drivers/usb/host/isp116x-hcd.c delete mode 100644 drivers/usb/host/isp116x.h

2 1