May 2016 - U-Boot

[U-Boot] [v2 PATCH 00/14] cleanup QEMU fw_cfg code
by Miao Yan 20 May '16

20 May '16

This patchset cleans the QEMU fw_cfg code: *) split qfw core and qfw command interface *) split x86 specific operations from qfw core *) move x86 ACPI generation code into qfw core as this can also be used by others like ARM64 *) various cleanups Changes in v2: *) make git format-patch detect renames *) add a patch to enable qfw for sandbox_defconfig *) address other trivial review comments Miao Yan (14): x86: qemu: fix ACPI Kconfig options cmd: qfw: add API to iterate firmware list cmd: qfw: remove qemu_fwcfg_free_files() cmd: qfw: make fwcfg_present and fwcfg_dma_present public x86: qemu: split qfw command interface and qfw core x86: qemu: move x86 specific operations out of qfw core x86: qemu: add comment about qfw register endianness cmd: qfw: rename qemu_fw_cfg.[c|h] to qfw.[c|h] cmd: qfw: do not require default macros when building qfw command cmd: qfw: do not depend on x86 cmd: qfw: bring ACPI generation code into qfw core x86: qemu: rename qemu/acpi_table.c cmd: qfw: rename QEMU_FW_CFG to CMD_QFW config: sandbox: enable qfw and cmd_qfw for testing arch/x86/Kconfig | 10 +- arch/x86/cpu/mp_init.c | 6 +- arch/x86/cpu/qemu/Makefile | 4 +- arch/x86/cpu/qemu/cpu.c | 2 +- arch/x86/cpu/qemu/e820.c | 43 ++++ arch/x86/cpu/qemu/qemu.c | 50 ++++- arch/x86/lib/Makefile | 2 +- cmd/Kconfig | 4 +- cmd/Makefile | 2 +- cmd/{qemu_fw_cfg.c => qfw.c} | 189 ++--------------- configs/qemu-x86_defconfig | 2 +- configs/sandbox_defconfig | 2 + drivers/misc/Kconfig | 6 + drivers/misc/Makefile | 1 + .../cpu/qemu/acpi_table.c => drivers/misc/qfw.c | 223 +++++++++++++++++---- include/{qemu_fw_cfg.h => qfw.h} | 28 ++- 16 files changed, 336 insertions(+), 238 deletions(-) create mode 100644 arch/x86/cpu/qemu/e820.c rename cmd/{qemu_fw_cfg.c => qfw.c} (54%) rename arch/x86/cpu/qemu/acpi_table.c => drivers/misc/qfw.c (57%) rename include/{qemu_fw_cfg.h => qfw.h} (84%) -- 1.9.1

2 29

[U-Boot] [PATCH v2] SPL: FIT: Enable SPL_FIT_LOAD in RAM based boot mode
by Michal Simek 20 May '16

20 May '16

Support loading FIT in SPL for RAM bootmode. CONFIG_SPL_LOAD_FIT_ADRESS points to address where FIT image is stored in memory. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> Reviewed-by: Simon Glass <sjg(a)chromium.org> --- Changes in v2: - Fix empty line - Fix addr name and remove SPL_LOAD_FIT macro common/spl/spl.c | 45 ++++++++++++++++++++++++++++++++++++--------- 1 file changed, 36 insertions(+), 9 deletions(-) diff --git a/common/spl/spl.c b/common/spl/spl.c index 0fc5b058be31..3faa751e4b43 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -136,20 +136,47 @@ __weak void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image) image_entry(); } +#ifndef CONFIG_SPL_LOAD_FIT_ADDRESS +# define CONFIG_SPL_LOAD_FIT_ADDRESS 0 +#endif + #ifdef CONFIG_SPL_RAM_DEVICE +static ulong spl_ram_load_read(struct spl_load_info *load, ulong sector, + ulong count, void *buf) +{ + debug("%s: sector %lx, count %lx, buf %lx\n", + __func__, sector, count, (ulong)buf); + memcpy(buf, (void *)(CONFIG_SPL_LOAD_FIT_ADDRESS + sector), count); + return count; +} + static int spl_ram_load_image(void) { - const struct image_header *header; + struct image_header *header; - /* - * Get the header. It will point to an address defined by handoff - * which will tell where the image located inside the flash. For - * now, it will temporary fixed to address pointed by U-Boot. - */ - header = (struct image_header *) - (CONFIG_SYS_TEXT_BASE - sizeof(struct image_header)); + header = (struct image_header *)CONFIG_SPL_LOAD_FIT_ADDRESS; - spl_parse_image_header(header); + if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) && + image_get_magic(header) == FDT_MAGIC) { + struct spl_load_info load; + + debug("Found FIT\n"); + load.bl_len = 1; + load.read = spl_ram_load_read; + spl_load_simple_fit(&load, 0, header); + } else { + debug("Legacy image\n"); + /* + * Get the header. It will point to an address defined by + * handoff which will tell where the image located inside + * the flash. For now, it will temporary fixed to address + * pointed by U-Boot. + */ + header = (struct image_header *) + (CONFIG_SYS_TEXT_BASE - sizeof(struct image_header)); + + spl_parse_image_header(header); + } return 0; } -- 1.9.1

4 9

[U-Boot] [PATCH] ARM: ARM: fix ifdefs in ARMv8 lowlevel_init() again
by Masahiro Yamada 20 May '16

20 May '16

Commit 116611937faa ("ARM: fix ifdefs in ARMv8 lowlevel_init()") accidentally inverted the logic of CONFIG_ARMV8_MULTIENTRY. Fixes: 116611937faa ("ARM: fix ifdefs in ARMv8 lowlevel_init()") Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- arch/arm/cpu/armv8/start.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/cpu/armv8/start.S b/arch/arm/cpu/armv8/start.S index c3cc819..e933021 100644 --- a/arch/arm/cpu/armv8/start.S +++ b/arch/arm/cpu/armv8/start.S @@ -216,7 +216,7 @@ WEAK(lowlevel_init) #endif #endif -#ifndef CONFIG_ARMV8_MULTIENTRY +#ifdef CONFIG_ARMV8_MULTIENTRY branch_if_master x0, x1, 2f /* -- 1.9.1

1 0

[U-Boot] Linker script u-boot.lds makes u-boot ELF not load with debugger
by Palacios, Hector 19 May '16

19 May '16

Hi, I'm loading U-Boot to an i.MX6Q platform using ARM DSTREAM debugger and after running the DDR initialization script it fails to load the u-boot ELF binary complaining with: loadfile "/home/hpalacio/git/u-boot-denx/u-boot" ERROR(CMD16-TAD11-NAL18): ! Failed to load "u-boot" ! Failed to write 160 bytes to address S:0x00010034 ! Bus error on memory operation. Target Message: Memory access caused precise abort. Debug Precise Abort Registers : DFSR = 0x00001808, DFAR = 0x00010034 If I revert the changes introduced to arch/arm/cpu/u-boot.lds in commit 47ed5dd031d7d2c587e6afd386e79ccec1a1b7f7, then the u-boot ELF loads fine: diff --git a/arch/arm/cpu/u-boot.lds b/arch/arm/cpu/u-boot.lds index 7336162d804f..cf5cc327a42b 100644 --- a/arch/arm/cpu/u-boot.lds +++ b/arch/arm/cpu/u-boot.lds @@ -127,14 +127,12 @@ SECTIONS KEEP(*(.__bss_end)); } - .dynsym _image_binary_end : { *(.dynsym) } - .dynbss : { *(.dynbss) } - .dynstr : { *(.dynstr*) } - .dynamic : { *(.dynamic*) } - .plt : { *(.plt*) } - .interp : { *(.interp*) } - .gnu.hash : { *(.gnu.hash) } - .gnu : { *(.gnu*) } - .ARM.exidx : { *(.ARM.exidx*) } - .gnu.linkonce.armexidx : { *(.gnu.linkonce.armexidx.*) } + /DISCARD/ : { *(.dynsym) } + /DISCARD/ : { *(.dynstr*) } + /DISCARD/ : { *(.dynamic*) } + /DISCARD/ : { *(.plt*) } + /DISCARD/ : { *(.interp*) } + /DISCARD/ : { *(.gnu*) } + /DISCARD/ : { *(.ARM.exidx*) } + /DISCARD/ : { *(.gnu.linkonce.armexidx.*) } } Does anybody know if I should do anything special in my debugger initialization script after commit 47ed5dd031d7d2c587e6afd386e79ccec1a1b7f7 to have it load U-Boot normally? Thank you. -- Héctor Palacios

2 1

[U-Boot] [PATCH 1/4] spi: fsl_qspi: Fix issues on arm64
by Yuan Yao 19 May '16

19 May '16

From: Yuan Yao <yao.yuan(a)nxp.com> The address value and size value get from dts "reg" property have type of u64 on arm64. If we assign those values to "u32" variables, driver can't work correctly. Converting the type of those variables to fdt_xxx_t. Signed-off-by: Yuan Yao <yao.yuan(a)freescale.com> Signed-off-by: Prabhakar Kushwaha <prabhakar(a)freescale.com> Signed-off-by: Yuan Yao <yao.yuan(a)nxp.com> --- drivers/spi/fsl_qspi.c | 46 +++++++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/drivers/spi/fsl_qspi.c b/drivers/spi/fsl_qspi.c index cb8d929..96fb909 100644 --- a/drivers/spi/fsl_qspi.c +++ b/drivers/spi/fsl_qspi.c @@ -92,9 +92,9 @@ DECLARE_GLOBAL_DATA_PTR; struct fsl_qspi_platdata { u32 flags; u32 speed_hz; - u32 reg_base; - u32 amba_base; - u32 amba_total_size; + fdt_addr_t reg_base; + fdt_addr_t amba_base; + fdt_size_t amba_total_size; u32 flash_num; u32 num_chipselect; }; @@ -940,8 +940,13 @@ static int fsl_qspi_probe(struct udevice *bus) priv->flags = plat->flags; priv->speed_hz = plat->speed_hz; - priv->amba_base[0] = plat->amba_base; - priv->amba_total_size = plat->amba_total_size; + /* + * QSPI SFADR width is 32bits, the max dest addr is 4GB-1. + * AMBA memory zone should be located on the 0~4GB space + * even on a 64bits cpu. + */ + priv->amba_base[0] = (u32)plat->amba_base; + priv->amba_total_size = (u32)plat->amba_total_size; priv->flash_num = plat->flash_num; priv->num_chipselect = plat->num_chipselect; @@ -984,10 +989,7 @@ static int fsl_qspi_probe(struct udevice *bus) static int fsl_qspi_ofdata_to_platdata(struct udevice *bus) { - struct reg_data { - u32 addr; - u32 size; - } regs_data[2]; + struct fdt_resource res_regs, res_mem; struct fsl_qspi_platdata *plat = bus->platdata; const void *blob = gd->fdt_blob; int node = bus->of_offset; @@ -996,10 +998,16 @@ static int fsl_qspi_ofdata_to_platdata(struct udevice *bus) if (fdtdec_get_bool(blob, node, "big-endian")) plat->flags |= QSPI_FLAG_REGMAP_ENDIAN_BIG; - ret = fdtdec_get_int_array(blob, node, "reg", (u32 *)regs_data, - sizeof(regs_data)/sizeof(u32)); + ret = fdt_get_named_resource(blob, node, "reg", "reg-names", + "QuadSPI", &res_regs); + if (ret) { + debug("Error: can't get regs base addresses(ret = %d)!\n", ret); + return -ENOMEM; + } + ret = fdt_get_named_resource(blob, node, "reg", "reg-names", + "QuadSPI-memory", &res_mem); if (ret) { - debug("Error: can't get base addresses (ret = %d)!\n", ret); + debug("Error: can't get AMBA base addresses(ret = %d)!\n", ret); return -ENOMEM; } @@ -1017,16 +1025,16 @@ static int fsl_qspi_ofdata_to_platdata(struct udevice *bus) plat->num_chipselect = fdtdec_get_int(blob, node, "num-cs", FSL_QSPI_MAX_CHIPSELECT_NUM); - plat->reg_base = regs_data[0].addr; - plat->amba_base = regs_data[1].addr; - plat->amba_total_size = regs_data[1].size; + plat->reg_base = res_regs.start; + plat->amba_base = res_mem.start; + plat->amba_total_size = res_mem.end - res_mem.start + 1; plat->flash_num = flash_num; - debug("%s: regs=<0x%x> <0x%x, 0x%x>, max-frequency=%d, endianess=%s\n", + debug("%s: regs=<0x%llx> <0x%llx, 0x%llx>, max-frequency=%d, endianess=%s\n", __func__, - plat->reg_base, - plat->amba_base, - plat->amba_total_size, + (u64)plat->reg_base, + (u64)plat->amba_base, + (u64)plat->amba_total_size, plat->speed_hz, plat->flags & QSPI_FLAG_REGMAP_ENDIAN_BIG ? "be" : "le" ); -- 2.1.0.27.g96db324

3 7

[U-Boot] SPL and FIT images
by michael＠walle.cc 19 May '16

19 May '16

Hi, I'm looking into the FIT support in the SPL, because we are planning to load bootloader from a filesystem (on a MMC device); the SPL will be stored in a write-protected SPI flash. To make sure that a user does not accidentally put a wrong bootloader image on the filesystem, we would like to do some kind of compatiblity checking. I guess this can be done with the FIT image and its compatibility node. Looking into the code I found out, that FIT images only seems to be supported when the bootloader is loaded from raw MMC. Simon, since this code is from you, might I ask, why you didn't put it into the common spl.c (spl_parse_image_header(), etc) so it could be used for all other methods, too? I just want to make sure, there is no reason not to do it for our case. -michael

2 2

[U-Boot] [PATCH v2 00/13] usb: dwc3: rework DWC3 and convert UniPhier xHCI driver to DM
by Masahiro Yamada 19 May '16

19 May '16

Masahiro Yamada (13): configs: blackfin: move CONFIG_USB to defconfig usb: move CONFIG_USB_XHCI to Kconfig with renaming usb: move CONFIG_USB_XHCI_DWC3 to Kconfig usb: xhci: add struct devrequest declaration to xhci.h usb: dwc3: change DWC3 core support code into a driver usb: dwc3: add UniPhier specific glue layer ARM: uniphier: switch over to USB DM ARM: uniphier: enable DWC3 xHCI driver usb: uniphier: remove UniPhier xHCI driver ARM: uniphier: delete unnecessary xHCI pin-mux settings ARM: uniphier: adjust ifdefs for new UniPhier DWC3 CONFIG ARM: dts: uniphier: add/update xHCI nodes ARM: uniphier: enable Generic EHCI for PH1-Pro4 arch/arm/Kconfig | 1 + arch/arm/dts/uniphier-ph1-ld20.dtsi | 17 ++++ arch/arm/dts/uniphier-ph1-pro4-ref.dts | 4 + arch/arm/dts/uniphier-ph1-pro4.dtsi | 32 ++++-- arch/arm/dts/uniphier-ph1-pro5.dtsi | 32 ++++-- arch/arm/dts/uniphier-proxstream2.dtsi | 32 ++++-- arch/arm/mach-uniphier/clk/clk-pro4.c | 6 +- arch/arm/mach-uniphier/clk/clk-pro5.c | 6 +- arch/arm/mach-uniphier/clk/clk-pxs2.c | 6 +- arch/arm/mach-uniphier/pinctrl/pinctrl-ld20.c | 12 --- arch/arm/mach-uniphier/pinctrl/pinctrl-ld6b.c | 11 --- arch/arm/mach-uniphier/pinctrl/pinctrl-pro4.c | 7 -- arch/arm/mach-uniphier/pinctrl/pinctrl-pro5.c | 7 -- arch/arm/mach-uniphier/pinctrl/pinctrl-pxs2.c | 11 --- common/usb.c | 2 +- configs/am437x_gp_evm_defconfig | 2 + configs/am437x_sk_evm_defconfig | 2 + configs/am43xx_evm_defconfig | 2 + configs/am43xx_evm_ethboot_defconfig | 2 + configs/am43xx_evm_qspiboot_defconfig | 2 + configs/am43xx_evm_usbhost_boot_defconfig | 2 + configs/am57xx_evm_defconfig | 3 + configs/am57xx_evm_nodt_defconfig | 3 + configs/bf526-ezbrd_defconfig | 1 + configs/bf527-ezkit-v2_defconfig | 1 + configs/bf527-ezkit_defconfig | 1 + configs/bf548-ezkit_defconfig | 1 + configs/cm_t43_defconfig | 3 + configs/dra72_evm_defconfig | 2 + configs/dra74_evm_defconfig | 2 + configs/dra7xx_evm_defconfig | 2 + configs/dra7xx_evm_qspiboot_defconfig | 2 + configs/dra7xx_evm_uart3_defconfig | 2 + configs/k2e_evm_defconfig | 3 + configs/k2g_evm_defconfig | 3 + configs/k2hk_evm_defconfig | 3 + configs/k2l_evm_defconfig | 3 + configs/ls1021aqds_ddr4_nor_defconfig | 3 + configs/ls1021aqds_ddr4_nor_lpuart_defconfig | 3 + configs/ls1021aqds_nand_defconfig | 3 + configs/ls1021aqds_nor_SECURE_BOOT_defconfig | 3 + configs/ls1021aqds_nor_defconfig | 3 + configs/ls1021aqds_nor_lpuart_defconfig | 3 + configs/ls1021aqds_qspi_defconfig | 3 + configs/ls1021aqds_sdcard_ifc_defconfig | 3 + configs/ls1021aqds_sdcard_qspi_defconfig | 3 + configs/ls1021atwr_nor_SECURE_BOOT_defconfig | 3 + configs/ls1021atwr_nor_defconfig | 3 + configs/ls1021atwr_nor_lpuart_defconfig | 3 + configs/ls1021atwr_qspi_defconfig | 3 + configs/ls1021atwr_sdcard_ifc_defconfig | 3 + configs/ls1021atwr_sdcard_qspi_defconfig | 3 + configs/ls1043aqds_defconfig | 3 + configs/ls1043aqds_lpuart_defconfig | 3 + configs/ls1043aqds_nand_defconfig | 3 + configs/ls1043aqds_nor_ddr3_defconfig | 3 + configs/ls1043aqds_qspi_defconfig | 3 + configs/ls1043aqds_sdcard_ifc_defconfig | 3 + configs/ls1043aqds_sdcard_qspi_defconfig | 3 + configs/ls1043ardb_SECURE_BOOT_defconfig | 3 + configs/ls1043ardb_defconfig | 3 + configs/ls1043ardb_nand_defconfig | 3 + configs/ls1043ardb_sdcard_defconfig | 3 + configs/ls2080aqds_SECURE_BOOT_defconfig | 3 + configs/ls2080aqds_defconfig | 3 + configs/ls2080aqds_nand_defconfig | 3 + configs/ls2080ardb_SECURE_BOOT_defconfig | 3 + configs/ls2080ardb_defconfig | 3 + configs/ls2080ardb_nand_defconfig | 3 + configs/odroid-xu3_defconfig | 2 + configs/peach-pi_defconfig | 2 + configs/peach-pit_defconfig | 2 + configs/smdk5420_defconfig | 2 + configs/uniphier_ld20_defconfig | 2 + configs/uniphier_ld4_sld8_defconfig | 1 - configs/uniphier_pro4_defconfig | 4 + configs/uniphier_pxs2_ld6b_defconfig | 2 + configs/uniphier_sld3_defconfig | 1 - configs/xilinx_zynqmp_ep_defconfig | 2 + configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 2 + configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 2 + configs/xilinx_zynqmp_zcu102_defconfig | 2 + configs/xilinx_zynqmp_zcu102_revB_defconfig | 2 + drivers/usb/host/Kconfig | 24 ++--- drivers/usb/host/Makefile | 4 +- drivers/usb/host/dwc3-uniphier.c | 119 +++++++++++++++++++++++ drivers/usb/host/xhci-dwc3.c | 71 +++++++++++++- drivers/usb/host/xhci-uniphier.c | 85 ---------------- drivers/usb/host/xhci.h | 2 + include/configs/am43xx_evm.h | 2 - include/configs/am57xx_evm.h | 2 - include/configs/bf526-ezbrd.h | 1 - include/configs/bf527-ezkit.h | 1 - include/configs/bf548-ezkit.h | 1 - include/configs/cm_t43.h | 2 - include/configs/dra7xx_evm.h | 2 - include/configs/ds414.h | 3 +- include/configs/exynos5-common.h | 1 - include/configs/exynos5420-common.h | 1 - include/configs/ls1021aqds.h | 2 - include/configs/ls1021atwr.h | 2 - include/configs/ls1043aqds.h | 2 - include/configs/ls1043ardb.h | 2 - include/configs/ls2080aqds.h | 2 - include/configs/ls2080ardb.h | 2 - include/configs/smdk5420.h | 1 - include/configs/ti_armv7_keystone2.h | 2 - include/configs/xilinx_zynqmp.h | 2 - include/fdtdec.h | 1 - lib/fdtdec.c | 1 - 110 files changed, 479 insertions(+), 218 deletions(-) create mode 100644 drivers/usb/host/dwc3-uniphier.c delete mode 100644 drivers/usb/host/xhci-uniphier.c -- 1.9.1

3 26

[U-Boot] [PATCH 0/3] spl: fit: Allow to load FIT using UART boot
by Lokesh Vutla 19 May '16

19 May '16

This series allows to load a FIT image using UART boot mode. Tested: BBB: http://pastebin.ubuntu.com/16505294/ Lokesh Vutla (3): spl: fit: Do not print selected dtb during fit load spl: fit: Detect a FS load using filename spl: Add an option to load a FIT containing U-Boot from UART common/spl/spl_fat.c | 4 +-- common/spl/spl_fit.c | 10 +++--- common/spl/spl_ymodem.c | 91 +++++++++++++++++++++++++++++++++++++++++++------ include/spl.h | 2 ++ 4 files changed, 88 insertions(+), 19 deletions(-) -- 2.8.2

2 6

[U-Boot] [PULL] Please pull u-boot-imx
by Stefano Babic 19 May '16

19 May '16

Hi Tom, please pull from u-boot-imx, thanks ! The following changes since commit aeaec0e682f45b9e0c62c522fafea353931f73ed: Prepare v2016.05 (2016-05-16 10:40:32 -0400) are available in the git repository at: git://www.denx.de/git/u-boot-imx.git master for you to fetch changes up to 291000894ed4d6257830baba547764b86e335b5c: ARM: mx6: Enable MMC and SATA extfs boot support (2016-05-17 17:52:20 +0200) ---------------------------------------------------------------- Adrian Alonso (1): imx: tools: imximage: fix CLR bit command Eric Nelson (1): imx: mx6: mx6sl_pins: add GPIO variant for SD1_DAT5 Fabio Estevam (1): mx6ul_evk: Remove CONFIG_SUPPORT_EMMC_BOOT Marek Vasut (4): ARM: mx6: Enable STDIO deregistering on Novena SPL: Let spl_parse_image_header() return value SPL: Add CONFIG_SPL_ABORT_ON_RAW_IMAGE ARM: mx6: Enable MMC and SATA extfs boot support Peng Fan (1): video: ipu_common: fix build error Stefan Agner (3): imx: iomux-v3: fix UART input selects imx: imx7d: fix ahb clock mux 1 imx: imx-common: print i.MX 7 SoC names consistently Stefano Babic (1): Merge branch 'master' of git://git.denx.de/u-boot README | 4 ++++ arch/arm/cpu/armv7/mx7/clock_slice.c | 2 +- arch/arm/imx-common/cpu.c | 2 +- arch/arm/include/asm/arch-mx6/mx6sl_pins.h | 1 + arch/arm/include/asm/arch-mx7/mx7d_pins.h | 8 ++++---- common/spl/spl.c | 6 +++++- common/spl/spl_ext.c | 6 +++++- common/spl/spl_fat.c | 4 +++- common/spl/spl_mmc.c | 6 +++++- common/spl/spl_nand.c | 9 +++++++-- common/spl/spl_net.c | 4 +--- common/spl/spl_nor.c | 9 +++++++-- common/spl/spl_onenand.c | 5 ++++- common/spl/spl_ymodem.c | 7 +++++-- drivers/mtd/spi/spi_spl_load.c | 10 ++++++++-- drivers/video/ipu_common.c | 4 +++- include/configs/imx6_spl.h | 4 ++++ include/configs/novena.h | 2 +- include/configs/tqma6.h | 1 - include/spl.h | 2 +- tools/imximage.c | 2 +- 21 files changed, 71 insertions(+), 27 deletions(-) -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de =====================================================================

2 2

[U-Boot] Please pull from u-boot-i2c
by Heiko Schocher 19 May '16

19 May '16

Hello Tom, please pull from u-boot-i2c.git master There is a compile fix from Mario, also DM support for fsl_i2c, DM support for TI PCA954X muxes from Michal, a check for the enable status register in the designware i2c driver from Stefan and a fix for the mvtwsi driver, which now does not need writting a global variable. buildman says no errors introduced, so I think its ready for mainline ... The following changes since commit aeaec0e682f45b9e0c62c522fafea353931f73ed: Prepare v2016.05 (2016-05-16 10:40:32 -0400) are available in the git repository at: git://git.denx.de/u-boot-i2c.git master for you to fetch changes up to d6b7757e41d22e08f21f58d3fe9183a150582f61: i2c: mvtwsi: Eliminate twsi_control_flags (2016-05-17 08:32:02 +0200) ---------------------------------------------------------------- Chris Packham (1): i2c: mvtwsi: Eliminate twsi_control_flags Michal Simek (4): i2c: cdns: Read address from DT in ofdata_to_platdata i2c: cdns: Moving speed setup from probe to set_bus_speed function i2c: cdns: Support different bus speeds i2c: muxes: Add support for TI PCA954X mux Stefan Roese (4): i2c: designware_i2c: Optionally check enable status register i2c: Add entry for Designware I2C driver in Kconfig i2c: config: Move SYS_I2C_DW to Kconfig i2c: Select SYS_I2C_DW_ENABLE_STATUS_UNSUPPORTED for SPEAr mario.six(a)gdsys.cc (9): dm: fsl_i2c: Rename I2C register structure dm: fsl_i2c: Use clearer parameter names dm: fsl_i2c: Reword and clarify comment dm: fsl_i2c: Remove unnecessary variable dm: fsl_i2c: Rename probe method dm: fsl_i2c: Rename methods for reading/writing data dm: fsl_i2c: Prepare compatibility functions dm: fsl_i2c: Factor out adap parameter dm: fsl_i2c: Enable DM for FSL I2C arch/m68k/include/asm/fsl_i2c.h | 2 +- arch/powerpc/include/asm/fsl_i2c.h | 12 +++- arch/powerpc/include/asm/immap_85xx.h | 4 +- arch/powerpc/include/asm/immap_86xx.h | 4 +- board/keymile/km83xx/km83xx_i2c.c | 28 +++++---- configs/axs101_defconfig | 1 + configs/axs103_defconfig | 1 + configs/socfpga_arria5_defconfig | 1 + configs/socfpga_cyclone5_defconfig | 1 + configs/socfpga_de0_nano_soc_defconfig | 1 + configs/socfpga_mcvevk_defconfig | 1 + configs/socfpga_sockit_defconfig | 1 + configs/socfpga_socrates_defconfig | 1 + configs/socfpga_sr1500_defconfig | 1 + configs/spear300_defconfig | 1 + configs/spear300_nand_defconfig | 1 + configs/spear300_usbtty_defconfig | 1 + configs/spear300_usbtty_nand_defconfig | 1 + configs/spear310_defconfig | 1 + configs/spear310_nand_defconfig | 1 + configs/spear310_pnor_defconfig | 1 + configs/spear310_usbtty_defconfig | 1 + configs/spear310_usbtty_nand_defconfig | 1 + configs/spear310_usbtty_pnor_defconfig | 1 + configs/spear320_defconfig | 1 + configs/spear320_nand_defconfig | 1 + configs/spear320_pnor_defconfig | 1 + configs/spear320_usbtty_defconfig | 1 + configs/spear320_usbtty_nand_defconfig | 1 + configs/spear320_usbtty_pnor_defconfig | 1 + configs/spear600_defconfig | 1 + configs/spear600_nand_defconfig | 1 + configs/spear600_usbtty_defconfig | 1 + configs/spear600_usbtty_nand_defconfig | 1 + configs/x600_defconfig | 1 + drivers/i2c/Kconfig | 25 ++++++++ drivers/i2c/designware_i2c.c | 9 +++ drivers/i2c/fsl_i2c.c | 379 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------- drivers/i2c/i2c-cdns.c | 132 ++++++++++++++++++++++++++-------------- drivers/i2c/muxes/Kconfig | 10 ++++ drivers/i2c/muxes/Makefile | 1 + drivers/i2c/muxes/pca954x.c | 79 ++++++++++++++++++++++++ drivers/i2c/mvtwsi.c | 62 +++++++++---------- include/configs/axs101.h | 1 - include/configs/socfpga_common.h | 1 - include/configs/spear-common.h | 1 - include/configs/x600.h | 1 - 47 files changed, 550 insertions(+), 231 deletions(-) create mode 100644 drivers/i2c/muxes/pca954x.c bye, Heiko -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

2 1