August 2017 - U-Boot

[U-Boot] [PATCH 1/3] dm: Add migration plan for CONFIG_BLK
by Simon Glass 03 Apr '18

03 Apr '18

The CONFIG_BLK conversion involves quite invasive changes in the U-Boot code, with #ifdefs and different code paths. We should try to move over to this soon so we can drop the old code. Set a deadline of 9 months for this work, rounded up to the next release. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- doc/driver-model/MIGRATION.txt | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 doc/driver-model/MIGRATION.txt diff --git a/doc/driver-model/MIGRATION.txt b/doc/driver-model/MIGRATION.txt new file mode 100644 index 0000000000..d2fe027249 --- /dev/null +++ b/doc/driver-model/MIGRATION.txt @@ -0,0 +1,20 @@ +Migration Schedule +==================== + +U-Boot has been migrating to a new driver model since its introduction in +2014. This file describes the schedule for deprecation of pre-driver-model +features. + + +CONFIG_BLK +---------- + +Status: In progress +Deadline: 2018.05 + +Maintainers should submit patches for enabling CONFIG_BLK on all boards in +time for inclusion in the 2018.05 release. Boards not converted by this +time may be removed in a subsequent release. + +Note that this implies use of driver model for all block devices (e.g. +MMC, USB, SCSI, SATA). -- 2.14.0.rc1.383.gd1ce394fe2-goog

10 24

[U-Boot] [PATCH] tools: buildman: prevent trying to use the working directory as build dorectory
by Lothar Waßmann 02 Apr '18

02 Apr '18

When the U-Boot base directory happens to have the same name as the branch that buildman is directed to use via the '-b' option and no output directory is specified with '-o', buildman happily starts removing the whole U-Boot sources eventually only stopped with the error message: OSError: [Errno 20] Not a directory: '../<branch-name>/boards.cfg Add a check to the builderthread.Mkdir function to verify that the path it tries to create does not match the current working directory. Signed-off-by: Lothar Waßmann <LW(a)KARO-electronics.de> --- tools/buildman/builderthread.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/buildman/builderthread.py b/tools/buildman/builderthread.py index acaf500..3549029 100644 --- a/tools/buildman/builderthread.py +++ b/tools/buildman/builderthread.py @@ -7,6 +7,7 @@ import errno import glob import os import shutil +import sys import threading import command @@ -27,6 +28,9 @@ def Mkdir(dirname, parents = False): os.mkdir(dirname) except OSError as err: if err.errno == errno.EEXIST: + if os.path.realpath('.') == os.path.realpath(dirname): + print "Cannot create the current working directory '%s'!" % dirname + sys.exit(1) pass else: raise -- 2.1.4

2 3

[U-Boot] [PATCH v3 00/10] driver model bring-up of musb on AM335x GP and BBB
by Mugunthan V N 26 Mar '18

26 Mar '18

This patch series enables musb driver to adopt driver model. This has been tested on the following evms (logs [1]) by loading kernel and dtbs from usb mass storage (host) and usb rndis mode (device). * AM335x GP evm * AM335x BBB Also pushed a branch for testing [2] This patch series depends on the following patch series * usb ether gadget DM conversion [4] Changes from v2: * Removed from non-useful error logs. * Since defconfig is merged into single defconfig for all TI AM335x platforms, rebased those patches as well. Changes from initial version: * Separated out the usb gadget driver patches from earlier musb series [3] for testing and submitting of dwc3 dm musb patches. * passed an dummy dev pointer for non-DM case as well for reducing the number of #ifdefs in musb backend driver. [1] - http://pastebin.ubuntu.com/23489333/ [2] - git://git.ti.com/~mugunthanvnm/ti-u-boot/mugunth-ti-u-boot.git dm-musb-v3 [3] - http://lists.denx.de/pipermail/u-boot/2016-February/246827.html [4] - http://lists.denx.de/pipermail/u-boot/2016-November/273037.html Note: ~~~~~ The following checkpatch warning can be ignore as splitting the line will break grep during debug session. WARNING: line over 80 characters #224: FILE: drivers/usb/musb-new/ti-musb.c:232: + error("musb - not able to bind usb host node\n"); total: 0 errors, 1 warnings, 0 checks, 207 lines checked NOTE: Ignored message types: COMPLEX_MACRO CONSIDER_KSTRTO MINMAX MULTISTATEMENT_MACRO_USE_DO_WHILE NETWORKING_BLOCK_COMMENT_STYLE PREFER_ETHER_ADDR_COPY USLEEP_RANGE ../dm-musb/patches/musb/v3.00/0006-drivers-usb-musb-add-ti-musb-host-driver-with-driver.patch has style problems, please review. If any of these errors are false positives, please report them to the maintainer, see CHECKPATCH in MAINTAINERS. WARNING: line over 80 characters #164: FILE: drivers/usb/musb-new/ti-musb.c:332: + error("musb - not able to bind usb device node\n"); total: 0 errors, 1 warnings, 0 checks, 139 lines checked NOTE: Ignored message types: COMPLEX_MACRO CONSIDER_KSTRTO MINMAX MULTISTATEMENT_MACRO_USE_DO_WHILE NETWORKING_BLOCK_COMMENT_STYLE PREFER_ETHER_ADDR_COPY USLEEP_RANGE ../dm-musb/patches/musb/v3.00/0007-drivers-usb-musb-add-ti-musb-peripheral-driver-with-.patch has style problems, please review. If any of these errors are false positives, please report them to the maintainer, see CHECKPATCH in MAINTAINERS. total: 0 errors, 0 warnings, 0 checks, 14 lines checked Mugunthan V N (10): configs: am335x: usb: do not define CONFIG_DM_USB for spl am33xx: board: do not register usb devices when CONFIG_DM_USB is defined drivers: usb: musb: add ti musb misc driver for wrapper am33xx: board: probe misc drivers to register musb devices drivers: usb: musb: adopt musb backend driver to driver model drivers: usb: musb: add ti musb host driver with driver model support drivers: usb: musb: add ti musb peripheral driver with driver model support am33xx: board: init usb ether gadget for rndis support am335x_evm: enable usb ether gadget as it supports DM_ETH defconfig: am335x_evm: enable usb driver model arch/arm/cpu/armv7/am33xx/board.c | 24 ++- arch/arm/cpu/armv7/omap3/am35x_musb.c | 6 +- arch/arm/include/asm/arch-omap3/musb.h | 6 +- arch/arm/include/asm/omap_musb.h | 7 +- configs/am335x_evm_defconfig | 3 + drivers/usb/musb-new/Kconfig | 9 + drivers/usb/musb-new/Makefile | 1 + drivers/usb/musb-new/am35x.c | 14 +- drivers/usb/musb-new/musb_dsps.c | 8 +- drivers/usb/musb-new/musb_uboot.c | 2 + drivers/usb/musb-new/ti-musb.c | 364 +++++++++++++++++++++++++++++++++ include/configs/am335x_evm.h | 4 +- 12 files changed, 422 insertions(+), 26 deletions(-) create mode 100644 drivers/usb/musb-new/ti-musb.c -- 2.11.0.rc1

5 25

[U-Boot] [PATCH] arm: imx6: configure NoC on i.MX6DQP
by Filip Brozovic 20 Mar '18

20 Mar '18

The i.MX6DP and i.MX6QP incorporate NoC interconnect logic which needs to be configured in order to use external DDR memory. This patch enables the SPL to configure the necessary registers in accordance with the NXP engineering bulletin EB828. Signed-off-by: Filip Brozovic <fbrozovic(a)gmail.com> --- arch/arm/cpu/armv7/mx6/ddr.c | 69 +++++++++++++++++++++++++++++++++ arch/arm/include/asm/arch-mx6/mx6-ddr.h | 19 +++++++++ 2 files changed, 88 insertions(+) diff --git a/arch/arm/cpu/armv7/mx6/ddr.c b/arch/arm/cpu/armv7/mx6/ddr.c index 7beb7ea..60bfd08 100644 --- a/arch/arm/cpu/armv7/mx6/ddr.c +++ b/arch/arm/cpu/armv7/mx6/ddr.c @@ -1181,6 +1181,8 @@ void mx6_ddr3_cfg(const struct mx6_ddr_sysinfo *sysinfo, { volatile struct mmdc_p_regs *mmdc0; volatile struct mmdc_p_regs *mmdc1; + struct src *src_regs = (struct src *)SRC_BASE_ADDR; + u8 soc_boot_cfg3 = ((readl(&src_regs->sbmr1) & 0xff0000) >> 16) & 0xff; u32 val; u8 tcke, tcksrx, tcksre, txpdll, taofpd, taonpd, trrd; u8 todtlon, taxpd, tanpd, tcwl, txp, tfaw, tcl; @@ -1473,6 +1475,73 @@ void mx6_ddr3_cfg(const struct mx6_ddr_sysinfo *sysinfo, /* Step 12: Configure and activate periodic refresh */ mmdc0->mdref = (sysinfo->refsel << 14) | (sysinfo->refr << 11); + /* + * i.MX6DQP only: If the NoC scheduler is enabled, + * configure it and disable MMDC arbitration/reordering (see EB828) + */ + if (is_mx6dqp() && ((soc_boot_cfg3 & 0x30) == 0x00 || + (soc_boot_cfg3 & 0x33) == 0x31)) { + struct mx6dqp_noc_sched_regs *noc_sched = + (struct mx6dqp_noc_sched_regs *)MX6DQP_NOC_SCHED_BASE; + + /* These values are fixed based on integration parameters and + * should not be modified */ + noc_sched->rlat = 0x00000040; + noc_sched->ipu1 = 0x00000020; + noc_sched->ipu2 = 0x00000020; + + noc_sched->activate = (1 << 10) | /* FawBank */ + (tfaw << 4) | + (trrd << 0); + noc_sched->ddrtiming = (((sysinfo->dsize == 1) ? 1 : 0) << 31) | + ((tcwl + twtr) << 26) | + ((tcl - tcwl + 2) << 21) | + (4 << 18) | /* Burst Length = 8 */ + ((tcwl + twr + trp + trcd) << 12) | + ((trtp + trp + trcd - 4) << 6) | + (trc << 0); + + if (sysinfo->dsize == 2) { + if (ddr3_cfg->coladdr == 10) { + if (ddr3_cfg->rowaddr == 15 && + sysinfo->ncs == 2) + noc_sched->ddrconf = 4; + else + noc_sched->ddrconf = 0; + } else if (ddr3_cfg->coladdr == 11) { + noc_sched->ddrconf = 1; + } + } else { + if (ddr3_cfg->coladdr == 9) { + if (ddr3_cfg->rowaddr == 13) + noc_sched->ddrconf = 2; + else if (ddr3_cfg->rowaddr == 14) + noc_sched->ddrconf = 15; + } else if (ddr3_cfg->coladdr == 10) { + if (ddr3_cfg->rowaddr == 14 && + sysinfo->ncs == 2) + noc_sched->ddrconf = 14; + else if (ddr3_cfg->rowaddr == 15 && + sysinfo->ncs == 2) + noc_sched->ddrconf = 9; + else + noc_sched->ddrconf = 3; + } else if (ddr3_cfg->coladdr == 11) { + if (ddr3_cfg->rowaddr == 15 && + sysinfo->ncs == 2) + noc_sched->ddrconf = 4; + else + noc_sched->ddrconf = 0; + } else if (ddr3_cfg->coladdr == 12) { + if (ddr3_cfg->rowaddr == 14) + noc_sched->ddrconf = 1; + } + } + + /* Disable MMDC arbitration/reordering */ + mmdc0->maarcr = 0x14420000; + } + /* Step 13: Deassert config request - init complete */ mmdc0->mdscr = 0x00000000; diff --git a/arch/arm/include/asm/arch-mx6/mx6-ddr.h b/arch/arm/include/asm/arch-mx6/mx6-ddr.h index 9922409..c881782 100644 --- a/arch/arm/include/asm/arch-mx6/mx6-ddr.h +++ b/arch/arm/include/asm/arch-mx6/mx6-ddr.h @@ -307,6 +307,25 @@ struct mx6dq_iomux_grp_regs { u32 grp_b6ds; }; +/* + * NoC scheduler registers - only on IMX6DQP + */ +#define MX6DQP_NOC_SCHED_BASE 0x00bb0000 +struct mx6dqp_noc_sched_regs { + u32 coreid; + u32 revid; + u32 ddrconf; + u32 ddrtiming; + u32 ddrmode; + u32 rlat; + u32 res1[4]; + u32 ipu1; + u32 ipu2; + u32 res2[2]; + u32 activate; + u32 res3[16]; +}; + #define MX6SDL_IOM_DDR_BASE 0x020e0400 struct mx6sdl_iomux_ddr_regs { u32 res1[25]; -- 2.1.4

3 2

[U-Boot] [PATCH v2 00/15] dm: sata: mmc: Convert a sunxi board to driver model for MMC, SATA
by Simon Glass 01 Feb '18

01 Feb '18

At present SCSI support for driver model works only with PCI controllers. This series makes the following changes: - Adjusts SATA/AHCI support to work with non-PCI controllers - Allows driver model to be used for MMC in U-Boot proper without requiring it to be used in SPL - Adjusts sunxi MMC and SATA drivers to support driver model - Enables this on a single board (Linksprite_pcDuino3) Even with this series the AHCI uclass still does not have any operations. This will be needed for drivers which do not use SCSI. Further work is needed to complete this. Changes in v2: - Drop debugging printf() now that the card detect is working - Add new patch to correct polarity of MMC card detect on Linksprite_pcDuino3 Simon Glass (15): ahci: Support non-PCI controllers dm: mmc: Allow disabling driver model in SPL fdt: Correct fdt_get_base_address() dm: scsi: Drop duplicate SCSI and DM_SCSI options dm: ahci: Correct uclass private data dm: mmc: sunxi: Rename struct sunxi_mmc_host to sunxi_mmc_priv dm: mmc: sunxi: Rename mmchost to priv dm: mmc: sunxi: Pass private data around explicitly dm: mmc: sunxi: Drop mmc_clk_io_on() dm: mmc: sunxi: Add support for driver model dm: sunxi: Linksprite_pcDuino3: Correct polarity of MMC card detect dm: scsi: Don't scan the SCSI bus when probing dm: sunxi: sata: Don't build sata support into SPL dm: sata: sunxi: Add support for driver model dm: sunxi: Move Linksprite_pcDuino3 to use DM for MMC, SATA arch/arm/dts/sun7i-a20-pcduino3.dts | 2 +- arch/x86/cpu/ivybridge/sata.c | 2 +- board/sunxi/Makefile | 2 + board/sunxi/ahci.c | 61 +++++- common/fdt_support.c | 7 +- common/spl/spl_mmc.c | 4 +- configs/Linksprite_pcDuino3_defconfig | 7 +- drivers/ata/Kconfig | 18 -- drivers/ata/ahci-uclass.c | 2 + drivers/ata/ahci.c | 33 ++-- drivers/block/Kconfig | 12 ++ drivers/block/Makefile | 4 +- drivers/mmc/Kconfig | 21 ++ drivers/mmc/Makefile | 4 +- drivers/mmc/mmc-uclass.c | 6 +- drivers/mmc/mmc.c | 28 +-- drivers/mmc/mmc_legacy.c | 2 +- drivers/mmc/mmc_private.h | 6 +- drivers/mmc/omap_hsmmc.c | 20 +- drivers/mmc/sunxi_mmc.c | 359 +++++++++++++++++++++++----------- drivers/scsi/scsi.c | 2 +- include/ahci.h | 14 +- include/blk.h | 4 +- include/mmc.h | 12 +- 24 files changed, 431 insertions(+), 201 deletions(-) -- 2.13.2.725.g09c95d1e9-goog

9 35

[U-Boot] [PATCH 00/10] mips: bmips: add SPI support
by Álvaro Fernández Rojas 26 Jan '18

26 Jan '18

BCM63xx SPI controller is a bit tricky since it doesn't allow keeping CS active between transfers, so I had to modify the spi_flash driver in order to allow limiting reads. Álvaro Fernández Rojas (10): drivers: spi: allow limiting reads drivers: spi: add config to consider command bytes when writting to flash dm: spi: add BCM63xx SPI driver mips: bmips: add bcm63xx-spi driver support for BCM6338 mips: bmips: add bcm63xx-spi driver support for BCM6348 mips: bmips: add bcm63xx-spi driver support for BCM6358 mips: bmips: add bcm63xx-spi driver support for BCM3380 mips: bmips: add bcm63xx-spi driver support for BCM63268 mips: bmips: enable the SPI flash on the Sagem F@ST1704 mips: bmips: enable the SPI flash on the Netgear CG3100D arch/mips/dts/brcm,bcm3380.dtsi | 13 ++ arch/mips/dts/brcm,bcm63268.dtsi | 13 ++ arch/mips/dts/brcm,bcm6338.dtsi | 13 ++ arch/mips/dts/brcm,bcm6348.dtsi | 13 ++ arch/mips/dts/brcm,bcm6358.dtsi | 13 ++ arch/mips/dts/netgear,cg3100d.dts | 13 ++ arch/mips/dts/sagem,f(a)st1704.dts | 13 ++ configs/netgear_cg3100d_ram_defconfig | 8 + configs/sagem_f@st1704_ram_defconfig | 8 + drivers/mtd/spi/spi_flash.c | 5 +- drivers/spi/Kconfig | 26 +++ drivers/spi/Makefile | 1 + drivers/spi/bcm63xx_spi.c | 404 ++++++++++++++++++++++++++++++++++ include/spi.h | 11 +- 14 files changed, 552 insertions(+), 2 deletions(-) create mode 100644 drivers/spi/bcm63xx_spi.c -- 2.1.4

4 186

[U-Boot] STM32F746 Discovery - No serial output?
by Francois Dugast 23 Jan '18

23 Jan '18

Hi, I am trying to run the master on a STM32F746 Discovery board [1] by using stm32f746-disco_defconfig. It was built with gcc-arm-none-eabi-5_4-2016q3 [2] and flashed with OpenOCD [3]. A USB-serial adapter is connected to USART6_RX and USART6_TX (pins D0 and D1 of the Arduino connector) and configured for 115200 8N1. No output coming out through the serial interface. It is unlikely to be a hardware issue as output is coming out normally this way when using the U-Boot repository from Emcraft. I do not know what I am doing wrong, can you help me out? Cheers, Francois [1] http://www.st.com/en/evaluation-tools/32f746gdiscovery.html [2] https://launchpad.net/gcc-arm-embedded [3] http://openocd.org [4] https://github.com/EmcraftSystems/u-boot

3 5

[U-Boot] [PATCH] travis-ci: Add qemu-x86_64 target
by Tom Rini 23 Jan '18

23 Jan '18

Add qemu-x86_64 to the list of targets we use for test.py runs. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml index 48b7b101f1c6..dab55f34e51d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -311,6 +311,13 @@ matrix: TOOLCHAIN="x86_64" BUILD_ROM="yes" - env: + - TEST_PY_BD="qemu-x86_64" + TEST_PY_TEST_SPEC="not sleep" + QEMU_TARGET="x86_64-softmmu" + BUILDMAN="^qemu-x86_64$" + TOOLCHAIN="x86_64" + BUILD_ROM="yes" + - env: - TEST_PY_BD="zynq_zc702" TEST_PY_TEST_SPEC="not sleep" QEMU_TARGET="arm-softmmu" -- 1.9.1

1 2

[U-Boot] [PATCH] net: Remove nfs.h include from bootp.c
by Joe Hershberger 22 Jan '18

22 Jan '18

Nothing from this header is used there, so remove it. Signed-off-by: Joe Hershberger <joe.hershberger(a)ni.com> --- net/bootp.c | 1 - 1 file changed, 1 deletion(-) diff --git a/net/bootp.c b/net/bootp.c index 73370a1..59bb209 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -14,7 +14,6 @@ #include <net.h> #include <net/tftp.h> #include "bootp.h" -#include "nfs.h" #ifdef CONFIG_LED_STATUS #include <status_led.h> #endif -- 1.7.11.5

1 1

[U-Boot] [PATCH] net: Fix buffer overrun error in netconsole
by Joe Hershberger 22 Jan '18

22 Jan '18

Need to not access the byte after the input_buffer. Reported-by: Coverity (CID: 144423) Signed-off-by: Joe Hershberger <joe.hershberger(a)ni.com> --- drivers/net/netconsole.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index e9dbedf..028fca9 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -153,14 +153,17 @@ int nc_input_packet(uchar *pkt, struct in_addr src_ip, unsigned dest_port, len = sizeof(input_buffer) - input_size; end = input_offset + input_size; - if (end > sizeof(input_buffer)) + if (end >= sizeof(input_buffer)) end -= sizeof(input_buffer); chunk = len; - if (end + len > sizeof(input_buffer)) { + /* Check if packet will wrap in input_buffer */ + if (end + len >= sizeof(input_buffer)) { chunk = sizeof(input_buffer) - end; + /* Copy the second part of the pkt to start of input_buffer */ memcpy(input_buffer, pkt + chunk, len - chunk); } + /* Copy first (or only) part of pkt after end of current valid input*/ memcpy(input_buffer + end, pkt, chunk); input_size += len; -- 1.7.11.5

1 1