July 2018 - U-Boot

[U-Boot] [PATCH 0/8] i.MX: Add initial CLK support
by Jagan Teki 31 Jul '18

31 Jul '18

This is first version for previous RFC[1] and on top of fec_mxc series [2] One of the blocking area where fec_mxc is unlikely to move dm can be CLK support, this series trying to add support for it and concentrated on ENET clocking for i.MX6QDL and i.MX6UL. Tested on i.MX6QDL For i.MX6UL, need clearing gpr1[13] for fec1. any suggestion how we can handle this in CLK driver? Changes for v1: - Set ENET_50MHZ directly from CLK diriver. [2] https://patchwork.ozlabs.org/cover/950886/ [1] https://patchwork.ozlabs.org/cover/941549/ Jagan Teki (8): clk: Kconfig: Ascending order to sub directiory kconfigs clk: Add DM CLK driver template for i.MX6QDL clk: imx: imx6q: Implement ENET clocks clk: imx: imx6ul: Implement ENET clocks clk: Add generic_clk_valid net: fec_mxc: Add clock support via CLK imx6ul: engicam: Enable CLK_IMX configs: icorem6_rqs: Enable CLK_IMX arch/arm/mach-imx/mx6/Kconfig | 1 + configs/imx6qdl_icore_rqs_defconfig | 1 + drivers/clk/Kconfig | 9 +-- drivers/clk/Makefile | 1 + drivers/clk/imx/Kconfig | 25 ++++++++ drivers/clk/imx/Makefile | 8 +++ drivers/clk/imx/clk_imx6q.c | 86 +++++++++++++++++++++++++++ drivers/clk/imx/clk_imx6ul.c | 92 +++++++++++++++++++++++++++++ drivers/net/fec_mxc.c | 58 +++++++++++++++++- drivers/net/fec_mxc.h | 5 ++ drivers/video/ipu_common.c | 8 +++ include/clk-uclass.h | 10 ++++ 12 files changed, 299 insertions(+), 5 deletions(-) create mode 100644 drivers/clk/imx/Kconfig create mode 100644 drivers/clk/imx/Makefile create mode 100644 drivers/clk/imx/clk_imx6q.c create mode 100644 drivers/clk/imx/clk_imx6ul.c -- 2.18.0.321.gffc6fa0e3

2 13

[U-Boot] [PATCH] tpmv2: Make it select CMD_LOG
by Tom Rini 30 Jul '18

30 Jul '18

The TPMv2 code requires the log functionality, so select it. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- cmd/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/cmd/Kconfig b/cmd/Kconfig index 6a471020f844..ef43ed8dda45 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1544,6 +1544,7 @@ config CMD_TPM_V1 config CMD_TPM_V2 bool + select CMD_LOG config CMD_TPM bool "Enable the 'tpm' command" -- 2.7.4

1 1

[U-Boot] [PATCH] tools: genboardscfg: move buildman path to first
by Peng Fan 30 Jul '18

30 Jul '18

To system which has kconfiglib installed, genboardscfg will use system kconfiglib, we need it use U-Boot owned version, so move the buildman path to first. Signed-off-by: Peng Fan <peng.fan(a)nxp.com> Cc: Masahiro Yamada <yamada.m(a)jp.panasonic.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Tom Rini <trini(a)konsulko.com> --- tools/genboardscfg.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/genboardscfg.py b/tools/genboardscfg.py index 0648472af0..e9bbd15e15 100755 --- a/tools/genboardscfg.py +++ b/tools/genboardscfg.py @@ -24,7 +24,7 @@ import sys import tempfile import time -sys.path.append(os.path.join(os.path.dirname(__file__), 'buildman')) +sys.path.insert(1, os.path.join(os.path.dirname(__file__), 'buildman')) import kconfiglib ### constant variables ### -- 2.14.1

4 5

[U-Boot] [PATCH v2 1/5] common: Log should depends on DM not be selected by DM
by Michal Simek 30 Jul '18

30 Jul '18

Better use depends on instead of select. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> Reviewed-by: Tom Rini <trini(a)konsulko.com> --- Changes in v2: None I found this in connection to setup imply CMD_DM and it seems to not standard that it is selecting DM which is not used anywhere else. --- common/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/Kconfig b/common/Kconfig index 81e88ea77c17..eae5d80cc71b 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -428,7 +428,7 @@ menu "Logging" config LOG bool "Enable logging support" - select DM + depends on DM help This enables support for logging of status and debug messages. These can be displayed on the console, recorded in a memory buffer, or -- 1.9.1

4 18

[U-Boot] [PATCH v5] u-boot: remove driver lookup loop from env_save()
by Nicholas Faustini 30 Jul '18

30 Jul '18

When called with ENVOP_SAVE, env_get_location() only returns the gd->env_load_location variable without actually checking for the environment location and priority. This behaviour causes env_save() to fall into an infinite loop when the low-level drv->save() call fails. The env_save() function should not loop through the environment location list but it should save the environment into the location stored in gd->env_load_location by the last env_load() call. Signed-off-by: Nicholas Faustini <nicholas.faustini(a)azcomtech.com> Reviewed-by: Simon Goldschmidt <sgoldschmidt(a)de.pepperl-fuchs.com> --- Changes in v5: - Correction to 'Reviewed-by' tag Changes in v4: - Remove env_load_location from gd_t since it is not used anymore Changes in v3: - Add comment when env_load() fails and the env location is restored - Introduce env_load_prio into gd struct. It stores the current priority of the environment location. Refactor of env_get_location() which acts the same on all the 'env_operation' Changes in v2: - Restore gd->env_load_location to the highest priority location when env_load() fails env/env.c | 34 ++++++++++++++++------------------ include/asm-generic/global_data.h | 2 +- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/env/env.c b/env/env.c index 5c0842a..e033b46 100644 --- a/env/env.c +++ b/env/env.c @@ -119,21 +119,12 @@ static void env_set_inited(enum env_location location) */ __weak enum env_location env_get_location(enum env_operation op, int prio) { - switch (op) { - case ENVOP_GET_CHAR: - case ENVOP_INIT: - case ENVOP_LOAD: - if (prio >= ARRAY_SIZE(env_locations)) - return ENVL_UNKNOWN; - - gd->env_load_location = env_locations[prio]; - return gd->env_load_location; - - case ENVOP_SAVE: - return gd->env_load_location; - } + if (prio >= ARRAY_SIZE(env_locations)) + return ENVL_UNKNOWN; + + gd->env_load_prio = prio; - return ENVL_UNKNOWN; + return env_locations[prio]; } @@ -205,22 +196,29 @@ int env_load(void) return 0; } + /* + * In case of invalid environment, we set the 'default' env location + * to the highest priority. In this way, next calls to env_save() + * will restore the environment at the right place. + */ + env_get_location(ENVOP_LOAD, 0); + return -ENODEV; } int env_save(void) { struct env_driver *drv; - int prio; - for (prio = 0; (drv = env_driver_lookup(ENVOP_SAVE, prio)); prio++) { + drv = env_driver_lookup(ENVOP_SAVE, gd->env_load_prio); + if (drv) { int ret; if (!drv->save) - continue; + return -ENODEV; if (!env_has_inited(drv->location)) - continue; + return -ENODEV; printf("Saving Environment to %s... ", drv->name); ret = drv->save(); diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h index 0fd4900..c83fc01 100644 --- a/include/asm-generic/global_data.h +++ b/include/asm-generic/global_data.h @@ -50,7 +50,7 @@ typedef struct global_data { unsigned long env_addr; /* Address of Environment struct */ unsigned long env_valid; /* Environment valid? enum env_valid */ unsigned long env_has_init; /* Bitmask of boolean of struct env_location offsets */ - int env_load_location; + int env_load_prio; /* Priority of the loaded environment */ unsigned long ram_base; /* Base address of RAM used by U-Boot */ unsigned long ram_top; /* Top address of RAM used by U-Boot */ -- 2.7.4

6 6

[U-Boot] [PATCH] Kconfig: Remove trailing whitespaces in prompt
by Michal Simek 30 Jul '18

30 Jul '18

Remove additional trailing whitespaces in prompt reported by kconfiglib: warning: DM_PMIC_SANDBOX (defined at drivers/power/pmic/Kconfig:133) has leading or trailing whitespace in its prompt warning: <choice> (defined at dts/Kconfig:204) has leading or trailing whitespace in its prompt Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- drivers/power/pmic/Kconfig | 2 +- dts/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/power/pmic/Kconfig b/drivers/power/pmic/Kconfig index d504c28b77fc..cba48e12da46 100644 --- a/drivers/power/pmic/Kconfig +++ b/drivers/power/pmic/Kconfig @@ -131,7 +131,7 @@ config PMIC_S2MPS11 Binding info: doc/device-tree-bindings/pmic/s2mps11.txt config DM_PMIC_SANDBOX - bool "Enable Driver Model for emulated Sandbox PMIC " + bool "Enable Driver Model for emulated Sandbox PMIC" depends on DM_PMIC ---help--- Enable the driver for Sandbox PMIC emulation. The emulated PMIC device diff --git a/dts/Kconfig b/dts/Kconfig index a1a92f2bbd41..43f85c2f6f44 100644 --- a/dts/Kconfig +++ b/dts/Kconfig @@ -202,7 +202,7 @@ config SPL_MULTI_DTB_FIT_NO_COMPRESSION endchoice choice - prompt "Location of uncompressed DTBs " + prompt "Location of uncompressed DTBs" depends on (SPL_MULTI_DTB_FIT_GZIP || SPL_MULTI_DTB_FIT_LZO) default SPL_MULTI_DTB_FIT_DYN_ALLOC if SYS_MALLOC_F -- 1.9.1

3 2

[U-Boot] [PATCH] Revert "fdt_support: Use CONFIG_NR_DRAM_BANKS if defined"
by Ramon Fried 30 Jul '18

30 Jul '18

This reverts commit 5e5745465c94605720295fab942eacbdd215db90. The reverted commit didn't support the scenario where there are less DRAM banks in U-Boot than in Linux. Also, it didn't introduce any new functionality, only limitaion. User could just increase MEMORY_BANKS_MAX if it's too small. --- common/fdt_support.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/common/fdt_support.c b/common/fdt_support.c index 812eca8173..26f50a94ee 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -409,11 +409,7 @@ static int fdt_pack_reg(const void *fdt, void *buf, u64 *address, u64 *size, return p - (char *)buf; } -#ifdef CONFIG_NR_DRAM_BANKS -#define MEMORY_BANKS_MAX CONFIG_NR_DRAM_BANKS -#else #define MEMORY_BANKS_MAX 4 -#endif int fdt_fixup_memory_banks(void *blob, u64 start[], u64 size[], int banks) { int err, nodeoffset; -- 2.18.0

3 2

[U-Boot] [PATCH] configs: omap3_logic: Remove USB Storage and enable CONFIG_BLK
by Adam Ford 30 Jul '18

30 Jul '18

With the pending requirement for CONFIG_BLK, this patch removes the USB_STORAGE option which assumes that DM_USB is enabled, but isn't yet available for the omap2340 musb glue among other issues. Once the USB issues are resolved, a future patch can enable them again. Signed-off-by: Adam Ford <aford173(a)gmail.com> diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig index cd8ffd5adf..d902fe3498 100644 --- a/configs/omap3_logic_defconfig +++ b/configs/omap3_logic_defconfig @@ -30,7 +30,6 @@ CONFIG_SPL_OF_CONTROL=y CONFIG_SPL_OF_PLATDATA=y # CONFIG_ENV_IS_IN_FAT is not set CONFIG_ENV_IS_IN_NAND=y -# CONFIG_BLK is not set CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0x82000000 CONFIG_DM_I2C=y @@ -57,7 +56,6 @@ CONFIG_USB_OMAP3=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_MUSB_OMAP2PLUS=y CONFIG_TWL4030_USB=y -CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="TI" CONFIG_USB_GADGET_VENDOR_NUM=0x0451 -- 2.17.1

2 1

[U-Boot] [PATCH 1/1] drivers: rtc: correctly set week day for mc146818
by Heinrich Schuchardt 30 Jul '18

30 Jul '18

The driver sets the weekday incorrectly when called by the 'date set' command. Sunday is 1, Saturday is 7 unlike in U-Boot (see data sheet https://www.nxp.com/docs/en/data-sheet/MC146818.pdf, table 3). Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- drivers/rtc/mc146818.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/rtc/mc146818.c b/drivers/rtc/mc146818.c index 744c0f4d75..b98c39d821 100644 --- a/drivers/rtc/mc146818.c +++ b/drivers/rtc/mc146818.c @@ -143,7 +143,8 @@ static int mc146818_set(struct rtc_time *tmp) mc146818_write8(RTC_YEAR, bin2bcd(tmp->tm_year % 100)); mc146818_write8(RTC_MONTH, bin2bcd(tmp->tm_mon)); - mc146818_write8(RTC_DAY_OF_WEEK, bin2bcd(tmp->tm_wday)); + /* Sunday = 1, Saturday = 7 */ + mc146818_write8(RTC_DAY_OF_WEEK, bin2bcd(tmp->tm_wday + 1)); mc146818_write8(RTC_DATE_OF_MONTH, bin2bcd(tmp->tm_mday)); mc146818_write8(RTC_HOURS, bin2bcd(tmp->tm_hour)); mc146818_write8(RTC_MINUTES, bin2bcd(tmp->tm_min)); -- 2.18.0

2 1

[U-Boot] [PATCH v2 0/7] Allow both TPM stacks to be compiled at the same time
by Miquel Raynal 30 Jul '18

30 Jul '18

It was first decided that the user would choose the TPM version (1.x or 2.x) that he wants to use at compile time. After some time the decision has been made to change this and allow both stacks (and drivers) to be compiled at the same time. The primary benefit would be to be able to compile the maximum of code with only one Sandbox configuration. This series removes this limitation by creating a 'tpm2' command (instead of two commands named 'tpm'). While test suites must be updated to use 'tpm2' instead of 'tpm' (in case both stacks are compiled), the user will not have to change anything as U-Boot prompt will find the closest matching command by default. In the TPM private data a version entry is added, updated by TPMv2 drivers in the ->set_version() hook added in the uclass. This has been tested with the tpm2.py test suite on Sandbox with either only the V1, only the V2 and with both versions selected. Thanks, Miquèl Changes since v1: ================= * Added Simon's Reviewed-by tags. * Added a patch to remove TPM_DRIVER_SELECTED stale symbol from Kconfig. * s/int rc/int ret/ * Removed conditionals from the code. * Moved the TPM stack version selection in the probe, removed the ->set_version() helper. Miquel Raynal (7): tpm: fix typo in kernel doc tpm: compile Sandbox driver by default tpm: remove stale symbol in Kconfig tpm: allow TPM v1 and v2 to be compiled at the same time test/py: tpm2: switch from 'tpm' to 'tpm2' command tpm: make TPM_V2 be compiled by default sandbox: compile both TPM stack versions and drivers cmd/tpm-common.c | 24 +++++++++++++++++++++++- cmd/tpm-v1.c | 2 +- cmd/tpm-v2.c | 4 ++-- configs/sandbox_defconfig | 3 +++ drivers/tpm/Kconfig | 13 +++++-------- drivers/tpm/tpm-uclass.c | 3 --- drivers/tpm/tpm2_tis_sandbox.c | 3 +++ drivers/tpm/tpm2_tis_spi.c | 4 ++++ include/tpm-common.h | 42 +++++++++++++++++++++++++++++++++++------- test/py/tests/test_tpm2.py | 40 ++++++++++++++++++++-------------------- 10 files changed, 96 insertions(+), 42 deletions(-) -- 2.14.1

3 16