May 2017 - U-Boot

[U-Boot] [PATCH v2 00/12] i2c: Remove old I2C support
by Simon Glass 13 May '17

13 May '17

We have about 6600 CONFIG options to convert to Kconfig at the time of writing and our target is to complete work by the end of the year. We have no hope of doing this unless we adopt a somewhat more agressive approach to dropping old boards and options. There are a very large number of deprecated or very old options. It does not make sense to convert these to Kconfig just to carry the debt for another few years. We should remove these options. Rather than completely dropping boards, one idea is to remove the parts of their support which have not been migrated. This was done with some Samsung boards recently, and it provided the maintainers with enough time to come in and make the changes. CONFIG_I2C_SOFT and CONFIG_I2C_HARD are very old. This series removes them. Boards which rely on these options for I2C support lose some of their functionality. To regain it they would need to be migrated to driver model. Changes in v2: - Add new patch to adjust omap boards to not need CONFIG_I2C_HARD - Drop changes to omap board.c files - Rebase to master Simon Glass (12): i2c: Drop use of CONFIG_I2C_HARD i2c: powerpc: Remove use of CONFIG_HARD_I2C i2c: cm5200: Drop use of CONFIG_I2C_HARD i2c: pdm360ng: Drop use of CONFIG_I2C_HARD i2c: keymile: Drop use of CONFIG_I2C_HARD i2c: mxc_i2c: Drop use of CONFIG_I2C_HARD i2c: omap: Modify code to work without CONFIG_I2C_HARD i2c: Drop use of CONFIG_I2C_HARD i2c: README: Drop CONFIG_SYS_I2C_INIT_MPC5XXX i2c: Drop CONFIG_SYS_I2C_BOARD_LATE_INIT Drop CONFIG_I2CFAST Drop use of CONFIG_I2C_SOFT README | 64 +-- arch/arm/include/asm/arch-armada100/config.h | 12 - arch/powerpc/cpu/mpc512x/Makefile | 1 - arch/powerpc/cpu/mpc512x/i2c.c | 386 -------------- arch/powerpc/cpu/mpc5xxx/Makefile | 1 - arch/powerpc/cpu/mpc5xxx/i2c.c | 456 ----------------- arch/powerpc/cpu/mpc8260/Makefile | 2 +- arch/powerpc/cpu/mpc8260/commproc.c | 4 - arch/powerpc/cpu/mpc8260/i2c.c | 741 --------------------------- arch/powerpc/cpu/mpc8xx/Makefile | 1 - arch/powerpc/cpu/mpc8xx/i2c.c | 672 ------------------------ board/alphaproject/ap_sh4a_4a/ap_sh4a_4a.c | 12 +- board/cm5200/cm5200.c | 36 +- board/cm5200/cmd_cm5200.c | 32 +- board/davedenx/aria/aria.c | 3 - board/esd/mecp5123/mecp5123.c | 12 +- board/freescale/m52277evb/README | 1 - board/freescale/m53017evb/README | 1 - board/freescale/m5373evb/README | 1 - board/freescale/m54455evb/README | 1 - board/freescale/m547xevb/README | 1 - board/freescale/mpc5121ads/mpc5121ads.c | 21 - board/ifm/ac14xx/ac14xx.c | 53 +- board/keymile/km82xx/km82xx.c | 5 - board/keymile/km_arm/km_arm.c | 4 - board/pdm360ng/pdm360ng.c | 30 -- board/renesas/r0p7734/r0p7734.c | 12 +- board/ti/am335x/board.c | 3 +- board/ti/am43xx/board.c | 3 +- board/tqc/tqm5200/tqm5200.c | 18 +- cmd/eeprom.c | 2 - common/board_f.c | 4 +- common/board_r.c | 17 - common/stdio.c | 5 +- configs/MiniFAP_defconfig | 2 - configs/O2D300_defconfig | 1 - configs/O2DNT2_RAMBOOT_defconfig | 1 - configs/O2DNT2_defconfig | 1 - configs/O2D_defconfig | 1 - configs/O2I_defconfig | 1 - configs/O2MNT_O2M110_defconfig | 1 - configs/O2MNT_O2M112_defconfig | 1 - configs/O2MNT_O2M113_defconfig | 1 - configs/O2MNT_defconfig | 1 - configs/O3DNT_defconfig | 1 - configs/TQM5200S_HIGHBOOT_defconfig | 2 - configs/TQM5200S_defconfig | 2 - configs/TQM5200_B_HIGHBOOT_defconfig | 2 - configs/TQM5200_B_defconfig | 2 - configs/TQM5200_STK100_defconfig | 2 - configs/TQM5200_defconfig | 2 - configs/a4m072_defconfig | 1 - configs/ac14xx_defconfig | 1 - configs/ap_sh4a_4a_defconfig | 1 - configs/apx4devkit_defconfig | 2 - configs/aria_defconfig | 1 - configs/aspenite_defconfig | 1 - configs/cam5200_defconfig | 2 - configs/cam5200_niosflash_defconfig | 2 - configs/charon_defconfig | 1 - configs/cm5200_defconfig | 1 - configs/digsy_mtc_RAMBOOT_defconfig | 2 - configs/digsy_mtc_defconfig | 2 - configs/digsy_mtc_rev5_RAMBOOT_defconfig | 2 - configs/digsy_mtc_rev5_defconfig | 2 - configs/fo300_defconfig | 2 - configs/gplugd_defconfig | 1 - configs/ipek01_defconfig | 2 - configs/m28evk_defconfig | 1 - configs/mecp5123_defconfig | 2 - configs/motionpro_defconfig | 2 - configs/mpc5121ads_defconfig | 2 - configs/mpc5121ads_rev2_defconfig | 2 - configs/pcm030_LOWBOOT_defconfig | 2 - configs/pcm030_defconfig | 2 - configs/pdm360ng_defconfig | 2 - configs/r0p7734_defconfig | 1 - configs/v38b_defconfig | 2 - drivers/i2c/fsl_i2c.c | 9 - drivers/i2c/fti2c010.c | 9 - drivers/i2c/mxc_i2c.c | 4 - include/common.h | 10 + include/configs/M54418TWR.h | 1 - include/configs/PATI.h | 7 +- include/configs/TQM5200.h | 64 +-- include/configs/a4m072.h | 20 - include/configs/ac14xx.h | 18 - include/configs/am335x_evm.h | 5 - include/configs/am43xx_evm.h | 6 - include/configs/ap_sh4a_4a.h | 14 - include/configs/apx4devkit.h | 6 - include/configs/aria.h | 21 - include/configs/axs10x.h | 2 +- include/configs/cm5200.h | 12 +- include/configs/digsy_mtc.h | 31 -- include/configs/ids8313.h | 1 - include/configs/ipek01.h | 23 - include/configs/jupiter.h | 19 - include/configs/m28evk.h | 6 - include/configs/manroland/mpc5200-common.h | 176 +++++++ include/configs/mecp5123.h | 18 +- include/configs/motionpro.h | 22 - include/configs/mpc5121ads.h | 18 - include/configs/mxs.h | 10 - include/configs/o2dnt-common.h | 22 - include/configs/pcm030.h | 31 +- include/configs/pdm360ng.h | 30 -- include/configs/r0p7734.h | 14 - include/configs/s32v234evb.h | 10 - include/configs/ti_armv7_keystone2.h | 1 - include/configs/v38b.h | 21 - include/i2c.h | 3 - scripts/config_whitelist.txt | 3 - 113 files changed, 223 insertions(+), 3129 deletions(-) delete mode 100644 arch/powerpc/cpu/mpc512x/i2c.c delete mode 100644 arch/powerpc/cpu/mpc5xxx/i2c.c delete mode 100644 arch/powerpc/cpu/mpc8260/i2c.c delete mode 100644 arch/powerpc/cpu/mpc8xx/i2c.c create mode 100644 include/configs/manroland/mpc5200-common.h -- 2.13.0.rc2.291.g57267f2277-goog

2 20

[U-Boot] Xpedite boards
by Simon Glass 13 May '17

13 May '17

Hi Peter, I am trying to help with the U-Boot conversion of CONFIG options to Kconfig. I notice that the Xpedite boards use a ds4510 driver which defines quite a few of these options. I could potentially convert it to Kconfig. However, many of the options in these boards define I2C addresses, which these days should be done with driver model / device tree. I wonder if you have any interest in converting these boards as part of ongoing work? Regards, Simon

2 2

[U-Boot] [RESEND PATCH v2 0/6] MIPS Boston updates and fixes
by Daniel Schwierzeck 12 May '17

12 May '17

This series is a resend of selected MIPS Boston updates/fixes from the original patch series [1] which was blocked by rejected PCI core changes and the series for converting CONFIG_SYS_SDRAM_BASE on MIPS from a virtual address to a physical one. At least the patches not affected by the blocking patch series should be finally applied. [1] https://lists.denx.de/pipermail/u-boot/2016-September/268137.html Changes in v2: - also patch ARM specific code to get a consistent behaviour - move to menu "General setup" - set default value for Boston in arch/mips/Kconfig - rebased to current mainline - rebased to current mainline Paul Burton (6): image: Use ram_top, not bi_memsize, in getenv_bootm_size MIPS: Make CM GCR base configurable boston: Move CM GCRs away from flash boston: Setup memory ranges in FDT provided to Linux boston: Bump CONFIG_SYS_BOOTM_LEN to 64MiB boston: Enable CONFIG_DISTRO_DEFAULTS in defconfigs arch/mips/Kconfig | 21 ++++++++++++--------- board/imgtec/boston/Makefile | 1 + board/imgtec/boston/dt.c | 27 +++++++++++++++++++++++++++ common/image.c | 3 +-- configs/boston32r2_defconfig | 7 +------ configs/boston32r2el_defconfig | 7 +------ configs/boston64r2_defconfig | 7 +------ configs/boston64r2el_defconfig | 7 +------ include/configs/boston.h | 5 +++++ 9 files changed, 50 insertions(+), 35 deletions(-) create mode 100644 board/imgtec/boston/dt.c -- 2.11.0

2 19

[U-Boot] [PATCH 1/5] mips: bmips: bcm6358: fix brcm, bcm6358-mc size
by Álvaro Fernández Rojas 12 May '17

12 May '17

Shrink brcm,bcm6358-mc size to avoid overlapping with other controllers Signed-off-by: Álvaro Fernández Rojas <noltari(a)gmail.com> --- arch/mips/dts/brcm,bcm6358.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/mips/dts/brcm,bcm6358.dtsi b/arch/mips/dts/brcm,bcm6358.dtsi index df75988..0dad998 100644 --- a/arch/mips/dts/brcm,bcm6358.dtsi +++ b/arch/mips/dts/brcm,bcm6358.dtsi @@ -133,7 +133,7 @@ memory-controller@fffe1200 { compatible = "brcm,bcm6358-mc"; - reg = <0xfffe1200 0x1000>; + reg = <0xfffe1200 0x4c>; u-boot,dm-pre-reloc; }; }; -- 2.1.4

2 9

Re: [U-Boot] drivers: pci: imx: add imx_pcie_remove function
by Soeren Moch 12 May '17

12 May '17

> There is no dedicated reset signal wired up for the MX6QDL thus if the > bootloader enables the link we need some special handling to get the core > back into a state where it is safe to touch it for configuration. > > While there has been some special handling in the Linux kernel to do this, > it was removed in 4.11 thus we need to do it properly in the bootloader > and therefore without this if you enable PCI in the bootloader you will hang > while booting the 4.11 kernel. > > This puts the PCIe controller back into a safe state for the kernel driver > before launching the kernel. > > Signed-off-by: Tim Harvey <tharvey(a)gateworks.com> Successfully tested on a tbs2910 board. Tested-by: Soeren Moch <smoch(a)web.de>

1 0

[U-Boot] [PATCH 0/2] armv7m: cache: cleanup before linux booting
by Vikas Manocha 12 May '17

12 May '17

This patchset: - add all data cache flushing & invalidation functions as declared in the common header file. - adds cleanup before linux booting. Vikas Manocha (2): armv7m: cache: add flush & invalidate all dcache arvm7m: add cleanup before linux booting arch/arm/cpu/armv7m/cache.c | 15 +++++++++++++++ arch/arm/cpu/armv7m/cpu.c | 19 +++++++++++++++++++ 2 files changed, 34 insertions(+) -- 1.9.1

3 5

[U-Boot] [PATCH 1/5] usb: dwc3: Add helper functions to enable snooping and burst settings
by yinbo.zhu 12 May '17

12 May '17

From: Rajat Srivastava <rajat.srivastava(a)nxp.com> Adds helper functions to enable snooping and outstanding burst beat settings. Signed-off-by: Rajat Srivastava <rajat.srivastava(a)nxp.com> Signed-off-by: Rajesh Bhagat <rajesh.bhagat(a)nxp.com> --- drivers/usb/dwc3/core.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ drivers/usb/dwc3/core.h | 7 +++++++ 2 files changed, 52 insertions(+) diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index 85cc96a..4ac599a 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -599,6 +599,51 @@ static void dwc3_core_exit_mode(struct dwc3 *dwc) #define DWC3_ALIGN_MASK (16 - 1) +void dwc3_core_incr_burst_enable(int index, int btype_incr_val, + int breq_limit) +{ + struct dwc3 *dwc; + u32 reg; + + list_for_each_entry(dwc, &dwc3_list, list) { + if (dwc->index != index) + continue; + + /* + * Change burst beat and outstanding pipelined + * transfers requests + */ + reg = dwc3_readl(dwc->regs, DWC3_GSBUSCFG0); + reg = (reg & ~DWC3_INCR_BTYPE_MASK) | btype_incr_val; + dwc3_writel(dwc->regs, DWC3_GSBUSCFG0, reg); + + reg = dwc3_readl(dwc->regs, DWC3_GSBUSCFG1); + reg = (reg & ~DWC3_BREQ_LIMIT_MASK) | (breq_limit << 8); + dwc3_writel(dwc->regs, DWC3_GSBUSCFG1, reg); + break; + } +} + +void dwc3_core_set_snooping(int index, bool snoop) +{ + struct dwc3 *dwc; + u32 reg; + + list_for_each_entry(dwc, &dwc3_list, list) { + if (dwc->index != index) + continue; + + /* Enable/Disable snooping */ + reg = dwc3_readl(dwc->regs, DWC3_GSBUSCFG0); + if (snoop) + reg |= DWC3_SNOOP_ENABLE; + else + reg &= ~DWC3_SNOOP_ENABLE; + dwc3_writel(dwc->regs, DWC3_GSBUSCFG0, reg); + break; + } +} + /** * dwc3_uboot_init - dwc3 core uboot initialization code * @dwc3_dev: struct dwc3_device containing initialization data diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h index 72d2fcd..455e7fa 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -593,6 +593,13 @@ struct dwc3_hwparams { /* HWPARAMS7 */ #define DWC3_RAM1_DEPTH(n) ((n) & 0xffff) +/* GSBUSCFG0 */ +#define DWC3_SNOOP_ENABLE (0x22220000) +#define DWC3_INCR_BTYPE_MASK (0xff) + +/* GSBUSCFG1 */ +#define DWC3_BREQ_LIMIT_MASK (0xf00) + struct dwc3_request { struct usb_request request; struct list_head list; -- 2.1.0.27.g96db324

2 1

[U-Boot] [RFC] drivers: pci: imx: add imx_pcie_remove function
by Tim Harvey 12 May '17

12 May '17

There is no dedicated reset signal wired up for the MX6QDL thus if the bootloader enables the link we need some special handling to get the core back into a state where it is safe to touch it for configuration. While there has been some special handling in the Linux kernel to do this, it was removed in 4.11 thus we need to do it properly in the bootloader and therefore without this if you enable PCI in the bootloader you will hang while booting the 4.11 kernel. This was tested on a Gateworks Ventana board. TODO: what is the right arch specific place to hook the remove function? Signed-off-by: Tim Harvey <tharvey(a)gateworks.com> --- board/gateworks/gw_ventana/gw_ventana.c | 3 +++ drivers/pci/pcie_imx.c | 38 +++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c index f404497..6762a71 100644 --- a/board/gateworks/gw_ventana/gw_ventana.c +++ b/board/gateworks/gw_ventana/gw_ventana.c @@ -1163,6 +1163,9 @@ int ft_board_setup(void *blob, bd_t *bd) int i; char rev = 0; +#if defined(CONFIG_CMD_PCI) + imx_pcie_remove(); +#endif /* determine board revision */ for (i = sizeof(ventana_info.model) - 1; i > 0; i--) { if (ventana_info.model[i] >= 'A') { diff --git a/drivers/pci/pcie_imx.c b/drivers/pci/pcie_imx.c index 732d59d..eab0a2b 100644 --- a/drivers/pci/pcie_imx.c +++ b/drivers/pci/pcie_imx.c @@ -42,6 +42,9 @@ /* PCIe Port Logic registers (memory-mapped) */ #define PL_OFFSET 0x700 +#define PCIE_PL_PFLR (PL_OFFSET + 0x08) +#define PCIE_PL_PFLR_LINK_STATE_MASK (0x3f << 16) +#define PCIE_PL_PFLR_FORCE_LINK (1 << 15) #define PCIE_PHY_DEBUG_R0 (PL_OFFSET + 0x28) #define PCIE_PHY_DEBUG_R1 (PL_OFFSET + 0x2c) #define PCIE_PHY_DEBUG_R1_LINK_UP (1 << 4) @@ -445,6 +448,36 @@ static int imx6_pcie_assert_core_reset(void) /* Power up PCIe PHY */ setbits_le32(&gpc_regs->cntr, PCIE_PHY_PUP_REQ); #else + /* + * If the bootloader already enabled the link we need some special + * handling to get the core back into a state where it is safe to + * touch it for configuration. As there is no dedicated reset signal + * wired up for MX6QDL, we need to manually force LTSSM into "detect" + * state before completely disabling LTSSM, which is a prerequisite + * for core configuration. + * + * If both LTSSM_ENABLE and REF_SSP_ENABLE are active we have a strong + * indication that the bootloader activated the link. + */ + if (is_mx6dq()) { + u32 val, gpr1, gpr12; + + gpr1 = readl(&iomuxc_regs->gpr[1]); + gpr12 = readl(&iomuxc_regs->gpr[12]); + if ((gpr1 & IOMUXC_GPR1_PCIE_REF_CLK_EN) && + (gpr12 & IOMUXC_GPR12_PCIE_CTL_2)) { + val = readl(MX6_DBI_ADDR + PCIE_PL_PFLR); + val &= ~PCIE_PL_PFLR_LINK_STATE_MASK; + val |= PCIE_PL_PFLR_FORCE_LINK; + + imx_pcie_fix_dabt_handler(true); + writel(val, MX6_DBI_ADDR + PCIE_PL_PFLR); + imx_pcie_fix_dabt_handler(false); + + gpr12 &= ~IOMUXC_GPR12_PCIE_CTL_2; + writel(val, &iomuxc_regs->gpr[12]); + } + } setbits_le32(&iomuxc_regs->gpr[1], IOMUXC_GPR1_TEST_POWERDOWN); clrbits_le32(&iomuxc_regs->gpr[1], IOMUXC_GPR1_REF_SSP_EN); #endif @@ -652,6 +685,11 @@ void imx_pcie_init(void) } } +void imx_pcie_remove(void) +{ + imx6_pcie_assert_core_reset(); +} + /* Probe function. */ void pci_init_board(void) { -- 2.7.4

7 12

[U-Boot] [PATCH v2 0/2] davinci: omapl138_lcdk: enable commonly used commands
by Sekhar Nori 12 May '17

12 May '17

Hi, This patch series enables some commonly used commands for OMAP-L138 LCDK. v1->v2: Change to using CONFIG_TI_COMMON_CMD_OPTIONS Sekhar Nori (2): davinci: da8xxevm: add support for TI_COMMON_CMD_OPTIONS davinci: omapl138_lcdk: switch to using TI_COMMON_CMD_OPTIONS board/davinci/da8xxevm/Kconfig | 2 ++ configs/omapl138_lcdk_defconfig | 12 ++---------- 2 files changed, 4 insertions(+), 10 deletions(-) -- 2.9.0

2 6

[U-Boot] [PATCH] net: Disable the format-extra-args warning
by Tom Rini 12 May '17

12 May '17

We will see warnings such as: net/eth_common.c:57:61: warning: data argument not used by format string [-Wformat-extra-args] sprintf(enetvar, index ? "%s%daddr" : "%saddr", base_name, index); ~~~~~~~~ ^ With clang. In this case we do not want to re-write our code to be less compact as the above is intentional and readable. Add a comment above the disabling so that it's clear why we want that warning off. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- net/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/net/Makefile b/net/Makefile index f03d6083268f..ae54eee5afe0 100644 --- a/net/Makefile +++ b/net/Makefile @@ -25,3 +25,8 @@ obj-$(CONFIG_CMD_PING) += ping.o obj-$(CONFIG_CMD_RARP) += rarp.o obj-$(CONFIG_CMD_SNTP) += sntp.o obj-$(CONFIG_CMD_NET) += tftp.o + +# Disable this warning as it is triggered by: +# sprintf(buf, index ? "foo%d" : "foo", index) +# and this is intentional usage. +CFLAGS_eth_common.o += -Wno-format-extra-args -- 1.9.1

2 2