February 2018 - U-Boot

Re: [U-Boot] U-Boot
by Marek Vasut 05 Mar '18

05 Mar '18

On 02/12/2018 03:52 PM, Mariano Coromac wrote: > Hello, I was hoping you could help me out with something. I just have 2 > main questions. I am using a SAMA5D27 and I've managed to port > AT91Bootloader and I'm currently on U-Boot U-Boot SPL can bring SAMA5D2 up, you don't need the AT91 bootloader. > 1. I am trying to use FLEXCOM1 (UART) as the main console of U-Boot but > haven't been able to find any documentation saying where or how U-Boot > specifies the console port. $ git grep DEBUG_UART configs/sama5d2* configs/sama5d27_som1_ek_mmc_defconfig:CONFIG_DEBUG_UART=y configs/sama5d27_som1_ek_mmc_defconfig:CONFIG_DEBUG_UART_ATMEL=y configs/sama5d27_som1_ek_mmc_defconfig:CONFIG_DEBUG_UART_BASE=0xf8020000 configs/sama5d27_som1_ek_mmc_defconfig:CONFIG_DEBUG_UART_CLOCK=82000000 configs/sama5d27_som1_ek_mmc_defconfig:CONFIG_DEBUG_UART_BOARD_INIT=y configs/sama5d27_som1_ek_mmc_defconfig:CONFIG_DEBUG_UART_ANNOUNCE=y would indicate there's a debug uart which you can use. I'm adding atmel maintainer to CC and dropping dead contacts. > 2. When U-Boot tries to boot it gives me these errors: > > bind node sdio-host@a0000000 > - attempt to match compatible string 'atmel,sama5d2-sdhci' > No match for node 'sdio-host@a0000000' > bind node sdio-host@b0000000 > - attempt to match compatible string 'atmel,sama5d2-sdhci' > No match for node 'sdio-host@b0000000' > bind node apb > - attempt to match compatible string 'simple-bus' > - found match at 'generic_simple_bus' > bind node pmc@f0014000 > - attempt to match compatible string 'atmel,sama5d2-pmc' > - found match at 'at91-pmc' > bind node mainck > - attempt to match compatible string 'atmel,at91sam9x5-clk-main' > - found match at 'at91sam9x5-main-osc-clk' > bind node pllack@0 > - attempt to match compatible string 'atmel,sama5d3-clk-pll' > - found match at 'at91-plla-clk' > bind node utmick > - attempt to match compatible string 'atmel,at91sam9x5-clk-utmi' > No match for node 'utmick' > bind node masterck > - attempt to match compatible string 'atmel,at91sam9x5-clk-master' > - found match at 'at91-master-clk' > bind node h32mxck > - attempt to match compatible string 'atmel,sama5d4-clk-h32mx' > No match for node 'h32mxck' > bind node periph32ck > - attempt to match compatible string 'atmel,at91sam9x5-clk-peripheral' > - found match at 'sam9x5-periph-clk' > Cannot create device named 'uart1_clk@25' (err=-12) > Error binding driver 'sam9x5-periph-clk': -12 > bind node periph64ck > - attempt to match compatible string 'atmel,at91sam9x5-clk-peripheral' > - found match at 'sam9x5-periph-clk' > Error binding driver 'sam9x5-periph-clk': -12 > bind node gck > - attempt to match compatible string 'atmel,sama5d2-clk-generated' > No match for node 'gck' > Some drivers failed to bind > Error binding driver 'at91-pmc': -12 > bind node spi@f8000000 > - attempt to match compatible string 'atmel,at91rm9200-spi' > No match for node 'spi@f8000000' > bind node serial@f8038200 > - attempt to match compatible string 'atmel,at91sam9260-usart' > - found match at 'serial_atmel' > Error binding driver 'serial_atmel': -12 > bind node gpio@fc038000 > - attempt to match compatible string 'atmel,sama5d2-gpio' > - found match at 'gpio_atmel_pio4' > Error binding driver 'gpio_atmel_pio4': -12 > Some drivers failed to bind > Error binding driver 'generic_simple_bus': -12 > Some drivers failed to bind > Error binding driver 'generic_simple_bus': -12 > Some drivers failed to bind > initcall sequence 26f20864 failed at call 26f073e4 (err=-12) > ### ERROR ### Please RESET the board ### > > NOTE: On my lists.c file I changed all the "dm_debug" for "dm_warn" > because the debug uart is the only one that's responding. > Any help or guidance would be really appreciated. Seems like some drivers are disabled. Which version of U-Boot do you use ? What platform did you derive your configuration from ? -- Best regards, Marek Vasut

6 22

[U-Boot] [RESEND PATCH v2 1/7] net: tsec: Fix style violations
by Mario Six 05 Mar '18

05 Mar '18

Signed-off-by: Mario Six <mario.six(a)gdsys.cc> Acked-by: Joe Hershberger <joe.hershberger(a)ni.com> --- v1 -> v2: None --- drivers/net/tsec.c | 72 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 37 insertions(+), 35 deletions(-) diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c index 18e7a83d0f..071595218e 100644 --- a/drivers/net/tsec.c +++ b/drivers/net/tsec.c @@ -74,11 +74,11 @@ static void tsec_configure_serdes(struct tsec_private *priv) * to the register offset used for external PHY accesses */ tsec_local_mdio_write(priv->phyregs_sgmii, in_be32(&priv->regs->tbipa), - 0, TBI_ANA, TBIANA_SETTINGS); + 0, TBI_ANA, TBIANA_SETTINGS); tsec_local_mdio_write(priv->phyregs_sgmii, in_be32(&priv->regs->tbipa), - 0, TBI_TBICON, TBICON_CLK_SELECT); + 0, TBI_TBICON, TBICON_CLK_SELECT); tsec_local_mdio_write(priv->phyregs_sgmii, in_be32(&priv->regs->tbipa), - 0, TBI_CR, CONFIG_TSEC_TBICR_SETTINGS); + 0, TBI_CR, CONFIG_TSEC_TBICR_SETTINGS); } #ifdef CONFIG_MCAST_TFTP @@ -116,7 +116,7 @@ static int tsec_mcast_addr(struct udevice *dev, const u8 *mcast_mac, int set) whichbit = (result >> 24) & 0x1f; /* the 5 LSB = which bit to set */ whichreg = result >> 29; /* the 3 MSB = which reg to set it in */ - value = 1 << (31-whichbit); + value = BIT(31 - whichbit); if (set) setbits_be32(&regs->hash.gaddr0 + whichreg, value); @@ -171,7 +171,6 @@ static void init_registers(struct tsec __iomem *regs) out_be32(&regs->attr, ATTR_INIT_SETTINGS); out_be32(&regs->attreli, ATTRELI_INIT_SETTINGS); - } /* @@ -222,8 +221,8 @@ static void adjust_link(struct tsec_private *priv, struct phy_device *phydev) out_be32(&regs->maccfg2, maccfg2); printf("Speed: %d, %s duplex%s\n", phydev->speed, - (phydev->duplex) ? "full" : "half", - (phydev->port == PORT_FIBRE) ? ", fiber mode" : ""); + (phydev->duplex) ? "full" : "half", + (phydev->port == PORT_FIBRE) ? ", fiber mode" : ""); } /* @@ -240,7 +239,7 @@ static int tsec_send(struct udevice *dev, void *packet, int length) { struct tsec_private *priv = (struct tsec_private *)dev->priv; struct tsec __iomem *regs = priv->regs; - uint16_t status; + u16 status; int result = 0; int i; @@ -287,7 +286,7 @@ static int tsec_recv(struct eth_device *dev) while (!(in_be16(&priv->rxbd[priv->rx_idx].status) & RXBD_EMPTY)) { int length = in_be16(&priv->rxbd[priv->rx_idx].length); - uint16_t status = in_be16(&priv->rxbd[priv->rx_idx].status); + u16 status = in_be16(&priv->rxbd[priv->rx_idx].status); uchar *packet = net_rx_packets[priv->rx_idx]; /* Send the packet up if there were no errors */ @@ -323,8 +322,8 @@ static int tsec_recv(struct udevice *dev, int flags, uchar **packetp) if (!(in_be16(&priv->rxbd[priv->rx_idx].status) & RXBD_EMPTY)) { int length = in_be16(&priv->rxbd[priv->rx_idx].length); - uint16_t status = in_be16(&priv->rxbd[priv->rx_idx].status); - uint32_t buf; + u16 status = in_be16(&priv->rxbd[priv->rx_idx].status); + u32 buf; /* Send the packet up if there were no errors */ if (!(status & RXBD_STATS)) { @@ -347,7 +346,7 @@ static int tsec_recv(struct udevice *dev, int flags, uchar **packetp) static int tsec_free_pkt(struct udevice *dev, uchar *packet, int length) { struct tsec_private *priv = (struct tsec_private *)dev->priv; - uint16_t status; + u16 status; out_be16(&priv->rxbd[priv->rx_idx].length, 0); @@ -427,7 +426,8 @@ void redundant_init(struct tsec_private *priv) clrbits_be32(&regs->dmactrl, DMACTRL_GRS | DMACTRL_GTS); do { - uint16_t status; + u16 status; + tsec_send(priv->dev, (void *)pkt, sizeof(pkt)); /* Wait for buffer to be received */ @@ -478,7 +478,7 @@ void redundant_init(struct tsec_private *priv) static void startup_tsec(struct tsec_private *priv) { struct tsec __iomem *regs = priv->regs; - uint16_t status; + u16 status; int i; /* reset the indices to zero */ @@ -532,7 +532,7 @@ static void startup_tsec(struct tsec_private *priv) * This allows U-Boot to find the first active controller. */ #ifndef CONFIG_DM_ETH -static int tsec_init(struct eth_device *dev, bd_t * bd) +static int tsec_init(struct eth_device *dev, bd_t *bd) #else static int tsec_init(struct udevice *dev) #endif @@ -616,22 +616,23 @@ static phy_interface_t tsec_get_interface(struct tsec_private *priv) } if (ecntrl & ECNTRL_REDUCED_MODE) { + phy_interface_t interface; + if (ecntrl & ECNTRL_REDUCED_MII_MODE) return PHY_INTERFACE_MODE_RMII; - else { - phy_interface_t interface = priv->interface; - - /* - * This isn't autodetected, so it must - * be set by the platform code. - */ - if ((interface == PHY_INTERFACE_MODE_RGMII_ID) || - (interface == PHY_INTERFACE_MODE_RGMII_TXID) || - (interface == PHY_INTERFACE_MODE_RGMII_RXID)) - return interface; - - return PHY_INTERFACE_MODE_RGMII; - } + + interface = priv->interface; + + /* + * This isn't autodetected, so it must + * be set by the platform code. + */ + if (interface == PHY_INTERFACE_MODE_RGMII_ID || + interface == PHY_INTERFACE_MODE_RGMII_TXID || + interface == PHY_INTERFACE_MODE_RGMII_RXID) + return interface; + + return PHY_INTERFACE_MODE_RGMII; } if (priv->flags & TSEC_GIGABIT) @@ -691,16 +692,16 @@ static int tsec_initialize(bd_t *bis, struct tsec_info_struct *tsec_info) int i; struct tsec_private *priv; - dev = (struct eth_device *)malloc(sizeof *dev); + dev = (struct eth_device *)malloc(sizeof(*dev)); - if (NULL == dev) + if (!dev) return 0; - memset(dev, 0, sizeof *dev); + memset(dev, 0, sizeof(*dev)); priv = (struct tsec_private *)malloc(sizeof(*priv)); - if (NULL == priv) + if (!priv) return 0; priv->regs = tsec_info->regs; @@ -747,10 +748,11 @@ static int tsec_initialize(bd_t *bis, struct tsec_info_struct *tsec_info) int tsec_eth_init(bd_t *bis, struct tsec_info_struct *tsecs, int num) { int i; - int ret, count = 0; + int count = 0; for (i = 0; i < num; i++) { - ret = tsec_initialize(bis, &tsecs[i]); + int ret = tsec_initialize(bis, &tsecs[i]); + if (ret > 0) count += ret; } -- 2.11.0

2 14

[U-Boot] [Patch] for drivers/net/phy/smsc.c to support SMSC LAN8741
by Arno Steffens 05 Mar '18

05 Mar '18

Hello, Be mild with me - my first patch to u-boot. Signed-off-by: Arno Steffens <star {at} gmx [dot] li> diff -Nur u-boot-2017.11/drivers/net/phy/smsc.c u-boot-2017.11_patched/drivers/net/phy/smsc.c --- u-boot-2017.11/drivers/net/phy/smsc.c 2017-11-14 02:08:06.000000000 +0100 +++ u-boot-2017.11_patched/drivers/net/phy/smsc.c 2018-01-24 12:17:39.326055469 +0100 @@ -83,6 +83,16 @@ .shutdown = &genphy_shutdown, }; +static struct phy_driver lan8741_driver = { + .name = "SMSC LAN8741", + .uid = 0x0007c120, + .mask = 0xffff0, + .features = PHY_BASIC_FEATURES, + .config = &genphy_config_aneg, + .startup = &genphy_startup, + .shutdown = &genphy_shutdown, +}; + static struct phy_driver lan8742_driver = { .name = "SMSC LAN8742", .uid = 0x0007c130, @@ -99,6 +109,7 @@ phy_register(&lan911x_driver); phy_register(&lan8700_driver); phy_register(&lan8740_driver); + phy_register(&lan8741_driver); phy_register(&lan8742_driver); return 0;

2 3

[U-Boot] [PATCH] net: e1000: Fix e1000_igb semaphore handling
by Bernhard Messerklinger 05 Mar '18

05 Mar '18

Fix commit f1bcad22dd19 ("net: e1000: add support for writing to EEPROM"). Signed-off-by: Bernhard Messerklinger <bernhard.messerklinger(a)br-automation.com> --- drivers/net/e1000.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c index 8316854bc1..5cc54efe48 100644 --- a/drivers/net/e1000.c +++ b/drivers/net/e1000.c @@ -1181,7 +1181,7 @@ e1000_put_hw_eeprom_semaphore(struct e1000_hw *hw) return; swsm = E1000_READ_REG(hw, SWSM); - if (hw->mac_type == e1000_80003es2lan) { + if (hw->mac_type == e1000_80003es2lan || hw->mac_type == e1000_igb) { /* Release both semaphores. */ swsm &= ~(E1000_SWSM_SMBI | E1000_SWSM_SWESMBI); } else -- 2.16.1

2 2

[U-Boot] [PATCH] NET: designware: fix clock enable
by Eugeniy Paltsev 05 Mar '18

05 Mar '18

After commit ba1f966725223 "net: designware: add clock support" we got NET broken on axs101 and axs103 platforms. Some clock don't support gating so their clock drivers don't implement .enable/.disable callbacks. In such case clk_enable returns -ENOSYS. Also some clock drivers implement .enable/.disable callbacks not for all clock IDs and return -ENOSYS (or -ENOTSUPP) for others. If we have such clock in 'clocks' list of designware ethernet controller node we fail to probe designware ethernet. Fix it. Signed-off-by: Eugeniy Paltsev <Eugeniy.Paltsev(a)synopsys.com> --- drivers/net/designware.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/designware.c b/drivers/net/designware.c index 6d53071..43670a7 100644 --- a/drivers/net/designware.c +++ b/drivers/net/designware.c @@ -684,7 +684,7 @@ int designware_eth_probe(struct udevice *dev) break; err = clk_enable(&priv->clocks[i]); - if (err) { + if (err && err != -ENOSYS && err != -ENOTSUPP) { pr_err("failed to enable clock %d\n", i); clk_free(&priv->clocks[i]); goto clk_err; -- 2.9.3

4 4

[U-Boot] [PATCH] spl: Kconfig: Rename SPL_USBETH_SUPPORT to SPL_USB_ETHER to match with the U-boot CONFIG
by Faiz Abbas 05 Mar '18

05 Mar '18

Rename CONFIG_SPL_USBETH_SUPPORT to CONFIG_SPL_USB_ETHER. This enables users to block text using CONFIG_IS_ENABLED() instead of resorting to #if ladders with SPL and non-SPL cases. Signed-off-by: Faiz Abbas <faiz_abbas(a)ti.com> --- arch/arm/mach-omap2/boot-common.c | 2 +- board/birdland/bav335x/board.c | 2 +- board/bosch/shc/board.c | 4 ++-- board/tcl/sl50/board.c | 4 ++-- board/ti/am335x/board.c | 6 +++--- board/vscom/baltos/board.c | 2 +- common/spl/Kconfig | 2 +- common/spl/spl_net.c | 4 ++-- configs/am335x_evm_usbspl_defconfig | 2 +- configs/am43xx_hs_evm_defconfig | 2 +- configs/mx6memcal_defconfig | 2 +- drivers/Makefile | 2 +- include/configs/am335x_evm.h | 2 +- include/configs/am335x_sl50.h | 2 +- include/configs/am43xx_evm.h | 2 +- include/configs/baltos.h | 2 +- include/configs/bav335x.h | 2 +- 17 files changed, 22 insertions(+), 22 deletions(-) diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c index 26245aa..db68a9d 100644 --- a/arch/arm/mach-omap2/boot-common.c +++ b/arch/arm/mach-omap2/boot-common.c @@ -99,7 +99,7 @@ void save_omap_boot_params(void) sys_boot_device = 1; break; #endif -#if defined(BOOT_DEVICE_USBETH) && !defined(CONFIG_SPL_USBETH_SUPPORT) +#if defined(BOOT_DEVICE_USBETH) && !defined(CONFIG_SPL_USB_ETHER) case BOOT_DEVICE_USBETH: sys_boot_device = 1; break; diff --git a/board/birdland/bav335x/board.c b/board/birdland/bav335x/board.c index f284568..d4bb1e7 100644 --- a/board/birdland/bav335x/board.c +++ b/board/birdland/bav335x/board.c @@ -360,7 +360,7 @@ static struct cpsw_platform_data cpsw_data = { * Build in only these cases to avoid warnings about unused variables * when we build an SPL that has neither option but full U-Boot will. */ -#if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USBETH_SUPPORT)) &&\ +#if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USB_ETHER)) &&\ defined(CONFIG_SPL_BUILD)) || \ ((defined(CONFIG_DRIVER_TI_CPSW) || \ defined(CONFIG_USB_ETHER) && defined(CONFIG_USB_MUSB_GADGET)) && \ diff --git a/board/bosch/shc/board.c b/board/bosch/shc/board.c index 999ed95..92689da 100644 --- a/board/bosch/shc/board.c +++ b/board/bosch/shc/board.c @@ -522,7 +522,7 @@ static struct cpsw_platform_data cpsw_data = { * when we build an SPL that has neither option but full U-Boot will. */ #if ((defined(CONFIG_SPL_ETH_SUPPORT) || \ - defined(CONFIG_SPL_USBETH_SUPPORT)) && \ + defined(CONFIG_SPL_USB_ETHER)) && \ defined(CONFIG_SPL_BUILD)) || \ ((defined(CONFIG_DRIVER_TI_CPSW) || \ defined(CONFIG_USB_ETHER) && defined(CONFIG_USB_MUSB_GADGET)) && \ @@ -563,7 +563,7 @@ int board_eth_init(bd_t *bis) #endif #if defined(CONFIG_USB_ETHER) && \ - (!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_USBETH_SUPPORT)) + (!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_USB_ETHER)) if (is_valid_ethaddr(mac_addr)) eth_env_set_enetaddr("usbnet_devaddr", mac_addr); diff --git a/board/tcl/sl50/board.c b/board/tcl/sl50/board.c index f79bb9d..933a407 100644 --- a/board/tcl/sl50/board.c +++ b/board/tcl/sl50/board.c @@ -299,7 +299,7 @@ static struct cpsw_platform_data cpsw_data = { * Build in only these cases to avoid warnings about unused variables * when we build an SPL that has neither option but full U-Boot will. */ -#if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USBETH_SUPPORT)) \ +#if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USB_ETHER)) \ && defined(CONFIG_SPL_BUILD)) || \ ((defined(CONFIG_DRIVER_TI_CPSW) || \ defined(CONFIG_USB_ETHER) && defined(CONFIG_MUSB_GADGET)) && \ @@ -371,7 +371,7 @@ int board_eth_init(bd_t *bis) #endif #if defined(CONFIG_USB_ETHER) && \ - (!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_USBETH_SUPPORT)) + (!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_USB_ETHER)) if (is_valid_ether_addr(mac_addr)) eth_env_set_enetaddr("usbnet_devaddr", mac_addr); diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c index 1a52bff..b144fd1 100644 --- a/board/ti/am335x/board.c +++ b/board/ti/am335x/board.c @@ -815,7 +815,7 @@ static struct cpsw_platform_data cpsw_data = { }; #endif -#if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USBETH_SUPPORT)) &&\ +#if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USB_ETHER)) &&\ defined(CONFIG_SPL_BUILD)) || \ ((defined(CONFIG_DRIVER_TI_CPSW) || \ defined(CONFIG_USB_ETHER) && defined(CONFIG_MUSB_GADGET)) && \ @@ -836,7 +836,7 @@ int board_eth_init(bd_t *bis) { int rv, n = 0; #if defined(CONFIG_USB_ETHER) && \ - (!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_USBETH_SUPPORT)) + (!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_USB_ETHER)) uint8_t mac_addr[6]; uint32_t mac_hi, mac_lo; @@ -906,7 +906,7 @@ int board_eth_init(bd_t *bis) } #endif #if defined(CONFIG_USB_ETHER) && \ - (!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_USBETH_SUPPORT)) + (!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_USB_ETHER)) if (is_valid_ethaddr(mac_addr)) eth_env_set_enetaddr("usbnet_devaddr", mac_addr); diff --git a/board/vscom/baltos/board.c b/board/vscom/baltos/board.c index cb39190..533d45e 100644 --- a/board/vscom/baltos/board.c +++ b/board/vscom/baltos/board.c @@ -423,7 +423,7 @@ static struct cpsw_platform_data cpsw_data = { }; #endif -#if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USBETH_SUPPORT)) \ +#if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USB_ETHER)) \ && defined(CONFIG_SPL_BUILD)) || \ ((defined(CONFIG_DRIVER_TI_CPSW) || \ defined(CONFIG_USB_ETHER) && defined(CONFIG_USB_MUSB_GADGET)) && \ diff --git a/common/spl/Kconfig b/common/spl/Kconfig index f58163c..9609fce 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -680,7 +680,7 @@ config SPL_USB_GADGET_SUPPORT if SPL_USB_GADGET_SUPPORT -config SPL_USBETH_SUPPORT +config SPL_USB_ETHER bool "Support USB Ethernet drivers" help Enable access to the USB network subsystem and associated diff --git a/common/spl/spl_net.c b/common/spl/spl_net.c index 8883109..ef13145 100644 --- a/common/spl/spl_net.c +++ b/common/spl/spl_net.c @@ -15,7 +15,7 @@ DECLARE_GLOBAL_DATA_PTR; -#if defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USBETH_SUPPORT) +#if defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USB_ETHER) static ulong spl_net_load_read(struct spl_load_info *load, ulong sector, ulong count, void *buf) { @@ -83,7 +83,7 @@ SPL_LOAD_IMAGE_METHOD("eth device", 0, BOOT_DEVICE_CPGMAC, spl_net_load_image_cpgmac); #endif -#ifdef CONFIG_SPL_USBETH_SUPPORT +#ifdef CONFIG_SPL_USB_ETHER int spl_net_load_image_usb(struct spl_image_info *spl_image, struct spl_boot_device *bootdev) { diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig index d61aa94..e4bf757 100644 --- a/configs/am335x_evm_usbspl_defconfig +++ b/configs/am335x_evm_usbspl_defconfig @@ -15,7 +15,7 @@ CONFIG_SPL_NET_SUPPORT=y CONFIG_SPL_NET_VCI_STRING="AM335x U-Boot SPL" CONFIG_SPL_OS_BOOT=y CONFIG_SPL_USB_GADGET_SUPPORT=y -CONFIG_SPL_USBETH_SUPPORT=y +CONFIG_SPL_USB_ETHER=y # CONFIG_SPL_YMODEM_SUPPORT is not set CONFIG_FASTBOOT=y CONFIG_CMD_SPL=y diff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig index e8a641e..e409f93 100644 --- a/configs/am43xx_hs_evm_defconfig +++ b/configs/am43xx_hs_evm_defconfig @@ -24,7 +24,7 @@ CONFIG_SPL_NET_VCI_STRING="AM43xx U-Boot SPL" CONFIG_SPL_USB_HOST_SUPPORT=y CONFIG_SPL_USB_SUPPORT=y CONFIG_SPL_USB_GADGET_SUPPORT=y -CONFIG_SPL_USBETH_SUPPORT=y +CONFIG_SPL_USB_ETHER=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_NAND=y diff --git a/configs/mx6memcal_defconfig b/configs/mx6memcal_defconfig index 79ca723..344da80 100644 --- a/configs/mx6memcal_defconfig +++ b/configs/mx6memcal_defconfig @@ -11,7 +11,7 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,SPL,MX6QDL" CONFIG_SPL=y CONFIG_SPL_USB_HOST_SUPPORT=y CONFIG_SPL_USB_GADGET_SUPPORT=y -CONFIG_SPL_USBETH_SUPPORT=y +CONFIG_SPL_USB_ETHER=y CONFIG_SPL_USB_SDP_SUPPORT=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_BOOTD is not set diff --git a/drivers/Makefile b/drivers/Makefile index e6062a5..2673428 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -35,7 +35,7 @@ obj-$(CONFIG_SPL_UBI) += mtd/ubispl/ obj-$(CONFIG_SPL_DMA_SUPPORT) += dma/ obj-$(CONFIG_SPL_ETH_SUPPORT) += net/ obj-$(CONFIG_SPL_ETH_SUPPORT) += net/phy/ -obj-$(CONFIG_SPL_USBETH_SUPPORT) += net/phy/ +obj-$(CONFIG_SPL_USB_ETHER) += net/phy/ obj-$(CONFIG_SPL_PCI_SUPPORT) += pci/ obj-$(CONFIG_SPL_PCH_SUPPORT) += pch/ obj-$(CONFIG_SPL_RTC_SUPPORT) += rtc/ diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 2e1dbf6..6b89f08 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -243,7 +243,7 @@ #undef CONFIG_DM_USB #endif -#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT) +#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USB_ETHER) /* Remove other SPL modes. */ /* disable host part of MUSB in SPL */ /* disable EFI partitions and partition UUID support */ diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h index 1cb3578..a6b689b 100644 --- a/include/configs/am335x_sl50.h +++ b/include/configs/am335x_sl50.h @@ -77,7 +77,7 @@ #define CONFIG_BOOTCOUNT_AM33XX #define CONFIG_SYS_BOOTCOUNT_BE -#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT) +#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USB_ETHER) /* Remove other SPL modes. */ /* disable host part of MUSB in SPL */ #undef CONFIG_MUSB_HOST diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 726dbba..0da525d 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -80,7 +80,7 @@ #define CONFIG_AM437X_USB2PHY2_HOST #endif -#if defined(CONFIG_SPL_BUILD) && !defined(CONFIG_SPL_USBETH_SUPPORT) +#if defined(CONFIG_SPL_BUILD) && !defined(CONFIG_SPL_USB_ETHER) #undef CONFIG_USB_DWC3_PHY_OMAP #undef CONFIG_USB_DWC3_OMAP #undef CONFIG_USB_DWC3 diff --git a/include/configs/baltos.h b/include/configs/baltos.h index 440dbf5..7c64f19 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -275,7 +275,7 @@ #define CONFIG_AM335X_USB1 #define CONFIG_AM335X_USB1_MODE MUSB_OTG -#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT) +#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USB_ETHER) /* disable host part of MUSB in SPL */ /* disable EFI partitions and partition UUID support */ /* diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index 5ea7658..847f746 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -396,7 +396,7 @@ DEFAULT_LINUX_BOOT_ENV \ #define CONFIG_AM335X_USB1 #define CONFIG_AM335X_USB1_MODE MUSB_HOST -#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT) +#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USB_ETHER) /* disable host part of MUSB in SPL */ /* disable EFI partitions and partition UUID support */ #endif -- 2.7.4

2 1

[U-Boot] [PATCH 0/3] Fix potential buffer overruns in TPM driver
by Jeremy Boone 05 Mar '18

05 Mar '18

From: Jeremy Boone <jeremy.boone(a)nccgroup.trust> The TPM response packet often contains a variable-length payload. It is the responsibility of U-Boot driver code to ensure that the length value that has been extracted from the response packet's header or body is appropriately sized before copying that data into another buffer. Jeremy Boone (3): STMicro TPM: Fix potential buffer overruns Infineon TPM: Fix potential buffer overruns Atmel TPM: Fix potential buffer overruns drivers/tpm/tpm_atmel_twi.c | 14 ++++++++++++-- drivers/tpm/tpm_tis_infineon.c | 5 +++-- drivers/tpm/tpm_tis_st33zp24_i2c.c | 5 +++-- drivers/tpm/tpm_tis_st33zp24_spi.c | 5 +++-- 4 files changed, 21 insertions(+), 8 deletions(-) -- 2.7.4

2 6

[U-Boot] [PATCH v1 0/6] Add support for DM_USB for TI's DRA7 platforms
by Jean-Jacques Hiblot 05 Mar '18

05 Mar '18

Supporting DM USB is required to support DM_ETH and USB network adapters with the same binary. This series adds support for DM_USB for the DRA7 family. It leverages the work done for the STi family. limitations: - only USB2 Host is supported. USB2 Device can be added later. - only DRA7 platforms, though it could be extended to other TI SOCs Jean-Jacques Hiblot (6): board: ti: dra7xx-evm: turn on USB clocks in late init stage syscon: dm: Add a new method to get a regmap from DTS phy: Add a new driver for OMAP's USB2 PHYs usb: omap5: Add glue logic to support DM for USB host configs: enable DM_USB for all the platforms of the DRA7 family dts: dra7x: enable host on USB2 for all the platforms of the DRA7 family arch/arm/dts/dra7-evm-common.dtsi | 7 ++ arch/arm/dts/dra72-evm-common.dtsi | 4 + arch/arm/dts/omap5-u-boot.dtsi | 4 + board/ti/dra7xx/evm.c | 19 ++++ configs/dra7xx_evm_defconfig | 2 + configs/dra7xx_hs_evm_defconfig | 2 + drivers/core/syscon-uclass.c | 23 +++++ drivers/phy/Kconfig | 8 ++ drivers/phy/Makefile | 2 + drivers/phy/omap-usb2-phy.c | 186 +++++++++++++++++++++++++++++++++++++ drivers/usb/host/Kconfig | 10 ++ drivers/usb/host/Makefile | 1 + drivers/usb/host/dwc3-omap-glue.c | 47 ++++++++++ include/syscon.h | 13 +++ 14 files changed, 328 insertions(+) create mode 100644 drivers/phy/omap-usb2-phy.c create mode 100644 drivers/usb/host/dwc3-omap-glue.c -- 1.9.1

3 11

[U-Boot] [PATCH 00/14] Add integrated phy support for rk322x and rk3328
by David Wu 05 Mar '18

05 Mar '18

To support the integrated phy, it is necessary that the gmac need to get 50M clock rate from internal PLL, the integrated phy can't generate 50M clock itself. David Wu (14): net: rockchip: Separate rmii and rgmii speed setup net: rockchip: Add rmii interface and rmii speed setup for rk3228 and rk3328 net: rockchip: Add integrated phy ops net: rockchip: Add integrated phy for rk3228 and rk3328 cllk: rockchip: Change the defined name for CONFIG_RESET_ROCKCHIP clk: rockchip: fix the gmac selection of pll source for rk322x clk: rockchip: Init CPLL 600M for rk322x clk: rockchip: Add SCLK_MAC_SRC clock rate setup ARM: dts: rockchip: Add integrated phy reset and clock for rk322x ARM: dts: rockchip: Enable integrated phy support for rk3229-evb clk: rk3328: Implement the gmac2phy clock assignment ARM: dts: rockchip: Add gmac2phy dts node for rk3328 ARM: dts: rockchip: Enable gmac2phy feature for rk3328-evb rockchip: defconfig: Enable CONFIG_RESET_ROCKCHIP for rk3329-evb and rk3328-evb arch/arm/dts/rk3229-evb.dts | 22 ++ arch/arm/dts/rk322x.dtsi | 8 +- arch/arm/dts/rk3328-evb.dts | 10 + arch/arm/dts/rk3328.dtsi | 35 +++ arch/arm/include/asm/arch-rockchip/cru_rk322x.h | 1 + configs/evb-rk3229_defconfig | 1 + configs/evb-rk3328_defconfig | 1 + drivers/clk/rockchip/clk_rk3036.c | 2 +- drivers/clk/rockchip/clk_rk322x.c | 18 +- drivers/clk/rockchip/clk_rk3288.c | 2 +- drivers/clk/rockchip/clk_rk3328.c | 90 ++++++- drivers/clk/rockchip/clk_rk3368.c | 2 +- drivers/clk/rockchip/clk_rk3399.c | 2 +- drivers/clk/rockchip/clk_rv1108.c | 2 +- drivers/net/gmac_rockchip.c | 328 ++++++++++++++++++++++-- 15 files changed, 487 insertions(+), 37 deletions(-) -- 2.7.4

2 37

[U-Boot] [PATCH 0/9] Add common pinctrl driver support for rockchip
by David Wu 05 Mar '18

05 Mar '18

The common pinctrl driver for rockchip Socs, it depends the PINCTRL_FULL config. If use it, the default pinctrl setup from DTS could be configured at device probe. David Wu (9): rockchip: rk3399-evb: defconfig: Disable SPL_OF_PLATDATA for new pinctrl driver ARM: rockchip: rk3188: Remove the pinctrl setup and enable uart at SPL ARM: rockchip: Kconfig: Remove the SPL_PINCTRL for rk3188 ARM: rockchip: Remove the pinctrl request at rk3288-board-spl rk3288: chrome: defconfig: Disable SPL_OF_PLATDATA for new pinctrl driver pinctrl: rockchip: Add common rockchip pinctrl driver rockchip: defconfig: Clean the unused pinctrl config pinctrl: rockchip: Clean the unused rockchip pinctrl drivers ARM: dts: rk322x: Correct the uart2 default pin configuration arch/arm/dts/rk322x.dtsi | 11 +- arch/arm/mach-rockchip/Kconfig | 1 - arch/arm/mach-rockchip/rk3188-board-spl.c | 42 +- arch/arm/mach-rockchip/rk3288-board-spl.c | 79 - configs/chromebit_mickey_defconfig | 4 - configs/chromebook_jerry_defconfig | 4 - configs/chromebook_minnie_defconfig | 4 - configs/evb-px5_defconfig | 1 - configs/evb-rk3128_defconfig | 1 - configs/evb-rk3229_defconfig | 1 - configs/evb-rk3288_defconfig | 2 - configs/evb-rk3399_defconfig | 2 - configs/evb-rv1108_defconfig | 1 - configs/fennec-rk3288_defconfig | 2 - configs/firefly-rk3288_defconfig | 2 - configs/firefly-rk3399_defconfig | 1 - configs/geekbox_defconfig | 1 - configs/kylin-rk3036_defconfig | 1 - configs/lion-rk3368_defconfig | 1 - configs/miqi-rk3288_defconfig | 2 - configs/phycore-rk3288_defconfig | 2 - configs/popmetal-rk3288_defconfig | 2 - configs/puma-rk3399_defconfig | 1 - configs/rock2_defconfig | 2 - configs/rock_defconfig | 1 - configs/sandbox_defconfig | 2 - configs/sandbox_flattree_defconfig | 2 - configs/sandbox_noblk_defconfig | 2 - configs/sheep-rk3368_defconfig | 1 - configs/tinker-rk3288_defconfig | 2 - configs/vyasa-rk3288_defconfig | 2 - drivers/pinctrl/Kconfig | 98 +- drivers/pinctrl/Makefile | 2 +- drivers/pinctrl/pinctrl-rockchip.c | 2440 +++++++++++++++++++++++++++++ drivers/pinctrl/rockchip/Makefile | 15 - drivers/pinctrl/rockchip/pinctrl_rk3036.c | 264 ---- drivers/pinctrl/rockchip/pinctrl_rk3128.c | 187 --- drivers/pinctrl/rockchip/pinctrl_rk3188.c | 610 -------- drivers/pinctrl/rockchip/pinctrl_rk322x.c | 895 ----------- drivers/pinctrl/rockchip/pinctrl_rk3288.c | 870 ---------- drivers/pinctrl/rockchip/pinctrl_rk3328.c | 708 --------- drivers/pinctrl/rockchip/pinctrl_rk3368.c | 742 --------- drivers/pinctrl/rockchip/pinctrl_rk3399.c | 457 ------ drivers/pinctrl/rockchip/pinctrl_rv1108.c | 582 ------- 44 files changed, 2466 insertions(+), 5586 deletions(-) create mode 100644 drivers/pinctrl/pinctrl-rockchip.c delete mode 100644 drivers/pinctrl/rockchip/Makefile delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3036.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3128.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3188.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk322x.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3288.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3328.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3368.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3399.c delete mode 100644 drivers/pinctrl/rockchip/pinctrl_rv1108.c -- 2.7.4

3 30