From patchwork Mon Jan 15 17:52:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Babic X-Patchwork-Id: 861012 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zL1C55J5xz9s7s for ; Tue, 16 Jan 2018 04:52:16 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 5189EC21DDD; Mon, 15 Jan 2018 17:52:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 70A64C21CA6; Mon, 15 Jan 2018 17:52:09 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6712FC21CA6; Mon, 15 Jan 2018 17:52:08 +0000 (UTC) Received: from mail-out.m-online.net (mail-out.m-online.net [212.18.0.9]) by lists.denx.de (Postfix) with ESMTPS id F387AC21C41 for ; Mon, 15 Jan 2018 17:52:07 +0000 (UTC) Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3zL1Bv5l2lz1qtxQ; Mon, 15 Jan 2018 18:52:07 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 3zL1Bv5Jx9z1qsvx; Mon, 15 Jan 2018 18:52:07 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id 5luwbkQlml1W; Mon, 15 Jan 2018 18:52:06 +0100 (CET) Received: from babic.homelinux.org (host-88-217-136-221.customer.m-online.net [88.217.136.221]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS; Mon, 15 Jan 2018 18:52:06 +0100 (CET) Received: from localhost (mail.babic.homelinux.org [127.0.0.1]) by babic.homelinux.org (Postfix) with ESMTP id 1C98545404FD; Mon, 15 Jan 2018 18:52:06 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at babic.homelinux.org Received: from babic.homelinux.org ([127.0.0.1]) by localhost (mail.babic.homelinux.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id A5WL4TWIkade; Mon, 15 Jan 2018 18:52:02 +0100 (CET) Received: from [192.168.178.132] (papero.fritz.box [192.168.178.132]) by babic.homelinux.org (Postfix) with ESMTP id F3EFC4540360; Mon, 15 Jan 2018 18:52:01 +0100 (CET) To: Tom Rini From: Stefano Babic Message-ID: Date: Mon, 15 Jan 2018 18:52:01 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 Content-Language: de-DE Cc: "U-Boot@lists.denx.de" Subject: [U-Boot] [PULL] Please pull u-boot-imx X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Hi Tom, please pull from u-boot-imx, thanks ! The following changes since commit 373b9003410b44a1133060c2e63483b278fb476b: Merge git://git.denx.de/u-boot-sunxi (2018-01-11 14:14:19 -0500) are available in the git repository at: git://www.denx.de/git/u-boot-imx.git master for you to fetch changes up to 9587b0d61133c025d48ebf480aa021fc2fdd53a7: arm: imx: hab: Add hab_failsafe console command (2018-01-14 17:26:30 +0100) ---------------------------------------------------------------- Bryan O'Donoghue (25): arm: imx: hab: Make authenticate_image return int arm: imx: hab: Fix authenticate_image result code arm: imx: hab: Optimise flow of authenticate_image on is_enabled fail arm: imx: hab: Optimise flow of authenticate_image on hab_entry fail arm: imx: hab: Move IVT_SIZE to hab.h arm: imx: hab: Move CSF_PAD_SIZE to hab.h arm: imx: hab: Fix authenticate_image input parameters arm: imx: hab: Add IVT header definitions arm: imx: hab: Add IVT header verification arm: imx: hab: Verify IVT self matches calculated address arm: imx: hab: Only call ROM once headers are verified arm: imx: hab: Print CSF based on IVT descriptor arm: imx: hab: Print additional IVT elements during debug arm: imx: hab: Define rvt_check_target() arm: imx: hab: Implement hab_rvt_check_target arm: imx: hab: Add a hab_rvt_check_target to image auth arm: imx: hab: Print HAB event log only after calling ROM arm: imx: hab: Make internal functions and data static arm: imx: hab: Prefix authenticate_image with imx_hab arm: imx: hab: Rename is_hab_enabled imx_hab_is_enabled arm: imx: hab: Make authenticate_image() return zero on open boards arm: imx: hab: Make imx_hab_is_enabled global arm: imx: hab: Define rvt_failsafe() arm: imx: hab: Implement hab_rvt_failsafe arm: imx: hab: Add hab_failsafe console command Christopher Spinrath (2): ARM: imx: cm_fx6: export board and soc info to env ARM: imx: cm_fx6: env: try to determine dtb to use Eran Matityahu (2): imx7: spl: Use SPL boot device MMC1 for all of the SOCs MMC/SD boot devices imx7: spl: Add support for MMC3, SD3 and NAND boot devices Fabio Estevam (4): mx6: ddr: Do not access MMDC_P1_BASE_ADDR on i.MX6ULL mx6memcal: Fix the UART ports for mx6sabresd/auto boards mx6memcal: spl: Also take i.MX6ULL into account mx6memcal: spl: Disambiguate the error message Koen Vandeputte (1): drivers: pci: imx: fix enumeration logic error Peng Fan (10): misc: mxc_ocotp: check fuse word before programming on i.MX7ULP ARM: imx: Introduce dts for i.MX6SX-SDB ARM: imx: Enable dts for i.MX6SX-SDB board: freescale: common: add pfuze dm code imx: mx6sxsabresd: Enable DM driver imx: mx6sxsabresd: config wdog pinmux imx: mx6sxsabresd: enlarge ENV offset pci: imx: request gpio before use spi: fsl_qspi: support i.MX6UL/6ULLL/7D imx: mx6ull-14x14-evk: enable DM QSPI driver Stefano Babic (1): mx6: Support SKS-Kinkel sksimx6 Board Tom Rini (4): arm: imx: Rework i.MX specific commands to be excluded from SPL imx: ventana: Rework CONFIG_CMD_EECONFIG code to not be included in SPL imx: ventana: Rework CONFIG_CMD_GSC code to not be included in SPL toradex: imx6: Rework PF0100 fuse programming commands to not be in SPL arch/arm/dts/Makefile | 1 + arch/arm/dts/imx6sx-sdb.dts | 138 +++++++ arch/arm/dts/imx6sx-sdb.dtsi | 612 ++++++++++++++++++++++++++++ arch/arm/dts/imx6ull-14x14-evk.dts | 5 +- arch/arm/dts/imx6ull.dtsi | 9 +- arch/arm/include/asm/mach-imx/hab.h | 46 ++- arch/arm/mach-imx/Makefile | 2 + arch/arm/mach-imx/hab.c | 461 ++++++++++++--------- arch/arm/mach-imx/imx_bootaux.c | 13 +- arch/arm/mach-imx/mx5/clock.c | 4 +- arch/arm/mach-imx/mx6/Kconfig | 6 + arch/arm/mach-imx/mx6/ddr.c | 4 +- arch/arm/mach-imx/mx7/clock.c | 2 + arch/arm/mach-imx/mx7ulp/clock.c | 2 + arch/arm/mach-imx/spl.c | 45 +- board/compulab/cm_fx6/cm_fx6.c | 21 + board/freescale/common/Makefile | 1 + board/freescale/common/pfuze.c | 79 ++++ board/freescale/common/pfuze.h | 5 + board/freescale/mx6memcal/Kconfig | 12 +- board/freescale/mx6memcal/spl.c | 3 +- board/freescale/mx6sxsabresd/mx6sxsabresd.c | 382 +++++++---------- board/gateworks/gw_ventana/eeprom.c | 4 +- board/gateworks/gw_ventana/gsc.c | 2 +- board/sks-kinkel/sksimx6/Kconfig | 11 + board/sks-kinkel/sksimx6/MAINTAINERS | 6 + board/sks-kinkel/sksimx6/Makefile | 3 + board/sks-kinkel/sksimx6/sksimx6.c | 426 +++++++++++++++++++ board/toradex/apalis_imx6/pf0100.c | 9 +- board/toradex/apalis_imx6/pf0100.h | 3 - board/toradex/colibri_imx6/pf0100.c | 8 +- board/toradex/colibri_imx6/pf0100.h | 3 - configs/cm_fx6_defconfig | 2 +- configs/mx6sxsabresd_defconfig | 15 +- configs/mx6sxsabresd_spl_defconfig | 15 +- configs/mx6ull_14x14_evk_defconfig | 6 + configs/mx6ull_14x14_evk_plugin_defconfig | 6 + configs/sksimx6_defconfig | 47 +++ drivers/misc/mxc_ocotp.c | 17 + drivers/pci/pcie_imx.c | 15 + drivers/spi/fsl_qspi.c | 18 +- include/configs/cm_fx6.h | 7 + include/configs/mx6sxsabresd.h | 9 +- include/configs/mx6ullevk.h | 10 + include/configs/sksimx6.h | 101 +++++ 45 files changed, 2103 insertions(+), 493 deletions(-) create mode 100644 arch/arm/dts/imx6sx-sdb.dts create mode 100644 arch/arm/dts/imx6sx-sdb.dtsi create mode 100644 board/sks-kinkel/sksimx6/Kconfig create mode 100644 board/sks-kinkel/sksimx6/MAINTAINERS create mode 100644 board/sks-kinkel/sksimx6/Makefile create mode 100644 board/sks-kinkel/sksimx6/sksimx6.c create mode 100644 configs/sksimx6_defconfig create mode 100644 include/configs/sksimx6.h