June 2019 - U-Boot

[U-Boot] [PATCH] thor: fix crash after usb initialization failure
by Marek Szyprowski 21 Jun '19

21 Jun '19

Registration of USB download gadget might fail for various reasons, so add a check for g_dnl_register() funtion return value. Without this fix, thor_init() will try to access the registered gadget structures resulting in NULL pointer dereference issue. Signed-off-by: Marek Szyprowski <m.szyprowski(a)samsung.com> --- cmd/thordown.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmd/thordown.c b/cmd/thordown.c index 19ae6721d19..2e1b2c5bea6 100644 --- a/cmd/thordown.c +++ b/cmd/thordown.c @@ -37,7 +37,11 @@ int do_thor_down(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) goto exit; } - g_dnl_register("usb_dnl_thor"); + ret = g_dnl_register("usb_dnl_thor"); + if (ret) { + error("g_dnl_register failed %d\n", ret); + return ret; + } ret = thor_init(); if (ret) { -- 2.17.1

1 0

[U-Boot] [PATCH v2] watchdog: tangier: Convert to use WDT class
by Andy Shevchenko 21 Jun '19

21 Jun '19

Convert legacy driver to use watchdog class. Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> --- - dropped redundant assignments (Stefan) - used clamp_t() instead of max_t()/min_t() pair arch/x86/cpu/tangier/Kconfig | 1 - arch/x86/dts/edison.dts | 4 ++ configs/edison_defconfig | 2 + drivers/watchdog/Kconfig | 17 ++++---- drivers/watchdog/Makefile | 2 +- drivers/watchdog/tangier_wdt.c | 73 +++++++++++++++++++++------------- 6 files changed, 60 insertions(+), 39 deletions(-) diff --git a/arch/x86/cpu/tangier/Kconfig b/arch/x86/cpu/tangier/Kconfig index a3bd16799d..d2b7edecd6 100644 --- a/arch/x86/cpu/tangier/Kconfig +++ b/arch/x86/cpu/tangier/Kconfig @@ -10,7 +10,6 @@ config INTEL_TANGIER imply MMC_SDHCI imply MMC_SDHCI_SDMA imply MMC_SDHCI_TANGIER - imply TANGIER_WATCHDOG imply USB imply USB_DWC3 diff --git a/arch/x86/dts/edison.dts b/arch/x86/dts/edison.dts index e8564bbb8a..c0487656d3 100644 --- a/arch/x86/dts/edison.dts +++ b/arch/x86/dts/edison.dts @@ -104,6 +104,10 @@ reg = <0xff009000 0x1000>; }; + watchdog: wdt@0 { + compatible = "intel,tangier-wdt"; + }; + reset { compatible = "intel,reset-tangier"; u-boot,dm-pre-reloc; diff --git a/configs/edison_defconfig b/configs/edison_defconfig index 840c87ac5a..468754493e 100644 --- a/configs/edison_defconfig +++ b/configs/edison_defconfig @@ -39,5 +39,7 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x8087 CONFIG_USB_GADGET_PRODUCT_NUM=0x0a99 CONFIG_USB_GADGET_DOWNLOAD=y # CONFIG_USB_HOST_ETHER is not set +CONFIG_WDT=y +CONFIG_WDT_TANGIER=y CONFIG_FAT_WRITE=y CONFIG_SHA1=y diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index b01dbc446d..2270ed2e39 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -34,15 +34,6 @@ config OMAP_WATCHDOG help Say Y here to enable the OMAP3+ watchdog driver. -config TANGIER_WATCHDOG - bool "Intel Tangier watchdog" - depends on INTEL_MID - select HW_WATCHDOG - help - This enables support for watchdog controller available on - Intel Tangier SoC. If you're using a board with Intel Tangier - SoC, say Y here. - config ULP_WATCHDOG bool "i.MX7ULP watchdog" help @@ -161,4 +152,12 @@ config WDT_MPC8xx help Select this to enable mpc8xx watchdog timer +config WDT_TANGIER + bool "Intel Tangier watchdog timer support" + depends on WDT && INTEL_MID + help + This enables support for watchdog controller available on + Intel Tangier SoC. If you're using a board with Intel Tangier + SoC, say Y here. + endmenu diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index 6f20e73810..2dfc8a37b0 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile @@ -14,7 +14,6 @@ obj-$(CONFIG_S5P) += s5p_wdt.o obj-$(CONFIG_XILINX_TB_WATCHDOG) += xilinx_tb_wdt.o obj-$(CONFIG_OMAP_WATCHDOG) += omap_wdt.o obj-$(CONFIG_DESIGNWARE_WATCHDOG) += designware_wdt.o -obj-$(CONFIG_TANGIER_WATCHDOG) += tangier_wdt.o obj-$(CONFIG_ULP_WATCHDOG) += ulp_wdog.o obj-$(CONFIG_WDT) += wdt-uclass.o obj-$(CONFIG_WDT_SANDBOX) += sandbox_wdt.o @@ -28,3 +27,4 @@ obj-$(CONFIG_WDT_MPC8xx) += mpc8xx_wdt.o obj-$(CONFIG_WDT_MT7621) += mt7621_wdt.o obj-$(CONFIG_WDT_MTK) += mtk_wdt.o obj-$(CONFIG_WDT_SP805) += sp805_wdt.o +obj-$(CONFIG_WDT_TANGIER) += tangier_wdt.o diff --git a/drivers/watchdog/tangier_wdt.c b/drivers/watchdog/tangier_wdt.c index be4a8f467a..21238dffa2 100644 --- a/drivers/watchdog/tangier_wdt.c +++ b/drivers/watchdog/tangier_wdt.c @@ -3,7 +3,9 @@ * Copyright (c) 2017 Intel Corporation */ #include <common.h> -#include <watchdog.h> +#include <dm.h> +#include <wdt.h> +#include <div64.h> #include <asm/scu.h> /* Hardware timeout in seconds */ @@ -12,12 +14,6 @@ #define WDT_TIMEOUT_MAX 170 #define WDT_DEFAULT_TIMEOUT 90 -#ifndef CONFIG_WATCHDOG_TIMEOUT_MSECS -#define WATCHDOG_HEARTBEAT 60000 -#else -#define WATCHDOG_HEARTBEAT CONFIG_WATCHDOG_TIMEOUT_MSECS -#endif - enum { SCU_WATCHDOG_START = 0, SCU_WATCHDOG_STOP = 1, @@ -25,39 +21,33 @@ enum { SCU_WATCHDOG_SET_ACTION_ON_TIMEOUT = 3, }; -void hw_watchdog_reset(void) +static int tangier_wdt_reset(struct udevice *dev) { - static unsigned long last; - unsigned long now; - - if (gd->timer) - now = timer_get_us(); - else - now = rdtsc() / 1000; - - /* Do not flood SCU */ - if (last > now) - last = 0; - - if (unlikely((now - last) > (WDT_PRETIMEOUT / 2) * 1000000)) { - last = now; - scu_ipc_simple_command(IPCMSG_WATCHDOG_TIMER, SCU_WATCHDOG_KEEPALIVE); - } + scu_ipc_simple_command(IPCMSG_WATCHDOG_TIMER, SCU_WATCHDOG_KEEPALIVE); + return 0; } -int hw_watchdog_disable(void) +static int tangier_wdt_stop(struct udevice *dev) { return scu_ipc_simple_command(IPCMSG_WATCHDOG_TIMER, SCU_WATCHDOG_STOP); } -void hw_watchdog_init(void) +static int tangier_wdt_start(struct udevice *dev, u64 timeout_ms, ulong flags) { - u32 timeout = WATCHDOG_HEARTBEAT / 1000; + u32 timeout_sec; int in_size; struct ipc_wd_start { u32 pretimeout; u32 timeout; - } ipc_wd_start = { timeout - WDT_PRETIMEOUT, timeout }; + } ipc_wd_start; + + /* Calculate timeout in seconds and restrict to min and max value */ + do_div(timeout_ms, 1000); + timeout_sec = clamp_t(u32, timeout_ms, WDT_TIMEOUT_MIN, WDT_TIMEOUT_MAX); + + /* Update values in the IPC request */ + ipc_wd_start.pretimeout = timeout_sec - WDT_PRETIMEOUT; + ipc_wd_start.timeout = timeout_sec; /* * SCU expects the input size for watchdog IPC @@ -67,4 +57,31 @@ void hw_watchdog_init(void) scu_ipc_command(IPCMSG_WATCHDOG_TIMER, SCU_WATCHDOG_START, (u32 *)&ipc_wd_start, in_size, NULL, 0); + + return 0; +} + +static const struct wdt_ops tangier_wdt_ops = { + .reset = tangier_wdt_reset, + .start = tangier_wdt_start, + .stop = tangier_wdt_stop, +}; + +static const struct udevice_id tangier_wdt_ids[] = { + { .compatible = "intel,tangier-wdt" }, + { /* sentinel */ } +}; + +static int tangier_wdt_probe(struct udevice *dev) +{ + debug("%s: Probing wdt%u\n", __func__, dev->seq); + return 0; } + +U_BOOT_DRIVER(wdt_tangier) = { + .name = "wdt_tangier", + .id = UCLASS_WDT, + .of_match = tangier_wdt_ids, + .ops = &tangier_wdt_ops, + .probe = tangier_wdt_probe, +}; -- 2.20.1

3 5

[U-Boot] [PATCH v4 0/6] rockchip: rk3399: Make u-boot.itb as BUILD_TARGET
by Jagan Teki 21 Jun '19

21 Jun '19

This is v4 set for supporting u-boot.itb build target image for rk3399. here is the previous version changes[1] Changes for v4: - rebase on master - support u-boot.itb build even if bl31.elf available in PWD like what is doing right now. this would keep the backward compatible. - update board README changes Changes for v3: - skip binman changes - rebase on u-boot-rockchip/master Note: While creating dummy bl31.elf (neither it available in PWD nor it as part of BL31 env), the build system is creating u-boot.its without firmware entry which indeed expected. but the resulting u-boot.itb seems booting on rk3399, which I'm not sure - any input would help on this regard. Travis-CI: https://travis-ci.org/openedev/u-boot-amarula/builds/548123247 [1] https://patchwork.ozlabs.org/cover/1096499/ Any inputs? Jagan. Jagan Teki (6): Makefile: clean image.map Makefile: clean bl31_*.bin travis.yml: Add pyelftools install entry rockchip: rk3399: Get bl31.elf via BL31 board: puma: Get bl31.bin via BL31 and rk3399m0.bin via PMUM0 Kconfig: Add u-boot.itb BUILD_TARGET for Rockchip .travis.yml | 1 + Kconfig | 2 +- Makefile | 3 +- arch/arm/mach-rockchip/make_fit_atf.py | 20 +++- board/theobroma-systems/puma_rk3399/README | 2 +- .../puma_rk3399/fit_spl_atf.its | 58 ------------ .../puma_rk3399/fit_spl_atf.sh | 94 +++++++++++++++++++ board/vamrs/rock960_rk3399/README | 1 - configs/puma-rk3399_defconfig | 2 +- doc/README.rockchip | 14 ++- 10 files changed, 124 insertions(+), 73 deletions(-) delete mode 100644 board/theobroma-systems/puma_rk3399/fit_spl_atf.its create mode 100755 board/theobroma-systems/puma_rk3399/fit_spl_atf.sh -- 2.18.0.321.gffc6fa0e3

2 8

[U-Boot] efi_loader: detaching runtime
by Heinrich Schuchardt 21 Jun '19

21 Jun '19

Hello Alex, currently we have two code sections in U-Boot: * __efi_runtime/__efi_runtime_data (mapped to EFI_RUNTIME_SERVICES_CODE) * all other code (mapped to EFI_LOADER_DATA by add_u_boot_and_runtime()) All code and data that is not marked as __efi_runtime or __efi_runtime_data lives in a memory area that the EFI application may reuse after ExitBootServices(). Code that is marked as __efi_runtime is relocated at SetVirtualMemoryMap(). I wonder in which section the relocation code should live. It cannot be __efi_runtime or it will mess up itself while relocating. It cannot be in EFI_LOADER_DATA or it may be overwritten after ExitBootServices(). If this reasoning is right wouldn't we need a third code section living in EFI_RUNTIME_SERVICES_CODE but which is excluded from the relocation during SetVirtualMemoryMap()? Another option of cause would be to put the whole U-Boot code into EFI_RUNTIME_SERVICES_CODE which will incur a loss of less than 1 MiB for the operating system. Best regards Heinrich

4 4

[U-Boot] [PATCH v3] rtc: Add DM support to ds3231
by Chuanhua Han 21 Jun '19

21 Jun '19

Add an implementation of the ds3231 driver that uses the driver model i2c APIs. Signed-off-by: Chuanhua Han <chuanhua.han(a)nxp.com> --- Changes in v3: - Update copyright information. Changes in v2: - Replace "#ifndef CONFIG_DM_RTC" with "#if !CONFIG_IS_ENABLED(DM_RTC)" drivers/rtc/ds3231.c | 108 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) diff --git a/drivers/rtc/ds3231.c b/drivers/rtc/ds3231.c index 9352ff87a2..86f1c3e899 100644 --- a/drivers/rtc/ds3231.c +++ b/drivers/rtc/ds3231.c @@ -2,6 +2,9 @@ /* * (C) Copyright 2006 * Markus Klotzbuecher, mk(a)denx.de + * + * (C) Copyright 2019 NXP + * Chuanhua Han <chuanhua.han(a)nxp.com> */ /* @@ -13,6 +16,7 @@ #include <common.h> #include <command.h> +#include <dm.h> #include <rtc.h> #include <i2c.h> @@ -50,6 +54,7 @@ #define RTC_STAT_BIT_EN32KHZ 0x8 /* Enable 32KHz Output */ +#if !CONFIG_IS_ENABLED(DM_RTC) static uchar rtc_read (uchar reg); static void rtc_write (uchar reg, uchar val); @@ -164,3 +169,106 @@ static void rtc_write (uchar reg, uchar val) { i2c_reg_write (CONFIG_SYS_I2C_RTC_ADDR, reg, val); } +#else +static int ds3231_rtc_get(struct udevice *dev, struct rtc_time *tmp) +{ + int rel = 0; + uchar sec, min, hour, mday, wday, mon_cent, year, status; + + status = dm_i2c_reg_read(dev, RTC_STAT_REG_ADDR); + sec = dm_i2c_reg_read(dev, RTC_SEC_REG_ADDR); + min = dm_i2c_reg_read(dev, RTC_MIN_REG_ADDR); + hour = dm_i2c_reg_read(dev, RTC_HR_REG_ADDR); + wday = dm_i2c_reg_read(dev, RTC_DAY_REG_ADDR); + mday = dm_i2c_reg_read(dev, RTC_DATE_REG_ADDR); + mon_cent = dm_i2c_reg_read(dev, RTC_MON_REG_ADDR); + year = dm_i2c_reg_read(dev, RTC_YR_REG_ADDR); + + if (status & RTC_STAT_BIT_OSF) { + printf("### Warning: RTC oscillator has stopped\n"); + /* clear the OSF flag */ + dm_i2c_reg_write(dev, RTC_STAT_REG_ADDR, + dm_i2c_reg_read(dev, RTC_STAT_REG_ADDR) + & ~RTC_STAT_BIT_OSF); + rel = -1; + } + + tmp->tm_sec = bcd2bin(sec & 0x7F); + tmp->tm_min = bcd2bin(min & 0x7F); + tmp->tm_hour = bcd2bin(hour & 0x3F); + tmp->tm_mday = bcd2bin(mday & 0x3F); + tmp->tm_mon = bcd2bin(mon_cent & 0x1F); + tmp->tm_year = bcd2bin(year) + ((mon_cent & 0x80) ? 2000 : 1900); + tmp->tm_wday = bcd2bin((wday - 1) & 0x07); + tmp->tm_yday = 0; + tmp->tm_isdst = 0; + + debug("Get DATE: %4d-%02d-%02d (wday=%d) TIME: %2d:%02d:%02d\n", + tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday, + tmp->tm_hour, tmp->tm_min, tmp->tm_sec); + + return rel; +} + +static int ds3231_rtc_set(struct udevice *dev, const struct rtc_time *tmp) +{ + uchar century; + + debug("Set DATE: %4d-%02d-%02d (wday=%d) TIME: %2d:%02d:%02d\n", + tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday, + tmp->tm_hour, tmp->tm_min, tmp->tm_sec); + + dm_i2c_reg_write(dev, RTC_YR_REG_ADDR, bin2bcd(tmp->tm_year % 100)); + + century = (tmp->tm_year >= 2000) ? 0x80 : 0; + dm_i2c_reg_write(dev, RTC_MON_REG_ADDR, bin2bcd(tmp->tm_mon) | century); + + dm_i2c_reg_write(dev, RTC_DAY_REG_ADDR, bin2bcd(tmp->tm_wday + 1)); + dm_i2c_reg_write(dev, RTC_DATE_REG_ADDR, bin2bcd(tmp->tm_mday)); + dm_i2c_reg_write(dev, RTC_HR_REG_ADDR, bin2bcd(tmp->tm_hour)); + dm_i2c_reg_write(dev, RTC_MIN_REG_ADDR, bin2bcd(tmp->tm_min)); + dm_i2c_reg_write(dev, RTC_SEC_REG_ADDR, bin2bcd(tmp->tm_sec)); + + return 0; +} + +static int ds3231_rtc_reset(struct udevice *dev) +{ + int ret; + + ret = dm_i2c_reg_write(dev, RTC_CTL_REG_ADDR, + RTC_CTL_BIT_RS1 | RTC_CTL_BIT_RS2); + if (ret < 0) + return ret; + + return 0; +} + +static int ds3231_probe(struct udevice *dev) +{ + i2c_set_chip_flags(dev, DM_I2C_CHIP_RD_ADDRESS | + DM_I2C_CHIP_WR_ADDRESS); + + return 0; +} + +static const struct rtc_ops ds3231_rtc_ops = { + .get = ds3231_rtc_get, + .set = ds3231_rtc_set, + .reset = ds3231_rtc_reset, +}; + +static const struct udevice_id ds3231_rtc_ids[] = { + { .compatible = "dallas,ds3231" }, + { .compatible = "dallas,ds3232" }, + { } +}; + +U_BOOT_DRIVER(rtc_ds3231) = { + .name = "rtc-ds3231", + .id = UCLASS_RTC, + .probe = ds3231_probe, + .of_match = ds3231_rtc_ids, + .ops = &ds3231_rtc_ops, +}; +#endif -- 2.17.1

2 3

[U-Boot] [PATCH v2] arm64: zynqmp: add MAINTAINERS entry for Avnet UltraZed-EV
by Luca Ceresoli 21 Jun '19

21 Jun '19

The board was added without adding a MAINTAINERS entry. Fixes: $ ./tools/genboardscfg.py -f WARNING: no status info for 'avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0' WARNING: no maintainers for 'avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0' $ Reported-by: Michal Simek <michal.simek(a)xilinx.com> Signed-off-by: Luca Ceresoli <luca(a)lucaceresoli.net> --- Changes v1 -> v2: - add to board/xilinx/zynqmp/MAINTAINERS, not the top-level file (Michal) - add the dts files (Michal) - explicitly mention the "EV" board variant --- board/xilinx/zynqmp/MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/board/xilinx/zynqmp/MAINTAINERS b/board/xilinx/zynqmp/MAINTAINERS index e6fed25152ac..1671c6eed2d8 100644 --- a/board/xilinx/zynqmp/MAINTAINERS +++ b/board/xilinx/zynqmp/MAINTAINERS @@ -6,3 +6,9 @@ F: board/xilinx/zynqmp/ F: include/configs/xilinx_zynqmp* F: configs/xilinx_zynqmp* F: configs/avnet_ultra96_rev1_defconfig + +ARM ZYNQMP AVNET ULTRAZED EV BOARD +M: Luca Ceresoli <luca(a)lucaceresoli.net> +S: Maintained +F: arch/arm/dts/avnet-ultrazedev-* +F: configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig -- 2.22.0

2 1

[U-Boot] [PATCH v2] rtc: Add DM support to ds3231
by Chuanhua Han 21 Jun '19

21 Jun '19

Add an implementation of the ds3231 driver that uses the driver model i2c APIs. Signed-off-by: Chuanhua Han <chuanhua.han(a)nxp.com> --- Changes in v2: - Replace "#ifndef CONFIG_DM_RTC" with "#if !CONFIG_IS_ENABLED(DM_RTC)" drivers/rtc/ds3231.c | 105 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/drivers/rtc/ds3231.c b/drivers/rtc/ds3231.c index 9352ff87a2..1c93facf9a 100644 --- a/drivers/rtc/ds3231.c +++ b/drivers/rtc/ds3231.c @@ -13,6 +13,7 @@ #include <common.h> #include <command.h> +#include <dm.h> #include <rtc.h> #include <i2c.h> @@ -50,6 +51,7 @@ #define RTC_STAT_BIT_EN32KHZ 0x8 /* Enable 32KHz Output */ +#if !CONFIG_IS_ENABLED(DM_RTC) static uchar rtc_read (uchar reg); static void rtc_write (uchar reg, uchar val); @@ -164,3 +166,106 @@ static void rtc_write (uchar reg, uchar val) { i2c_reg_write (CONFIG_SYS_I2C_RTC_ADDR, reg, val); } +#else +static int ds3231_rtc_get(struct udevice *dev, struct rtc_time *tmp) +{ + int rel = 0; + uchar sec, min, hour, mday, wday, mon_cent, year, status; + + status = dm_i2c_reg_read(dev, RTC_STAT_REG_ADDR); + sec = dm_i2c_reg_read(dev, RTC_SEC_REG_ADDR); + min = dm_i2c_reg_read(dev, RTC_MIN_REG_ADDR); + hour = dm_i2c_reg_read(dev, RTC_HR_REG_ADDR); + wday = dm_i2c_reg_read(dev, RTC_DAY_REG_ADDR); + mday = dm_i2c_reg_read(dev, RTC_DATE_REG_ADDR); + mon_cent = dm_i2c_reg_read(dev, RTC_MON_REG_ADDR); + year = dm_i2c_reg_read(dev, RTC_YR_REG_ADDR); + + if (status & RTC_STAT_BIT_OSF) { + printf("### Warning: RTC oscillator has stopped\n"); + /* clear the OSF flag */ + dm_i2c_reg_write(dev, RTC_STAT_REG_ADDR, + dm_i2c_reg_read(dev, RTC_STAT_REG_ADDR) + & ~RTC_STAT_BIT_OSF); + rel = -1; + } + + tmp->tm_sec = bcd2bin(sec & 0x7F); + tmp->tm_min = bcd2bin(min & 0x7F); + tmp->tm_hour = bcd2bin(hour & 0x3F); + tmp->tm_mday = bcd2bin(mday & 0x3F); + tmp->tm_mon = bcd2bin(mon_cent & 0x1F); + tmp->tm_year = bcd2bin(year) + ((mon_cent & 0x80) ? 2000 : 1900); + tmp->tm_wday = bcd2bin((wday - 1) & 0x07); + tmp->tm_yday = 0; + tmp->tm_isdst = 0; + + debug("Get DATE: %4d-%02d-%02d (wday=%d) TIME: %2d:%02d:%02d\n", + tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday, + tmp->tm_hour, tmp->tm_min, tmp->tm_sec); + + return rel; +} + +static int ds3231_rtc_set(struct udevice *dev, const struct rtc_time *tmp) +{ + uchar century; + + debug("Set DATE: %4d-%02d-%02d (wday=%d) TIME: %2d:%02d:%02d\n", + tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday, + tmp->tm_hour, tmp->tm_min, tmp->tm_sec); + + dm_i2c_reg_write(dev, RTC_YR_REG_ADDR, bin2bcd(tmp->tm_year % 100)); + + century = (tmp->tm_year >= 2000) ? 0x80 : 0; + dm_i2c_reg_write(dev, RTC_MON_REG_ADDR, bin2bcd(tmp->tm_mon) | century); + + dm_i2c_reg_write(dev, RTC_DAY_REG_ADDR, bin2bcd(tmp->tm_wday + 1)); + dm_i2c_reg_write(dev, RTC_DATE_REG_ADDR, bin2bcd(tmp->tm_mday)); + dm_i2c_reg_write(dev, RTC_HR_REG_ADDR, bin2bcd(tmp->tm_hour)); + dm_i2c_reg_write(dev, RTC_MIN_REG_ADDR, bin2bcd(tmp->tm_min)); + dm_i2c_reg_write(dev, RTC_SEC_REG_ADDR, bin2bcd(tmp->tm_sec)); + + return 0; +} + +static int ds3231_rtc_reset(struct udevice *dev) +{ + int ret; + + ret = dm_i2c_reg_write(dev, RTC_CTL_REG_ADDR, + RTC_CTL_BIT_RS1 | RTC_CTL_BIT_RS2); + if (ret < 0) + return ret; + + return 0; +} + +static int ds3231_probe(struct udevice *dev) +{ + i2c_set_chip_flags(dev, DM_I2C_CHIP_RD_ADDRESS | + DM_I2C_CHIP_WR_ADDRESS); + + return 0; +} + +static const struct rtc_ops ds3231_rtc_ops = { + .get = ds3231_rtc_get, + .set = ds3231_rtc_set, + .reset = ds3231_rtc_reset, +}; + +static const struct udevice_id ds3231_rtc_ids[] = { + { .compatible = "dallas,ds3231" }, + { .compatible = "dallas,ds3232" }, + { } +}; + +U_BOOT_DRIVER(rtc_ds3231) = { + .name = "rtc-ds3231", + .id = UCLASS_RTC, + .probe = ds3231_probe, + .of_match = ds3231_rtc_ids, + .ops = &ds3231_rtc_ops, +}; +#endif -- 2.17.1

1 0

[U-Boot] [PATCH v2] MAINTAINERS: Update git repo links
by Bin Meng 21 Jun '19

21 Jun '19

Update all git repo links with the new gitlab ones. Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> Acked-by: Wolfgang Denk <wd(a)denx.de> --- Changes in v2: - add .git suffix to the repo links MAINTAINERS | 106 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 8e26eda..8600b91 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -55,7 +55,7 @@ M: Alexey Brodkin <alexey.brodkin(a)synopsys.com> M: Eugeniy Paltsev <Eugeniy.Paltsev(a)synopsys.com> S: Maintained L: uboot-snps-arc(a)synopsys.com -T: git git://git.denx.de/u-boot-arc.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-arc.git F: arch/arc/ F: board/synopsys/ @@ -84,7 +84,7 @@ F: drivers/mmc/snps_dw_mmc.c ARM M: Albert Aribaud <albert.u.boot(a)aribaud.net> S: Maintained -T: git git://git.denx.de/u-boot-arm.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-arm.git F: arch/arm/ F: cmd/arm/ @@ -92,14 +92,14 @@ ARM ALTERA SOCFPGA M: Marek Vasut <marex(a)denx.de> M: Simon Goldschmidt <simon.k.r.goldschmidt(a)gmail.com> S: Maintainted -T: git git://git.denx.de/u-boot-socfpga.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-socfpga.git F: arch/arm/mach-socfpga/ ARM AMLOGIC SOC SUPPORT M: Neil Armstrong <narmstrong(a)baylibre.com> S: Maintained L: u-boot-amlogic(a)groups.io -T: git git://git.denx.de/u-boot-amlogic.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-amlogic.git F: arch/arm/mach-meson/ F: arch/arm/include/asm/arch-meson/ F: drivers/clk/meson/ @@ -153,7 +153,7 @@ M: Stefano Babic <sbabic(a)denx.de> M: Fabio Estevam <festevam(a)gmail.com> R: NXP i.MX U-Boot Team <uboot-imx(a)nxp.com> S: Maintained -T: git git://git.denx.de/u-boot-imx.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-imx.git F: arch/arm/cpu/arm1136/mx*/ F: arch/arm/cpu/arm926ejs/mx*/ F: arch/arm/cpu/armv7/vf610/ @@ -174,7 +174,7 @@ F: arch/arm/include/asm/arch-hi6220/ ARM MARVELL KIRKWOOD ARMADA-XP ARMADA-38X ARMADA-37XX ARMADA-7K/8K M: Stefan Roese <sr(a)denx.de> S: Maintained -T: git git://git.denx.de/u-boot-marvell.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-marvell.git F: arch/arm/mach-kirkwood/ F: arch/arm/mach-mvebu/ F: drivers/ata/ahci_mvebu.c @@ -188,7 +188,7 @@ F: drivers/watchdog/orion_wdt.c ARM MARVELL PXA M: Marek Vasut <marex(a)denx.de> S: Maintained -T: git git://git.denx.de/u-boot-pxa.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-pxa.git F: arch/arm/cpu/pxa/ F: arch/arm/include/asm/arch-pxa/ @@ -217,7 +217,7 @@ N: mediatek ARM MICROCHIP/ATMEL AT91 M: Eugen Hristev <eugen.hristev(a)microchip.com> S: Maintained -T: git git://git.denx.de/u-boot-atmel.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-atmel.git F: arch/arm/mach-at91/ F: board/atmel/ @@ -234,7 +234,7 @@ ARM RENESAS RMOBILE/R-CAR M: Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> M: Marek Vasut <marek.vasut+renesas(a)gmail.com> S: Maintained -T: git git://git.denx.de/u-boot-sh.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-sh.git F: arch/arm/mach-rmobile/ ARM ROCKCHIP @@ -242,7 +242,7 @@ M: Simon Glass <sjg(a)chromium.org> M: Philipp Tomsich <philipp.tomsich(a)theobroma-systems.com> M: Kever Yang <kever.yang(a)rock-chips.com> S: Maintained -T: git git://git.denx.de/u-boot-rockchip.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip.git F: arch/arm/include/asm/arch-rockchip/ F: arch/arm/mach-rockchip/ F: board/rockchip/ @@ -264,7 +264,7 @@ F: tools/rkspi.c ARM SAMSUNG M: Minkyu Kang <mk7.kang(a)samsung.com> S: Maintained -T: git git://git.denx.de/u-boot-samsung.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-samsung.git F: arch/arm/mach-exynos/ F: arch/arm/mach-s5pc1xx/ F: arch/arm/cpu/armv7/s5p-common/ @@ -289,7 +289,7 @@ F: arch/arm/include/asm/arch-sti*/ ARM STM SPEAR #M: Vipin Kumar <vipin.kumar(a)st.com> S: Orphaned (Since 2016-02) -T: git git://git.denx.de/u-boot-stm.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-stm.git F: arch/arm/cpu/arm926ejs/spear/ F: arch/arm/include/asm/arch-spear/ @@ -326,7 +326,7 @@ ARM SUNXI M: Jagan Teki <jagan(a)amarulasolutions.com> M: Maxime Ripard <maxime.ripard(a)bootlin.com> S: Maintained -T: git git://git.denx.de/u-boot-sunxi.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-sunxi.git F: arch/arm/cpu/armv7/sunxi/ F: arch/arm/include/asm/arch-sunxi/ F: arch/arm/mach-sunxi/ @@ -335,14 +335,14 @@ F: board/sunxi/ ARM TEGRA M: Tom Warren <twarren(a)nvidia.com> S: Maintained -T: git git://git.denx.de/u-boot-tegra.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-tegra.git F: arch/arm/mach-tegra/ F: arch/arm/include/asm/arch-tegra*/ ARM TI M: Tom Rini <trini(a)konsulko.com> S: Maintained -T: git git://git.denx.de/u-boot-ti.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-ti.git F: arch/arm/mach-davinci/ F: arch/arm/mach-k3/ F: arch/arm/mach-keystone/ @@ -352,7 +352,7 @@ F: arch/arm/include/asm/ti-common/ ARM UNIPHIER M: Masahiro Yamada <yamada.masahiro(a)socionext.com> S: Maintained -T: git git://git.denx.de/u-boot-uniphier.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-uniphier.git F: arch/arm/mach-uniphier/ F: configs/uniphier_*_defconfig N: uniphier @@ -360,7 +360,7 @@ N: uniphier ARM VERSAL M: Michal Simek <michal.simek(a)xilinx.com> S: Maintained -T: git git://git.denx.de/u-boot-microblaze.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze.git F: arch/arm/mach-versal/ ARM VERSATILE EXPRESS DRIVERS @@ -373,7 +373,7 @@ N: vexpress ARM ZYNQ M: Michal Simek <monstr(a)monstr.eu> S: Maintained -T: git git://git.denx.de/u-boot-microblaze.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze.git F: arch/arm/mach-zynq/ F: drivers/clk/clk_zynq.c F: drivers/fpga/zynqpl.c @@ -397,7 +397,7 @@ N: zynq ARM ZYNQMP M: Michal Simek <michal.simek(a)xilinx.com> S: Maintained -T: git git://git.denx.de/u-boot-microblaze.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze.git F: arch/arm/mach-zynqmp/ F: drivers/clk/clk_zynqmp.c F: drivers/fpga/zynqpl.c @@ -423,7 +423,7 @@ N: zynqmp ARM ZYNQMP R5 M: Michal Simek <michal.simek(a)xilinx.com> S: Maintained -T: git git://git.denx.de/u-boot-microblaze.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze.git F: arch/arm/mach-zynqmp-r5/ BINMAN @@ -439,7 +439,7 @@ F: tools/buildman/ CFI FLASH M: Stefan Roese <sr(a)denx.de> S: Maintained -T: git git://git.denx.de/u-boot-cfi-flash.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-cfi-flash.git F: drivers/mtd/cfi_flash.c F: drivers/mtd/jedec_flash.c @@ -447,13 +447,13 @@ COLDFIRE M: Huan Wang <alison.wang(a)nxp.com> M: Angelo Dureghello <angelo(a)sysam.it> S: Maintained -T: git git://git.denx.de/u-boot-coldfire.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-coldfire.git F: arch/m68k/ DFU M: Lukasz Majewski <lukma(a)denx.de> S: Maintained -T: git git://git.denx.de/u-boot-dfu.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-dfu.git F: cmd/dfu.c F: cmd/usb_*.c F: common/dfu.c @@ -465,7 +465,7 @@ F: drivers/usb/gadget/ DRIVER MODEL M: Simon Glass <sjg(a)chromium.org> S: Maintained -T: git git://git.denx.de/u-boot-dm.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-dm.git F: drivers/core/ F: include/dm/ F: test/dm/ @@ -474,7 +474,7 @@ EFI PAYLOAD M: Heinrich Schuchardt <xypron.glpk(a)gmx.de> R: Alexander Graf <agraf(a)csgraf.de> S: Maintained -T: git git://git.denx.de/u-boot-efi.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-efi.git F: doc/README.uefi F: doc/README.iscsi F: Documentation/efi.rst @@ -497,7 +497,7 @@ F: tools/file2include.c FPGA M: Michal Simek <michal.simek(a)xilinx.com> S: Maintained -T: git git://git.denx.de/u-boot-microblaze.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze.git F: drivers/fpga/ F: cmd/fpga.c F: include/fpga.h @@ -505,7 +505,7 @@ F: include/fpga.h FLATTENED DEVICE TREE M: Simon Glass <sjg(a)chromium.org> S: Maintained -T: git git://git.denx.de/u-boot-fdt.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-fdt.git F: lib/fdtdec* F: lib/libfdt/ F: include/fdt* @@ -516,24 +516,24 @@ F: common/fdt_support.c FREEBSD M: Rafal Jaworowski <raj(a)semihalf.com> S: Maintained -T: git git://git.denx.de/u-boot-freebsd.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-freebsd.git FREESCALE QORIQ M: Prabhakar Kushwaha <prabhakar.kushwaha(a)nxp.com> S: Maintained -T: git git://git.denx.de/u-boot-fsl-qoriq.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq.git F: drivers/watchdog/sp805_wdt.c I2C M: Heiko Schocher <hs(a)denx.de> S: Maintained -T: git git://git.denx.de/u-boot-i2c.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-i2c.git F: drivers/i2c/ LOGGING M: Simon Glass <sjg(a)chromium.org> S: Maintained -T: git git://git.denx.de/u-boot.git +T: git https://gitlab.denx.de/u-boot/u-boot.git F: common/log.c F: cmd/log.c F: test/log/log_test.c @@ -549,7 +549,7 @@ F: drivers/i2c/i2c-versatile.c MICROBLAZE M: Michal Simek <monstr(a)monstr.eu> S: Maintained -T: git git://git.denx.de/u-boot-microblaze.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze.git F: arch/microblaze/ F: cmd/mfsl.c F: drivers/gpio/xilinx_gpio.c @@ -564,7 +564,7 @@ N: xilinx MIPS M: Daniel Schwierzeck <daniel.schwierzeck(a)gmail.com> S: Maintained -T: git git://git.denx.de/u-boot-mips.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-mips.git F: arch/mips/ MIPS MSCC @@ -595,38 +595,38 @@ F: arch/mips/mach-jz47xx/ MMC M: Peng Fan <peng.fan(a)nxp.com> S: Maintained -T: git git://git.denx.de/u-boot-mmc.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-mmc.git F: drivers/mmc/ NAND FLASH #M: Scott Wood <oss(a)buserror.net> S: Orphaned (Since 2018-07) -T: git git://git.denx.de/u-boot-nand-flash.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-nand-flash.git F: drivers/mtd/nand/raw/ NDS32 M: Macpaul Lin <macpaul(a)andestech.com> S: Maintained -T: git git://git.denx.de/u-boot-nds32.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-nds32.git F: arch/nds32/ NETWORK M: Joe Hershberger <joe.hershberger(a)ni.com> S: Maintained -T: git git://git.denx.de/u-boot-net.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-net.git F: drivers/net/ F: net/ NIOS M: Thomas Chou <thomas(a)wytron.com.tw> S: Maintained -T: git git://git.denx.de/u-boot-nios.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-nios.git F: arch/nios2/ ONENAND #M: Lukasz Majewski <l.majewski(a)majess.pl> S: Orphaned (Since 2017-01) -T: git git://git.denx.de/u-boot-onenand.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-onenand.git F: drivers/mtd/onenand/ PATMAN @@ -637,7 +637,7 @@ F: tools/patman/ POWER M: Jaehoon Chung <jh80.chung(a)samsung.com> S: Maintained -T: git git://git.denx.de/u-boot-pmic.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-pmic.git F: drivers/power/ POWERPC @@ -648,13 +648,13 @@ F: arch/powerpc/ POWERPC MPC8XX M: Christophe Leroy <christophe.leroy(a)c-s.fr> S: Maintained -T: git git://git.denx.de/u-boot-mpc8xx.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-mpc8xx.git F: arch/powerpc/cpu/mpc8xx/ POWERPC MPC83XX M: Mario Six <mario.six(a)gdsys.cc> S: Maintained -T: git git://git.denx.de/u-boot-mpc83xx.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-mpc83xx.git F: drivers/ram/mpc83xx_sdram.c F: include/dt-bindings/memory/mpc83xx-sdram.h F: drivers/sysreset/sysreset_mpc83xx.c @@ -672,19 +672,19 @@ F: arch/powerpc/include/asm/arch-mpc83xx/ POWERPC MPC85XX M: Prabhakar Kushwaha <prabhakar.kushwaha(a)nxp.com> S: Maintained -T: git git://git.denx.de/u-boot-mpc85xx.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-mpc85xx.git F: arch/powerpc/cpu/mpc85xx/ POWERPC MPC86XX M: Prabhakar Kushwaha <prabhakar.kushwaha(a)nxp.com> S: Maintained -T: git git://git.denx.de/u-boot-mpc86xx.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-mpc86xx.git F: arch/powerpc/cpu/mpc86xx/ RISC-V M: Rick Chen <rick(a)andestech.com> S: Maintained -T: git git://git.denx.de/u-boot-riscv.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-riscv.git F: arch/riscv/ F: cmd/riscv/ F: tools/prelink-riscv.c @@ -704,13 +704,13 @@ F: arch/sandbox/ SH M: Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> S: Maintained -T: git git://git.denx.de/u-boot-sh.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-sh.git F: arch/sh/ SPI M: Jagan Teki <jagan(a)amarulasolutions.com> S: Maintained -T: git git://git.denx.de/u-boot-spi.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-spi.git F: drivers/spi/ F: include/spi* @@ -772,25 +772,25 @@ UBI M: Kyungmin Park <kmpark(a)infradead.org> M: Heiko Schocher <hs(a)denx.de> S: Maintained -T: git git://git.denx.de/u-boot-ubi.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-ubi.git F: drivers/mtd/ubi/ USB M: Marek Vasut <marex(a)denx.de> S: Maintained -T: git git://git.denx.de/u-boot-usb.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-usb.git F: drivers/usb/ USB xHCI M: Bin Meng <bmeng.cn(a)gmail.com> S: Maintained -T: git git://git.denx.de/u-boot-usb.git topic-xhci +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-usb.git topic-xhci F: drivers/usb/host/xhci* VIDEO M: Anatolij Gustschin <agust(a)denx.de> S: Maintained -T: git git://git.denx.de/u-boot-video.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-video.git F: drivers/video/ F: common/lcd*.c F: include/lcd*.h @@ -800,7 +800,7 @@ X86 M: Simon Glass <sjg(a)chromium.org> M: Bin Meng <bmeng.cn(a)gmail.com> S: Maintained -T: git git://git.denx.de/u-boot-x86.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-x86.git F: arch/x86/ F: cmd/x86/ @@ -814,7 +814,7 @@ M: Tom Rini <trini(a)konsulko.com> L: u-boot(a)lists.denx.de Q: http://patchwork.ozlabs.org/project/uboot/list/ S: Maintained -T: git git://git.denx.de/u-boot.git +T: git https://gitlab.denx.de/u-boot/u-boot.git F: configs/tools-only_defconfig F: * F: */ -- 2.7.4

2 1

[U-Boot] [PATCH] armv8: fix typo in LINUX_KERNEL_IMAGE_HEADER check
by Mian Yousaf Kaukab 21 Jun '19

21 Jun '19

Fixes: 8163faf952 ARMv8: add optional Linux kernel image header Signed-off-by: Mian Yousaf Kaukab <ykaukab(a)suse.de> --- 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 fe52166e28..99d126660d 100644 --- a/arch/arm/cpu/armv8/start.S +++ b/arch/arm/cpu/armv8/start.S @@ -18,7 +18,7 @@ .globl _start _start: -#if defined(LINUX_KERNEL_IMAGE_HEADER) +#if defined(CONFIG_LINUX_KERNEL_IMAGE_HEADER) #include <asm/boot0-linux-kernel-header.h> #elif defined(CONFIG_ENABLE_ARM_SOC_BOOT0_HOOK) /* -- 2.11.0

4 3

[U-Boot] [PATCH] fw_env: Add missing write failure check
by Alex Kiernan 21 Jun '19

21 Jun '19

If flash_write fails, whilst we propagate this up to our caller, we need to avoid swapping in the new file (if we're on a filesystem) in this case. Fixes: dbc34323796b ("tools: env: Implement atomic replace for filesystem") Signed-off-by: Alex Kiernan <alex.kiernan(a)gmail.com> --- tools/env/fw_env.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index cfada0ee1157..eef12dd2b757 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -1317,7 +1317,7 @@ static int flash_io_write(int fd_current) rc = -1; } - if (target_temp) { + if (rc >= 0 && target_temp) { int dir_fd; dir_fd = open(dname, O_DIRECTORY | O_RDONLY); -- 2.17.1

2 1