February 2018 - U-Boot

[U-Boot] [PATCH 1/2] core: add uclass_get_device_by_phandle_id() api
by Kever Yang 08 Feb '18

08 Feb '18

Add api for who can not get phandle from a device property. Signed-off-by: Kever Yang <kever.yang(a)rock-chips.com> --- drivers/core/uclass.c | 28 ++++++++++++++++++++++++++++ include/dm/uclass.h | 16 ++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/drivers/core/uclass.c b/drivers/core/uclass.c index f5e4067..dd7a89c 100644 --- a/drivers/core/uclass.c +++ b/drivers/core/uclass.c @@ -443,6 +443,34 @@ int uclass_get_device_by_ofnode(enum uclass_id id, ofnode node, } #if CONFIG_IS_ENABLED(OF_CONTROL) +int uclass_get_device_by_phandle_id(enum uclass_id id, int phandle_id, + struct udevice **devp) +{ + struct udevice *dev; + struct uclass *uc; + int ret; + + *devp = NULL; + ret = uclass_get(id, &uc); + if (ret) + return ret; + + ret = -ENODEV; + list_for_each_entry(dev, &uc->dev_head, uclass_node) { + uint phandle; + + phandle = dev_read_phandle(dev); + + if (phandle == phandle_id) { + *devp = dev; + ret = 0; + break; + } + } + + return uclass_get_device_tail(dev, ret, devp); +} + int uclass_get_device_by_phandle(enum uclass_id id, struct udevice *parent, const char *name, struct udevice **devp) { diff --git a/include/dm/uclass.h b/include/dm/uclass.h index 1818849..f3befe4 100644 --- a/include/dm/uclass.h +++ b/include/dm/uclass.h @@ -203,6 +203,22 @@ int uclass_get_device_by_ofnode(enum uclass_id id, ofnode node, struct udevice **devp); /** + * uclass_get_device_by_phandle_id() - Get a uclass device by phandle id + * + * This searches the devices in the uclass for one with the given phandle id. + * + * The device is probed to activate it ready for use. + * + * @id: uclass ID to look up + * @phandle_id: the phandle id to look up + * @devp: Returns pointer to device (there is only one for each node) + * @return 0 if OK, -ENODEV if there is no device match the phandle, other + * -ve on error + */ +int uclass_get_device_by_phandle_id(enum uclass_id id, int phandle_id, + struct udevice **devp) + +/** * uclass_get_device_by_phandle() - Get a uclass device by phandle * * This searches the devices in the uclass for one with the given phandle. -- 1.9.1

1 1

[U-Boot] [PATCH] doc: watchdog: Remove Blackfin related documentation entry
by Lukasz Majewski 08 Feb '18

08 Feb '18

This commit cleans up the README.watchdog by removing the reminescent of ADI's Blackfin architecture removed some time ago. Signed-off-by: Lukasz Majewski <lukma(a)denx.de> --- doc/README.watchdog | 3 --- 1 file changed, 3 deletions(-) diff --git a/doc/README.watchdog b/doc/README.watchdog index b66fd6cb8a..7097c8766b 100644 --- a/doc/README.watchdog +++ b/doc/README.watchdog @@ -31,6 +31,3 @@ CONFIG_IMX_WATCHDOG CONFIG_XILINX_TB_WATCHDOG Available for Xilinx Axi platforms to service timebase watchdog timer. - -CONFIG_BFIN_WATCHDOG - Available for bf5xx and bf6xx to service the watchdog. -- 2.11.0

2 1

[U-Boot] [PATCH 0/2] ARM: omap3: evm: Fix serial driver compiler warnings
by Derald D. Woods 08 Feb '18

08 Feb '18

This small series resolves compiler warnings that are generated when DM_SERIAL is enabled for OMAP3 boards using "include/configs/ti_omap3_common.h". Derald D. Woods (2): ARM: omap3: ti_omap3_common: Fix CONFIG_SYS_NS16550_REG_SIZE compiler warning ARM: omap3: evm: Remove CONFIG_SYS_NS16550_REG_SIZE undefine include/configs/omap3_evm.h | 3 --- include/configs/ti_omap3_common.h | 10 ++++++---- 2 files changed, 6 insertions(+), 7 deletions(-) -- 2.16.1

2 6

[U-Boot] [PATCH 1/2] ARM: k2g: Add pinmux data for QSPI on K2G ICE
by Vignesh R 08 Feb '18

08 Feb '18

Add pinmux for QSPI pins on K2G ICE board. Signed-off-by: Vignesh R <vigneshr(a)ti.com> --- board/ti/ks2_evm/mux-k2g.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/board/ti/ks2_evm/mux-k2g.h b/board/ti/ks2_evm/mux-k2g.h index 9e3fa1100331..f7d36d132ec8 100644 --- a/board/ti/ks2_evm/mux-k2g.h +++ b/board/ti/ks2_evm/mux-k2g.h @@ -338,6 +338,15 @@ struct pin_cfg k2g_ice_evm_pin_cfg[] = { /* I2C 0 */ { 223, MODE(0) }, /* SOC_I2C0_SCL */ { 224, MODE(0) }, /* SOC_I2C0_SDA */ + + /* QSPI */ + { 129, MODE(0) }, /* SOC_QSPI_CLK */ + { 130, MODE(0) }, /* SOC_QSPI_RTCLK */ + { 131, MODE(0) }, /* SOC_QSPI_D0 */ + { 132, MODE(0) }, /* SOC_QSPI_D1 */ + { 133, MODE(0) }, /* SOC_QSPI_D2 */ + { 134, MODE(0) }, /* SOC_QSPI_D3 */ + { 135, MODE(0) }, /* SOC_QSPI_CSN0 */ { MAX_PIN_N, } }; -- 2.16.1

2 3

[U-Boot] [PATCH 1/1] atcspi200: avoid possible NULL dereference
by Heinrich Schuchardt 08 Feb '18

08 Feb '18

Check if ns before and not after dereferencing it. Indicated by cppcheck. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- drivers/spi/atcspi200_spi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/spi/atcspi200_spi.c b/drivers/spi/atcspi200_spi.c index 3e29df03a4..5b2e9d6264 100644 --- a/drivers/spi/atcspi200_spi.c +++ b/drivers/spi/atcspi200_spi.c @@ -297,6 +297,8 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, return NULL; ns = spi_alloc_slave(struct nds_spi_slave, bus, cs); + if (!ns) + return NULL; switch (bus) { case SPI0_BUS: @@ -316,8 +318,6 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, ns->to = SPI_TIMEOUT; ns->max_transfer_length = MAX_TRANSFER_LEN; ns->slave.max_write_size = MAX_TRANSFER_LEN; - if (!ns) - return NULL; return &ns->slave; } -- 2.15.1

2 1

[U-Boot] [PATCH] part: Allocate only one legacy_mbr buffer
by Alexey Brodkin 08 Feb '18

08 Feb '18

Commit ff98cb90514d ("part: extract MBR signature from partitions") blindly switched allocated by ALLOC_CACHE_ALIGN_BUFFER buffer type from "unsigned char" to "legacy_mbr" which caused allocation of size = (typeof(legacy_mbr) * dev_desc->blksize) instead of just space enough for "legacy_mbr" structure. Signed-off-by: Alexey Brodkin <abrodkin(a)synopsys.com> Cc: Rob Clark <robdclark(a)gmail.com> Cc: Peter Jones <pjones(a)redhat.com> Cc: Alexander Graf <agraf(a)suse.de> Cc: Tom Rini <trini(a)konsulko.com> --- disk/part_dos.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/disk/part_dos.c b/disk/part_dos.c index 046f9bbb3d69..9dd086d3db06 100644 --- a/disk/part_dos.c +++ b/disk/part_dos.c @@ -90,7 +90,7 @@ static int test_block_type(unsigned char *buffer) static int part_test_dos(struct blk_desc *dev_desc) { #ifndef CONFIG_SPL_BUILD - ALLOC_CACHE_ALIGN_BUFFER(legacy_mbr, mbr, dev_desc->blksz); + ALLOC_CACHE_ALIGN_BUFFER(legacy_mbr, mbr, 1); if (blk_dread(dev_desc, 0, 1, (ulong *)mbr) != 1) return -1; -- 2.14.3

2 1

[U-Boot] [PATCH 0/2] Android and arm64 improvement
by Bin Chen 08 Feb '18

08 Feb '18

I rebased the two patches submitted (quite )a while ago on top of current U-boot master fb4413295c765aa8c013650984dc2d908964c81d (and there were no conflicts). The first patch added the support of parsing the second area of Android image so that it can be used for good. On Poplar board, we are using that area for dtb. The first patch shouldn't impact any functionality since it is new. The second patch moves the booti_setup out of booti.c. It was the result of a discusion[1] how to better support the arm64 Android image. I have boot tested it on Poplar board[2] with additional patch[3] that is built on top of the booti. I have hacked version of using bootm but it seems quit mess up - need lots of changes in different places ("Shotgun Surgery") to handle Android specific and/or arm64 specific code. Now, I feel a separate bootandroid command might be a cleaner solution. That being said, the second patch doesn't depend on or impact any change we might have in the future for better Android support. [1] https://lists.denx.de/pipermail/u-boot/2017-July/297933.html [2] https://github.com/96boards-poplar/Documentation [3] https://github.com/pierrchen/u-boot/commit/8463e6177654026746161487d0f0bd89… Bin Chen (2): parse the second area of android image move booti_setup to arch/arm/lig/image.c arch/arm/lib/Makefile | 2 +- arch/arm/lib/image.c | 76 +++++++++++++++++++++++++++++++++++++++++ cmd/booti.c | 92 +++++++------------------------------------------- common/image-android.c | 19 +++++++++++ include/image.h | 11 ++++++ 5 files changed, 120 insertions(+), 80 deletions(-) create mode 100644 arch/arm/lib/image.c -- 2.15.0

3 8

[U-Boot] [PATCH 0/5] Add 3GiB DRAM support to 64-bit Allwinner SoCs
by Icenowy Zheng 08 Feb '18

08 Feb '18

Allwinner 64-bit SoCs have allocated 3GiB space in the memory map for DRAM. If memory bigger than 3GiB is installed (as memory usually come as pow of 2 and they are not known to support 3GiB LPDDR3 modules, it means 4GiB memory is installed), the whole 3GiB space can be all used. However, in many situations we still only defined 2GiB for the DRAM. Add support for 3GiB DRAM. Tested on a customized Pine A64-LTS with 4GiB LPDDR3 memory installed. Icenowy Zheng (5): sunxi: map DRAM part with 3G size sunxi: add Kconfig option for the maximum accessible DRAM sunxi: add 3GiB DRAM detection support in main U-Boot sunxi: let sunxi_dram_init return unsigned long long sunxi: restrict the ram_size to the accessible range in SPL arch/arm/include/asm/arch-sunxi/dram.h | 2 +- arch/arm/mach-sunxi/Kconfig | 7 +++++++ arch/arm/mach-sunxi/board.c | 2 +- arch/arm/mach-sunxi/dram_sun6i.c | 2 +- arch/arm/mach-sunxi/dram_sun8i_a23.c | 2 +- arch/arm/mach-sunxi/dram_sun8i_a33.c | 2 +- arch/arm/mach-sunxi/dram_sun8i_a83t.c | 2 +- arch/arm/mach-sunxi/dram_sun9i.c | 4 ++-- arch/arm/mach-sunxi/dram_sunxi_dw.c | 4 ++-- board/sunxi/board.c | 36 ++++++++++++++++++++++++++++++++-- board/sunxi/dram_sun4i_auto.c | 2 +- board/sunxi/dram_sun5i_auto.c | 2 +- include/configs/sunxi-common.h | 2 +- 13 files changed, 54 insertions(+), 15 deletions(-) -- 2.15.1

3 14

Re: [U-Boot] [PATCH v3 09/15] env: Support multiple environments
by Goldschmidt Simon 08 Feb '18

08 Feb '18

On 02/07/2018 21:18, York Sun wrote: > On 02/07/2018 12:43 AM, Maxime Ripard wrote: >> Hi, >> >> On Tue, Jan 30, 2018 at 11:02:49PM +0000, York Sun wrote: >>> On 01/30/2018 12:16 PM, York Sun wrote: >>>> On 01/30/2018 11:40 AM, York Sun wrote: >>>>> On 01/30/2018 12:19 AM, Simon Goldschmidt wrote: >>>>>> On 23.01.2018 21:16, Maxime Ripard wrote: >>>>>>> Now that we have everything in place to support multiple environment, let's >>>>>>> make sure the current code can use it. >>>>>>> >>>>>>> The priority used between the various environment is the same one that was >>>>>>> used in the code previously. >>>>>>> >>>>>>> At read / init times, the highest priority environment is going to be >>>>>>> detected, >>>>>> >>>>>> Does priority handling really work here? Most env drivers seem to ignore >>>>>> the return value of env_import and may thus return success although >>>>>> importing the environment failed (only reading the data from the device >>>>>> succeeded). >>>>>> >>>>>> This is from reading the code, I haven't had a chance to test this, yet. >>>>> >>>>> It is broken on my LS1043ARDB with simply NOR flash. I am trying to >>>>> determine what went wrong. >>>>> >>>> >>>> I found the problem. The variable "env_load_location" is static. It is >>>> probably not write-able during booting from flash. It is expected to be >>>> set during ENVOP_INIT. But if I print this variable, it has >>>> ENVL_UNKNOWN. I can make it work by moving env_load_location to global >>>> data structure. >> >> That would work for me. >> >>>> That being said, this addition of multiple environments really slows >>>> down the booting process for me. I see every time env_get_char() is >>>> called, env_driver_lookup() runs. A simple call of env_get_f() gets >>>> slowed down dramatically. I didn't find out where the most time is spent >>>> yet. >>>> >>>> Does anyone else experience this unbearable slowness? >>>> >>> >>> I found the problem. In patch #3 in this series, the default get_char() >>> was dropped so there is no driver for a plain NOR flash. A quick (and >>> maybe dirty) fix is this >>> >>> >>> diff --git a/env/env.c b/env/env.c >>> index edfb575..210bae2 100644 >>> --- a/env/env.c >>> +++ b/env/env.c >>> @@ -159,7 +159,7 @@ int env_get_char(int index) >>> int ret; >>> >>> if (!drv->get_char) >>> - continue; >>> + return *(uchar *)(gd->env_addr + index); >>> >>> if (!env_has_inited(drv->location)) >>> continue; >> >> And this too. > > If you agree with this fix (actually revert your change earlier), I can > send out a patch. I still think we should get rid of the 'get_char' callback for the env drivers. While that could have made sense for some boards before the conversion to multiple environments (although I doubt that, as the environment is *not* checked for validity in this call), its meaning is totally lost when having multiple env drivers active. The whole purpose of multiple env drivers is that we select a valid driver in the 'load' callback. How could we possibly know that the 'get_char' callback of the highest prio env driver is what we want? I'd rather make 'env_get_char' weak and let boards decide if they really want this behaviour. A quick search through the current code base shows me *no* usage of 'get_char' in nvram.c (CONFIG_SYS_NVRAM_ACCESS_ROUTINE is never defined) and only 7 defconfigs that use ENV_IS_IN_EEPROM: imx31_phycore_defconfig imx31_phycore_eet_defconfig km_kirkwood_128m16_defconfig km_kirkwood_defconfig km_kirkwood_pci_defconfig mgcoge3un_defconfig portl2_defconfig Are these seven boards worth keeping this feature? Simon >> >>> With this temporary fix, my flash chip works again and I can boot all >>> the way up in a timely manner. I still don't like to call >>> env_driver_lookup() thousands of times to get a simple env variable. >>> >>> Can Maxime post a quick post soon? >> >> Given that you already made all the debugging, and the patches, and I >> have no way to test, I guess it would make more sense if you did it :) > > Yes, I have tested on my boards. I will send out this patch. > > York

3 2

[U-Boot] [PATCH v2 00/12] Add NX25 to support RISC-V
by Andes 08 Feb '18

08 Feb '18

From: Rick Chen <rick(a)andestech.com> Changelog v2: - Patch 5/12 : Changes - Patch 9/12 : Changes - Others : No changed [Patch 5/12] riscv: Add Kconfig to support RISC-V - Modify the top-level MAINTAINERS for RISC-V [Patch 9/12] riscv: tools: Prelink u-boot - Add license information. Rick Chen (12): riscv: cpu: Add nx25 to support RISC-V riscv: nx25: lib: Add relative lib funcs to support RISC-V riscv: nx25: dts: Add AE250 dts to support RISC-V riscv: nx25: include: Add header files to support RISC-V riscv: Add Kconfig to support RISC-V riscv: board: Add nx25-ae250 to support RISC-V riscv: configs: Add nx25-ae250.h to support RISC-V riscv: defconfig: Add nx25-ae250 defconfig to support RISC-V riscv: tools: Prelink u-boot riscv: Support standalone riscv: Modify generic codes to support RISC-V riscv: doc: Add relative doc to describe RISC-V MAINTAINERS | 7 + Makefile | 4 + README | 19 +- arch/Kconfig | 5 + arch/riscv/Kconfig | 42 +++ arch/riscv/Makefile | 11 + arch/riscv/config.mk | 33 +++ arch/riscv/cpu/nx25/Makefile | 10 + arch/riscv/cpu/nx25/cpu.c | 33 +++ arch/riscv/cpu/nx25/start.S | 291 +++++++++++++++++++ arch/riscv/cpu/nx25/u-boot.lds | 69 +++++ arch/riscv/dts/Makefile | 14 + arch/riscv/dts/ae250.dts | 96 +++++++ arch/riscv/include/asm/bitops.h | 172 +++++++++++ arch/riscv/include/asm/bootm.h | 65 +++++ arch/riscv/include/asm/byteorder.h | 35 +++ arch/riscv/include/asm/cache.h | 22 ++ arch/riscv/include/asm/config.h | 13 + arch/riscv/include/asm/encoding.h | 188 ++++++++++++ arch/riscv/include/asm/global_data.h | 22 ++ arch/riscv/include/asm/io.h | 494 ++++++++++++++++++++++++++++++++ arch/riscv/include/asm/linkage.h | 12 + arch/riscv/include/asm/mach-types.h | 30 ++ arch/riscv/include/asm/posix_types.h | 89 ++++++ arch/riscv/include/asm/processor.h | 26 ++ arch/riscv/include/asm/ptrace.h | 106 +++++++ arch/riscv/include/asm/sections.h | 11 + arch/riscv/include/asm/setup.h | 191 ++++++++++++ arch/riscv/include/asm/string.h | 43 +++ arch/riscv/include/asm/system.h | 18 ++ arch/riscv/include/asm/types.h | 64 +++++ arch/riscv/include/asm/u-boot-riscv.h | 21 ++ arch/riscv/include/asm/u-boot.h | 46 +++ arch/riscv/include/asm/unaligned.h | 1 + arch/riscv/lib/Makefile | 14 + arch/riscv/lib/boot.c | 19 ++ arch/riscv/lib/bootm.c | 248 ++++++++++++++++ arch/riscv/lib/cache.c | 50 ++++ arch/riscv/lib/interrupts.c | 76 +++++ board/AndesTech/nx25-ae250/Kconfig | 24 ++ board/AndesTech/nx25-ae250/MAINTAINERS | 6 + board/AndesTech/nx25-ae250/Makefile | 8 + board/AndesTech/nx25-ae250/nx25-ae250.c | 77 +++++ cmd/bdinfo.c | 15 + common/board_f.c | 2 +- common/board_r.c | 4 +- configs/nx25-ae250_defconfig | 36 +++ doc/README.NX25 | 46 +++ doc/README.ae250 | 137 +++++++++ doc/README.standalone | 1 + examples/standalone/riscv.lds | 41 +++ examples/standalone/stubs.c | 12 + include/configs/nx25-ae250.h | 126 ++++++++ include/elf.h | 5 + include/image.h | 1 + tools/Makefile | 1 + tools/prelink-riscv.c | 102 +++++++ tools/prelink-riscv.inc | 112 ++++++++ 58 files changed, 3462 insertions(+), 4 deletions(-) create mode 100644 arch/riscv/Kconfig create mode 100644 arch/riscv/Makefile create mode 100644 arch/riscv/config.mk create mode 100644 arch/riscv/cpu/nx25/Makefile create mode 100644 arch/riscv/cpu/nx25/cpu.c create mode 100644 arch/riscv/cpu/nx25/start.S create mode 100644 arch/riscv/cpu/nx25/u-boot.lds create mode 100644 arch/riscv/dts/Makefile create mode 100644 arch/riscv/dts/ae250.dts create mode 100644 arch/riscv/include/asm/bitops.h create mode 100644 arch/riscv/include/asm/bootm.h create mode 100644 arch/riscv/include/asm/byteorder.h create mode 100644 arch/riscv/include/asm/cache.h create mode 100644 arch/riscv/include/asm/config.h create mode 100644 arch/riscv/include/asm/encoding.h create mode 100644 arch/riscv/include/asm/global_data.h create mode 100644 arch/riscv/include/asm/io.h create mode 100644 arch/riscv/include/asm/linkage.h create mode 100644 arch/riscv/include/asm/mach-types.h create mode 100644 arch/riscv/include/asm/posix_types.h create mode 100644 arch/riscv/include/asm/processor.h create mode 100644 arch/riscv/include/asm/ptrace.h create mode 100644 arch/riscv/include/asm/sections.h create mode 100644 arch/riscv/include/asm/setup.h create mode 100644 arch/riscv/include/asm/string.h create mode 100644 arch/riscv/include/asm/system.h create mode 100644 arch/riscv/include/asm/types.h create mode 100644 arch/riscv/include/asm/u-boot-riscv.h create mode 100644 arch/riscv/include/asm/u-boot.h create mode 100644 arch/riscv/include/asm/unaligned.h create mode 100644 arch/riscv/lib/Makefile create mode 100644 arch/riscv/lib/boot.c create mode 100644 arch/riscv/lib/bootm.c create mode 100644 arch/riscv/lib/cache.c create mode 100644 arch/riscv/lib/interrupts.c create mode 100644 board/AndesTech/nx25-ae250/Kconfig create mode 100644 board/AndesTech/nx25-ae250/MAINTAINERS create mode 100644 board/AndesTech/nx25-ae250/Makefile create mode 100644 board/AndesTech/nx25-ae250/nx25-ae250.c create mode 100644 configs/nx25-ae250_defconfig create mode 100644 doc/README.NX25 create mode 100644 doc/README.ae250 create mode 100644 examples/standalone/riscv.lds create mode 100644 include/configs/nx25-ae250.h create mode 100644 tools/prelink-riscv.c create mode 100644 tools/prelink-riscv.inc -- 2.7.4

3 29