February 2016 - U-Boot

[U-Boot] Please pull u-boot-dm
by Simon Glass 28 Feb '16

28 Feb '16

Hi Tom, Here is the series that fixes various tests. The following changes since commit 24862c640ea50ac88be343161eb681bea5dbfeef: test/py: skip tests that require large CONFIG_SYS_MAXARGS (2016-02-26 08:42:12 -0500) are available in the git repository at: git://git.denx.de/u-boot-dm.git for you to fetch changes up to 6796704b0dfb4f98cb4a026988e9739884812b5c: pci: Fix compiler warnings in dm_pciauto_setup_device() (2016-02-26 08:53:10 -0700) ---------------------------------------------------------------- Bin Meng (1): pci: Fix compiler warnings in dm_pciauto_setup_device() Simon Glass (16): image: Correct the OS location code to work on sandbox Revert "image-fit: Fix signature checking" image: Fix FIT and vboot tests to exit sandbox correctly trace: Fix compiler warnings in trace lib: Don't instrument the div64 function trace: Improve the trace test number recognition timer: Support tracing fully timer: Provide an early timer timer: Set up the real timer after driver model is available sandbox: timer: Support the early timer sandbox: Correct ordering of defconfig sandbox: Enable the early timer sandbox: spi: Add more debugging to SPI emulation sandbox: spi: Remove an incorrect free() spi: Correct two error return values spi: Re-enable the SPI flash tests cmd/trace.c | 4 ++-- common/board_f.c | 6 ++++++ common/board_r.c | 14 ++++++++++++-- common/bootm.c | 2 +- common/image-fit.c | 16 +++++++++++++--- configs/sandbox_defconfig | 11 ++++++----- drivers/mtd/spi/sandbox.c | 14 ++++++++++---- drivers/mtd/spi/sf_probe.c | 4 +--- drivers/mtd/spi/spi_flash.c | 2 +- drivers/pci/pci_auto.c | 2 +- drivers/timer/Kconfig | 10 ++++++++++ drivers/timer/sandbox_timer.c | 18 +++++++++++++++--- drivers/timer/timer-uclass.c | 6 +++--- include/image.h | 5 +---- include/timer.h | 21 +++++++++++++++++++++ lib/div64.c | 3 ++- lib/time.c | 28 +++++++++++++++++++++------- test/dm/Makefile | 4 ++-- test/image/test-fit.py | 4 ++++ test/trace/test-trace.sh | 4 +++- test/vboot/sandbox-u-boot.dts | 3 +++ 21 files changed, 138 insertions(+), 43 deletions(-) Regards, Simon

2 1

[U-Boot] Pull request: u-boot-net.git master
by Joe Hershberger 28 Feb '16

28 Feb '16

The following changes since commit 24862c640ea50ac88be343161eb681bea5dbfeef: test/py: skip tests that require large CONFIG_SYS_MAXARGS (2016-02-26 08:42:12 -0500) are available in the git repository at: git://git.denx.de/u-boot-net.git master for you to fetch changes up to 50768f5b06e7704cf2bc209f89e250130c3fff5b: net: bootp: Add environment variable for timeout period (2016-02-26 13:37:38 -0600) ---------------------------------------------------------------- Alexandre Messier (1): net: bootp: Add environment variable for timeout period Alison Wang (1): net: phy: atheros: Fix problem with phy_reset() clearing BMCR README | 6 ++++++ drivers/net/phy/atheros.c | 3 +++ net/bootp.c | 11 ++++++++++- 3 files changed, 19 insertions(+), 1 deletion(-)

2 1

[U-Boot] [PATCH] arm: socfpga: Fix SR1500 env position
by Marek Vasut 27 Feb '16

27 Feb '16

Move the inclusion of the common socfpga configuration file further down in the sr1500 configuration, so that the socfpga_common.h can check if environment is in SPI NOR and it's location is defined and if it is not, define default location. This fixes "arm: socfpga: Enabling U-Boot environment support in QSPI" which introduced a minor warning. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Chin Liang See <clsee(a)altera.com> Cc: Dinh Nguyen <dinguyen(a)opensource.altera.com> Cc: Dinh Nguyen <dinh.linux(a)gmail.com> Cc: Pavel Machek <pavel(a)denx.de> Cc: Marek Vasut <marex(a)denx.de> Cc: Stefan Roese <sr(a)denx.de> --- include/configs/socfpga_sr1500.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h index fdf67ca..e4aafaa 100644 --- a/include/configs/socfpga_sr1500.h +++ b/include/configs/socfpga_sr1500.h @@ -92,13 +92,6 @@ #define CONFIG_SYS_BOOTCOUNT_ADDR 0xfffffff8 #define CONFIG_SYS_BOOTCOUNT_BE -/* The rest of the configuration is shared */ -#include <configs/socfpga_common.h> - -/* U-Boot payload is stored at offset 0x60000 */ -#undef CONFIG_SYS_SPI_U_BOOT_OFFS -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x60000 - /* Environment setting for SPI flash */ #undef CONFIG_ENV_SIZE #define CONFIG_SYS_REDUNDAND_ENVIRONMENT @@ -111,4 +104,11 @@ #define CONFIG_ENV_SPI_MODE SPI_MODE_3 #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED +/* The rest of the configuration is shared */ +#include <configs/socfpga_common.h> + +/* U-Boot payload is stored at offset 0x60000 */ +#undef CONFIG_SYS_SPI_U_BOOT_OFFS +#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x60000 + #endif /* __CONFIG_SOCFPGA_SR1500_H__ */ -- 2.7.0

2 2

[U-Boot] [PATCH 0/6] ARM: keystone2: Miscellaneous fixes
by Nishanth Menon 27 Feb '16

27 Feb '16

Hi, Please find various fixes for DDR, DSP and speed grade operations w.r.t Keystone devices Based on master 52dd704bf8ed Merge branch 'master' of http://git.denx.de/u-boot-sunxi Lokesh Vutla (2): ARM: keystone2: Allow for board specific speed definitions ARM: keystone2: K2G: Add support for different arm/device speeds Suman Anna (2): ARM: keystone2: Use macro for DSP GEM power domain ARM: keystone2: K2G: power-off DSP during boot Vitaly Andrianov (2): ARM: keystone2: use SPD info to configure K2HK and K2E DDR3 ARM: keystone2: use detected ddr3a size arch/arm/mach-keystone/Makefile | 2 + arch/arm/mach-keystone/clock.c | 19 +- arch/arm/mach-keystone/ddr3_spd.c | 466 +++++++++++++++++++++ arch/arm/mach-keystone/include/mach/clock-k2g.h | 4 +- arch/arm/mach-keystone/include/mach/clock.h | 8 +- arch/arm/mach-keystone/include/mach/ddr3.h | 9 + arch/arm/mach-keystone/include/mach/hardware-k2g.h | 7 +- arch/arm/mach-keystone/include/mach/hardware-k2l.h | 7 + arch/arm/mach-keystone/include/mach/hardware.h | 1 + arch/arm/mach-keystone/keystone.c | 2 +- board/ti/ks2_evm/Makefile | 4 +- board/ti/ks2_evm/board.c | 4 +- board/ti/ks2_evm/board_k2e.c | 2 +- board/ti/ks2_evm/board_k2g.c | 50 ++- board/ti/ks2_evm/board_k2hk.c | 4 +- board/ti/ks2_evm/board_k2l.c | 4 +- board/ti/ks2_evm/ddr3_cfg.c | 159 +------ board/ti/ks2_evm/ddr3_cfg.h | 11 +- board/ti/ks2_evm/ddr3_k2e.c | 51 +-- board/ti/ks2_evm/ddr3_k2hk.c | 97 ++--- include/configs/k2e_evm.h | 2 + include/configs/k2hk_evm.h | 2 + 22 files changed, 628 insertions(+), 287 deletions(-) create mode 100644 arch/arm/mach-keystone/ddr3_spd.c -- 2.7.0

2 13

[U-Boot] [PATCH] usb: ehci: Fix warning on aarch64
by Marek Vasut 26 Feb '16

26 Feb '16

Fix the following warning on aarch64 introduced by using p2v/v2p functions in the code: In file included from ./arch/arm/include/asm/byteorder.h:29:0, from include/compiler.h:125, from include/image.h:19, from include/common.h:88, from drivers/usb/host/ehci-hcd.c:10: drivers/usb/host/ehci-hcd.c: In function ‘ehci_td_buffer’: drivers/usb/host/ehci-hcd.c:250:49: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] td->qt_buffer[idx] = cpu_to_hc32(virt_to_phys((void *)addr)); ^ include/linux/byteorder/little_endian.h:34:51: note: in definition of macro ‘__cpu_to_le32’ #define __cpu_to_le32(x) ((__force __le32)(__u32)(x)) ^ drivers/usb/host/ehci-hcd.c:250:24: note: in expansion of macro ‘cpu_to_hc32’ td->qt_buffer[idx] = cpu_to_hc32(virt_to_phys((void *)addr)); Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Stephen Warren <swarren(a)wwwdotorg.org> Cc: Tom Rini <trini(a)konsulko.com> --- drivers/usb/host/ehci-hcd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 8f259be..0113c6c 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -237,7 +237,7 @@ static int ehci_shutdown(struct ehci_ctrl *ctrl) static int ehci_td_buffer(struct qTD *td, void *buf, size_t sz) { uint32_t delta, next; - uint32_t addr = (unsigned long)buf; + unsigned long addr = (unsigned long)buf; int idx; if (addr != ALIGN(addr, ARCH_DMA_MINALIGN)) -- 2.7.0

2 2

[U-Boot] [PATCH 1/3] omap5: Kconfig: Add option to select Android boot
by Semen Protsenko 26 Feb '16

26 Feb '16

From: Sam Protsenko <semen.protsenko(a)linaro.org> We need to differentiate somehow if u-boot build is intended for Android or regular Linux boot. Android requires some specific details from bootloader, such as enabled fastboot and specific partition table. Using this option we can check if user chose Android boot and configure those details properly. Signed-off-by: Sam Protsenko <semen.protsenko(a)linaro.org> --- arch/arm/cpu/armv7/omap5/Kconfig | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/arm/cpu/armv7/omap5/Kconfig b/arch/arm/cpu/armv7/omap5/Kconfig index bfa264e..e03daff 100644 --- a/arch/arm/cpu/armv7/omap5/Kconfig +++ b/arch/arm/cpu/armv7/omap5/Kconfig @@ -21,6 +21,14 @@ endchoice config SYS_SOC default "omap5" +config ANDROID_BOOT + bool "Android boot" + default n + help + This option enables Android build. Different boards can rely on this + option to provide Android partition list, enable fastboot capability + and so on. + source "board/compulab/cm_t54/Kconfig" source "board/ti/omap5_uevm/Kconfig" source "board/ti/dra7xx/Kconfig" -- 2.7.0

3 6

[U-Boot] [PATCH] net: phy: atheros: Fix problem with phy_reset() clearing BMCR
by Alison Wang 26 Feb '16

26 Feb '16

In commit <a058052c358c> [net: phy: do not read configuration register on reset], phy_reset() will clear the BMCR register. Bit 12(AUTO_NEGOTIATION) is cleared too. It causes auto-negotiation timeout error on Atheros's PHY AR8033. To fix this problem, genphy_config_aneg() and genphy_restart_aneg() needs to be called in ar8035_config() to enable and restart auto-negotiation. Signed-off-by: Alison Wang <alison.wang(a)nxp.com> --- drivers/net/phy/atheros.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/phy/atheros.c b/drivers/net/phy/atheros.c index ba57b1a..e57c412 100644 --- a/drivers/net/phy/atheros.c +++ b/drivers/net/phy/atheros.c @@ -33,6 +33,9 @@ static int ar8035_config(struct phy_device *phydev) phydev->supported = phydev->drv->features; + genphy_config_aneg(phydev); + genphy_restart_aneg(phydev); + return 0; } -- 2.1.0.27.g96db324

5 4

[U-Boot] [PATCH v2] net: bootp: Add environment variable for timeout period
by amessier.tyco＠gmail.com 26 Feb '16

26 Feb '16

From: Alexandre Messier <amessier(a)tycoint.com> There is currently one config option (CONFIG_NET_RETRY_COUNT) that is available to tune the retries of the network stack. Unfortunately, it is global to all protocols, and the value is interpreted differently in all of them. Add a new environment variable that directly sets the retry period for BOOTP timeouts. If this new value is not set, the period is still derived from the default number of retries, or from CONFIG_NET_RETRY_COUNT if defined. When both the new variable is set and CONFIG_NET_RETRY_COUNT is defined, the variable has precedence. Signed-off-by: Alexandre Messier <amessier(a)tycoint.com> --- Changes since v1: - Now uses an environment variable instead of a config option. This is to have a similar approach as TFTP towards how timeouts are controlled. (e.g. https://patchwork.ozlabs.org/patch/528815/) - Title was changed, it was previously "net: bootp: Add BOOTP specific config for timeout value." - Removed from patch series. v1 was in a series, but now the patch stands alone. v1 can be found here: Patchwork: https://patchwork.ozlabs.org/patch/571776/ Mailing list: http://lists.denx.de/pipermail/u-boot/2016-January/242840.html README | 6 ++++++ net/bootp.c | 11 ++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/README b/README index c7c9e0a..567243e 100644 --- a/README +++ b/README @@ -5429,6 +5429,12 @@ List of environment variables (most likely not complete): Ethernet is encapsulated/received over 802.1q VLAN tagged frames. + bootpretryperiod - Period during which BOOTP/DHCP sends retries. + Unsigned value, in milliseconds. If not set, the period will + be either the default (28000), or a value based on + CONFIG_NET_RETRY_COUNT, if defined. This value has + precedence over the valu based on CONFIG_NET_RETRY_COUNT. + The following image location variables contain the location of images used in booting. The "Image" column gives the role of the image and is not an environment variable name. The other columns are environment diff --git a/net/bootp.c b/net/bootp.c index f2978a2..aefc808 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -60,6 +60,8 @@ char net_nis_domain[32] = {0,}; /* Our NIS domain */ char net_hostname[32] = {0,}; /* Our hostname */ char net_root_path[64] = {0,}; /* Our bootpath */ +static ulong time_taken_max; + #if defined(CONFIG_CMD_DHCP) static dhcp_state_t dhcp_state = INIT; static u32 dhcp_leasetime; @@ -380,7 +382,7 @@ static void bootp_timeout_handler(void) { ulong time_taken = get_timer(bootp_start); - if (time_taken >= TIMEOUT_MS) { + if (time_taken >= time_taken_max) { #ifdef CONFIG_BOOTP_MAY_FAIL puts("\nRetry time exceeded\n"); net_set_state(NETLOOP_FAIL); @@ -675,12 +677,19 @@ void bootp_request(void) u32 bootp_id; struct in_addr zero_ip; struct in_addr bcast_ip; + char *ep; /* Environment pointer */ bootstage_mark_name(BOOTSTAGE_ID_BOOTP_START, "bootp_start"); #if defined(CONFIG_CMD_DHCP) dhcp_state = INIT; #endif + ep = getenv("bootpretryperiod"); + if (ep != NULL) + time_taken_max = simple_strtoul(ep, NULL, 10); + else + time_taken_max = TIMEOUT_MS; + #ifdef CONFIG_BOOTP_RANDOM_DELAY /* Random BOOTP delay */ if (bootp_try == 0) srand_mac(); -- 2.7.0

3 2

[U-Boot] [PATCH 1/5] mips: cache: Bulletproof the code against cornercases
by Marek Vasut 26 Feb '16

26 Feb '16

This patch makes sure that the flush/invalidate_dcache_range() functions can handle corner-case calls like this -- invalidate_dcache_range(0, 0, 0); This call is valid and is happily produced by USB EHCI code for example. The expected behavior of the cache function(s) in this case is that they will do no operation, since the size is zero. The current implementation though has a problem where such invocation will result in a hard CPU hang. This is because under such conditions, where the start_addr = 0 and stop = 0, the addr = 0 and aend = 0xffffffe0 . The loop will then try to iterate over the entire address space, which in itself is wrong. But iterating over the entire address space might also hit some odd address which will cause bus hang. The later happens on the Atheros MIPS. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Daniel Schwierzeck <daniel.schwierzeck(a)gmail.com> Cc: Hans de Goede <hdegoede(a)redhat.com> --- arch/mips/lib/cache.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/mips/lib/cache.c b/arch/mips/lib/cache.c index bf8ff59..7482005 100644 --- a/arch/mips/lib/cache.c +++ b/arch/mips/lib/cache.c @@ -95,6 +95,10 @@ void flush_dcache_range(ulong start_addr, ulong stop) const void *addr = (const void *)(start_addr & ~(lsize - 1)); const void *aend = (const void *)((stop - 1) & ~(lsize - 1)); + /* aend will be miscalculated when size is zero, so we return here */ + if (start_addr == stop) + return; + while (1) { mips_cache(HIT_WRITEBACK_INV_D, addr); if (addr == aend) @@ -109,6 +113,10 @@ void invalidate_dcache_range(ulong start_addr, ulong stop) const void *addr = (const void *)(start_addr & ~(lsize - 1)); const void *aend = (const void *)((stop - 1) & ~(lsize - 1)); + /* aend will be miscalculated when size is zero, so we return here */ + if (start_addr == stop) + return; + while (1) { mips_cache(HIT_INVALIDATE_D, addr); if (addr == aend) -- 2.1.4

4 18

[U-Boot] Please pull u-boot-mpc85xx master
by york sun 26 Feb '16

26 Feb '16

Tom, The following changes since commit 24862c640ea50ac88be343161eb681bea5dbfeef: test/py: skip tests that require large CONFIG_SYS_MAXARGS (2016-02-26 08:42:12 -0500) are available in the git repository at: git://git.denx.de/u-boot-mpc85xx.git master for you to fetch changes up to cf23b4da624f32639d5cb9de6e3c9069ffd26ae5: powerpc/t208xqds: fix esdhc peripheral clock support (2016-02-26 10:48:07 -0800) ---------------------------------------------------------------- Yangbo Lu (1): powerpc/t208xqds: fix esdhc peripheral clock support include/configs/T208xQDS.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Thanks. York

2 1