August 2018 - U-Boot

[U-Boot] [PATCH] common: fdt: Make fdt_del_subnodes/fdt_del_partition static
by Michal Simek 02 Aug '18

02 Aug '18

These functions are only called in this file that's why make them static to keep static analysers happy. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- common/fdt_support.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/fdt_support.c b/common/fdt_support.c index 1bdd03fddab1..34d2bd59c485 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -725,7 +725,7 @@ struct reg_cell { unsigned int r1; }; -int fdt_del_subnodes(const void *blob, int parent_offset) +static int fdt_del_subnodes(const void *blob, int parent_offset) { int off, ndepth; int ret; @@ -750,7 +750,7 @@ int fdt_del_subnodes(const void *blob, int parent_offset) return 0; } -int fdt_del_partitions(void *blob, int parent_offset) +static int fdt_del_partitions(void *blob, int parent_offset) { const void *prop; int ndepth = 0; -- 1.9.1

2 1

[U-Boot] [PATCH 1/2] lib: bitrev: Sync with Linux kernel v4.17
by Bin Meng 02 Aug '18

02 Aug '18

Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> --- include/linux/bitrev.h | 102 ++++++++++++++++++++++++++++++++++++++++++++----- lib/bitrev.c | 28 ++++---------- 2 files changed, 101 insertions(+), 29 deletions(-) diff --git a/include/linux/bitrev.h b/include/linux/bitrev.h index cc5abd7..50fb0de 100644 --- a/include/linux/bitrev.h +++ b/include/linux/bitrev.h @@ -1,21 +1,105 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Based on bitrev from the Linux kernel, by Akinobu Mita - */ - +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef _LINUX_BITREV_H #define _LINUX_BITREV_H #include <linux/types.h> -extern u8 const byte_rev_table[256]; +#ifdef CONFIG_HAVE_ARCH_BITREVERSE +#include <asm/bitrev.h> + +#define __bitrev32 __arch_bitrev32 +#define __bitrev16 __arch_bitrev16 +#define __bitrev8 __arch_bitrev8 -static inline u8 bitrev8(u8 byte) +#else +extern u8 const byte_rev_table[256]; +static inline u8 __bitrev8(u8 byte) { return byte_rev_table[byte]; } -u16 bitrev16(u16 in); -u32 bitrev32(u32 in); +static inline u16 __bitrev16(u16 x) +{ + return (__bitrev8(x & 0xff) << 8) | __bitrev8(x >> 8); +} + +static inline u32 __bitrev32(u32 x) +{ + return (__bitrev16(x & 0xffff) << 16) | __bitrev16(x >> 16); +} + +#endif /* CONFIG_HAVE_ARCH_BITREVERSE */ + +#define __bitrev8x4(x) (__bitrev32(swab32(x))) + +#define __constant_bitrev32(x) \ +({ \ + u32 __x = x; \ + __x = (__x >> 16) | (__x << 16); \ + __x = ((__x & (u32)0xFF00FF00UL) >> 8) | ((__x & (u32)0x00FF00FFUL) << 8); \ + __x = ((__x & (u32)0xF0F0F0F0UL) >> 4) | ((__x & (u32)0x0F0F0F0FUL) << 4); \ + __x = ((__x & (u32)0xCCCCCCCCUL) >> 2) | ((__x & (u32)0x33333333UL) << 2); \ + __x = ((__x & (u32)0xAAAAAAAAUL) >> 1) | ((__x & (u32)0x55555555UL) << 1); \ + __x; \ +}) + +#define __constant_bitrev16(x) \ +({ \ + u16 __x = x; \ + __x = (__x >> 8) | (__x << 8); \ + __x = ((__x & (u16)0xF0F0U) >> 4) | ((__x & (u16)0x0F0FU) << 4); \ + __x = ((__x & (u16)0xCCCCU) >> 2) | ((__x & (u16)0x3333U) << 2); \ + __x = ((__x & (u16)0xAAAAU) >> 1) | ((__x & (u16)0x5555U) << 1); \ + __x; \ +}) + +#define __constant_bitrev8x4(x) \ +({ \ + u32 __x = x; \ + __x = ((__x & (u32)0xF0F0F0F0UL) >> 4) | ((__x & (u32)0x0F0F0F0FUL) << 4); \ + __x = ((__x & (u32)0xCCCCCCCCUL) >> 2) | ((__x & (u32)0x33333333UL) << 2); \ + __x = ((__x & (u32)0xAAAAAAAAUL) >> 1) | ((__x & (u32)0x55555555UL) << 1); \ + __x; \ +}) + +#define __constant_bitrev8(x) \ +({ \ + u8 __x = x; \ + __x = (__x >> 4) | (__x << 4); \ + __x = ((__x & (u8)0xCCU) >> 2) | ((__x & (u8)0x33U) << 2); \ + __x = ((__x & (u8)0xAAU) >> 1) | ((__x & (u8)0x55U) << 1); \ + __x; \ +}) + +#define bitrev32(x) \ +({ \ + u32 __x = x; \ + __builtin_constant_p(__x) ? \ + __constant_bitrev32(__x) : \ + __bitrev32(__x); \ +}) + +#define bitrev16(x) \ +({ \ + u16 __x = x; \ + __builtin_constant_p(__x) ? \ + __constant_bitrev16(__x) : \ + __bitrev16(__x); \ + }) + +#define bitrev8x4(x) \ +({ \ + u32 __x = x; \ + __builtin_constant_p(__x) ? \ + __constant_bitrev8x4(__x) : \ + __bitrev8x4(__x); \ + }) +#define bitrev8(x) \ +({ \ + u8 __x = x; \ + __builtin_constant_p(__x) ? \ + __constant_bitrev8(__x) : \ + __bitrev8(__x) ; \ + }) #endif /* _LINUX_BITREV_H */ diff --git a/lib/bitrev.c b/lib/bitrev.c index 4d494e1..beef6c8 100644 --- a/lib/bitrev.c +++ b/lib/bitrev.c @@ -1,13 +1,12 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * - * Based on bitrev from the Linux kernel, by Akinobu Mita - */ - - +#ifndef CONFIG_HAVE_ARCH_BITREVERSE #include <linux/types.h> +#include <linux/compat.h> #include <linux/bitrev.h> +MODULE_AUTHOR("Akinobu Mita <akinobu.mita(a)gmail.com>"); +MODULE_DESCRIPTION("Bit ordering reversal functions"); +MODULE_LICENSE("GPL"); + const u8 byte_rev_table[256] = { 0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0, 0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0, @@ -42,17 +41,6 @@ const u8 byte_rev_table[256] = { 0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef, 0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff, }; +EXPORT_SYMBOL_GPL(byte_rev_table); -u16 bitrev16(u16 x) -{ - return (bitrev8(x & 0xff) << 8) | bitrev8(x >> 8); -} - -/** - * bitrev32 - reverse the order of bits in a u32 value - * @x: value to be bit-reversed - */ -u32 bitrev32(u32 x) -{ - return (bitrev16(x & 0xffff) << 16) | bitrev16(x >> 16); -} +#endif /* CONFIG_HAVE_ARCH_BITREVERSE */ -- 2.7.4

2 3

[U-Boot] [PATCH] xyz-modem: Change getc timeout loop waiting
by Tomas Melin 02 Aug '18

02 Aug '18

This fixes the loop delay when using a hw watchdog. In case a watchdog is used that accesses CPU registers, the defined delay of 20us in a tight loop will cause a huge delay in the actual timeout seen. This is caused by the fact that udelay will inheritantly call WATCHDOG_RESET. Together with the omap wdt implementation, the seen timeout increases up to around 30s. This makes the loop very slow and causes long delays when using the modem. Instead, implement the 2 sec loop by using the timer interface to know when to break out of the timeout loop. Watchdog kicking is taken care of by getc(). Signed-off-by: Tomas Melin <tomas.melin(a)vaisala.com> --- common/xyzModem.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/common/xyzModem.c b/common/xyzModem.c index 5656aac..e0d87db 100644 --- a/common/xyzModem.c +++ b/common/xyzModem.c @@ -71,12 +71,12 @@ typedef int cyg_int32; static int CYGACC_COMM_IF_GETC_TIMEOUT (char chan, char *c) { -#define DELAY 20 - unsigned long counter = 0; - while (!tstc () && (counter < xyzModem_CHAR_TIMEOUT * 1000 / DELAY)) + + ulong now = get_timer(0); + while (!tstc ()) { - udelay (DELAY); - counter++; + if (get_timer(now) > xyzModem_CHAR_TIMEOUT) + break; } if (tstc ()) { -- 2.1.4

3 6

[U-Boot] [PATCH V2] Convert CONFIG_USB_ULPI_TIMEOUT to Kconfig
by Adam Ford 02 Aug '18

02 Aug '18

This converts the following to Kconfig: CONFIG_USB_ULPI_TIMEOUT Signed-off-by: Adam Ford <aford173(a)gmail.com> --- V2: Make USB_ULPI_TIMEOUT depend on USB_ULPI diff --git a/drivers/usb/ulpi/Kconfig b/drivers/usb/ulpi/Kconfig index 001564d40c..6a67f70411 100644 --- a/drivers/usb/ulpi/Kconfig +++ b/drivers/usb/ulpi/Kconfig @@ -30,3 +30,10 @@ config USB_ULPI PHY Transreceiver for USB controllers. This driver uses ULPI viewports that are specific for each SoC. + +config USB_ULPI_TIMEOUT + int "ULPI Timeout (us)" + depends on USB_ULPI + default 1000 if USB_ULPI + help + Select the UPLI timeout in microseconds diff --git a/include/usb/ulpi.h b/include/usb/ulpi.h index 71642d257b..00cc60190b 100644 --- a/include/usb/ulpi.h +++ b/include/usb/ulpi.h @@ -20,10 +20,6 @@ #define ULPI_ERROR (1 << 8) /* overflow from any register value */ -#ifndef CONFIG_USB_ULPI_TIMEOUT -#define CONFIG_USB_ULPI_TIMEOUT 1000 /* timeout in us */ -#endif - /* * ulpi view port address and * Port_number that can be passed. diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 7ced4099f2..8f6a1e3f7f 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4666,7 +4666,6 @@ CONFIG_USB_SS_BASE CONFIG_USB_TI_CPPI_DMA CONFIG_USB_TTY CONFIG_USB_TUSB_OMAP_DMA -CONFIG_USB_ULPI_TIMEOUT CONFIG_USB_XHCI_EXYNOS CONFIG_USB_XHCI_KEYSTONE CONFIG_USB_XHCI_OMAP -- 2.17.1

2 1

[U-Boot] [PATCH] Convert CONFIG_USB_ULPI_TIMEOUT to Kconfig
by Adam Ford 02 Aug '18

02 Aug '18

This converts the following to Kconfig: CONFIG_USB_ULPI_TIMEOUT Signed-off-by: Adam Ford <aford173(a)gmail.com> diff --git a/drivers/usb/ulpi/Kconfig b/drivers/usb/ulpi/Kconfig index 001564d40c..d0eff66e1c 100644 --- a/drivers/usb/ulpi/Kconfig +++ b/drivers/usb/ulpi/Kconfig @@ -30,3 +30,9 @@ config USB_ULPI PHY Transreceiver for USB controllers. This driver uses ULPI viewports that are specific for each SoC. + +config USB_ULPI_TIMEOUT + int "ULPI Timeout (us)" + default 1000 if USB_ULPI + help + Select the UPLI timeout in microseconds diff --git a/include/usb/ulpi.h b/include/usb/ulpi.h index 71642d257b..00cc60190b 100644 --- a/include/usb/ulpi.h +++ b/include/usb/ulpi.h @@ -20,10 +20,6 @@ #define ULPI_ERROR (1 << 8) /* overflow from any register value */ -#ifndef CONFIG_USB_ULPI_TIMEOUT -#define CONFIG_USB_ULPI_TIMEOUT 1000 /* timeout in us */ -#endif - /* * ulpi view port address and * Port_number that can be passed. diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 7ced4099f2..8f6a1e3f7f 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4666,7 +4666,6 @@ CONFIG_USB_SS_BASE CONFIG_USB_TI_CPPI_DMA CONFIG_USB_TTY CONFIG_USB_TUSB_OMAP_DMA -CONFIG_USB_ULPI_TIMEOUT CONFIG_USB_XHCI_EXYNOS CONFIG_USB_XHCI_KEYSTONE CONFIG_USB_XHCI_OMAP -- 2.17.1

2 2

Re: [U-Boot] [PATCH v5 00/27] SPI-NAND support
by Jose Landeros 02 Aug '18

02 Aug '18

1 0

[U-Boot] SUCCESS: Building U-Boot for MIPS64 on Windows7
by George Robinson 02 Aug '18

02 Aug '18

I was able to successfully Build U-Boot v2018.07 under Windows 7 SP1 (64bit) - under MinGW64_NT-6.1 ( a.k.a. MSYS2 or MSYS64 ) - using the native host toolchain (with GCC v7.3.0 for x86_64 code generation on x86_64 CPU) - using the target toolchain (with GCC v5.3.0 for MIPS code generation on x86_64 CPU (Sourcery CodeBench Lite 2016.05-8) ) by modifying the function parse_dep_file() defnied in u-boot-master/scripts/basic/fixdep.c, as illustrated below: The change was necessary because the command "gcc cc -Wp,-MD, dependencyfile.o.d..." generates a dependency file containg Windows style paths like: C:\src\bin ...instead of the Linux like path, like: /c/src/bin static void parse_dep_file(void *map, size_t len) { char *m = map; char *end = m + len; char *p; char s[PATH_MAX]; int is_target; int saw_any_target = 0; int is_first_dep = 0; while (m < end) { /* Skip any "white space" */ while (m < end && (*m == ' ' || *m == '\t' || *m == '\\' || *m == '\r' || *m == '\n')) m++; /* Skip any "non-white space" */ p = m; while (p < end && *p != ' ' && *p != '\t' && *p != '\\' && *p != '\r' && *p != '\n') p++; /* Convert any Windows paths into Cygwin paths, just like "cygpath -u <windowspath>" would do. */ if( ( (p-m) >=2) && (*(m+1) == ':') && ((*(m+2) == '/') || (*(m+2) == '\\')) && (((*m>='A') && (*m<='Z')) || ((*m>='a') && (*m<='z'))) ) { *(m+1)= (*m) | 0x20; //Convert the drive letter to lowercase and move it where the colon was *m = '/'; //Prepend a forward slash //*(m+2) = '/'; //Make sure a forward slash follows the drive letter // Substitute remaining backslashes in the Windows path, with forward slashes while (p < end && *p != ' ' && *p != '\t' && *p != '\r' && *p != '\n') { if(*p == '\\') *p = '/'; p++; } #ifdef FIXDEP_DBG fprintf(stderr,"FIXDEP: Windows path at %ld= %s\n", m-(char*)map, m); #endif } /* Is the token we found a target name? */ is_target = (*(p-1) == ':'); /* Don't write any target names into the dependency file */ if (is_target) { /* The /next/ file is the first dependency */ is_first_dep = 1; } else if( (p-m) > 0 ) { /* Save this token/filename */ memcpy(s, m, p-m); s[p - m] = 0; /* Ignore certain dependencies */ if (strrcmp(s, "include/generated/autoconf.h") && strrcmp(s, "arch/um/include/uml-config.h") && strrcmp(s, "include/linux/kconfig.h") && strrcmp(s, ".ver")) { /* * Do not list the source file as dependency, * so that kbuild is not confused if a .c file * is rewritten into .S or vice versa. Storing * it in source_* is needed for modpost to * compute srcversions. */ if (is_first_dep) { /* * If processing the concatenation of * multiple dependency files, only * process the first target name, which * will be the original source name, * and ignore any other target names, * which will be intermediate temporary * files. */ if (!saw_any_target) { saw_any_target = 1; printf("source_%s := %s\n\n", target, s); printf("deps_%s := \\\n", target); } is_first_dep = 0; } else printf(" %s \\\n", s); do_config_file(s); } } /* * Start searching for next token immediately after the first * "whitespace" character that follows this token. */ m = p + 1; } if (!saw_any_target) { fprintf(stderr, "fixdep: parse error; no targets found\n"); exit(1); } printf("\n%s: $(deps_%s)\n\n", target, target); printf("$(deps_%s):\n", target); } Also the command "gcc -print-file-name=include" generates such Windows style paths. They can be adjusted by patching the NOSTDINC_FLAGS assignment in the main Makefile as such: PossiblyWinPath = $(shell $(CC) -print-file-name=include) NOSTDINC_FLAGS += -nostdinc -isystem $(shell cygpath -u $(subst \\,\/,$(PossiblyWinPath))) CHECKFLAGS += $(NOSTDINC_FLAGS) Besides the above, in order to get it to compile I had to define the following data types because they were Linux-specific and were not defined in the sys/types.h belonging to MinGW64. #ifdef __CHECKER__ #define __bitwise__ __attribute__((bitwise)) #else #define __bitwise__ #endif #ifdef __CHECK_ENDIAN__ #define __bitwise __bitwise__ #else #define __bitwise #endif typedef unsigned short __u16; typedef unsigned int __u32; typedef unsigned long long int __u64; typedef __u16 __bitwise __le16; typedef __u16 __bitwise __be16; typedef __u32 __bitwise __le32; typedef __u32 __bitwise __be32; #if defined(__GNUC__) typedef __u64 __bitwise __le64; typedef __u64 __bitwise __be64; #endif typedef __u16 __bitwise __sum16; typedef __u32 __bitwise __wsum; Also, I had to add: #include <linux/byteorder/swab.h> ...to the file tools/zynqmpbif.c, because__swab32 was not defined anywhere in the default headers. Is, this of any interest to anyone ?

2 1

[U-Boot] [PATCH 1/4] gpio: xilinx: Find out bank before use in xilinx_gpio_get_function()
by Michal Simek 02 Aug '18

02 Aug '18

Call xilinx_gpio_get_bank_pin() before use. Reported-by: Stefan Herbrechtsmeier <stefan(a)herbrechtsmeier.net> Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- drivers/gpio/xilinx_gpio.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpio/xilinx_gpio.c b/drivers/gpio/xilinx_gpio.c index 48b52c985a55..8ce08d80f491 100644 --- a/drivers/gpio/xilinx_gpio.c +++ b/drivers/gpio/xilinx_gpio.c @@ -435,6 +435,10 @@ static int xilinx_gpio_get_function(struct udevice *dev, unsigned offset) int val, ret; u32 bank, pin; + ret = xilinx_gpio_get_bank_pin(offset, &bank, &pin, dev); + if (ret) + return ret; + /* Check if all pins are inputs */ if (platdata->bank_input[bank]) return GPIOF_INPUT; @@ -443,10 +447,6 @@ static int xilinx_gpio_get_function(struct udevice *dev, unsigned offset) if (platdata->bank_output[bank]) return GPIOF_OUTPUT; - ret = xilinx_gpio_get_bank_pin(offset, &bank, &pin, dev); - if (ret) - return ret; - /* FIXME test on dual */ val = readl(&platdata->regs->gpiodir + bank * 2); val = !(val & (1 << pin)); -- 1.9.1

2 18

[U-Boot] [PATCH] ram: stm32_sdram: Adds stm32f746-disco fix for HardFault at booting
by Mark Olsson 02 Aug '18

02 Aug '18

- changes ram start address to 0xC0000000 Signed-off-by: Mark Olsson <post(a)markolsson.se> Cc: Vipin Kumar <vk.vipin(a)gmail.com> --- include/configs/stm32f746-disco.h | 2 ++ 1 file changed, 2 insertions(+) mode change 100644 => 100755 include/configs/stm32f746-disco.h diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h old mode 100644 new mode 100755 index 567e7f2a00..238d4e939f --- a/include/configs/stm32f746-disco.h +++ b/include/configs/stm32f746-disco.h @@ -21,6 +21,8 @@ * Configuration of the external SDRAM memory */ #define CONFIG_NR_DRAM_BANKS 1 +#define CONFIG_SYS_RAM_BASE 0xC0000000 +#define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_RAM_BASE #define CONFIG_SYS_MAX_FLASH_SECT 8 #define CONFIG_SYS_MAX_FLASH_BANKS 1 -- 2.17.1

2 2

[U-Boot] [PATCH 1/1] arm: zynq: Fix device tree for Avnet Picozed boards
by Andreas Galauner 02 Aug '18

02 Aug '18

This change adds the necessary /chosen/stdout-path to the device tree for the Avnet Picozed boards. This node is mandatory for the SPL. Without it the board resets in a loop without any output. The change also adds the USB, QSPI and Ethernet MAC nodes of the corresponding devices present on the board. Signed-off-by: Andreas Galauner <andreas(a)galauner.de> --- arch/arm/dts/zynq-picozed.dts | 40 +++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/arch/arm/dts/zynq-picozed.dts b/arch/arm/dts/zynq-picozed.dts index dea6a422c3..db5bb8a6fe 100644 --- a/arch/arm/dts/zynq-picozed.dts +++ b/arch/arm/dts/zynq-picozed.dts @@ -14,13 +14,33 @@ aliases { serial0 = &uart1; spi0 = &qspi; - mmc0 = &sdhci1; + mmc0 = &sdhci0; + mmc1 = &sdhci1; }; memory@0 { device_type = "memory"; reg = <0 0x40000000>; }; + + chosen { + bootargs = "earlyprintk"; + stdout-path = "serial0:115200n8"; + }; + + usb_phy0: phy0 { + compatible = "usb-nop-xceiv"; + #phy-cells = <0>; + }; +}; + +&clkc { + ps-clk-frequency = <33333333>; +}; + +&qspi { + u-boot,dm-pre-reloc; + status = "okay"; }; &uart1 { @@ -28,7 +48,17 @@ status = "okay"; }; -&qspi { +&gem0 { + status = "okay"; + phy-mode = "rgmii-id"; + phy-handle = <&ethernet_phy>; + + ethernet_phy: ethernet-phy@0 { + reg = <0>; + }; +}; + +&sdhci0 { u-boot,dm-pre-reloc; status = "okay"; }; @@ -37,3 +67,9 @@ u-boot,dm-pre-reloc; status = "okay"; }; + +&usb0 { + status = "okay"; + dr_mode = "host"; + usb-phy = <&usb_phy0>; +}; -- 2.18.0

2 1