December 2016 - U-Boot

[U-Boot] [PATCH] armv8: ls1046aqds: added usb feature support
by yuantian.tang＠nxp.com 19 Jan '17

19 Jan '17

From: Tang Yuantian <Yuantian.Tang(a)nxp.com> The LS1046AQDS processor has three integrated USB 3.0 controllers (USB1, USB2, and USB3) that allow direct connection to the USB ports with appropriate protection circuitry and power supplies. USB1 and USB2 ports are powered by a NX5P2190UK device, which supplies 5v power at up to 1.2 A. The power enable and power-fault-detect pins are connected to the LS1046A processor via CPLD for individual port management. Signed-off-by: Tang Yuantian <yuantian.tang(a)nxp.com> --- include/configs/ls1046aqds.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h index 29e0aa5..53a1ffb 100644 --- a/include/configs/ls1046aqds.h +++ b/include/configs/ls1046aqds.h @@ -135,6 +135,14 @@ unsigned long get_board_ddr_clk(void); #define CFG_LPUART_EN 0x2 #endif +/* USB */ +#define CONFIG_HAS_FSL_XHCI_USB +#ifdef CONFIG_HAS_FSL_XHCI_USB +#define CONFIG_USB_XHCI_FSL +#define CONFIG_USB_MAX_CONTROLLER_COUNT 3 +#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2 +#endif + /* SATA */ #define CONFIG_LIBATA #define CONFIG_SCSI_AHCI -- 2.1.0.27.g96db324

3 2

[U-Boot] [PATCH] spl: don't use %.*s with CONFIG_USE_TINY_PRINTF
by Oded Gabbay 19 Jan '17

19 Jan '17

In the tiny-printf implementation, there is no support for %.*s. This patch checks if CONFIG_USE_TINY_PRINTF is defined and if so, prints a different debug statement which doesn't use %.*s Signed-off-by: Oded Gabbay <oded.gabbay(a)gmail.com> Cc: Simon Glass <sjg(a)chromium.org> --- common/spl/spl.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/common/spl/spl.c b/common/spl/spl.c index f7df834..7c4744d 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -115,9 +115,14 @@ int spl_parse_image_header(struct spl_image_info *spl_image, } spl_image->os = image_get_os(header); spl_image->name = image_get_name(header); +#ifdef CONFIG_USE_TINY_PRINTF + debug("spl: payload image: %s load addr: 0x%x size: %d\n", + spl_image->name, spl_image->load_addr, spl_image->size); +#else debug("spl: payload image: %.*s load addr: 0x%x size: %d\n", (int)sizeof(spl_image->name), spl_image->name, spl_image->load_addr, spl_image->size); +#endif } else { #ifdef CONFIG_SPL_PANIC_ON_RAW_IMAGE /* -- 2.7.4

4 6

[U-Boot] [PATCH] spl: don't use %#l with CONFIG_USE_TINY_PRINTF
by Oded Gabbay 19 Jan '17

19 Jan '17

In the tiny-printf implementation, there is no support for %# and/or %l. This patch checks if CONFIG_USE_TINY_PRINTF is defined and if so, prints a different debug statement which doesn't use %#l Signed-off-by: Oded Gabbay <oded.gabbay(a)gmail.com> Cc: Simon Glass <sjg(a)chromium.org> --- common/spl/spl.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/common/spl/spl.c b/common/spl/spl.c index f7df834..23dfa2d 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -385,9 +385,14 @@ void board_init_r(gd_t *dummy1, ulong dummy2) debug("Unsupported OS image.. Jumping nevertheless..\n"); } #if defined(CONFIG_SYS_MALLOC_F_LEN) && !defined(CONFIG_SYS_SPL_MALLOC_SIZE) +#ifdef CONFIG_USE_TINY_PRINTF + debug("SPL malloc() used 0x%x bytes (%d KB)\n", + (uint) gd->malloc_ptr, (uint) gd->malloc_ptr / 1024); +#else debug("SPL malloc() used %#lx bytes (%ld KB)\n", gd->malloc_ptr, gd->malloc_ptr / 1024); #endif +#endif debug("loaded - jumping to U-Boot..."); spl_board_prepare_for_boot(); -- 2.7.4

4 3

[U-Boot] [PATCH v3 0/9] ARM: stm32: add network and qspi driver support to stm32f746-disco board
by Michael Kurz 18 Jan '17

18 Jan '17

This series adds support for the network and the qspi devices found on the stm32f746 controller and enables those devices on the stm32f746-disco board. Changes in v3: - Split pin control files of from device tree patch - Add Acked-by tag to 'add stm32f746 device tree pin control files' - Split pin control files of from device tree patch - Add Acked-by tag to 'add stm32f746-disco device tree files' - Removed 'prefix all constants with STM32_' - Reverted move of header into source file (rcc.h -> clock.c) - Split clock setup changes of from cleanup patch - Add Acked-by tag to 'add designware mac glue code for stm32' - Moved qspi rcc bits into rcc header - Drop 'add missing flag to micron/stm N25Q128 flash chips' patch Changes in v2: - Add cleanup patch - Replaced bit shifts and masks with BIT() and GENMASK() macro - Moved STM32_SYSCFG_BASE into stm32.h header - Add Acked-by tag to 'net: phy: add SMSC LAN8742 phy' - Replaced bit shifts and masks with BIT() and GENMASK() macro Michael Kurz (9): ARM: DTS: stm32: add stm32f746 device tree pin control files ARM: DTS: stm32: add stm32f746-disco device tree files ARM: stm32: cleanup stm32f7 files ARM: stm32: fix stm32f7 sdram fmc base address ARM: stm32: use clock setup function defined in clock.c net: stm32: add designware mac glue code for stm32 net: phy: add SMSC LAN8742 phy ARM: stm32: enable support for smsc phy on stm32f746-disco board ARM: SPI: stm32: add stm32f746 qspi driver arch/arm/dts/Makefile | 2 + arch/arm/dts/armv7-m.dtsi | 24 + arch/arm/dts/stm32f746-disco.dts | 154 +++ arch/arm/dts/stm32f746.dtsi | 397 +++++++ arch/arm/include/asm/arch-stm32f7/fmc.h | 9 +- arch/arm/include/asm/arch-stm32f7/gpt.h | 6 +- arch/arm/include/asm/arch-stm32f7/rcc.h | 77 +- arch/arm/include/asm/arch-stm32f7/stm32.h | 10 +- arch/arm/include/asm/arch-stm32f7/stm32_periph.h | 10 +- arch/arm/include/asm/arch-stm32f7/syscfg.h | 38 + arch/arm/mach-stm32/stm32f7/clock.c | 171 ++- arch/arm/mach-stm32/stm32f7/timer.c | 4 +- board/st/stm32f746-disco/stm32f746-disco.c | 124 +- configs/stm32f746-disco_defconfig | 23 +- drivers/net/designware.c | 1 + drivers/net/phy/smsc.c | 12 + drivers/spi/Kconfig | 8 + drivers/spi/Makefile | 1 + drivers/spi/stm32_qspi.c | 628 ++++++++++ include/configs/stm32f746-disco.h | 10 +- include/dt-bindings/pinctrl/stm32f746-pinfunc.h | 1324 ++++++++++++++++++++++ 21 files changed, 2872 insertions(+), 161 deletions(-) create mode 100644 arch/arm/dts/armv7-m.dtsi create mode 100644 arch/arm/dts/stm32f746-disco.dts create mode 100644 arch/arm/dts/stm32f746.dtsi create mode 100644 arch/arm/include/asm/arch-stm32f7/syscfg.h create mode 100644 drivers/spi/stm32_qspi.c create mode 100644 include/dt-bindings/pinctrl/stm32f746-pinfunc.h -- 2.1.4

5 36

[U-Boot] [PATCH] armv8: fix #if around spin-table code in start.S
by Oded Gabbay 17 Jan '17

17 Jan '17

Using CONFIG_IS_ENABLED() doesn't work in SPL. This patch replaces the only occurrence of CONFIG_IS_ENABLED() in start.S to a regular #if defined(). It also adds "&& !defined(CONFIG_SPL_BUILD)" to that #if statement because the spin-table code can't currently work in SPL, and the spin-table file isn't even compiled in SPL. Signed-off-by: Oded Gabbay <oded.gabbay(a)gmail.com> --- arch/arm/cpu/armv8/start.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/cpu/armv8/start.S b/arch/arm/cpu/armv8/start.S index 4f5f6d8..2f975a0 100644 --- a/arch/arm/cpu/armv8/start.S +++ b/arch/arm/cpu/armv8/start.S @@ -99,7 +99,7 @@ save_boot_params_ret: /* Processor specific initialization */ bl lowlevel_init -#if CONFIG_IS_ENABLED(ARMV8_SPIN_TABLE) +#if defined(CONFIG_ARMV8_SPIN_TABLE) && !defined(CONFIG_SPL_BUILD) branch_if_master x0, x1, master_cpu b spin_table_secondary_jump /* never return */ -- 2.7.4

3 5

[U-Boot] [PATCH] lib: net_utils: make string_to_ip stricter
by Chris Packham 15 Jan '17

15 Jan '17

Previously values greater than 255 were implicitly truncated. Add some stricter checking to reject addresses with components >255. With the input "1234192.168.1.1" the old behaviour would truncate the address to 192.168.1.1. New behaviour rejects the string outright and returns 0.0.0.0, which for the purposes of IP addresses can be considered an error. Signed-off-by: Chris Packham <judge.packham(a)gmail.com> --- This was part of my long running IPv6 patchset (which I promise I'll get back to someday). But I feel this stands on it's own merits. lib/net_utils.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/net_utils.c b/lib/net_utils.c index cfae84275241..f148b8a70a7d 100644 --- a/lib/net_utils.c +++ b/lib/net_utils.c @@ -24,11 +24,16 @@ struct in_addr string_to_ip(const char *s) for (addr.s_addr = 0, i = 0; i < 4; ++i) { ulong val = s ? simple_strtoul(s, &e, 10) : 0; + if (val > 255) { + addr.s_addr = 0; + return addr; + } addr.s_addr <<= 8; addr.s_addr |= (val & 0xFF); - if (s) { - s = (*e) ? e+1 : e; - } + if (*e == '.') + s = e + 1; + else + break; } addr.s_addr = htonl(addr.s_addr); -- 2.11.0.24.ge6920cf

4 12

[U-Boot] [PATCH v2 0/5] Introduce basic headers for time, typecheck, iopoll
by Masahiro Yamada 15 Jan '17

15 Jan '17

Changes in v2: - Fix typo include/timer.h -> include/time.h Masahiro Yamada (5): delay: collect {m,n,u}delay declarations to include/linux/delay.h time: move timer APIs to include/time.h typecheck: import include/linux/typecheck.h from Linux 4.9 time: import time_after, time_before and friends from Linux iopoll: import include/linux/iopoll.h from Linux 4.9 include/common.h | 14 ++-------- include/linux/compat.h | 2 -- include/linux/delay.h | 24 +++++++++++++++++ include/linux/iopoll.h | 68 +++++++++++++++++++++++++++++++++++++++++++++++ include/linux/typecheck.h | 24 +++++++++++++++++ include/time.h | 57 +++++++++++++++++++++++++++++++++++++++ lib/time.c | 6 ----- 7 files changed, 175 insertions(+), 20 deletions(-) create mode 100644 include/linux/delay.h create mode 100644 include/linux/iopoll.h create mode 100644 include/linux/typecheck.h create mode 100644 include/time.h -- 2.7.4

3 11

[U-Boot] [PATCH v3 1/2] Convert CONFIG_SPL_RAM_DEVICE to defconfig
by Stefan Agner 15 Jan '17

15 Jan '17

From: Stefan Agner <stefan.agner(a)toradex.com> This converts the following to Kconfig: CONFIG_SPL_RAM_DEVICE Signed-off-by: Stefan Agner <stefan.agner(a)toradex.com> --- Changes in v3: None Changes in v2: None common/spl/Kconfig | 9 +++++++++ include/configs/microblaze-generic.h | 1 - include/configs/socfpga_common.h | 1 - include/configs/tegra-common.h | 1 - include/configs/xilinx_zynqmp.h | 1 - include/configs/zynq-common.h | 1 - 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/common/spl/Kconfig b/common/spl/Kconfig index cba51f5df6..ea084f462b 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -449,6 +449,15 @@ config SPL_POWER_SUPPORT in drivers/power, drivers/power/pmic and drivers/power/regulator as part of an SPL build. +config SPL_RAM_DEVICE + bool "Support booting from preloaded image in RAM" + depends on SPL + default y if MICROBLAZE || ARCH_SOCFPGA || TEGRA || ARCH_ZYNQ + help + Enable booting of an image already loaded in RAM. The image has to + be already in memory when SPL takes over, e.g. loaded by the boot + ROM. + config SPL_SATA_SUPPORT bool "Support loading from SATA" depends on SPL diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 7abffdb2ef..cc90b73fa1 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -284,7 +284,6 @@ #define CONFIG_SPL_LDSCRIPT "arch/microblaze/cpu/u-boot-spl.lds" -#define CONFIG_SPL_RAM_DEVICE #ifdef CONFIG_SYS_FLASH_BASE # define CONFIG_SYS_UBOOT_BASE CONFIG_SYS_FLASH_BASE #endif diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 58a6550844..7292469433 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -309,7 +309,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void); * 0xFFFF_FF00 ...... End of SRAM */ #define CONFIG_SPL_FRAMEWORK -#define CONFIG_SPL_RAM_DEVICE #define CONFIG_SPL_TEXT_BASE CONFIG_SYS_INIT_RAM_ADDR #define CONFIG_SPL_MAX_SIZE (64 * 1024) diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h index 23a0e782e0..f30fec84a2 100644 --- a/include/configs/tegra-common.h +++ b/include/configs/tegra-common.h @@ -98,7 +98,6 @@ /* Defines for SPL */ #define CONFIG_SPL_FRAMEWORK -#define CONFIG_SPL_RAM_DEVICE #define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_MAX_FOOTPRINT (CONFIG_SYS_TEXT_BASE - \ diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index fb4f6d6806..8845ff425d 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -260,7 +260,6 @@ #define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_BOARD_INIT -#define CONFIG_SPL_RAM_DEVICE /* u-boot is like dtb */ #define CONFIG_SPL_FS_LOAD_ARGS_NAME "u-boot.bin" diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 953e7311a6..e04be5c18c 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -296,7 +296,6 @@ #define CONFIG_CMD_SPL #define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_BOARD_INIT -#define CONFIG_SPL_RAM_DEVICE #define CONFIG_SPL_LDSCRIPT "arch/arm/mach-zynq/u-boot-spl.lds" -- 2.11.0

2 5

[U-Boot] [PATCH 1/2] libfdt: overlay: Fix missing symbols condition
by Stefan Agner 14 Jan '17

14 Jan '17

From: Stefan Agner <stefan.agner(a)toradex.com> When there is no symbols section in the device tree, overlay_fixup_phandles should return FDT_ERR_NOTFOUND instead of FDT_ERR_BADOFFSET. Signed-off-by: Stefan Agner <stefan.agner(a)toradex.com> --- lib/libfdt/fdt_overlay.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libfdt/fdt_overlay.c b/lib/libfdt/fdt_overlay.c index bb41404..4a9ba40 100644 --- a/lib/libfdt/fdt_overlay.c +++ b/lib/libfdt/fdt_overlay.c @@ -495,9 +495,9 @@ static int overlay_fixup_phandles(void *fdt, void *fdto) if ((fixups_off < 0 && (fixups_off != -FDT_ERR_NOTFOUND))) return fixups_off; - /* And base DTs without symbols */ + /* But if we need to fixup phandles, symbols are required */ symbols_off = fdt_path_offset(fdt, "/__symbols__"); - if ((symbols_off < 0 && (symbols_off != -FDT_ERR_NOTFOUND))) + if (symbols_off < 0) return symbols_off; fdt_for_each_property_offset(property, fdto, fixups_off) { -- 2.10.2

3 7

[U-Boot] [PATCH v2 1/2] libfdt: Correct fdt handling of overlays without fixups and base trees without symbols
by Stefan Agner 14 Jan '17

14 Jan '17

From: David Gibson <david(a)gibson.dropbear.id.au> The fdt_overlay_apply() function purports to support the edge cases where an overlay has no fixups to be applied, or a base tree which has no symbols (the latter can only work if the former is also true). However it gets it wrong in a couple of small ways: * In the no fixups case, it doesn't fail immediately, but will attempt fdt_for_each_property_offset() giving -FDT_ERR_NOTFOUND as the node offset, which will fail. Instead it should succeed immediately, since there's nothing to do. * In the case of no symbols, it again doesn't fail immediately. However if there is an actual fixup it will fail with an unexpected error, because -FDT_ERR_NOTFOUND is passed to fdt_getprop() when attempting to look up the symbols. We should instead return -FDT_ERR_NOTFOUND directly. Both of these errors lead to the code returning misleading error codes in failing cases. [ DTC commit: 7d8ef6e1db9794f72805a0855f4f7f12fadd03d3 ] Signed-off-by: David Gibson <david(a)gibson.dropbear.id.au> Signed-off-by: Stefan Agner <stefan.agner(a)toradex.com> --- Changes in v2: - Backported patch from libfdt lib/libfdt/fdt_overlay.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/libfdt/fdt_overlay.c b/lib/libfdt/fdt_overlay.c index bb41404..56cb70e 100644 --- a/lib/libfdt/fdt_overlay.c +++ b/lib/libfdt/fdt_overlay.c @@ -359,6 +359,9 @@ static int overlay_fixup_one_phandle(void *fdt, void *fdto, int symbol_off, fixup_off; int prop_len; + if (symbols_off < 0) + return symbols_off; + symbol_path = fdt_getprop(fdt, symbols_off, label, &prop_len); if (!symbol_path) @@ -492,7 +495,9 @@ static int overlay_fixup_phandles(void *fdt, void *fdto) /* We can have overlays without any fixups */ fixups_off = fdt_path_offset(fdto, "/__fixups__"); - if ((fixups_off < 0 && (fixups_off != -FDT_ERR_NOTFOUND))) + if (fixups_off == -FDT_ERR_NOTFOUND) + return 0; /* nothing to do */ + if (fixups_off < 0) return fixups_off; /* And base DTs without symbols */ -- 2.10.2

2 3