March 2017 - U-Boot

[U-Boot] [PATCH v2] net: macb: Fix ETH not found when clock not support
by Wenyou Yang 03 Mar '17

03 Mar '17

For the boards such as smartweb on which the clock driver isn't supported, the ethernet fail to be found when booting up with the below log. ---8<--- Net: No ethernet found. --->8--- Signed-off-by: Wenyou Yang <wenyou.yang(a)atmel.com> Tested-by: Heiko Schocher <hs(a)denx.de> --- Changes in v2: - Rebase on current commit: 85d0bea153c76f4a3912b5683222885bfd37c769. drivers/net/macb.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/net/macb.c b/drivers/net/macb.c index 1c4bef97b6..402e866817 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -113,7 +113,9 @@ struct macb_device { struct mii_dev *bus; #ifdef CONFIG_DM_ETH +#ifdef CONFIG_CLK unsigned long pclk_rate; +#endif phy_interface_t phy_interface; #endif }; @@ -756,7 +758,7 @@ static int _macb_write_hwaddr(struct macb_device *macb, unsigned char *enetaddr) static u32 macb_mdc_clk_div(int id, struct macb_device *macb) { u32 config; -#ifdef CONFIG_DM_ETH +#if defined(CONFIG_DM_ETH) && defined(CONFIG_CLK) unsigned long macb_hz = macb->pclk_rate; #else unsigned long macb_hz = get_macb_pclk_rate(id); @@ -778,7 +780,7 @@ static u32 gem_mdc_clk_div(int id, struct macb_device *macb) { u32 config; -#ifdef CONFIG_DM_ETH +#if defined(CONFIG_DM_ETH) && defined(CONFIG_CLK) unsigned long macb_hz = macb->pclk_rate; #else unsigned long macb_hz = get_macb_pclk_rate(id); @@ -1002,6 +1004,7 @@ static const struct eth_ops macb_eth_ops = { .write_hwaddr = macb_write_hwaddr, }; +#ifdef CONFIG_CLK static int macb_enable_clk(struct udevice *dev) { struct macb_device *macb = dev_get_priv(dev); @@ -1025,13 +1028,13 @@ static int macb_enable_clk(struct udevice *dev) return 0; } +#endif static int macb_eth_probe(struct udevice *dev) { struct eth_pdata *pdata = dev_get_platdata(dev); struct macb_device *macb = dev_get_priv(dev); const char *phy_mode; - int ret; phy_mode = fdt_getprop(gd->fdt_blob, dev_of_offset(dev), "phy-mode", NULL); @@ -1044,9 +1047,11 @@ static int macb_eth_probe(struct udevice *dev) macb->regs = (void *)pdata->iobase; - ret = macb_enable_clk(dev); +#ifdef CONFIG_CLK + int ret = macb_enable_clk(dev); if (ret) return ret; +#endif _macb_eth_initialize(macb); -- 2.11.0

3 2

[U-Boot] [PATCH] cmd: wdt: Add "wdt disable" command
by Lukasz Majewski 03 Mar '17

03 Mar '17

Add support for "wdt disable" command necessary for disabling the watchdog timer. Signed-off-by: Lukasz Majewski <lukma(a)denx.de> --- cmd/Kconfig | 6 ++++++ cmd/Makefile | 2 ++ cmd/wdt.c | 32 ++++++++++++++++++++++++++++++++ include/watchdog.h | 2 ++ 4 files changed, 42 insertions(+) create mode 100644 cmd/wdt.c diff --git a/cmd/Kconfig b/cmd/Kconfig index e339d86..293e0bb 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -426,6 +426,12 @@ config CMD_REMOTEPROC help Support for Remote Processor control +config CMD_WDT + bool "wdt" + default n + help + Enables the "wdt" command, which is used to control a watchdog timer. + config CMD_GPIO bool "gpio" help diff --git a/cmd/Makefile b/cmd/Makefile index 9c9a9d1..4934427 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -157,6 +157,8 @@ obj-$(CONFIG_CMD_ETHSW) += ethsw.o # Power obj-$(CONFIG_CMD_PMIC) += pmic.o obj-$(CONFIG_CMD_REGULATOR) += regulator.o + +obj-$(CONFIG_CMD_WDT) += wdt.o endif # !CONFIG_SPL_BUILD obj-$(CONFIG_CMD_BLOB) += blob.o diff --git a/cmd/wdt.c b/cmd/wdt.c new file mode 100644 index 0000000..aeaa9c2 --- /dev/null +++ b/cmd/wdt.c @@ -0,0 +1,32 @@ +/* + * wdt.c -- Watchdog support command + * + * Copyright (C) 2017 + * Lukasz Majewski, DENX Software Engineering, lukma(a)denx.de. + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <watchdog.h> + +static int do_wdt(cmd_tbl_t *cmdtp, int flag, int argc, + char * const argv[]) +{ + int ret = CMD_RET_SUCCESS; + + if (argc < 2 || argc > 2) + return CMD_RET_USAGE; + + if (!strcmp(argv[1], "disable")) { + WATCHDOG_DISABLE(); + printf("WDT disabled\n"); + } + + return ret; +} + +U_BOOT_CMD(wdt, CONFIG_SYS_MAXARGS, 1, do_wdt, + "Watchdog (wdt)", + "disable - disable watchdog\n" +); diff --git a/include/watchdog.h b/include/watchdog.h index 174c894..b0716c5 100644 --- a/include/watchdog.h +++ b/include/watchdog.h @@ -41,8 +41,10 @@ int init_func_watchdog_reset(void); #define WATCHDOG_RESET bl hw_watchdog_reset #else extern void hw_watchdog_reset(void); + void hw_watchdog_disable(void); #define WATCHDOG_RESET hw_watchdog_reset + #define WATCHDOG_DISABLE hw_watchdog_disable #endif /* __ASSEMBLY__ */ #else /* -- 2.1.4

2 3

Re: [U-Boot] [linux-sunxi] Re: [PATCH 14/17] sunxi: Pine64: defconfig: enable SPL FIT support
by Icenowy Zheng 03 Mar '17

03 Mar '17

2017年3月3日 17:55于 Andre Przywara <andre.przywara(a)arm.com>写道： > > Hi, > > On 03/03/17 09:22, Maxime Ripard wrote: > > On Thu, Mar 02, 2017 at 12:03:20AM +0800, Icenowy Zheng wrote: > >> > >> 2017年3月1日 23:51于 Maxime Ripard <maxime.ripard(a)free-electrons.com>写道： > >>> > >>> Hi Andre, > >>> > >>> On Wed, Mar 01, 2017 at 02:25:26AM +0000, Andre Przywara wrote: > >>>> The Pine64 (and all other 64-bit Allwinner boards) need to load an > >>>> ARM Trusted Firmware image beside the actual U-Boot proper. > >>>> This can now be easily achieved by using the just extended SPL FIT > >>>> loading support, so enable it in the Pine64 defconfig. > >>>> Also add the FIT image as a build target to 64-bit sunxi board to > >>>> trigger the respective Makefile rules. > >>>> > >>>> Signed-off-by: Andre Przywara <andre.przywara(a)arm.com> > >>>> --- > >>>> configs/pine64_plus_defconfig | 6 ++++++ > >>>> include/configs/sunxi-common.h | 4 ++++ > >>>> 2 files changed, 10 insertions(+) > >>>> > >>>> diff --git a/configs/pine64_plus_defconfig b/configs/pine64_plus_defconfig > >>>> index 7c7d86f..2b47157 100644 > >>>> --- a/configs/pine64_plus_defconfig > >>>> +++ b/configs/pine64_plus_defconfig > >>>> @@ -3,9 +3,14 @@ CONFIG_RESERVE_ALLWINNER_BOOT0_HEADER=y > >>>> CONFIG_ARCH_SUNXI=y > >>>> CONFIG_MACH_SUN50I=y > >>>> CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-pine64-plus" > >>>> +CONFIG_OF_LIST="sun50i-a64-pine64 sun50i-a64-pine64-plus" > >>>> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set > >>>> CONFIG_CONSOLE_MUX=y > >>>> CONFIG_SPL=y > >>>> +CONFIG_FIT=y > >>>> +CONFIG_SPL_FIT=y > >>>> +CONFIG_SPL_LOAD_FIT=y > >>>> +CONFIG_SPL_OF_LIBFDT=y > >>> > >>> I'm not sure we want to force down that support to all our users. > >> > >> A64 boards are now unusable without proper ATF. > > > > That's debatable, but that's not really what I meant. What I meant was > > that they're perfectly usable without FIT. > > But this is a defconfig for a certain, and the Pine64 is not really > usable without ATF at the moment in an upstream tree. > > Do you want a CONFIG_LOAD_ATF wrapper option, that would make it easier > to select / deselect? I will try to adapt ARMv8 PSCI on A64. (But I don't know ARM assembly well... both 32 and 64) > > Cheers, > Andre. > > -- > You received this message because you are subscribed to the Google Groups "linux-sunxi" group. > To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe(a)googlegroups.com. > For more options, visit https://groups.google.com/d/optout.

1 0

[U-Boot] [PATCH v2 0/2] mtd: nand: atmel: use another functions to set gpio value
by Wenyou Yang 03 Mar '17

03 Mar '17

The purpose of the patch set is to use another functions to set and get the gpio value for the atmel nand driver to fix the error to set and get the gpio value after the at91 gpio driver conversion to support the driver model. Changes in v2: - Improve the commit log. - Add Reviewed-by tag. Wenyou Yang (2): ARM: at91: gpio: fix at91_set_gpio_value() define mtd: nand: atmel: use another functions to set gpio value arch/arm/mach-at91/include/mach/gpio.h | 12 +++++------- drivers/mtd/nand/atmel_nand.c | 5 +++-- 2 files changed, 8 insertions(+), 9 deletions(-) -- 2.11.0

1 2

[U-Boot] [PATCH v2 0/2] clk: at91: enhance the peripheral clock
by Wenyou Yang 03 Mar '17

03 Mar '17

The purpose of the patch set is to enhance the peripheral clock to support both at9sam9x5's and at91rm9200's peripheral clock, and align the clk-master's compatibles with kernel's. Changes in v2: - Use an enum with a descriptive name to denote the clock type. - Add the Reviewed-by tags. Wenyou Yang (2): clk: at91: enhance the peripheral clock clk: at91: align clk-master's compatibles with kernel's drivers/clk/at91/clk-master.c | 1 + drivers/clk/at91/clk-peripheral.c | 29 ++++++++++++++++++++++++++--- 2 files changed, 27 insertions(+), 3 deletions(-) -- 2.11.0

1 2

[U-Boot] [PATCH 0/2] mtd: nand: atmel: use another functions to set/get gpio value
by Wenyou Yang 03 Mar '17

03 Mar '17

The purpose of the patch set is to use another functions to set or get the gpio value for the atmel nand driver. Wenyou Yang (2): ARM: at91: gpio: fix at91_set/get_gpio_value() mtd: nand: atmel: change another functions to set/get gpio value arch/arm/mach-at91/include/mach/gpio.h | 12 +++++------- drivers/mtd/nand/atmel_nand.c | 5 +++-- 2 files changed, 8 insertions(+), 9 deletions(-) -- 2.11.0

3 5

[U-Boot] [RESEND PATCH 0/9] Add support for secure boot on Keystone2 SoCs
by Andrew F. Davis 03 Mar '17

03 Mar '17

Hello all, This series adds support for secure Keystone2 K2E and K2HK devices, much of the work is borrowed from the OMAP style devices as the secure workings are very similar, allowing minimal changes for this support addition. Thanks, Andrew Changes for resend: - Fixup patch authorship Andrew F. Davis (1): defconfig: k2hk_hs_evm: Add k2hk_hs_evm_defconfig Madan Srinivas (5): image: Fixes build warning with CONFIG_FIT_IMAGE_POST_PROCESS arm: mach-omap2: Add secure image name common to OMAP and keystone ARM: Keystone2: Build secure images for K2 doc: Updates info on using Keystone2 secure devices Kconfig: Adds SYS_TEXT_BASE config option for Keystone2 Vitaly Andrianov (3): arm: mach-keystone: Implements FIT post-processing call for keystone SoCs arm: mach-omap2: Enable Kconfig support for K2 HS devices defconfig: k2e_hs_evm: Add k2e_hs_evm_defconfig Kconfig | 2 +- arch/arm/mach-keystone/config.mk | 6 ++ arch/arm/mach-keystone/mon.c | 73 ++++++++++++++++++++++ arch/arm/mach-omap2/Kconfig | 2 +- arch/arm/mach-omap2/config_secure.mk | 6 ++ configs/k2e_evm_defconfig | 1 + .../{k2e_evm_defconfig => k2e_hs_evm_defconfig} | 15 ++--- configs/k2g_evm_defconfig | 1 + configs/k2hk_evm_defconfig | 1 + .../{k2hk_evm_defconfig => k2hk_hs_evm_defconfig} | 13 ++-- configs/k2l_evm_defconfig | 1 + doc/README.ti-secure | 20 ++++++ include/image.h | 3 +- 13 files changed, 122 insertions(+), 22 deletions(-) copy configs/{k2e_evm_defconfig => k2e_hs_evm_defconfig} (78%) copy configs/{k2hk_evm_defconfig => k2hk_hs_evm_defconfig} (80%) -- 2.11.0

3 20

[U-Boot] Device cleanup before starting OS (Linux)
by Stefan Roese 03 Mar '17

03 Mar '17

Hi! I'm currently trying to add some code to stop (DMA) buffer usage in the Marvell mvpp2 ethernet driver, that should only be executed once, before the OS is started - stop() does not work easily for me here. I've found the weak function "board_quiesce_devices()", which is already used for such cases. But since you are not fond of weak functions (I totally agree here, this is far from perfect) and already suggested some kind of "finalize" DM API call, I'm wondering if I should introduce this new API call for such cases and use it in the ethernet driver. So what is your opinion about this? Should I add such a finalize DM function and call it from the arch/.../bootm code? Or do you have other suggestions on how to handle such driver specific last-stage (pre OS) calls? Thanks, Stefan

2 4

[U-Boot] [PATCH 0/9] Add support for secure boot on Keystone2 SoCs
by Andrew F. Davis 03 Mar '17

03 Mar '17

Hello all, This series adds support for secure Keystone2 K2E and K2HK devices, much of the work is borrowed from the OMAP style devices as the secure workings are very similar, allowing minimal changes for this support addition. Thanks, Andrew Andrew F. Davis (9): image: Fixes build warning with CONFIG_FIT_IMAGE_POST_PROCESS arm: mach-keystone: Implements FIT post-processing call for keystone SoCs arm: mach-omap2: Enable Kconfig support for K2 HS devices arm: mach-omap2: Add secure image name common to OMAP and keystone ARM: Keystone2: Build secure images for K2 doc: Updates info on using Keystone2 secure devices Kconfig: Adds SYS_TEXT_BASE config option for Keystone2 defconfig: k2e_hs_evm: Add k2e_hs_evm_defconfig defconfig: k2hk_hs_evm: Add k2hk_hs_evm_defconfig Kconfig | 2 +- arch/arm/mach-keystone/config.mk | 6 ++ arch/arm/mach-keystone/mon.c | 73 ++++++++++++++++++++++ arch/arm/mach-omap2/Kconfig | 2 +- arch/arm/mach-omap2/config_secure.mk | 6 ++ configs/k2e_evm_defconfig | 1 + .../{k2e_evm_defconfig => k2e_hs_evm_defconfig} | 15 ++--- configs/k2g_evm_defconfig | 1 + configs/k2hk_evm_defconfig | 1 + .../{k2hk_evm_defconfig => k2hk_hs_evm_defconfig} | 13 ++-- configs/k2l_evm_defconfig | 1 + doc/README.ti-secure | 20 ++++++ include/image.h | 3 +- 13 files changed, 122 insertions(+), 22 deletions(-) copy configs/{k2e_evm_defconfig => k2e_hs_evm_defconfig} (78%) copy configs/{k2hk_evm_defconfig => k2hk_hs_evm_defconfig} (80%) -- 2.11.0

2 10

[U-Boot] [PATCH] binman: Explicitly request python2 instead of python from env
by Paul Kocialkowski 03 Mar '17

03 Mar '17

We now live in a world where python cannot be assumed to be python2. As a matter of fact, it is no longer the default for python on many GNU/Linux distributions. Running binman with python3 fails, so explicitly request python2 from env in the shebang for running it. Signed-off-by: Paul Kocialkowski <contact(a)paulk.fr> --- tools/binman/binman.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/binman/binman.py b/tools/binman/binman.py index 4cc431fbbe..25a01d9adb 100755 --- a/tools/binman/binman.py +++ b/tools/binman/binman.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> -- 2.11.1

4 5