December 2018 - U-Boot

[U-Boot] [PATCH] arm: K3: Fix usage of CONFIG_SYS_K3_KEY
by Lokesh Vutla 27 Dec '18

27 Dec '18

For signing the tiboot3.bin image, an optional KEY file can be passed using CONFIG_SYS_K3_KEY. Right now, Makefile scripts directly takes the config value and uses it for signing. This is okay if the build directory is a sub-directory of source tree, otherwise it fails. Fix it by using the path relative to the source tree. Reported-by: Jean-Jacques Hiblot <jjhiblot(a)ti.com> Signed-off-by: Lokesh Vutla <lokeshvutla(a)ti.com> --- arch/arm/mach-k3/config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-k3/config.mk b/arch/arm/mach-k3/config.mk index 7fc0b3f357..be00d79fb0 100644 --- a/arch/arm/mach-k3/config.mk +++ b/arch/arm/mach-k3/config.mk @@ -37,7 +37,7 @@ cmd_gencert = cat $(srctree)/tools/k3_x509template.txt | sed $(SED_OPTS) > u-boo ifeq ($(CONFIG_SYS_K3_KEY), "") KEY=u-boot-spl-eckey.pem else -KEY=$(patsubst "%",%,$(CONFIG_SYS_K3_KEY)) +KEY=$(patsubst "%",$(srctree)/%,$(CONFIG_SYS_K3_KEY)) endif u-boot-spl-eckey.pem: FORCE -- 2.19.2

2 1

[U-Boot] [PATCH] api: storage: Fix enumeration of storage devices
by Cristian Ciocaltea 27 Dec '18

27 Dec '18

dev_stor_get() is not able to find the next available device in the current storage group when the previous enumerated device belongs to a different group or class (e.g. network). The root cause is the device group iterator not being reset after an unsuccessful search for the last returned device so that the following search for the next available device will start from beginning. The issue has been identified by loading and booting GRUB in a QEMU vexpress-a9 environment. Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea(a)iquestgroup.com> --- api/api_storage.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/api/api_storage.c b/api/api_storage.c index 8aeeda2715..2b90c18aae 100644 --- a/api/api_storage.c +++ b/api/api_storage.c @@ -99,6 +99,7 @@ static int dev_stor_get(int type, int *more, struct device_info *di) { struct blk_desc *dd; int found = 0; + int found_last = 0; int i = 0; /* Wasn't configured for this type, return 0 directly */ @@ -111,9 +112,13 @@ static int dev_stor_get(int type, int *more, struct device_info *di) if (di->cookie == (void *)blk_get_dev(specs[type].name, i)) { i += 1; + found_last = 1; break; } } + + if (!found_last) + i = 0; } for (; i < specs[type].max_dev; i++) { -- 2.17.1

2 1

[U-Boot] [PATCH V2] ARM: mach-omap2: omap3: Fix GPIO clocking in SPL
by Adam Ford 27 Dec '18

27 Dec '18

OMAP3_GPIO_x is needed to enable each GPIO bank on the OMAP3 boards. At one point, the #ifdef's were replaced with if CONFIG_IS_ENABLED but this won't work for people who need OMAP3_GPIO_x in SPL since the SPL prefix for this option isn't used in Kconfig. This patch moves the check to #if defined and also makes Kconfig select the banks if CMD_GPIO is used which makes the checks in the code less cumbersome. Fixes: bd8a9c14c91c ("arm: mach-omap2/omap3/clock.c: Enable all GPIO with CMD_GPIO") Reported-by: Liam O'Shaughnessy <liam.o.shaughnessy(a)gumstix.com> Signed-off-by: Adam Ford <aford173(a)gmail.com> --- V2: change if defined(OMAP3_GPIO_x) to include the CONFIG_ prefix diff --git a/arch/arm/mach-omap2/omap3/Kconfig b/arch/arm/mach-omap2/omap3/Kconfig index e0d02fb4e5..0286b0daa3 100644 --- a/arch/arm/mach-omap2/omap3/Kconfig +++ b/arch/arm/mach-omap2/omap3/Kconfig @@ -3,18 +3,23 @@ if OMAP34XX # We only enable the clocks for the GPIO banks that a given board requies. config OMAP3_GPIO_2 bool + default y if CMD_GPIO config OMAP3_GPIO_3 bool + default y if CMD_GPIO config OMAP3_GPIO_4 bool + default y if CMD_GPIO config OMAP3_GPIO_5 bool + default y if CMD_GPIO config OMAP3_GPIO_6 bool + default y if CMD_GPIO choice prompt "OMAP3 board select" diff --git a/arch/arm/mach-omap2/omap3/clock.c b/arch/arm/mach-omap2/omap3/clock.c index 9a03bfa9d3..cb9e91ebc3 100644 --- a/arch/arm/mach-omap2/omap3/clock.c +++ b/arch/arm/mach-omap2/omap3/clock.c @@ -750,23 +750,23 @@ void per_clocks_enable(void) setbits_le32(&prcm_base->iclken_per, 0x00000800); #endif -#if (CONFIG_IS_ENABLED(OMAP3_GPIO_2) || CONFIG_IS_ENABLED(CMD_GPIO)) +#if defined(CONFIG_OMAP3_GPIO_2) setbits_le32(&prcm_base->fclken_per, 0x00002000); setbits_le32(&prcm_base->iclken_per, 0x00002000); #endif -#if (CONFIG_IS_ENABLED(OMAP3_GPIO_3) || CONFIG_IS_ENABLED(CMD_GPIO)) +#if defined(CONFIG_OMAP3_GPIO_3) setbits_le32(&prcm_base->fclken_per, 0x00004000); setbits_le32(&prcm_base->iclken_per, 0x00004000); #endif -#if (CONFIG_IS_ENABLED(OMAP3_GPIO_4) || CONFIG_IS_ENABLED(CMD_GPIO)) +#if defined(CONFIG_OMAP3_GPIO_4) setbits_le32(&prcm_base->fclken_per, 0x00008000); setbits_le32(&prcm_base->iclken_per, 0x00008000); #endif -#if (CONFIG_IS_ENABLED(OMAP3_GPIO_5) || CONFIG_IS_ENABLED(CMD_GPIO)) +#if defined(CONFIG_OMAP3_GPIO_5) setbits_le32(&prcm_base->fclken_per, 0x00010000); setbits_le32(&prcm_base->iclken_per, 0x00010000); #endif -#if (CONFIG_IS_ENABLED(OMAP3_GPIO_6) || CONFIG_IS_ENABLED(CMD_GPIO)) +#if defined(CONFIG_OMAP3_GPIO_6) setbits_le32(&prcm_base->fclken_per, 0x00020000); setbits_le32(&prcm_base->iclken_per, 0x00020000); #endif -- 2.17.1

2 1

[U-Boot] [PATCH v2 1/1] tests: enable DT overlay tests by default
by Heinrich Schuchardt 27 Dec '18

27 Dec '18

Enable device tree overlay tests by default if unit tests are selected and the runtime is configured via device tree. Overlays have been mainlined in the device tree compiler so there is no reason anymore to disable the tests by default. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- We cannot select OF_LIBFDT_OVERLAY is OF_CONTROL is not enabled. --- test/overlay/Kconfig | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/test/overlay/Kconfig b/test/overlay/Kconfig index 13c85428cba..a4f154415db 100644 --- a/test/overlay/Kconfig +++ b/test/overlay/Kconfig @@ -1,11 +1,10 @@ config UT_OVERLAY bool "Enable Device Tree Overlays Unit Tests" - depends on OF_LIBFDT_OVERLAY - depends on UNIT_TEST + depends on UNIT_TEST && OF_CONTROL + default y + select OF_LIBFDT_OVERLAY help This enables the 'ut overlay' command which runs a series of unit tests on the fdt overlay code. If all is well then all tests pass although there will be a few messages printed along the way. - Be warned that it requires an out-of-tree dtc compiler with patches - to support the DT overlays, otherwise it will fail. -- 2.19.2

2 1

[U-Boot] [PATCH v1] scripts/check-config.sh: Add usage()
by Andy Shevchenko 27 Dec '18

27 Dec '18

When arguments are not supplied the error message is misleading and doesn't tell what exactly has to be done. Fix this by adding usage() and call it if above circumstance occurs. Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> --- scripts/check-config.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/scripts/check-config.sh b/scripts/check-config.sh index 4848ca6e25..583f7d0963 100755 --- a/scripts/check-config.sh +++ b/scripts/check-config.sh @@ -17,6 +17,15 @@ set -e set -u +PROG_NAME="${0##*/}" + +usage() { + echo "$PROG_NAME <path to u-boot.cfg> <path to whitelist file> <source dir>" + exit 1 +} + +[ $# -ge 3 ] || usage + path="$1" whitelist="$2" srctree="$3" -- 2.19.2

3 2

[U-Boot] [PATCH] spl: fix the new position of gd and stack
by Peng Donglin 27 Dec '18

27 Dec '18

If we enable CONFIG_SPL_SYS_MALLOC_SIMPLE and set CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN, the new gd and stack will inside malloc area,so there is a overwrite risk. We can place the new position of gd and stack under the malloc area to fix this issue. Signed-off-by: Peng Donglin <dolinux.peng(a)gmail.com> --- common/spl/spl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/spl/spl.c b/common/spl/spl.c index 292e659c9a..e85a153869 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -628,7 +628,7 @@ ulong spl_relocate_stack_gd(void) } #endif /* Get stack position: use 8-byte alignment for ABI compliance */ - ptr = CONFIG_SPL_STACK_R_ADDR - roundup(sizeof(gd_t),16); + ptr -= roundup(sizeof(gd_t), 16); new_gd = (gd_t *)ptr; memcpy(new_gd, (void *)gd, sizeof(gd_t)); #if CONFIG_IS_ENABLED(DM) -- 2.17.1

2 1

Re: [U-Boot] u-boot-rockchip: firefly-rk3288 hangs on: Loading Environment from MMC
by Vagrant Cascadian 27 Dec '18

27 Dec '18

On 2018-05-12, Vagrant Cascadian wrote: > On 2018-05-12, Vagrant Cascadian wrote: >> Booting firefly-rk3288 seems to hang looking for environment: >> >> U-Boot 2018.05+dfsg-1 (May 10 2018 - 20:24:57 +0000) >> >> Model: Firefly-RK3288 >> DRAM: 2 GiB >> MMC: dwmmc@ff0c0000: 1, dwmmc@ff0f0000: 0 >> Loading Environment from MMC... >> >> And just hangs there. I tried to bisect this, and got: commit 04a2ea248f58b3b6216d0cd0a6b8698df8b14355 Author: Jean-Jacques Hiblot <jjhiblot(a)ti.com> Date: Thu Sep 21 16:30:08 2017 +0200 mmc: disable UHS modes if Vcc cannot be switched on and off But it fails in a slightly different way: U-Boot 2018.01-00026-g04a2ea248f (May 21 2018 - 21:46:18 +0000) Model: Firefly-RK3288 DRAM: 2 GiB MMC: dwmmc@ff0c0000: 1, dwmmc@ff0f0000: 0 And just hangs without the "Loading Environment from MMC..." part... It is not a trivial revert on top of 2018.05, so I haven't been able to do that simple test. CONFIG_ENV_IS_IN_MMC has been enabled since at least: 5dc4dfd2a94 (Tom Rini 2017-08-28 07:16:32 -0400 36) CONFIG_ENV_IS_IN_MMC=y live well, vagrant

4 8

[U-Boot] [PATCH 1/3] include: configs: Add gunzip size for HiKey board
by Manivannan Sadhasivam 27 Dec '18

27 Dec '18

Default 8MB gunzip size is not enough to load the release kernel, hence fix 64MB size for uncompressing the kernel. Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam(a)linaro.org> --- include/configs/hikey.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/configs/hikey.h b/include/configs/hikey.h index 1376d6155d..572a52fad5 100644 --- a/include/configs/hikey.h +++ b/include/configs/hikey.h @@ -18,6 +18,8 @@ #define CONFIG_REMAKE_ELF +#define CONFIG_SYS_BOOTM_LEN SZ_64M + /* Physical Memory Map */ /* CONFIG_SYS_TEXT_BASE needs to align with where ATF loads bl33.bin */ -- 2.17.1

3 7

[U-Boot] [PATCH 0/6] mips: mscc: gpio: Add MSCC serial GPIO driver
by Lars Povlsen 27 Dec '18

27 Dec '18

This patch series add the GPIO device (SIO) in the MSCC VCoreIII-based SOCs, and enables it on the supported platforms. Lars Povlsen (6): mips: mscc_sgpio: Add the MSCC serial GPIO device (SIO) mips: mscc_sgpio: Add DT bindings documentation mips: luton: DT: Enable use of serial gpio mips: luton: Enable use of serial gpio for LED mips: ocelot: DT: Enable use of serial gpio mips: ocelot: Enable use of serial gpio for LED arch/mips/dts/luton_pcb090.dts | 23 ++ arch/mips/dts/luton_pcb091.dts | 26 ++ arch/mips/dts/mscc,luton.dtsi | 23 ++ arch/mips/dts/mscc,ocelot.dtsi | 25 ++ arch/mips/dts/ocelot_pcb120.dts | 76 ++++++ arch/mips/dts/ocelot_pcb123.dts | 25 ++ board/mscc/luton/luton.c | 6 + board/mscc/ocelot/ocelot.c | 6 + configs/mscc_luton_defconfig | 3 + configs/mscc_ocelot_defconfig | 3 + doc/device-tree-bindings/gpio/mscc_sgpio.txt | 39 +++ drivers/gpio/Kconfig | 11 + drivers/gpio/Makefile | 1 + drivers/gpio/mscc_sgpio.c | 252 +++++++++++++++++++ 14 files changed, 519 insertions(+) create mode 100644 doc/device-tree-bindings/gpio/mscc_sgpio.txt create mode 100644 drivers/gpio/mscc_sgpio.c -- 2.19.2

3 8

[U-Boot] [PATCH v2] net: macb: fix mapping of registers
by Ramon Fried 27 Dec '18

27 Dec '18

Some architectures (MIPS) needs mapping to access IOMEM. Fix that. Fixes: f1dcc19b213d ("net: macb: Convert to driver model") Signed-off-by: Ramon Fried <ramon.fried(a)gmail.com> --- v2: switched to use dev_reamp_addr() to reduce boilerplate code. (as suggested by Daniel Schwierzeck) drivers/net/macb.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/macb.c b/drivers/net/macb.c index 94c89c762b..ede1277901 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -1151,7 +1151,9 @@ static int macb_eth_ofdata_to_platdata(struct udevice *dev) { struct eth_pdata *pdata = dev_get_platdata(dev); - pdata->iobase = devfdt_get_addr(dev); + pdata->iobase = dev_remap_addr(dev); + if (!pdata->iobase) + return -EINVAL; return macb_late_eth_ofdata_to_platdata(dev); } -- 2.19.2

3 3