December 2018 - U-Boot

[U-Boot] [PATCH 1/2] net: zynq_gem: Added 64-bit addressing support
by Siva Durga Prasad Paladugu 03 Dec '18

03 Dec '18

From: Vipul Kumar <vipul.kumar(a)xilinx.com> This patch adds 64-bit addressing support for zynq gem. This means it can perform send and receive operations on 64-bit address buffers. Signed-off-by: Vipul Kumar <vipul.kumar(a)xilinx.com> Signed-off-by: Siva Durga Prasad Paladugu <siva.durga.paladugu(a)xilinx.com> Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- drivers/net/zynq_gem.c | 63 ++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 54 insertions(+), 9 deletions(-) diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c index bc33126..ee528db 100644 --- a/drivers/net/zynq_gem.c +++ b/drivers/net/zynq_gem.c @@ -86,10 +86,17 @@ DECLARE_GLOBAL_DATA_PTR; /* Set with binary 00011000 to use 1536 byte(1*max length frame/buffer) */ #define ZYNQ_GEM_DMACR_RXBUF 0x00180000 +#if defined(CONFIG_PHYS_64BIT) +# define ZYNQ_GEM_DMA_BUS_WIDTH BIT(30) /* 64 bit bus */ +#else +# define ZYNQ_GEM_DMA_BUS_WIDTH (0 << 30) /* 32 bit bus */ +#endif + #define ZYNQ_GEM_DMACR_INIT (ZYNQ_GEM_DMACR_BLENGTH | \ ZYNQ_GEM_DMACR_RXSIZE | \ ZYNQ_GEM_DMACR_TXSIZE | \ - ZYNQ_GEM_DMACR_RXBUF) + ZYNQ_GEM_DMACR_RXBUF | \ + ZYNQ_GEM_DMA_BUS_WIDTH) #define ZYNQ_GEM_TSR_DONE 0x00000020 /* Tx done mask */ @@ -147,12 +154,20 @@ struct zynq_gem_regs { u32 transmit_q1_ptr; /* 0x440 - Transmit priority queue 1 */ u32 reserved8[15]; u32 receive_q1_ptr; /* 0x480 - Receive priority queue 1 */ + u32 reserved10[17]; + u32 upper_txqbase; /* 0x4C8 - Upper tx_q base addr */ + u32 reserved11[2]; + u32 upper_rxqbase; /* 0x4D4 - Upper rx_q base addr */ }; /* BD descriptors */ struct emac_bd { u32 addr; /* Next descriptor pointer */ u32 status; +#if defined(CONFIG_PHYS_64BIT) + u32 addr_hi; + u32 reserved; +#endif }; #define RX_BUF 32 @@ -390,13 +405,21 @@ static int zynq_gem_init(struct udevice *dev) for (i = 0; i < RX_BUF; i++) { priv->rx_bd[i].status = 0xF0000000; priv->rx_bd[i].addr = - ((ulong)(priv->rxbuffers) + - (i * PKTSIZE_ALIGN)); - } + (lower_32_bits((ulong)(priv->rxbuffers) + + (i * PKTSIZE_ALIGN))); +#if defined(CONFIG_PHYS_64BIT) + priv->rx_bd[i].addr_hi = + (upper_32_bits((ulong)(priv->rxbuffers) + + (i * PKTSIZE_ALIGN))); +#endif + } /* WRAP bit to last BD */ priv->rx_bd[--i].addr |= ZYNQ_GEM_RXBUF_WRAP_MASK; /* Write RxBDs to IP */ - writel((ulong)priv->rx_bd, &regs->rxqbase); + writel(lower_32_bits((ulong)priv->rx_bd), &regs->rxqbase); +#if defined(CONFIG_PHYS_64BIT) + writel(upper_32_bits((ulong)priv->rx_bd), &regs->upper_rxqbase); +#endif /* Setup for DMA Configuration register */ writel(ZYNQ_GEM_DMACR_INIT, &regs->dmacr); @@ -406,12 +429,18 @@ static int zynq_gem_init(struct udevice *dev) /* Disable the second priority queue */ dummy_tx_bd->addr = 0; +#if defined(CONFIG_PHYS_64BIT) + dummy_tx_bd->addr_hi = 0; +#endif dummy_tx_bd->status = ZYNQ_GEM_TXBUF_WRAP_MASK | ZYNQ_GEM_TXBUF_LAST_MASK| ZYNQ_GEM_TXBUF_USED_MASK; dummy_rx_bd->addr = ZYNQ_GEM_RXBUF_WRAP_MASK | ZYNQ_GEM_RXBUF_NEW_MASK; +#if defined(CONFIG_PHYS_64BIT) + dummy_rx_bd->addr_hi = 0; +#endif dummy_rx_bd->status = 0; writel((ulong)dummy_tx_bd, &regs->transmit_q1_ptr); @@ -485,7 +514,8 @@ static int zynq_gem_init(struct udevice *dev) static int zynq_gem_send(struct udevice *dev, void *ptr, int len) { - u32 addr, size; + dma_addr_t addr; + u32 size; struct zynq_gem_priv *priv = dev_get_priv(dev); struct zynq_gem_regs *regs = priv->iobase; struct emac_bd *current_bd = &priv->tx_bd[1]; @@ -493,17 +523,26 @@ static int zynq_gem_send(struct udevice *dev, void *ptr, int len) /* Setup Tx BD */ memset(priv->tx_bd, 0, sizeof(struct emac_bd)); - priv->tx_bd->addr = (ulong)ptr; + priv->tx_bd->addr = lower_32_bits((ulong)ptr); +#if defined(CONFIG_PHYS_64BIT) + priv->tx_bd->addr_hi = upper_32_bits((ulong)ptr); +#endif priv->tx_bd->status = (len & ZYNQ_GEM_TXBUF_FRMLEN_MASK) | ZYNQ_GEM_TXBUF_LAST_MASK; /* Dummy descriptor to mark it as the last in descriptor chain */ current_bd->addr = 0x0; +#if defined(CONFIG_PHYS_64BIT) + current_bd->addr_hi = 0x0; +#endif current_bd->status = ZYNQ_GEM_TXBUF_WRAP_MASK | ZYNQ_GEM_TXBUF_LAST_MASK| ZYNQ_GEM_TXBUF_USED_MASK; /* setup BD */ - writel((ulong)priv->tx_bd, &regs->txqbase); + writel(lower_32_bits((ulong)priv->tx_bd), &regs->txqbase); +#if defined(CONFIG_PHYS_64BIT) + writel(upper_32_bits((ulong)priv->tx_bd), &regs->upper_txqbase); +#endif addr = (ulong) ptr; addr &= ~(ARCH_DMA_MINALIGN - 1); @@ -531,7 +570,7 @@ static int zynq_gem_send(struct udevice *dev, void *ptr, int len) static int zynq_gem_recv(struct udevice *dev, int flags, uchar **packetp) { int frame_len; - u32 addr; + dma_addr_t addr; struct zynq_gem_priv *priv = dev_get_priv(dev); struct emac_bd *current_bd = &priv->rx_bd[priv->rxbd_current]; @@ -550,8 +589,14 @@ static int zynq_gem_recv(struct udevice *dev, int flags, uchar **packetp) return -1; } +#if defined(CONFIG_PHYS_64BIT) + addr = (dma_addr_t)((current_bd->addr & ZYNQ_GEM_RXBUF_ADD_MASK) + | ((dma_addr_t)current_bd->addr_hi << 32)); +#else addr = current_bd->addr & ZYNQ_GEM_RXBUF_ADD_MASK; +#endif addr &= ~(ARCH_DMA_MINALIGN - 1); + *packetp = (uchar *)(uintptr_t)addr; return frame_len; -- 2.7.4

2 2

[U-Boot] [BUG] serial: ns16550: missing characters on serial output of rk3399 board
by Roosen Henri 03 Dec '18

03 Dec '18

Since u-boot Commit 6f57c34473d3 (serial: ns16550: fix debug uart putc called before init) the serial output from SPL boot on my rk3399 board is missing characters. Without the commit SPL-boot puts out a string "U-Boot SPL board init", when this commit is in, the rk3399 board only prints a few of the characters of that string ("U-o Lodnt"). Reading the thread at https://patchwork.ozlabs.org/patch/955765/, I agree with Marek that "The real problem I believe is that someone can call debug UART print/read functions before it is inited". IMHO commits like these which try to make _debug_uart_putc() somewhat work without a proper _debug_uart_init() don't make sense; fighting sympthoms mostly leads to problems. Question is: what are the design decisions regarding _debug_uart_init() and _debug_uart_putc()? * if _debug_uart_putc() is not allowed before _debug_uart_init(), then that is what is broken and should be fixed. * if _debug_uart_putc() is allowed before _debug_uart_init(), then implementations of _debug_uart_putc() should ignore printing until _debug_uart_init() has been called. If a subsystem (like GD?) is required to properly implement that design, then that subsystem should be guaranteed to be available before any _debug_uart_putc() call... So there is some design information needed, or probably it is available and I'm not familiar with it (I'm not an active u-boot developer). Please share the information with who is trying to properly fix the initial issue. Thanks, Henri

1 0

[U-Boot] [PATCH 1/2] Kconfig: Add entry for VF610 NAND NFC device tree aware driver
by Lukasz Majewski 03 Dec '18

03 Dec '18

This commit provides code to add proper entry to Kconfig to enable support for VF610 device tree aware driver. Signed-off-by: Lukasz Majewski <lukma(a)denx.de> --- drivers/mtd/nand/raw/Kconfig | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig index 008f7b4b4b..fd1723feda 100644 --- a/drivers/mtd/nand/raw/Kconfig +++ b/drivers/mtd/nand/raw/Kconfig @@ -88,6 +88,15 @@ config NAND_VF610_NFC The driver supports a maximum 2k page size. The driver currently does not support hardware ECC. +if NAND_VF610_NFC + +config NAND_VF610_NFC_DT + bool "Support Vybrid's vf610 NAND controller as a DT device" + depends on OF_CONTROL && MTD + help + Enable the driver for Vybrid's vf610 NAND flash on platforms + using device tree. + choice prompt "Hardware ECC strength" depends on NAND_VF610_NFC @@ -103,6 +112,8 @@ config SYS_NAND_VF610_NFC_60_ECC_BYTES endchoice +endif + config NAND_PXA3XX bool "Support for NAND on PXA3xx and Armada 370/XP/38x" select SYS_NAND_SELF_INIT -- 2.11.0

2 3

[U-Boot] [PATCH] arm64: zynqmp: Add new header file for zcu104 RevC
by Michal Simek 03 Dec '18

03 Dec '18

From: T Karthik Reddy <t.karthik.reddy(a)xilinx.com> Created a new header file for zcu104 RevC board and added below configurations to use MAC address from EEPROM. CONFIG_ZYNQ_GEM_EEPROM_ADDR CONFIG_ZYNQ_EEPROM_BUS Added CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20 to xilinx_zynqmp_zcu104_revC_defconfig Signed-off-by: T Karthik Reddy <t.karthik.reddy(a)xilinx.com> Signed-off-by: Siva Durga Prasad Paladugu <siva.durga.paladugu(a)xilinx.com> Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- configs/xilinx_zynqmp_zcu104_revC_defconfig | 3 ++- include/configs/xilinx_zynqmp_zcu104_revC.h | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 include/configs/xilinx_zynqmp_zcu104_revC.h diff --git a/configs/xilinx_zynqmp_zcu104_revC_defconfig b/configs/xilinx_zynqmp_zcu104_revC_defconfig index 33258e41b201..0357b1744545 100644 --- a/configs/xilinx_zynqmp_zcu104_revC_defconfig +++ b/configs/xilinx_zynqmp_zcu104_revC_defconfig @@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_zcu104" +CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_zcu104_revC" CONFIG_ARCH_ZYNQMP=y CONFIG_SYS_TEXT_BASE=0x8000000 CONFIG_SYS_MALLOC_F_LEN=0x8000 @@ -53,6 +53,7 @@ CONFIG_CMD_PCA953X=y CONFIG_SYS_I2C_ZYNQ=y CONFIG_ZYNQ_I2C1=y CONFIG_MISC=y +CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20 CONFIG_DM_MMC=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ZYNQ=y diff --git a/include/configs/xilinx_zynqmp_zcu104_revC.h b/include/configs/xilinx_zynqmp_zcu104_revC.h new file mode 100644 index 000000000000..8b3ae36d0f32 --- /dev/null +++ b/include/configs/xilinx_zynqmp_zcu104_revC.h @@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Configuration for Xilinx ZynqMP zcu104 + * + * (C) Copyright 2018 Xilinx, Inc. + * Michal Simek <michal.simek(a)xilinx.com> + */ + +#ifndef __CONFIG_ZYNQMP_ZCU104_REVC_H +#define __CONFIG_ZYNQMP_ZCU104_REVC_H + +#include <configs/xilinx_zynqmp_zcu104.h> + +#define CONFIG_ZYNQ_GEM_EEPROM_ADDR 0x54 +#define CONFIG_ZYNQ_EEPROM_BUS 1 + +#endif /* __CONFIG_ZYNQMP_ZCU104_REVC_H */ -- 1.9.1

1 0

[U-Boot] [PATCH] imx8m: ddr: removed unused macros
by Peng Fan 03 Dec '18

03 Dec '18

Remove unused DDRC register macros. Signed-off-by: Peng Fan <peng.fan(a)nxp.com> --- To address comments: https://lists.denx.de/pipermail/u-boot/2018-November/348351.html arch/arm/include/asm/arch-imx8m/ddr.h | 188 ---------------------------------- 1 file changed, 188 deletions(-) diff --git a/arch/arm/include/asm/arch-imx8m/ddr.h b/arch/arm/include/asm/arch-imx8m/ddr.h index 020f814f44..53d46256d8 100644 --- a/arch/arm/include/asm/arch-imx8m/ddr.h +++ b/arch/arm/include/asm/arch-imx8m/ddr.h @@ -356,194 +356,6 @@ enum msg_response { TRAIN_FAIL = 0xff, }; -#define DDRC_MSTR_0 0x3d400000 -#define DDRC_STAT_0 0x3d400004 -#define DDRC_MSTR1_0 0x3d400008 -#define DDRC_MRCTRL0_0 0x3d400010 -#define DDRC_MRCTRL1_0 0x3d400014 -#define DDRC_MRSTAT_0 0x3d400018 -#define DDRC_MRCTRL2_0 0x3d40001c -#define DDRC_DERATEEN_0 0x3d400020 -#define DDRC_DERATEINT_0 0x3d400024 -#define DDRC_MSTR2_0 0x3d400028 -#define DDRC_PWRCTL_0 0x3d400030 -#define DDRC_PWRTMG_0 0x3d400034 -#define DDRC_HWLPCTL_0 0x3d400038 -#define DDRC_HWFFCCTL_0 0x3d40003c -#define DDRC_HWFFCSTAT_0 0x3d400040 -#define DDRC_RFSHCTL0_0 0x3d400050 -#define DDRC_RFSHCTL1_0 0x3d400054 -#define DDRC_RFSHCTL2_0 0x3d400058 -#define DDRC_RFSHCTL3_0 0x3d400060 -#define DDRC_RFSHTMG_0 0x3d400064 -#define DDRC_ECCCFG0_0 0x3d400070 -#define DDRC_ECCCFG1_0 0x3d400074 -#define DDRC_ECCSTAT_0 0x3d400078 -#define DDRC_ECCCLR_0 0x3d40007c -#define DDRC_ECCERRCNT_0 0x3d400080 -#define DDRC_ECCCADDR0_0 0x3d400084 -#define DDRC_ECCCADDR1_0 0x3d400088 -#define DDRC_ECCCSYN0_0 0x3d40008c -#define DDRC_ECCCSYN1_0 0x3d400090 -#define DDRC_ECCCSYN2_0 0x3d400094 -#define DDRC_ECCBITMASK0_0 0x3d400098 -#define DDRC_ECCBITMASK1_0 0x3d40009c -#define DDRC_ECCBITMASK2_0 0x3d4000a0 -#define DDRC_ECCUADDR0_0 0x3d4000a4 -#define DDRC_ECCUADDR1_0 0x3d4000a8 -#define DDRC_ECCUSYN0_0 0x3d4000ac -#define DDRC_ECCUSYN1_0 0x3d4000b0 -#define DDRC_ECCUSYN2_0 0x3d4000b4 -#define DDRC_ECCPOISONADDR0_0 0x3d4000b8 -#define DDRC_ECCPOISONADDR1_0 0x3d4000bc -#define DDRC_CRCPARCTL0_0 0x3d4000c0 -#define DDRC_CRCPARCTL1_0 0x3d4000c4 -#define DDRC_CRCPARCTL2_0 0x3d4000c8 -#define DDRC_CRCPARSTAT_0 0x3d4000cc -#define DDRC_INIT0_0 0x3d4000d0 -#define DDRC_INIT1_0 0x3d4000d4 -#define DDRC_INIT2_0 0x3d4000d8 -#define DDRC_INIT3_0 0x3d4000dc -#define DDRC_INIT4_0 0x3d4000e0 -#define DDRC_INIT5_0 0x3d4000e4 -#define DDRC_INIT6_0 0x3d4000e8 -#define DDRC_INIT7_0 0x3d4000ec -#define DDRC_DIMMCTL_0 0x3d4000f0 -#define DDRC_RANKCTL_0 0x3d4000f4 -#define DDRC_DRAMTMG0_0 0x3d400100 -#define DDRC_DRAMTMG1_0 0x3d400104 -#define DDRC_DRAMTMG2_0 0x3d400108 -#define DDRC_DRAMTMG3_0 0x3d40010c -#define DDRC_DRAMTMG4_0 0x3d400110 -#define DDRC_DRAMTMG5_0 0x3d400114 -#define DDRC_DRAMTMG6_0 0x3d400118 -#define DDRC_DRAMTMG7_0 0x3d40011c -#define DDRC_DRAMTMG8_0 0x3d400120 -#define DDRC_DRAMTMG9_0 0x3d400124 -#define DDRC_DRAMTMG10_0 0x3d400128 -#define DDRC_DRAMTMG11_0 0x3d40012c -#define DDRC_DRAMTMG12_0 0x3d400130 -#define DDRC_DRAMTMG13_0 0x3d400134 -#define DDRC_DRAMTMG14_0 0x3d400138 -#define DDRC_DRAMTMG15_0 0x3d40013C -#define DDRC_DRAMTMG16_0 0x3d400140 -#define DDRC_DRAMTMG17_0 0x3d400144 - -#define DDRC_ZQCTL0_0 0x3d400180 -#define DDRC_ZQCTL1_0 0x3d400184 -#define DDRC_ZQCTL2_0 0x3d400188 -#define DDRC_ZQSTAT_0 0x3d40018c -#define DDRC_DFITMG0_0 0x3d400190 -#define DDRC_DFITMG1_0 0x3d400194 -#define DDRC_DFILPCFG0_0 0x3d400198 -#define DDRC_DFILPCFG1_0 0x3d40019c -#define DDRC_DFIUPD0_0 0x3d4001a0 -#define DDRC_DFIUPD1_0 0x3d4001a4 -#define DDRC_DFIUPD2_0 0x3d4001a8 - -#define DDRC_DFIMISC_0 0x3d4001b0 -#define DDRC_DFITMG2_0 0x3d4001b4 -#define DDRC_DFITMG3_0 0x3d4001b8 -#define DDRC_DFISTAT_0 0x3d4001bc - -#define DDRC_DBICTL_0 0x3d4001c0 -#define DDRC_DFIPHYMSTR_0 0x3d4001c4 -#define DDRC_TRAINCTL0_0 0x3d4001d0 -#define DDRC_TRAINCTL1_0 0x3d4001d4 -#define DDRC_TRAINCTL2_0 0x3d4001d8 -#define DDRC_TRAINSTAT_0 0x3d4001dc -#define DDRC_ADDRMAP0_0 0x3d400200 -#define DDRC_ADDRMAP1_0 0x3d400204 -#define DDRC_ADDRMAP2_0 0x3d400208 -#define DDRC_ADDRMAP3_0 0x3d40020c -#define DDRC_ADDRMAP4_0 0x3d400210 -#define DDRC_ADDRMAP5_0 0x3d400214 -#define DDRC_ADDRMAP6_0 0x3d400218 -#define DDRC_ADDRMAP7_0 0x3d40021c -#define DDRC_ADDRMAP8_0 0x3d400220 -#define DDRC_ADDRMAP9_0 0x3d400224 -#define DDRC_ADDRMAP10_0 0x3d400228 -#define DDRC_ADDRMAP11_0 0x3d40022c - -#define DDRC_ODTCFG_0 0x3d400240 -#define DDRC_ODTMAP_0 0x3d400244 -#define DDRC_SCHED_0 0x3d400250 -#define DDRC_SCHED1_0 0x3d400254 -#define DDRC_PERFHPR1_0 0x3d40025c -#define DDRC_PERFLPR1_0 0x3d400264 -#define DDRC_PERFWR1_0 0x3d40026c -#define DDRC_PERFVPR1_0 0x3d400274 - -#define DDRC_PERFVPW1_0 0x3d400278 - -#define DDRC_DQMAP0_0 0x3d400280 -#define DDRC_DQMAP1_0 0x3d400284 -#define DDRC_DQMAP2_0 0x3d400288 -#define DDRC_DQMAP3_0 0x3d40028c -#define DDRC_DQMAP4_0 0x3d400290 -#define DDRC_DQMAP5_0 0x3d400294 -#define DDRC_DBG0_0 0x3d400300 -#define DDRC_DBG1_0 0x3d400304 -#define DDRC_DBGCAM_0 0x3d400308 -#define DDRC_DBGCMD_0 0x3d40030c -#define DDRC_DBGSTAT_0 0x3d400310 - -#define DDRC_SWCTL_0 0x3d400320 -#define DDRC_SWSTAT_0 0x3d400324 -#define DDRC_OCPARCFG0_0 0x3d400330 -#define DDRC_OCPARCFG1_0 0x3d400334 -#define DDRC_OCPARCFG2_0 0x3d400338 -#define DDRC_OCPARCFG3_0 0x3d40033c -#define DDRC_OCPARSTAT0_0 0x3d400340 -#define DDRC_OCPARSTAT1_0 0x3d400344 -#define DDRC_OCPARWLOG0_0 0x3d400348 -#define DDRC_OCPARWLOG1_0 0x3d40034c -#define DDRC_OCPARWLOG2_0 0x3d400350 -#define DDRC_OCPARAWLOG0_0 0x3d400354 -#define DDRC_OCPARAWLOG1_0 0x3d400358 -#define DDRC_OCPARRLOG0_0 0x3d40035c -#define DDRC_OCPARRLOG1_0 0x3d400360 -#define DDRC_OCPARARLOG0_0 0x3d400364 -#define DDRC_OCPARARLOG1_0 0x3d400368 -#define DDRC_POISONCFG_0 0x3d40036C -#define DDRC_POISONSTAT_0 0x3d400370 -#define DDRC_ADVECCINDEX_0 0x3d400003 -#define DDRC_ADVECCSTAT_0 0x3d400003 -#define DDRC_ECCPOISONPAT0_0 0x3d400003 -#define DDRC_ECCPOISONPAT1_0 0x3d400003 -#define DDRC_ECCPOISONPAT2_0 0x3d400003 -#define DDRC_HIFCTL_0 0x3d400003 - -#define DDRC_PSTAT_0 0x3d4003fc -#define DDRC_PCCFG_0 0x3d400400 -#define DDRC_PCFGR_0_0 0x3d400404 -#define DDRC_PCFGR_1_0 0x3d4004b4 -#define DDRC_PCFGR_2_0 0x3d400564 -#define DDRC_PCFGR_3_0 0x3d400614 -#define DDRC_PCFGW_0_0 0x3d400408 -#define DDRC_PCFGW_1_0 0x3d400408 -#define DDRC_PCFGW_2_0 0x3d400568 -#define DDRC_PCFGW_3_0 0x3d400618 -#define DDRC_PCFGC_0_0 0x3d40040c -#define DDRC_PCFGIDMASKCH_0 0x3d400410 -#define DDRC_PCFGIDVALUECH_0 0x3d400414 -#define DDRC_PCTRL_0_0 0x3d400490 -#define DDRC_PCTRL_1_0 0x3d400540 -#define DDRC_PCTRL_2_0 0x3d4005f0 -#define DDRC_PCTRL_3_0 0x3d4006a0 -#define DDRC_PCFGQOS0_0_0 0x3d400494 -#define DDRC_PCFGQOS1_0_0 0x3d400498 -#define DDRC_PCFGWQOS0_0_0 0x3d40049c -#define DDRC_PCFGWQOS1_0_0 0x3d4004a0 -#define DDRC_SARBASE0_0 0x3d400f04 -#define DDRC_SARSIZE0_0 0x3d400f08 -#define DDRC_SBRCTL_0 0x3d400f24 -#define DDRC_SBRSTAT_0 0x3d400f28 -#define DDRC_SBRWDATA0_0 0x3d400f2c -#define DDRC_SBRWDATA1_0 0x3d400f30 -#define DDRC_PDCH_0 0x3d400f34 - -/**********************/ #define DDRC_MSTR(X) (DDRC_IPS_BASE_ADDR(X) + 0x00) #define DDRC_STAT(X) (DDRC_IPS_BASE_ADDR(X) + 0x04) #define DDRC_MSTR1(X) (DDRC_IPS_BASE_ADDR(X) + 0x08) -- 2.14.1

1 0

[U-Boot] Please pull u-boot-dm
by Simon Glass 03 Dec '18

03 Dec '18

Hi Tom, Here is my attempt at a signed pull request. I've brought in most of the outstanding dm patches. Please let me know if it looks OK. Do you have my public key? The following changes since commit 0a60a81ba3860946551cb79aa6486aa076e357f3: Kconfig: sandbox: enable cmd_avb and dependencies (2018-10-07 13:34:19 -0400) are available in the Git repository at: git://git.denx.de/u-boot-dm.git tags/dm-9oct18 for you to fetch changes up to 41b781ddf1869f5349e05ace888979f3673fe8c6: dtoc: Fix the value of SetInt() (2018-10-09 04:40:27 -0600) ---------------------------------------------------------------- Test improvements to tidy up output and drop duplicate tests Sandbox SPL/TPL support Various dm-related improvements ---------------------------------------------------------------- Marek Vasut (2): ofnode: Replace of_n_addr_cells with of_n_size_cells ofnode: Add missing address translation into ofnode_get_addr_size() Simon Glass (74): sandbox: Unprotect DATA regions in bus tests patman: Handle unicode in _ProjectConfigParser tests test/py: Fix unicode handling for log filtering buildman: Make the toolchain test more forgiving Makefile: Add a 'check' target for make test: Simplify the PATH setup test: Print the name of each test before running it test: Tidy up comments and variable name binman: Add a default path to libfdt.py binman: Fix up removal of temporary directories binman: Separate out testSplBssPad() buildman: dtoc: Suppress unwanted output from test tools: Set an initial value for indir patman: Don't clear progress in tout unless it was used test: Reduce the number of tests run with sandbox_flattree binman: Run tests concurrently log: Correct definition of log_msg_ret() log: Add helpers for common log levels sandbox: Support file truncation with os_open() sandbox: Add a way to write data to the host filesystem sandbox: spi: Drop command-line SPI option sandbox: Support booting from TPL to SPL sandbox: Add a flag to set the default log level sandbox: Remove the old memory file later sandbox: spi: Add more logging sandbox: video: Speed up video output sandbox: Add a debug UART serial: sandbox: Allow serial output without device tree sandbox: tpm: Tidy up enums and return values sandbox: tpm: Enhance to support the latest Chromium OS dm: spi: Clean up detection of sandbox SPI emulator sandbox: Restore blocking I/O on exit dm: core: Alloc uclass-private data to be cache-aligned dm: core: Update some functions to use const dm: core: Add a function to find the first inactive child dm: core: Update ofnode to read binman-style flash entry sf: Avoid allocating memory on every read operation spl: input: Allow input in SPL and TPL Makefile: Add a warning if SPL/TPL cannot be built blk: Support block drivers in TPL Kconfig: Convert CONFIG_RTC_MC146818 to Kconfig rtc: Allow use of RTC in SPL and TPL fdt: Document the fact that dtc is now built doc: Update docs for device tree in SPL, TPL fdt: Allow indicating a node is for U-Boot proper only tpm: Add support for SPL and TPL serial: Allow serial to be absent in TPL fdt: Allow libfdt in TPL cros: Update cros_ec code to use struct udevice cros: Adjust board_get_cros_ec_dev() to return a udevice dm: spi: Add logging of some return values fdt: Remove fdtdec_decode_region() function video: Adjust video_clear() to return an error tpm: Use livetree and allow children tpm: Tidy up logging in tpm-common.c tpm: Add a few new commands for v1 binman: Move to three-digit test-file numbers log: Add comments to the rest of the log categories Add a header file for strings Rename GPT_HEADER_SIGNATURE to avoid conflict cros: Update ec_commands to latest version x86: Update mtrr functions to allow leaving cache alone cros_ec: Update cros_ec_read_hash() to specify the image cros_ec: Add support for v3 messages on LPC test: panel: Add a test for the panel uclass panel: Expand the backlight support ctags: Minor changes to fix ctags output fdt: Allow C++ comments in link scripts and DT files pci: Add a little more debugging to pci_rom sysreset: Tidy up a few comments and logging sysreset: Add a way to find the last reset video: at91: Adjust vidconsole_position_cursor() to use char pos video: Tidy up a few comments in video.o dtoc: Fix the value of SetInt() .travis.yml | 1 + Makefile | 8 +- arch/sandbox/cpu/os.c | 85 +- arch/sandbox/cpu/start.c | 19 +- arch/sandbox/cpu/state.c | 6 +- arch/sandbox/dts/sandbox.dts | 20 +- arch/sandbox/dts/sandbox64.dts | 20 +- arch/sandbox/dts/sandbox_pmic.dtsi | 2 +- arch/sandbox/dts/test.dts | 49 +- arch/sandbox/include/asm/state.h | 2 +- arch/sandbox/include/asm/test.h | 15 + arch/x86/cpu/coreboot/coreboot.c | 4 +- arch/x86/cpu/mtrr.c | 31 +- arch/x86/include/asm/mtrr.h | 6 +- board/atmel/common/video_display.c | 5 +- cmd/cros_ec.c | 31 +- cmd/tpm_test.c | 15 - cmd/x86/mtrr.c | 8 +- common/cros_ec.c | 4 +- common/log.c | 3 +- configs/chromebook_link64_defconfig | 1 + configs/edison_defconfig | 1 + configs/malta64_defconfig | 1 + configs/malta64el_defconfig | 1 + configs/malta_defconfig | 1 + configs/maltael_defconfig | 1 + configs/sandbox_defconfig | 2 + configs/sandbox_flattree_defconfig | 1 + disk/part_efi.c | 6 +- doc/README.fdt-control | 16 +- doc/driver-model/README.txt | 7 +- drivers/block/Kconfig | 12 + drivers/block/Makefile | 2 +- drivers/core/device.c | 45 +- drivers/core/of_extra.c | 27 +- drivers/core/ofnode.c | 10 +- drivers/input/Kconfig | 48 + drivers/input/Makefile | 11 +- drivers/input/input.c | 5 +- drivers/misc/cros_ec.c | 178 +- drivers/misc/cros_ec_lpc.c | 33 + drivers/misc/cros_ec_sandbox.c | 8 +- drivers/mtd/spi/sandbox.c | 194 +- drivers/mtd/spi/sf-uclass.c | 6 +- drivers/mtd/spi/sf_probe.c | 2 +- drivers/mtd/spi/spi_flash.c | 17 +- drivers/pci/pci_rom.c | 4 +- drivers/pwm/sandbox_pwm.c | 25 + drivers/rtc/Kconfig | 26 + drivers/rtc/Makefile | 2 +- drivers/serial/Kconfig | 21 + drivers/serial/sandbox.c | 24 +- drivers/serial/serial-uclass.c | 4 + drivers/spi/sandbox_spi.c | 38 +- drivers/spi/spi-uclass.c | 6 +- drivers/sysreset/sysreset-uclass.c | 34 +- drivers/sysreset/sysreset_sandbox.c | 15 + drivers/tpm/Makefile | 2 +- drivers/tpm/tpm-uclass.c | 9 +- drivers/tpm/tpm_tis_lpc.c | 2 +- drivers/tpm/tpm_tis_sandbox.c | 115 +- drivers/video/backlight-uclass.c | 10 + drivers/video/panel-uclass.c | 18 + drivers/video/pwm_backlight.c | 187 +- drivers/video/simple_panel.c | 20 +- drivers/video/tegra124/sor.c | 3 +- drivers/video/vidconsole-uclass.c | 14 +- drivers/video/video-uclass.c | 10 +- drivers/video/video_bmp.c | 2 +- include/backlight.h | 25 + include/configs/edison.h | 1 - include/configs/malta.h | 1 - include/cros_ec.h | 72 +- include/dm/device.h | 39 +- include/dm/of_extra.h | 3 +- include/dm/uclass.h | 3 + include/ec_commands.h | 4324 +++++++++++++++++++++++++++------ include/fdtdec.h | 45 - include/linux/compiler-gcc.h | 6 +- include/log.h | 29 +- include/os.h | 36 +- include/panel.h | 22 +- include/part_efi.h | 2 +- include/string.h | 1 + include/sysreset.h | 34 +- include/tpm-v1.h | 76 + include/tpm-v2.h | 1 + include/video.h | 11 +- lib/Kconfig | 32 + lib/Makefile | 10 +- lib/fdtdec.c | 83 - lib/hang.c | 5 +- lib/tpm-common.c | 10 +- lib/tpm-v1.c | 68 +- scripts/Makefile.spl | 9 +- scripts/config_whitelist.txt | 1 - test/dm/Makefile | 1 + test/dm/bus.c | 12 + test/dm/core.c | 31 + test/dm/ofnode.c | 16 + test/dm/panel.c | 79 + test/dm/sysreset.c | 21 +- test/dm/video.c | 2 +- test/log/log_test.c | 13 + test/py/README.md | 1 + test/py/multiplexed_log.py | 7 +- test/py/tests/test_log.py | 6 + test/run | 57 +- tools/binman/binman.py | 28 +- tools/binman/cmdline.py | 2 + tools/binman/elf_test.py | 5 + tools/binman/entry_test.py | 17 +- tools/binman/fdt_test.py | 8 +- tools/binman/ftest.py | 268 +- tools/binman/test/{01_invalid.dts => 001_invalid.dts} | 0 tools/binman/test/{02_missing_node.dts => 002_missing_node.dts} | 0 tools/binman/test/{03_empty.dts => 003_empty.dts} | 0 tools/binman/test/{04_invalid_entry.dts => 004_invalid_entry.dts} | 0 tools/binman/test/{05_simple.dts => 005_simple.dts} | 0 tools/binman/test/{06_dual_image.dts => 006_dual_image.dts} | 0 tools/binman/test/{07_bad_align.dts => 007_bad_align.dts} | 0 tools/binman/test/{08_pack.dts => 008_pack.dts} | 0 tools/binman/test/{09_pack_extra.dts => 009_pack_extra.dts} | 0 tools/binman/test/{10_pack_align_power2.dts => 010_pack_align_power2.dts} | 0 .../{11_pack_align_size_power2.dts => 011_pack_align_size_power2.dts} | 0 tools/binman/test/{12_pack_inv_align.dts => 012_pack_inv_align.dts} | 0 .../test/{13_pack_inv_size_align.dts => 013_pack_inv_size_align.dts} | 0 tools/binman/test/{14_pack_overlap.dts => 014_pack_overlap.dts} | 0 tools/binman/test/{15_pack_overflow.dts => 015_pack_overflow.dts} | 0 .../test/{16_pack_image_overflow.dts => 016_pack_image_overflow.dts} | 0 tools/binman/test/{17_pack_image_size.dts => 017_pack_image_size.dts} | 0 tools/binman/test/{18_pack_image_align.dts => 018_pack_image_align.dts} | 0 .../test/{19_pack_inv_image_align.dts => 019_pack_inv_image_align.dts} | 0 ...ack_inv_image_align_power2.dts => 020_pack_inv_image_align_power2.dts} | 0 tools/binman/test/{21_image_pad.dts => 021_image_pad.dts} | 0 tools/binman/test/{22_image_name.dts => 022_image_name.dts} | 0 tools/binman/test/{23_blob.dts => 023_blob.dts} | 0 tools/binman/test/{24_sorted.dts => 024_sorted.dts} | 0 tools/binman/test/{25_pack_zero_size.dts => 025_pack_zero_size.dts} | 0 tools/binman/test/{26_pack_u_boot_dtb.dts => 026_pack_u_boot_dtb.dts} | 0 tools/binman/test/{27_pack_4gb_no_size.dts => 027_pack_4gb_no_size.dts} | 0 tools/binman/test/{28_pack_4gb_outside.dts => 028_pack_4gb_outside.dts} | 0 tools/binman/test/{29_x86-rom.dts => 029_x86-rom.dts} | 0 .../binman/test/{30_x86-rom-me-no-desc.dts => 030_x86-rom-me-no-desc.dts} | 0 tools/binman/test/{31_x86-rom-me.dts => 031_x86-rom-me.dts} | 0 tools/binman/test/{32_intel-vga.dts => 032_intel-vga.dts} | 0 tools/binman/test/{33_x86-start16.dts => 033_x86-start16.dts} | 0 tools/binman/test/{34_x86_ucode.dts => 034_x86_ucode.dts} | 0 tools/binman/test/{35_x86_single_ucode.dts => 035_x86_single_ucode.dts} | 0 tools/binman/test/{36_u_boot_img.dts => 036_u_boot_img.dts} | 0 tools/binman/test/{37_x86_no_ucode.dts => 037_x86_no_ucode.dts} | 0 .../{38_x86_ucode_missing_node.dts => 038_x86_ucode_missing_node.dts} | 0 .../{39_x86_ucode_missing_node2.dts => 039_x86_ucode_missing_node2.dts} | 0 .../{40_x86_ucode_not_in_image.dts => 040_x86_ucode_not_in_image.dts} | 0 tools/binman/test/{41_unknown_pos_size.dts => 041_unknown_pos_size.dts} | 0 tools/binman/test/{42_intel-fsp.dts => 042_intel-fsp.dts} | 0 tools/binman/test/{43_intel-cmc.dts => 043_intel-cmc.dts} | 0 .../binman/test/{44_x86_optional_ucode.dts => 044_x86_optional_ucode.dts} | 0 tools/binman/test/{45_prop_test.dts => 045_prop_test.dts} | 0 tools/binman/test/{46_intel-vbt.dts => 046_intel-vbt.dts} | 0 tools/binman/test/{47_spl_bss_pad.dts => 047_spl_bss_pad.dts} | 0 tools/binman/test/{48_x86-start16-spl.dts => 048_x86-start16-spl.dts} | 0 tools/binman/test/{49_x86_ucode_spl.dts => 049_x86_ucode_spl.dts} | 0 tools/binman/test/{50_intel_mrc.dts => 050_intel_mrc.dts} | 0 tools/binman/test/{51_u_boot_spl_dtb.dts => 051_u_boot_spl_dtb.dts} | 0 tools/binman/test/{52_u_boot_spl_nodtb.dts => 052_u_boot_spl_nodtb.dts} | 0 tools/binman/test/{53_symbols.dts => 053_symbols.dts} | 0 tools/binman/test/{54_unit_address.dts => 054_unit_address.dts} | 0 tools/binman/test/{55_sections.dts => 055_sections.dts} | 0 tools/binman/test/{56_name_prefix.dts => 056_name_prefix.dts} | 0 tools/binman/test/{57_unknown_contents.dts => 057_unknown_contents.dts} | 0 ...58_x86_ucode_spl_needs_retry.dts => 058_x86_ucode_spl_needs_retry.dts} | 0 tools/binman/test/{59_change_size.dts => 059_change_size.dts} | 0 tools/binman/test/{60_fdt_update.dts => 060_fdt_update.dts} | 0 tools/binman/test/{61_fdt_update_bad.dts => 061_fdt_update_bad.dts} | 0 tools/binman/test/{62_entry_args.dts => 062_entry_args.dts} | 0 .../binman/test/{63_entry_args_missing.dts => 063_entry_args_missing.dts} | 0 .../test/{64_entry_args_required.dts => 064_entry_args_required.dts} | 0 ...ntry_args_unknown_datatype.dts => 065_entry_args_unknown_datatype.dts} | 0 tools/binman/test/{66_text.dts => 066_text.dts} | 0 tools/binman/test/{67_fmap.dts => 067_fmap.dts} | 0 tools/binman/test/{68_blob_named_by_arg.dts => 068_blob_named_by_arg.dts} | 0 tools/binman/test/{69_fill.dts => 069_fill.dts} | 0 tools/binman/test/{70_fill_no_size.dts => 070_fill_no_size.dts} | 0 tools/binman/test/{71_gbb.dts => 071_gbb.dts} | 0 tools/binman/test/{72_gbb_too_small.dts => 072_gbb_too_small.dts} | 0 tools/binman/test/{73_gbb_no_size.dts => 073_gbb_no_size.dts} | 0 tools/binman/test/{74_vblock.dts => 074_vblock.dts} | 0 tools/binman/test/{75_vblock_no_content.dts => 075_vblock_no_content.dts} | 0 .../binman/test/{76_vblock_bad_phandle.dts => 076_vblock_bad_phandle.dts} | 0 tools/binman/test/{77_vblock_bad_entry.dts => 077_vblock_bad_entry.dts} | 0 tools/binman/test/{78_u_boot_tpl.dts => 078_u_boot_tpl.dts} | 0 tools/binman/test/{79_uses_pos.dts => 079_uses_pos.dts} | 0 tools/binman/test/{80_fill_empty.dts => 080_fill_empty.dts} | 0 tools/binman/test/{81_x86-start16-tpl.dts => 081_x86-start16-tpl.dts} | 0 tools/binman/test/{82_fdt_update_all.dts => 082_fdt_update_all.dts} | 0 tools/binman/test/{83_compress.dts => 083_compress.dts} | 0 tools/binman/test/{84_files.dts => 084_files.dts} | 0 tools/binman/test/{85_files_compress.dts => 085_files_compress.dts} | 0 tools/binman/test/{86_files_none.dts => 086_files_none.dts} | 0 tools/binman/test/{87_files_no_pattern.dts => 087_files_no_pattern.dts} | 0 tools/binman/test/{88_expand_size.dts => 088_expand_size.dts} | 0 tools/binman/test/{89_expand_size_bad.dts => 089_expand_size_bad.dts} | 0 tools/binman/test/{90_hash.dts => 090_hash.dts} | 0 tools/binman/test/{91_hash_no_algo.dts => 091_hash_no_algo.dts} | 0 tools/binman/test/{92_hash_bad_algo.dts => 092_hash_bad_algo.dts} | 0 tools/binman/test/{93_x86_tpl_ucode.dts => 093_x86_tpl_ucode.dts} | 0 tools/binman/test/{94_fmap_x86.dts => 094_fmap_x86.dts} | 0 tools/binman/test/{95_fmap_x86_section.dts => 095_fmap_x86_section.dts} | 0 tools/binman/test/{96_elf.dts => 096_elf.dts} | 0 tools/binman/test/{97_elf_strip.dts => 097_elf_strip.dts} | 0 tools/binman/test/{99_hash_section.dts => 099_hash_section.dts} | 0 tools/buildman/test.py | 8 +- tools/concurrencytest/.gitignore | 1 + tools/concurrencytest/README.md | 74 + tools/concurrencytest/concurrencytest.py | 144 ++ tools/dtoc/dtoc.py | 7 + tools/dtoc/fdt.py | 2 +- tools/dtoc/test_dtoc.py | 6 +- tools/dtoc/test_fdt.py | 12 +- tools/patman/settings.py | 27 +- tools/patman/test_util.py | 2 +- tools/patman/tools.py | 3 + tools/patman/tout.py | 8 +- 224 files changed, 5757 insertions(+), 1621 deletions(-) create mode 100644 include/string.h create mode 100644 test/dm/panel.c rename tools/binman/test/{01_invalid.dts => 001_invalid.dts} (100%) rename tools/binman/test/{02_missing_node.dts => 002_missing_node.dts} (100%) rename tools/binman/test/{03_empty.dts => 003_empty.dts} (100%) rename tools/binman/test/{04_invalid_entry.dts => 004_invalid_entry.dts} (100%) rename tools/binman/test/{05_simple.dts => 005_simple.dts} (100%) rename tools/binman/test/{06_dual_image.dts => 006_dual_image.dts} (100%) rename tools/binman/test/{07_bad_align.dts => 007_bad_align.dts} (100%) rename tools/binman/test/{08_pack.dts => 008_pack.dts} (100%) rename tools/binman/test/{09_pack_extra.dts => 009_pack_extra.dts} (100%) rename tools/binman/test/{10_pack_align_power2.dts => 010_pack_align_power2.dts} (100%) rename tools/binman/test/{11_pack_align_size_power2.dts => 011_pack_align_size_power2.dts} (100%) rename tools/binman/test/{12_pack_inv_align.dts => 012_pack_inv_align.dts} (100%) rename tools/binman/test/{13_pack_inv_size_align.dts => 013_pack_inv_size_align.dts} (100%) rename tools/binman/test/{14_pack_overlap.dts => 014_pack_overlap.dts} (100%) rename tools/binman/test/{15_pack_overflow.dts => 015_pack_overflow.dts} (100%) rename tools/binman/test/{16_pack_image_overflow.dts => 016_pack_image_overflow.dts} (100%) rename tools/binman/test/{17_pack_image_size.dts => 017_pack_image_size.dts} (100%) rename tools/binman/test/{18_pack_image_align.dts => 018_pack_image_align.dts} (100%) rename tools/binman/test/{19_pack_inv_image_align.dts => 019_pack_inv_image_align.dts} (100%) rename tools/binman/test/{20_pack_inv_image_align_power2.dts => 020_pack_inv_image_align_power2.dts} (100%) rename tools/binman/test/{21_image_pad.dts => 021_image_pad.dts} (100%) rename tools/binman/test/{22_image_name.dts => 022_image_name.dts} (100%) rename tools/binman/test/{23_blob.dts => 023_blob.dts} (100%) rename tools/binman/test/{24_sorted.dts => 024_sorted.dts} (100%) rename tools/binman/test/{25_pack_zero_size.dts => 025_pack_zero_size.dts} (100%) rename tools/binman/test/{26_pack_u_boot_dtb.dts => 026_pack_u_boot_dtb.dts} (100%) rename tools/binman/test/{27_pack_4gb_no_size.dts => 027_pack_4gb_no_size.dts} (100%) rename tools/binman/test/{28_pack_4gb_outside.dts => 028_pack_4gb_outside.dts} (100%) rename tools/binman/test/{29_x86-rom.dts => 029_x86-rom.dts} (100%) rename tools/binman/test/{30_x86-rom-me-no-desc.dts => 030_x86-rom-me-no-desc.dts} (100%) rename tools/binman/test/{31_x86-rom-me.dts => 031_x86-rom-me.dts} (100%) rename tools/binman/test/{32_intel-vga.dts => 032_intel-vga.dts} (100%) rename tools/binman/test/{33_x86-start16.dts => 033_x86-start16.dts} (100%) rename tools/binman/test/{34_x86_ucode.dts => 034_x86_ucode.dts} (100%) rename tools/binman/test/{35_x86_single_ucode.dts => 035_x86_single_ucode.dts} (100%) rename tools/binman/test/{36_u_boot_img.dts => 036_u_boot_img.dts} (100%) rename tools/binman/test/{37_x86_no_ucode.dts => 037_x86_no_ucode.dts} (100%) rename tools/binman/test/{38_x86_ucode_missing_node.dts => 038_x86_ucode_missing_node.dts} (100%) rename tools/binman/test/{39_x86_ucode_missing_node2.dts => 039_x86_ucode_missing_node2.dts} (100%) rename tools/binman/test/{40_x86_ucode_not_in_image.dts => 040_x86_ucode_not_in_image.dts} (100%) rename tools/binman/test/{41_unknown_pos_size.dts => 041_unknown_pos_size.dts} (100%) rename tools/binman/test/{42_intel-fsp.dts => 042_intel-fsp.dts} (100%) rename tools/binman/test/{43_intel-cmc.dts => 043_intel-cmc.dts} (100%) rename tools/binman/test/{44_x86_optional_ucode.dts => 044_x86_optional_ucode.dts} (100%) rename tools/binman/test/{45_prop_test.dts => 045_prop_test.dts} (100%) rename tools/binman/test/{46_intel-vbt.dts => 046_intel-vbt.dts} (100%) rename tools/binman/test/{47_spl_bss_pad.dts => 047_spl_bss_pad.dts} (100%) rename tools/binman/test/{48_x86-start16-spl.dts => 048_x86-start16-spl.dts} (100%) rename tools/binman/test/{49_x86_ucode_spl.dts => 049_x86_ucode_spl.dts} (100%) rename tools/binman/test/{50_intel_mrc.dts => 050_intel_mrc.dts} (100%) rename tools/binman/test/{51_u_boot_spl_dtb.dts => 051_u_boot_spl_dtb.dts} (100%) rename tools/binman/test/{52_u_boot_spl_nodtb.dts => 052_u_boot_spl_nodtb.dts} (100%) rename tools/binman/test/{53_symbols.dts => 053_symbols.dts} (100%) rename tools/binman/test/{54_unit_address.dts => 054_unit_address.dts} (100%) rename tools/binman/test/{55_sections.dts => 055_sections.dts} (100%) rename tools/binman/test/{56_name_prefix.dts => 056_name_prefix.dts} (100%) rename tools/binman/test/{57_unknown_contents.dts => 057_unknown_contents.dts} (100%) rename tools/binman/test/{58_x86_ucode_spl_needs_retry.dts => 058_x86_ucode_spl_needs_retry.dts} (100%) rename tools/binman/test/{59_change_size.dts => 059_change_size.dts} (100%) rename tools/binman/test/{60_fdt_update.dts => 060_fdt_update.dts} (100%) rename tools/binman/test/{61_fdt_update_bad.dts => 061_fdt_update_bad.dts} (100%) rename tools/binman/test/{62_entry_args.dts => 062_entry_args.dts} (100%) rename tools/binman/test/{63_entry_args_missing.dts => 063_entry_args_missing.dts} (100%) rename tools/binman/test/{64_entry_args_required.dts => 064_entry_args_required.dts} (100%) rename tools/binman/test/{65_entry_args_unknown_datatype.dts => 065_entry_args_unknown_datatype.dts} (100%) rename tools/binman/test/{66_text.dts => 066_text.dts} (100%) rename tools/binman/test/{67_fmap.dts => 067_fmap.dts} (100%) rename tools/binman/test/{68_blob_named_by_arg.dts => 068_blob_named_by_arg.dts} (100%) rename tools/binman/test/{69_fill.dts => 069_fill.dts} (100%) rename tools/binman/test/{70_fill_no_size.dts => 070_fill_no_size.dts} (100%) rename tools/binman/test/{71_gbb.dts => 071_gbb.dts} (100%) rename tools/binman/test/{72_gbb_too_small.dts => 072_gbb_too_small.dts} (100%) rename tools/binman/test/{73_gbb_no_size.dts => 073_gbb_no_size.dts} (100%) rename tools/binman/test/{74_vblock.dts => 074_vblock.dts} (100%) rename tools/binman/test/{75_vblock_no_content.dts => 075_vblock_no_content.dts} (100%) rename tools/binman/test/{76_vblock_bad_phandle.dts => 076_vblock_bad_phandle.dts} (100%) rename tools/binman/test/{77_vblock_bad_entry.dts => 077_vblock_bad_entry.dts} (100%) rename tools/binman/test/{78_u_boot_tpl.dts => 078_u_boot_tpl.dts} (100%) rename tools/binman/test/{79_uses_pos.dts => 079_uses_pos.dts} (100%) rename tools/binman/test/{80_fill_empty.dts => 080_fill_empty.dts} (100%) rename tools/binman/test/{81_x86-start16-tpl.dts => 081_x86-start16-tpl.dts} (100%) rename tools/binman/test/{82_fdt_update_all.dts => 082_fdt_update_all.dts} (100%) rename tools/binman/test/{83_compress.dts => 083_compress.dts} (100%) rename tools/binman/test/{84_files.dts => 084_files.dts} (100%) rename tools/binman/test/{85_files_compress.dts => 085_files_compress.dts} (100%) rename tools/binman/test/{86_files_none.dts => 086_files_none.dts} (100%) rename tools/binman/test/{87_files_no_pattern.dts => 087_files_no_pattern.dts} (100%) rename tools/binman/test/{88_expand_size.dts => 088_expand_size.dts} (100%) rename tools/binman/test/{89_expand_size_bad.dts => 089_expand_size_bad.dts} (100%) rename tools/binman/test/{90_hash.dts => 090_hash.dts} (100%) rename tools/binman/test/{91_hash_no_algo.dts => 091_hash_no_algo.dts} (100%) rename tools/binman/test/{92_hash_bad_algo.dts => 092_hash_bad_algo.dts} (100%) rename tools/binman/test/{93_x86_tpl_ucode.dts => 093_x86_tpl_ucode.dts} (100%) rename tools/binman/test/{94_fmap_x86.dts => 094_fmap_x86.dts} (100%) rename tools/binman/test/{95_fmap_x86_section.dts => 095_fmap_x86_section.dts} (100%) rename tools/binman/test/{96_elf.dts => 096_elf.dts} (100%) rename tools/binman/test/{97_elf_strip.dts => 097_elf_strip.dts} (100%) rename tools/binman/test/{99_hash_section.dts => 099_hash_section.dts} (100%) create mode 100644 tools/concurrencytest/.gitignore create mode 100644 tools/concurrencytest/README.md create mode 100644 tools/concurrencytest/concurrencytest.py Regards, Simon

4 8

[U-Boot] [PATCH v3 0/1] efi_loader: improve boot sequence in distro_bootcmd
by AKASHI Takahiro 03 Dec '18

03 Dec '18

Actually, this patch is a RESEND of my v2[1], without patch #2 and #3 as I don't want to dive into details of dtb discussions[2]. I think that the patch #1 alone is useful. If fdt_addr_r is not defined, "load ... ${fdt_addr_r} ${prefix}${efi_fdtfile}" will fail quietly. So it should be OK. Think about applying my "removable device" patch[3] alongside this patch. [1] https://lists.denx.de/pipermail/u-boot/2018-October/345029.html [2] https://lists.denx.de/pipermail/u-boot/2018-October/344375.html [3] https://lists.denx.de/pipermail/u-boot/2018-November/347491.html Changes in v3 (Nov 27, 2018): * remove v2's patch #2 and #3 Changes in v2 (Oct 22, 2018): * rewrite my previous changes after Alex's comments, including - boot bootmgr only once before searching for boot binary - dtb must be loaded from the same device with boot binary's * add patch#2 as part of this patch set, in particular adding CONFIG_SYS Thanks, -Takahio Akashi AKASHI Takahiro (1): efi_loader: rework fdt handling in distro boot script include/config_distro_bootcmd.h | 38 +++++++++++++++++---------------- 1 file changed, 20 insertions(+), 18 deletions(-) -- 2.19.1

2 4

[U-Boot] [PATCH] cmd: bmp: manage centered display
by Patrick Delaunay 03 Dec '18

03 Dec '18

Allow to display BMP at the middle of the screen. 'm' means "middle" as it is done for the splashscreen variable: splashpos=m,m Signed-off-by: Patrick Delaunay <patrick.delaunay(a)st.com> --- Example for command load mmc 0:4 ${splashimage} splash.bmp bmp display ${splashimage} m m or function can be used directly bmp_display(0xC0000000, BMP_ALIGN_CENTER, BMP_ALIGN_CENTER) cmd/bmp.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/cmd/bmp.c b/cmd/bmp.c index 02bdf48..1ace8a8 100644 --- a/cmd/bmp.c +++ b/cmd/bmp.c @@ -108,6 +108,7 @@ static int do_bmp_info(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[ return (bmp_info(addr)); } +#define BMP_ALIGN_CENTER 0x7FFF static int do_bmp_display(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) { ulong addr; @@ -124,8 +125,14 @@ static int do_bmp_display(cmd_tbl_t * cmdtp, int flag, int argc, char * const ar break; case 4: addr = simple_strtoul(argv[1], NULL, 16); - x = simple_strtoul(argv[2], NULL, 10); - y = simple_strtoul(argv[3], NULL, 10); + if (!strcmp(argv[2], "m")) + x = BMP_ALIGN_CENTER; + else + x = simple_strtoul(argv[2], NULL, 10); + if (!strcmp(argv[3], "m")) + y = BMP_ALIGN_CENTER; + else + y = simple_strtoul(argv[3], NULL, 10); break; default: return CMD_RET_USAGE; @@ -249,9 +256,11 @@ int bmp_display(ulong addr, int x, int y) if (!ret) { bool align = false; -# ifdef CONFIG_SPLASH_SCREEN_ALIGN - align = true; -# endif /* CONFIG_SPLASH_SCREEN_ALIGN */ + if (CONFIG_IS_ENABLED(SPLASH_SCREEN_ALIGN) || + x == BMP_ALIGN_CENTER || + y == BMP_ALIGN_CENTER) + align = true; + ret = video_bmp_display(dev, addr, x, y, align); } #elif defined(CONFIG_LCD) -- 2.7.4

3 3

[U-Boot] [PATCH] distro: add more efi dtb prefixes
by Guillaume GARDET 03 Dec '18

03 Dec '18

As used on some distro, such as openSUSE. Signed-off-by: Guillaume GARDET <guillaume.gardet(a)free.fr> Cc: Tom Rini <trini(a)konsulko.com> --- include/config_distro_bootcmd.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h index d672e8ebe6..ad4c7a78f1 100644 --- a/include/config_distro_bootcmd.h +++ b/include/config_distro_bootcmd.h @@ -141,7 +141,8 @@ "load ${devtype} ${devnum}:${distro_bootpart} " \ "${fdt_addr_r} ${prefix}${efi_fdtfile}\0" \ \ - "efi_dtb_prefixes=/ /dtb/ /dtb/current/\0" \ + "efi_dtb_prefixes=/ /dtb/ /dtb/current/ " \ + "/boot/ /boot/dtb/ /boot/dtb/current/\0" \ "scan_dev_for_efi=" \ "setenv efi_fdtfile ${fdtfile}; " \ BOOTENV_EFI_SET_FDTFILE_FALLBACK \ -- 2.17.1

4 5

[U-Boot] [PATCH 0/1] ARM: mvebu: Armada-38x DDR training update
by Chris Packham 03 Dec '18

03 Dec '18

Hi All, I had a faulty board to debug at $dayjob. Part of that involved trying the latest DDR training code from Marvell. That didn't fix by problem (I suspect a manufacturing issue with that board). Since I've done the work anyway I figured I'd send this out. Most of the delta is code movement and tidy up. There's very little behavioural change for A38X. This may however be useful if/when someone starts looking at the newer Armada-3700/3900 SoCs. Chris Packham (1): ARM: mvebu: a38x: sync ddr training code with mv_ddr-armada-18.09 board/CZ.NIC/turris_omnia/turris_omnia.c | 4 +- board/Marvell/db-88f6820-amc/db-88f6820-amc.c | 2 +- board/Marvell/db-88f6820-gp/db-88f6820-gp.c | 2 +- board/gdsys/a38x/controlcenterdc.c | 2 +- board/kobol/helios4/helios4.c | 2 +- board/solidrun/clearfog/clearfog.c | 2 +- drivers/ddr/marvell/a38x/ddr3_debug.c | 414 +-------------- drivers/ddr/marvell/a38x/ddr3_init.c | 91 +--- drivers/ddr/marvell/a38x/ddr3_init.h | 43 +- drivers/ddr/marvell/a38x/ddr3_topology_def.h | 78 --- drivers/ddr/marvell/a38x/ddr3_training.c | 484 +++++++++--------- drivers/ddr/marvell/a38x/ddr3_training_bist.c | 1 + .../a38x/ddr3_training_centralization.c | 3 + drivers/ddr/marvell/a38x/ddr3_training_db.c | 172 ++++--- .../ddr/marvell/a38x/ddr3_training_hw_algo.c | 1 + drivers/ddr/marvell/a38x/ddr3_training_ip.h | 38 -- .../ddr/marvell/a38x/ddr3_training_ip_def.h | 31 -- .../marvell/a38x/ddr3_training_ip_engine.c | 2 + .../marvell/a38x/ddr3_training_ip_engine.h | 1 + .../ddr/marvell/a38x/ddr3_training_ip_flow.h | 91 +--- .../marvell/a38x/ddr3_training_ip_prv_if.h | 10 +- .../ddr/marvell/a38x/ddr3_training_leveling.c | 75 +-- .../ddr/marvell/a38x/ddr3_training_leveling.h | 1 - drivers/ddr/marvell/a38x/ddr3_training_pbs.c | 7 +- drivers/ddr/marvell/a38x/ddr_topology_def.h | 107 +++- drivers/ddr/marvell/a38x/ddr_training_ip_db.h | 2 - drivers/ddr/marvell/a38x/dram_if.h | 13 + .../ddr/marvell/a38x/mv_ddr_build_message.c | 2 +- drivers/ddr/marvell/a38x/mv_ddr_common.h | 38 +- drivers/ddr/marvell/a38x/mv_ddr_plat.c | 181 ++++--- drivers/ddr/marvell/a38x/mv_ddr_plat.h | 12 +- drivers/ddr/marvell/a38x/mv_ddr_regs.h | 19 + drivers/ddr/marvell/a38x/mv_ddr_spd.c | 16 +- drivers/ddr/marvell/a38x/mv_ddr_topology.c | 215 ++++++-- drivers/ddr/marvell/a38x/mv_ddr_topology.h | 214 +++++++- drivers/ddr/marvell/a38x/mv_ddr_training_db.h | 40 ++ drivers/ddr/marvell/a38x/xor.c | 8 +- 37 files changed, 1163 insertions(+), 1261 deletions(-) delete mode 100644 drivers/ddr/marvell/a38x/ddr3_topology_def.h create mode 100644 drivers/ddr/marvell/a38x/dram_if.h create mode 100644 drivers/ddr/marvell/a38x/mv_ddr_training_db.h -- 2.19.2

2 3