June 2019 - U-Boot

[U-Boot] [PATCH] drivers: serial: lpuart: Enable Little Endian Support
by Vabhav Sharma 24 Jun '19

24 Jun '19

By default LPUART driver with compatible string "fsl,ls1021a-lpuart" support big-endian mode.On NXP SoC like LS1028A LPUART IP is little-endian,Added support to Fetch LPUART IP Endianness from lpuart device-tree node. Signed-off-by: Vabhav Sharma <vabhav.sharma(a)nxp.com> --- drivers/serial/serial_lpuart.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/serial/serial_lpuart.c b/drivers/serial/serial_lpuart.c index a357b00..57dd4a7 100644 --- a/drivers/serial/serial_lpuart.c +++ b/drivers/serial/serial_lpuart.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* + * Copyright 2019 NXP * Copyright 2013 Freescale Semiconductor, Inc. */ @@ -502,6 +503,9 @@ static int lpuart_serial_ofdata_to_platdata(struct udevice *dev) plat->reg = (void *)addr; plat->flags = dev_get_driver_data(dev); + if (fdtdec_get_bool(blob, node, "little-endian")) + plat->flags &= ~LPUART_FLAG_REGMAP_ENDIAN_BIG; + if (!fdt_node_check_compatible(blob, node, "fsl,ls1021a-lpuart")) plat->devtype = DEV_LS1021A; else if (!fdt_node_check_compatible(blob, node, "fsl,imx7ulp-lpuart")) -- 2.7.4

3 4

[U-Boot] [PATCH v3] Add a simple script to remove boards
by Simon Glass 24 Jun '19

24 Jun '19

This script attempts to create a git commit which removes a single board. It is quite fallible and everything it does needs checking. But it can help speed up the process. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- Changes in v3: - Move this into its own separate patch - Fix typos tools/rmboard.py | 150 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 150 insertions(+) create mode 100755 tools/rmboard.py diff --git a/tools/rmboard.py b/tools/rmboard.py new file mode 100755 index 00000000000..df4f04b01c5 --- /dev/null +++ b/tools/rmboard.py @@ -0,0 +1,150 @@ +#! /usr/bin/python +# SPDX-License-Identifier: GPL-2.0+ +# Copyright 2019 Google LLC +# + +""" +Script to remove boards + +Usage: + rmboard.py <board_name>... + +A single commit is created for each board removed. + +Some boards may depend on files provided by another and this will cause +problems, generally the removal of files which should not be removed. + +This script works by: + - Looking through the MAINTAINERS files which mention a board to find out + what files the board uses + - Looking through the Kconfig files which mention a board to find one that + needs to have material removed + +Search for ## to update the commit message manually. +""" + +from __future__ import print_function + +import glob +import os +import re +import sys + +# Bring in the patman libraries +our_path = os.path.dirname(os.path.realpath(__file__)) +sys.path.append(os.path.join(our_path, '../tools/patman')) + +import command + +def rm_kconfig_include(path): + """Remove a path from Kconfig files + + This function finds the given path in a 'source' statement in a Kconfig + file and removes that line from the file. This is needed because the path + is going to be removed, so any reference to it will cause a problem with + Kconfig parsing. + + The changes are made locally and then added to the git staging area. + + Args: + path: Path to search for and remove + """ + cmd = ['git', 'grep', path] + stdout = command.RunPipe([cmd], capture=True, raise_on_error=False).stdout + if not stdout: + return + fname = stdout.split(':')[0] + + print("Fixing up '%s' to remove reference to '%s'" % (fname, path)) + cmd = ['sed', '-i', '\|%s|d' % path, fname] + stdout = command.RunPipe([cmd], capture=True).stdout + + cmd = ['git', 'add', fname] + stdout = command.RunPipe([cmd], capture=True).stdout + +def rm_board(board): + """Create a commit which removes a single board + + This looks up the MAINTAINERS file to file files that need to be removed, + then removes pieces from the Kconfig files that mention the board. + + + Args: + board: Board name to remove + """ + + # Find all MAINTAINERS and Kconfig files which mention the board + cmd = ['git', 'grep', '-l', board] + stdout = command.RunPipe([cmd], capture=True).stdout + maintain = [] + kconfig = [] + for line in stdout.splitlines(): + line = line.strip() + if 'MAINTAINERS' in line: + if line not in maintain: + maintain.append(line) + elif 'Kconfig' in line: + kconfig.append(line) + paths = [] + cc = [] + + # Look through the MAINTAINERS file to find things to remove + for fname in maintain: + with open(fname) as fd: + for line in fd: + line = line.strip() + fields = re.split('[ \t]', line, 1) + if len(fields) == 2: + if fields[0] == 'M:': + cc.append(fields[1]) + elif fields[0] == 'F:': + paths.append(fields[1].strip()) + + # Expand any wildcards in the MAINTAINERS file + real = [] + for path in paths: + if path[-1] == '/': + path = path[:-1] + if '*' in path: + globbed = glob.glob(path) + print("Expanded '%s' to '%s'" % (path, globbed)) + real += globbed + else: + real.append(path) + + # Search for Kconfig files in the resulting list. Remove any 'source' lines + # which reference Kconfig files we want to remove + for path in real: + cmd = ['find', path] + stdout = (command.RunPipe([cmd], capture=True, raise_on_error=False). + stdout) + for fname in stdout.splitlines(): + if fname.endswith('Kconfig'): + rm_kconfig_include(fname) + + # Remove unwanted files + cmd = ['git', 'rm', '-r'] + real + stdout = command.RunPipe([cmd], capture=True).stdout + + ## Change the messages as needed + msg = '''arm: Remove %s board + +This board has not been converted to CONFIG_DM_MMC by the deadline. +Remove it. + +''' % board + for name in cc: + msg += 'Patch-cc: %s\n' % name + + # Create the commit + cmd = ['git', 'commit', '-s', '-m', msg] + stdout = command.RunPipe([cmd], capture=True).stdout + + # Check if the board is mentioned anywhere else. The user will need to deal + # with this + cmd = ['git', 'grep', '-il', board] + print(command.RunPipe([cmd], capture=True, raise_on_error=False).stdout) + print(' '.join(cmd)) + +for board in sys.argv[1:]: + rm_board(board) -- 2.21.0.1020.gf2820cf01a-goog

2 2

[U-Boot] [PATCH 00/21] patman: Update to support Python 3
by Simon Glass 24 Jun '19

24 Jun '19

This series updates patman to support Python 3: - Avoid using 'unicode' type directly - Use items() instead of iteritems() - Make sure file I/O uses binary mode where necessary - Change print statements to functions - Use the built-in set() class - Fix up generation of repeated bytes A few patches for binman are included, but this still requires Python 2. Simon Glass (21): patman: Update cros_subprocess to use bytearray patman: Convert print statements to Python 3 binman: Convert print statements to Python 3 binman: Don't show errors for failed tests binman: Remove use of Set() patman: Use items() instead of iteritems() binman: Use items() instead of iteritems() tools: binman: Open all binary files in binary mode tools: dtoc: Open all binary files in binary mode patman: Provide a way to get program output in binary mode binman: Use binary mode when compressing data binman: Drop an unused input file binman: Handle repeated bytes for Python 3 Add a simple script to remove boards patman: Support use of stringIO in Python 3 patman: Move unicode helpers to tools patman: Sort series output for repeatabily patman: Avoid unicode type in settings unit tests patman: Adjust functional tests for Python 3 patman: Tidy up a few more unicode conversions patman: Don't require Python 2 tools/binman/binman.py | 26 +++- tools/binman/bsection.py | 7 +- tools/binman/control.py | 8 +- tools/binman/elf.py | 4 +- tools/binman/elf_test.py | 2 +- tools/binman/entry.py | 5 +- tools/binman/etype/blob.py | 2 +- tools/binman/etype/fill.py | 4 +- tools/binman/etype/gbb.py | 2 +- tools/binman/etype/u_boot_spl_bss_pad.py | 2 +- tools/binman/ftest.py | 81 ++++++------ tools/binman/state.py | 7 +- tools/dtoc/fdt.py | 2 +- tools/patman/cros_subprocess.py | 53 +++++--- tools/patman/func_test.py | 41 ++++--- tools/patman/gitutil.py | 16 +-- tools/patman/patman.py | 2 +- tools/patman/series.py | 20 +-- tools/patman/settings.py | 34 ++--- tools/patman/test_util.py | 16 +-- tools/patman/tools.py | 55 ++++++++- tools/rmboard.py | 150 +++++++++++++++++++++++ 22 files changed, 385 insertions(+), 154 deletions(-) create mode 100755 tools/rmboard.py -- 2.21.0.1020.gf2820cf01a-goog

2 25

[U-Boot] [PATCH 00/24] binman: dtoc: Convert to Python 3
by Simon Glass 24 Jun '19

24 Jun '19

This series updates both binman and dtoc to support Python 3 as well as Python 2. This mostly involves moving the code to use the 'bytes' type on Python 3 (with associated unicode conversions) but there are various other tweaks required as well. Simon Glass (24): dtoc: Adjust code for Python 3 dtoc: Sort platdata output from dtoc dtoc: Use GetBytes() to obtain repeating bytes dtoc: Move BytesToValue() out of the Prop class dtoc: Updates BytesToValue() for Python 3 dtoc: Use byte type instead of str in fdt dtoc: Convert the Fdt.Prop class to Python 3 dtoc: Convert the Fdt.Node class to Python 3 dtoc: Use binary mode for reading files dtoc: Test full 64-bit properties with FdtCellsToCpu() dtoc: Add a unit test for BytesToValue() dtoc: Update fdt_util for Python 3 dtoc: Update dtb_platdata to support Python 3 patman: Allow reading files in text mode binman: Avoid changing a dict during iteration binman: Convert to use bytes type binman: Update entry_test to support Python 3 patman: Update fmap code for Python 3 binman: Update 'text' entry for Python 3 binman: Fix up a format string in AssertInList() binman: Read map files as text binman: Document parallel tests binman: Update the README.entries file patman: Update cover-coverage tests for Python 3 tools/binman/README | 14 ++ tools/binman/README.entries | 15 ++ tools/binman/control.py | 7 +- tools/binman/elf_test.py | 5 +- tools/binman/entry_test.py | 6 +- tools/binman/etype/_testing.py | 2 +- tools/binman/etype/fmap.py | 3 +- tools/binman/etype/text.py | 9 +- tools/binman/etype/u_boot_dtb_with_ucode.py | 4 +- tools/binman/etype/u_boot_ucode.py | 4 +- tools/binman/etype/vblock.py | 2 +- tools/binman/fmap_util.py | 12 +- tools/binman/ftest.py | 136 +++++++++--------- tools/dtoc/dtb_platdata.py | 10 +- tools/dtoc/dtoc.py | 8 +- tools/dtoc/fdt.py | 146 +++++++++++--------- tools/dtoc/fdt_util.py | 15 +- tools/dtoc/test_dtoc.py | 16 ++- tools/dtoc/test_fdt.py | 51 ++++--- tools/patman/test_util.py | 15 +- tools/patman/tools.py | 56 +++++++- 21 files changed, 335 insertions(+), 201 deletions(-) -- 2.21.0.1020.gf2820cf01a-goog

1 25

[U-Boot] QSPI support on i.MX7D Sabre Eval Board
by Thomas Schaefer 24 Jun '19

24 Jun '19

Hi all, I've built current u-boot (v2019.07-rc4) with QSPI support for our i.MX7D Sabre eval system. I am using mx7dsabresd_qspi_defconfig. The resulting u-boot fails to read from QSPI, i.e. the data read is not the same than that written before with a previous (v2018) version. After some investigation I found that the 'is_controller_busy' function comes back with -ETIMEDOUT during read operation, because the retry count of 5 is too low. To figure out how many retries are needed, I added some debug code as part of a while(1) loop to the is_controller_busy function: diff --git a/drivers/spi/fsl_qspi.c b/drivers/spi/fsl_qspi.c index 1598c4f698..fa5b7a29f2 100644 --- a/drivers/spi/fsl_qspi.c +++ b/drivers/spi/fsl_qspi.c @@ -152,16 +152,20 @@ static inline int is_controller_busy(const struct fsl_qspi_priv *priv) u32 val; const u32 mask = QSPI_SR_BUSY_MASK | QSPI_SR_AHB_ACC_MASK | QSPI_SR_IP_ACC_MASK; - unsigned int retry = 5; + unsigned int retry = 0; do { val = qspi_read32(priv->flags, &priv->regs->sr); - if ((~val & mask) == mask) + if ((~val & mask) == mask) { + if (retry > 5) + printf("%s: timeout! retry = %d\n", __func__, retry); return 0; + } udelay(1); - } while (--retry); + retry++; + } while (1); return -ETIMEDOUT; } On my MX7 eval system I found that a retry count between 73 and 147 is necessary to make sure that the controller will be ready before the next operation. So from my point of view we have 2 options to fix this issue: - increase retry from 5 to 200 - wait in an endless loop (while (1) ) and return only when the controller is ready (which means that the board will hang if the controller doesn't come back for some other reason. What do you think? Best regards, Thomas Schäfer SW Design Engineer Kontron - An S&T Company Heinrich-Barth-Straße 1-1a | 66115 Saarbrücken | Germany thomas.schaefer(a)kontron.com http://www.kontron.com Website | Blog | Twitter | LinkedIn | YouTube | Facebook Kontron Europe GmbH Die gesetzlichen Pflichtangaben finden Sie hier. Please find our mandatory legal statements here. Mit dem Öffnen dieses E-Mails stimmen Sie Kontrons Richtlinien zur elektronischen Kommunikation zu. By opening this email you are agreeing to Kontron's Electronic Communications Policy.

2 4

[U-Boot] [ANNOUNCEMENT] Switching to gitlab.denx.de
by Wolfgang Denk 24 Jun '19

24 Jun '19

Hello everybody, as discussed before, we want to switch from the old git server to more powerful soft- and hardware. We will move the U-Boot master repository and all custodian repositories to gitlab. The new URLs for cloning will become https://gitlab.denx.de/u-boot/u-boot for the master repository and https://gitlab.denx.de/u-boot/custodians/u-boot-XXX for the XXX custodian repo. Note: a) These are the Web URLs, from where you also can clone. Feel free to add a ".git" to these URLs. b) SSH access for the custodians is available under git@gitlab.denx.de:u-boot/custodians/u-boot-XXX.git c) git:// access is not available yet; this depends on the URL rewrite rules and DNS changes and will be added later - ASAP, see below. The switch will take place as follows: 1. We will create user accounts for all custodians at gitlab.denx.de You will receive an e-mail notification with your login credentials. We will start with this this afternoon (CEST), so if you have not received such an e-mail by tomorrow morning, please let us know. 2. We will block your SSH keys on the old git server, thus effectively turning the custodian repositories into read-only mode. Custodians will not be able to push any new stuff to the old repositories any more. This phase will start when all custodian repositories have been created, but in no case before 12:00 p. m. (noon) CEST. the next steps will follow as quickly as possible, ideally only a few minutes later. 3. The old repository will be cloned to the new gitlab server. This should not take long. We don't expect any long interruption. You wanted to have another cup of coffee anyway :-) 4. The custodian can resume work using the gitlab server, as soon as he can "see" his repository there. Tom should already be prepared to pull from the gitlab repos. 5. After all custodians have been moved, URL rewrite rules will be activated, and the DNS will be changed, so that the old URLs will still be working, though only for read-only access. Note: this last step is the most error-prone one. It is likely that the rewrite roles are incomplete at the beginning, and/or incorrect for a few special cases. Please be patient and report such errors with enough detail to reproduce, then we will fix them. 6. Everybody is happy. Hopefully. OK, at least that's the theory. If there are problems please let us know (me and Harald <hws(a)denx.de>) and we will do our best to fix the issues as fast as possible. Thanks, and please keep your finger's crossed. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd(a)denx.de When choosing between two evils, I always like to take the one I've never tried before. -- Mae West, "Klondike Annie"

9 14

[U-Boot] [PATCH] net: davinci_emac: convert to using the driver model
by Bartosz Golaszewski 24 Jun '19

24 Jun '19

From: Bartosz Golaszewski <bgolaszewski(a)baylibre.com> Now that we removed all legacy boards selecting TI_EMAC we can completely convert the driver code to using the driver model. This patch also updates all remaining users of davinci_emac. Signed-off-by: Bartosz Golaszewski <bgolaszewski(a)baylibre.com> --- arch/arm/mach-davinci/cpu.c | 13 ----- arch/arm/mach-omap2/omap3/emac.c | 3 +- board/davinci/da8xxevm/da850evm.c | 6 -- board/davinci/da8xxevm/omapl138_lcdk.c | 14 ----- board/logicpd/am3517evm/am3517evm.c | 1 - board/ti/ti816x/evm.c | 3 +- configs/am3517_evm_defconfig | 1 + configs/da850evm_defconfig | 1 + configs/da850evm_direct_nor_defconfig | 1 + configs/da850evm_nand_defconfig | 1 + configs/omapl138_lcdk_defconfig | 1 + configs/ti816x_evm_defconfig | 1 + drivers/net/ti/davinci_emac.c | 77 ++++++++++++++------------ include/netdev.h | 1 - 14 files changed, 51 insertions(+), 73 deletions(-) diff --git a/arch/arm/mach-davinci/cpu.c b/arch/arm/mach-davinci/cpu.c index f97ad3fc74..9fd6564d04 100644 --- a/arch/arm/mach-davinci/cpu.c +++ b/arch/arm/mach-davinci/cpu.c @@ -5,7 +5,6 @@ */ #include <common.h> -#include <netdev.h> #include <asm/arch/hardware.h> #include <asm/io.h> @@ -90,15 +89,3 @@ int set_cpu_clk_info(void) gd->bd->bi_dsp_freq = 0; return 0; } - -/* - * Initializes on-chip ethernet controllers. - * to override, implement board_eth_init() - */ -int cpu_eth_init(bd_t *bis) -{ -#if defined(CONFIG_DRIVER_TI_EMAC) - davinci_emac_initialize(); -#endif - return 0; -} diff --git a/arch/arm/mach-omap2/omap3/emac.c b/arch/arm/mach-omap2/omap3/emac.c index c79e870183..fb0c9188f5 100644 --- a/arch/arm/mach-omap2/omap3/emac.c +++ b/arch/arm/mach-omap2/omap3/emac.c @@ -7,7 +7,6 @@ */ #include <common.h> -#include <netdev.h> #include <asm/io.h> #include <asm/arch/am35x_def.h> @@ -24,5 +23,5 @@ int cpu_eth_init(bd_t *bis) reset &= ~CPGMACSS_SW_RST; writel(reset, &am35x_scm_general_regs->ip_sw_reset); - return davinci_emac_initialize(); + return 0; } diff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c index 1bc26828bf..d090c00466 100644 --- a/board/davinci/da8xxevm/da850evm.c +++ b/board/davinci/da8xxevm/da850evm.c @@ -13,7 +13,6 @@ #include <environment.h> #include <i2c.h> #include <net.h> -#include <netdev.h> #include <spi.h> #include <spi_flash.h> #include <asm/arch/hardware.h> @@ -472,11 +471,6 @@ int board_eth_init(bd_t *bis) if (rmii_hw_init()) printf("RMII hardware init failed!!!\n"); #endif - if (!davinci_emac_initialize()) { - printf("Error: Ethernet init failed!\n"); - return -1; - } - return 0; } #endif /* CONFIG_DRIVER_TI_EMAC */ diff --git a/board/davinci/da8xxevm/omapl138_lcdk.c b/board/davinci/da8xxevm/omapl138_lcdk.c index 2c2f885d43..ef9656add8 100644 --- a/board/davinci/da8xxevm/omapl138_lcdk.c +++ b/board/davinci/da8xxevm/omapl138_lcdk.c @@ -11,7 +11,6 @@ #include <common.h> #include <i2c.h> #include <net.h> -#include <netdev.h> #include <spi.h> #include <spi_flash.h> #include <asm/arch/hardware.h> @@ -229,19 +228,6 @@ int board_init(void) #ifdef CONFIG_DRIVER_TI_EMAC -/* - * Initializes on-board ethernet controllers. - */ -int board_eth_init(bd_t *bis) -{ - if (!davinci_emac_initialize()) { - printf("Error: Ethernet init failed!\n"); - return -1; - } - - return 0; -} - #endif /* CONFIG_DRIVER_TI_EMAC */ #define CFG_MAC_ADDR_SPI_BUS 0 diff --git a/board/logicpd/am3517evm/am3517evm.c b/board/logicpd/am3517evm/am3517evm.c index 10031a4801..bfd4e78274 100644 --- a/board/logicpd/am3517evm/am3517evm.c +++ b/board/logicpd/am3517evm/am3517evm.c @@ -28,7 +28,6 @@ #include <linux/usb/gadget.h> #include <linux/usb/musb.h> #include <i2c.h> -#include <netdev.h> #include "am3517evm.h" DECLARE_GLOBAL_DATA_PTR; diff --git a/board/ti/ti816x/evm.c b/board/ti/ti816x/evm.c index 07a084bab8..240df8cbe1 100644 --- a/board/ti/ti816x/evm.c +++ b/board/ti/ti816x/evm.c @@ -9,7 +9,6 @@ #include <common.h> #include <environment.h> #include <spl.h> -#include <netdev.h> #include <asm/cache.h> #include <asm/io.h> #include <asm/arch/clock.h> @@ -56,7 +55,7 @@ int board_eth_init(bd_t *bis) printf("Unable to read MAC address. Set <ethaddr>\n"); } - return davinci_emac_initialize(); + return 0; } #ifdef CONFIG_SPL_BUILD diff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig index b9f59f3291..5cb76322df 100644 --- a/configs/am3517_evm_defconfig +++ b/configs/am3517_evm_defconfig @@ -44,6 +44,7 @@ CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000 CONFIG_SPL_NAND_SIMPLE=y +CONFIG_DM_ETH=y CONFIG_MII=y CONFIG_DRIVER_TI_EMAC=y CONFIG_PINCTRL=y diff --git a/configs/da850evm_defconfig b/configs/da850evm_defconfig index 8c16d5c4f5..ca304ed78a 100644 --- a/configs/da850evm_defconfig +++ b/configs/da850evm_defconfig @@ -60,6 +60,7 @@ CONFIG_SF_DEFAULT_SPEED=30000000 CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_SPI_FLASH_MTD=y +CONFIG_DM_ETH=y CONFIG_MII=y CONFIG_DRIVER_TI_EMAC=y CONFIG_PINCTRL=y diff --git a/configs/da850evm_direct_nor_defconfig b/configs/da850evm_direct_nor_defconfig index 166e77b8e3..9b1da07384 100644 --- a/configs/da850evm_direct_nor_defconfig +++ b/configs/da850evm_direct_nor_defconfig @@ -50,6 +50,7 @@ CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y +CONFIG_DM_ETH=y CONFIG_MII=y CONFIG_DRIVER_TI_EMAC=y CONFIG_PINCTRL=y diff --git a/configs/da850evm_nand_defconfig b/configs/da850evm_nand_defconfig index b8eac0e659..eaf5d73dd8 100644 --- a/configs/da850evm_nand_defconfig +++ b/configs/da850evm_nand_defconfig @@ -60,6 +60,7 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_SPI_FLASH_MTD=y +CONFIG_DM_ETH=y CONFIG_PINCTRL=y CONFIG_PINCTRL_SINGLE=y CONFIG_DM_SERIAL=y diff --git a/configs/omapl138_lcdk_defconfig b/configs/omapl138_lcdk_defconfig index e43141844a..f93a06083e 100644 --- a/configs/omapl138_lcdk_defconfig +++ b/configs/omapl138_lcdk_defconfig @@ -50,6 +50,7 @@ CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_SPEED=30000000 CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y +CONFIG_DM_ETH=y CONFIG_MII=y CONFIG_DRIVER_TI_EMAC=y CONFIG_DM_SERIAL=y diff --git a/configs/ti816x_evm_defconfig b/configs/ti816x_evm_defconfig index bf877f596b..b233ab8cc9 100644 --- a/configs/ti816x_evm_defconfig +++ b/configs/ti816x_evm_defconfig @@ -45,6 +45,7 @@ CONFIG_SYS_I2C_OMAP24XX=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y +CONFIG_DM_ETH=y CONFIG_MII=y CONFIG_DRIVER_TI_EMAC=y CONFIG_SYS_NS16550=y diff --git a/drivers/net/ti/davinci_emac.c b/drivers/net/ti/davinci_emac.c index 9d53984973..4b0a98a4aa 100644 --- a/drivers/net/ti/davinci_emac.c +++ b/drivers/net/ti/davinci_emac.c @@ -26,7 +26,6 @@ #include <net.h> #include <miiphy.h> #include <malloc.h> -#include <netdev.h> #include <linux/compiler.h> #include <asm/arch/emac_defs.h> #include <asm/io.h> @@ -107,8 +106,9 @@ static u_int8_t num_phy; phy_t phy[CONFIG_SYS_DAVINCI_EMAC_PHY_COUNT]; -static int davinci_eth_set_mac_addr(struct eth_device *dev) +static int davinci_emac_write_hwaddr(struct udevice *dev) { + struct eth_pdata *pdata = dev_get_platdata(dev); unsigned long mac_hi; unsigned long mac_lo; @@ -118,12 +118,12 @@ static int davinci_eth_set_mac_addr(struct eth_device *dev) * Using channel 0 only - other channels are disabled * */ writel(0, &adap_emac->MACINDEX); - mac_hi = (dev->enetaddr[3] << 24) | - (dev->enetaddr[2] << 16) | - (dev->enetaddr[1] << 8) | - (dev->enetaddr[0]); - mac_lo = (dev->enetaddr[5] << 8) | - (dev->enetaddr[4]); + mac_hi = (pdata->enetaddr[3] << 24) | + (pdata->enetaddr[2] << 16) | + (pdata->enetaddr[1] << 8) | + (pdata->enetaddr[0]); + mac_lo = (pdata->enetaddr[5] << 8) | + (pdata->enetaddr[4]); writel(mac_hi, &adap_emac->MACADDRHI); #if defined(DAVINCI_EMAC_VERSION2) @@ -411,7 +411,7 @@ static void __attribute__((unused)) davinci_eth_gigabit_enable(int phy_addr) } /* Eth device open */ -static int davinci_eth_open(struct eth_device *dev, bd_t *bis) +static int davinci_emac_start(struct udevice *dev) { dv_reg_p addr; u_int32_t clkdiv, cnt, mac_control; @@ -447,7 +447,7 @@ static int davinci_eth_open(struct eth_device *dev, bd_t *bis) writel(1, &adap_emac->TXCONTROL); writel(1, &adap_emac->RXCONTROL); - davinci_eth_set_mac_addr(dev); + davinci_emac_write_hwaddr(dev); /* Set DMA 8 TX / 8 RX Head pointers to 0 */ addr = &adap_emac->TX0HDP; @@ -588,7 +588,7 @@ static void davinci_eth_ch_teardown(int ch) } /* Eth device close */ -static void davinci_eth_close(struct eth_device *dev) +static void davinci_emac_stop(struct udevice *dev) { debug_emac("+ emac_close\n"); @@ -619,8 +619,8 @@ static int tx_send_loop = 0; * This function sends a single packet on the network and returns * positive number (number of bytes transmitted) or negative for error */ -static int davinci_eth_send_packet (struct eth_device *dev, - void *packet, int length) +static int davinci_emac_send(struct udevice *dev, + void *packet, int length) { int ret_status = -1; int index; @@ -672,7 +672,7 @@ static int davinci_eth_send_packet (struct eth_device *dev, /* * This function handles receipt of a packet from the network */ -static int davinci_eth_rcv_packet (struct eth_device *dev) +static int davinci_emac_recv(struct udevice *dev, int flags, uchar **packetp) { volatile emac_desc *rx_curr_desc; volatile emac_desc *curr_desc; @@ -742,6 +742,9 @@ static int davinci_eth_rcv_packet (struct eth_device *dev) } return (ret); } + + *packetp = rx_curr_desc->buffer; + return (0); } @@ -750,30 +753,12 @@ static int davinci_eth_rcv_packet (struct eth_device *dev) * EMAC modules power or pin multiplexors, that is done by board_init() * much earlier in bootup process. Returns 1 on success, 0 otherwise. */ -int davinci_emac_initialize(void) +static int davinci_emac_probe(struct udevice *dev) { u_int32_t phy_id; u_int16_t tmp; int i; int ret; - struct eth_device *dev; - - dev = malloc(sizeof *dev); - - if (dev == NULL) - return -1; - - memset(dev, 0, sizeof *dev); - strcpy(dev->name, "DaVinci-EMAC"); - - dev->iobase = 0; - dev->init = davinci_eth_open; - dev->halt = davinci_eth_close; - dev->send = davinci_eth_send_packet; - dev->recv = davinci_eth_rcv_packet; - dev->write_hwaddr = davinci_eth_set_mac_addr; - - eth_register(dev); davinci_eth_mdio_enable(); @@ -854,5 +839,29 @@ int davinci_emac_initialize(void) phy[i].auto_negotiate(i); } #endif - return(1); + return 0; } + +static const struct eth_ops davinci_emac_ops = { + .start = davinci_emac_start, + .send = davinci_emac_send, + .recv = davinci_emac_recv, + .stop = davinci_emac_stop, + .write_hwaddr = davinci_emac_write_hwaddr, +}; + +static const struct udevice_id davinci_emac_ids[] = { + { .compatible = "ti,davinci-dm6467-emac" }, + { .compatible = "ti,am3517-emac", }, + { .compatible = "ti,dm816-emac", }, + { } +}; + +U_BOOT_DRIVER(davinci_emac) = { + .name = "davinci_emac", + .id = UCLASS_ETH, + .of_match = davinci_emac_ids, + .probe = davinci_emac_probe, + .ops = &davinci_emac_ops, + .platdata_auto_alloc_size = sizeof(struct eth_pdata), +}; diff --git a/include/netdev.h b/include/netdev.h index 0a1a3a2d8d..a40c4adaad 100644 --- a/include/netdev.h +++ b/include/netdev.h @@ -30,7 +30,6 @@ int bcm_sf2_eth_register(bd_t *bis, u8 dev_num); int bfin_EMAC_initialize(bd_t *bis); int calxedaxgmac_initialize(u32 id, ulong base_addr); int cs8900_initialize(u8 dev_num, int base_addr); -int davinci_emac_initialize(void); int dc21x4x_initialize(bd_t *bis); int designware_initialize(ulong base_addr, u32 interface); int dm9000_initialize(bd_t *bis); -- 2.21.0

3 14

[U-Boot] Bug in omap_gpmc.c:omap_nand_read_prefetch
by Reitinger, Peter 24 Jun '19

24 Jun '19

Hello, sorry I am completely new to these kind of mailing lists, and quite probably I violate most of the rules for using this mailing list, but I have a serious bug to report and actually no time at all... /u-boot_2019/drivers/mtd/nand/raw/omap_gpmc.c - function omap_nand_read_prefetch(): Whenever buf % 4 is neither 0 or 2 (i.e. 1 or 3), too few or too many bytes, respectively, are read before the calls to __read_prefetch_align. Suggested fix: original: /* * If the destination buffer is unaligned, start with reading * the overlap byte-wise. */ head = ((uint32_t) buf) % 4; if (head) { omap_nand_read(mtd, buf, head); buf += head; len -= head; } fixed: /* * If the destination buffer is unaligned, start with reading * the overlap byte-wise. */ head = ((uint32_t) buf) % 4; if (head) { head = 4 - head; // randomly equal to head if head == 2 ;-) omap_nand_read(mtd, buf, head); buf += head; len -= head; } Best regards Peter Reitinger

1 0

[U-Boot] [PATCH] usb: ehci-mx6: Fix bus enumeration for DM case
by Marek Vasut 24 Jun '19

24 Jun '19

It is likely that the DM conversion of EHCI iMX6 driver was a derivative of EHCI VF, however the conversion is incomplete and is missing the bind workaround, which updates dev->seq number. Without this, all controllers have dev->seq number 0 . Add this bind workaround into EHCI iMX6 driver as well. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Abel Vesa <abel.vesa(a)nxp.com> Cc: Adam Ford <aford173(a)gmail.com> Cc: Fabio Estevam <festevam(a)gmail.com> Cc: Ludwig Zenz <lzenz(a)dh-electronics.com> Cc: Peng Fan <peng.fan(a)nxp.com> Cc: Stefano Babic <sbabic(a)denx.de> Cc: Vagrant Cascadian <vagrant(a)debian.org> --- drivers/usb/host/ehci-mx6.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c index 33abfeada0..109ed7ed4a 100644 --- a/drivers/usb/host/ehci-mx6.c +++ b/drivers/usb/host/ehci-mx6.c @@ -503,6 +503,22 @@ static int ehci_usb_ofdata_to_platdata(struct udevice *dev) return 0; } +static int ehci_usb_bind(struct udevice *dev) +{ + static int num_controllers; + + /* + * Without this hack, if we return ENODEV for USB Controller 0, on + * probe for the next controller, USB Controller 1 will be given a + * sequence number of 0. This conflicts with our requirement of + * sequence numbers while initialising the peripherals. + */ + dev->req_seq = num_controllers; + num_controllers++; + + return 0; +} + static int ehci_usb_probe(struct udevice *dev) { struct usb_platdata *plat = dev_get_platdata(dev); @@ -564,6 +580,7 @@ U_BOOT_DRIVER(usb_mx6) = { .id = UCLASS_USB, .of_match = mx6_usb_ids, .ofdata_to_platdata = ehci_usb_ofdata_to_platdata, + .bind = ehci_usb_bind, .probe = ehci_usb_probe, .remove = ehci_deregister, .ops = &ehci_usb_ops, -- 2.20.1

4 10

[U-Boot] Please pull u-boot-x86
by Bin Meng 24 Jun '19

24 Jun '19

Hi Tom, This includes the following changes to U-Boot x86 for v2019.07: - boot failure fix for Intel edison - tangier wdt conversion to driver model The following changes since commit 226a35ef0ef310d8fffa3e6283ee3aab9dab26aa: Merge branch '2019-06-20-master-imports' (2019-06-20 21:52:31 -0400) are available in the git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-x86 for you to fetch changes up to c974a3d1550557f246c98480083651c0a502e7e7: watchdog: tangier: Convert to use WDT class (2019-06-22 22:27:13 +0800) ---------------------------------------------------------------- Andy Shevchenko (3): x86: Revert "Don't set up MTRRs in SPL" watchdog: tangier: Replace unused constant with a comment watchdog: tangier: Convert to use WDT class arch/x86/cpu/tangier/Kconfig | 1 - arch/x86/dts/edison.dts | 4 ++++ arch/x86/lib/init_helpers.c | 5 +---- configs/edison_defconfig | 2 ++ drivers/watchdog/Kconfig | 17 ++++++++--------- drivers/watchdog/Makefile | 2 +- drivers/watchdog/tangier_wdt.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------- 7 files changed, 66 insertions(+), 43 deletions(-) Regards, Bin

2 1