From patchwork Wed Apr 11 12:36:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 897166 X-Patchwork-Delegate: sbabic@denx.de 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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="DShfGUCm"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40LkDs1bVJz9s35 for ; Wed, 11 Apr 2018 22:41:32 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 2A190C21E1D; Wed, 11 Apr 2018 12:37:54 +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, T_DKIM_INVALID 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 893DEC21DD7; Wed, 11 Apr 2018 12:37:23 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 40002C21DA6; Wed, 11 Apr 2018 12:36:34 +0000 (UTC) Received: from mail-pg0-f68.google.com (mail-pg0-f68.google.com [74.125.83.68]) by lists.denx.de (Postfix) with ESMTPS id E693BC21C2F for ; Wed, 11 Apr 2018 12:36:30 +0000 (UTC) Received: by mail-pg0-f68.google.com with SMTP id i194so710645pgd.0 for ; Wed, 11 Apr 2018 05:36:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ru+OQrDRyOnrxFXSTQdphIJOgS/dEvzdbzgoJgJF9cI=; b=DShfGUCmf6v8MNdBV0mBN4AXFyApRBcS9Wi5ism4J4pRUC7tkIM+EIn+zQvKDf7EN6 wjEuQstaVUcjJZ+DhNlvXXRftRtc4ApxN9+uflu1ShxyVJFeen8NYp8N+kxLoT7E0IeH hhrWulMM+C4GCNcC+DOQf+KhwEwYvH5JBMpLo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ru+OQrDRyOnrxFXSTQdphIJOgS/dEvzdbzgoJgJF9cI=; b=K+NDzsZzbFQxLxgtLv3aMhMTUY7QnrdOMXixAVnvEZLk7WkGHT3HJ1bMPs9WAq9x58 aq1wWHBJZ2NYm21GNra8gtO8lPfPrU1Hf5bIOOeNEh5kAVD0SgzRg5WtEniD0tiOXRoo z+1Tu8qFyXD+3Mp1259yo3CmQcXC4SH/yDjuYEaU701WUVS7nJ5eX9O7Ui/r/oVhO/bG knURnpsHv54z4nmurOVGxhUBLxfN1j0tPkj6pDjADmuUAzhz9hofxPuNE87SD6JG4ke8 4Wk+zy2oTkKqWogPpLBKO3/2JjwveXFLN/yIAgJ1xeqKhQEhjkujZtMcG6tUJjqPlQRl /CDA== X-Gm-Message-State: ALQs6tAVeedbz+daP8OrWATCJDsDMTZqUxm1kc1FKc+Fh7bzy0snMrjw CkLLL6pu49NAQs1lRyu0uSLYtg== X-Google-Smtp-Source: AIpwx4+BTrdf+udZFZTt6y9dnBKMG3kZa6ZZlFIRnkpnkDkhc9Kydur+d072XasvMhhUclpV1IylEg== X-Received: by 10.99.123.21 with SMTP id w21mr1157732pgc.124.1523450189252; Wed, 11 Apr 2018 05:36:29 -0700 (PDT) Received: from localhost.localdomain ([115.97.190.51]) by smtp.gmail.com with ESMTPSA id l10sm2316021pgp.35.2018.04.11.05.36.24 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 11 Apr 2018 05:36:28 -0700 (PDT) From: Jagan Teki To: Stefano Babic Date: Wed, 11 Apr 2018 18:06:09 +0530 Message-Id: <20180411123615.15130-2-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180411123615.15130-1-jagan@amarulasolutions.com> References: <20180411123615.15130-1-jagan@amarulasolutions.com> Cc: Simone CIANNI , Shyam Saini , u-boot@lists.denx.de, Davide Bonfanti , Andrea CORTESE , Fabio maggi , Fabio Estevam , Raffaele RECALCATI , lamiaposta71@gmail.com Subject: [U-Boot] [PATCH v2 1/7] i.MX6: board: Add BTicino i.MX6DL Mamoj initial support 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Add initial support for i.MX6DL BTicino Mamoj board. Mamoh board added: - SPL - SPL_DM - SPL_OF_CONTROL - DM for U-Boot proper - OF_CONTROL for U-Boot proper - eMMC - FEC - Boot from eMMC - Boot from USB SDP Signed-off-by: Simone CIANNI Signed-off-by: Raffaele RECALCATI Signed-off-by: Jagan Teki --- arch/arm/dts/Makefile | 1 + arch/arm/dts/imx6dl-mamoj-u-boot.dtsi | 15 ++++ arch/arm/dts/imx6dl-mamoj.dts | 84 +++++++++++++++++++ arch/arm/mach-imx/mx6/Kconfig | 29 +++++++ board/bticino/mamoj/Kconfig | 12 +++ board/bticino/mamoj/MAINTAINERS | 10 +++ board/bticino/mamoj/Makefile | 8 ++ board/bticino/mamoj/README | 60 +++++++++++++ board/bticino/mamoj/mamoj.c | 27 ++++++ board/bticino/mamoj/spl.c | 154 ++++++++++++++++++++++++++++++++++ configs/imx6dl_mamoj_defconfig | 39 +++++++++ include/configs/imx6dl-mamoj.h | 88 +++++++++++++++++++ 12 files changed, 527 insertions(+) create mode 100644 arch/arm/dts/imx6dl-mamoj-u-boot.dtsi create mode 100644 arch/arm/dts/imx6dl-mamoj.dts create mode 100644 board/bticino/mamoj/Kconfig create mode 100644 board/bticino/mamoj/MAINTAINERS create mode 100644 board/bticino/mamoj/Makefile create mode 100644 board/bticino/mamoj/README create mode 100644 board/bticino/mamoj/mamoj.c create mode 100644 board/bticino/mamoj/spl.c create mode 100644 configs/imx6dl_mamoj_defconfig create mode 100644 include/configs/imx6dl-mamoj.h diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index f03e276486..2a75711246 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -398,6 +398,7 @@ dtb-$(CONFIG_MX6QDL) += \ imx6dl-icore.dtb \ imx6dl-icore-mipi.dtb \ imx6dl-icore-rqs.dtb \ + imx6dl-mamoj.dtb \ imx6q-cm-fx6.dtb \ imx6q-icore.dtb \ imx6q-icore-mipi.dtb \ diff --git a/arch/arm/dts/imx6dl-mamoj-u-boot.dtsi b/arch/arm/dts/imx6dl-mamoj-u-boot.dtsi new file mode 100644 index 0000000000..d4c3c0bdf0 --- /dev/null +++ b/arch/arm/dts/imx6dl-mamoj-u-boot.dtsi @@ -0,0 +1,15 @@ +/* + * Copyright (C) 2018 Jagan Teki + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include "imx6qdl-u-boot.dtsi" + +&usdhc3 { + u-boot,dm-spl; +}; + +&pinctrl_usdhc3 { + u-boot,dm-spl; +}; diff --git a/arch/arm/dts/imx6dl-mamoj.dts b/arch/arm/dts/imx6dl-mamoj.dts new file mode 100644 index 0000000000..068d518de3 --- /dev/null +++ b/arch/arm/dts/imx6dl-mamoj.dts @@ -0,0 +1,84 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (C) 2018 BTicino + * Copyright (C) 2018 Amarula Solutions B.V. + */ + +/dts-v1/; + +#include +#include "imx6dl.dtsi" + +/ { + model = "BTicino i.MX6DL Mamoj board"; + compatible = "bticino,imx6dl-mamoj", "fsl,imx6dl"; +}; + +&fec { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_enet>; + phy-mode = "mii"; + status = "okay"; +}; + +&uart3 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart3>; + status = "okay"; +}; + +&usdhc3 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usdhc3>; + bus-width = <8>; + non-removable; + keep-power-in-suspend; + status = "okay"; +}; + +&iomuxc { + pinctrl_enet: enetgrp { + fsl,pins = < + MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0 + MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0 + MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b1 + MX6QDL_PAD_ENET_TXD0__ENET_TX_DATA0 0x1b0b0 + MX6QDL_PAD_ENET_TXD1__ENET_TX_DATA1 0x1b0b0 + MX6QDL_PAD_KEY_ROW2__ENET_TX_DATA2 0x1b0b0 + MX6QDL_PAD_KEY_ROW0__ENET_TX_DATA3 0x1b0b0 + MX6QDL_PAD_ENET_TX_EN__ENET_TX_EN 0x1b0b0 + MX6QDL_PAD_GPIO_19__ENET_TX_ER 0x1b0b0 + MX6QDL_PAD_GPIO_18__ENET_RX_CLK 0x1b0b1 + MX6QDL_PAD_ENET_RXD0__ENET_RX_DATA0 0x1b0b0 + MX6QDL_PAD_ENET_RXD1__ENET_RX_DATA1 0x1b0b0 + MX6QDL_PAD_KEY_COL2__ENET_RX_DATA2 0x1b0b0 + MX6QDL_PAD_KEY_COL0__ENET_RX_DATA3 0x1b0b0 + MX6QDL_PAD_ENET_CRS_DV__ENET_RX_EN 0x1b0b0 + MX6QDL_PAD_ENET_RX_ER__ENET_RX_ER 0x1b0b0 + MX6QDL_PAD_KEY_COL3__ENET_CRS 0x1b0b0 + MX6QDL_PAD_KEY_ROW1__ENET_COL 0x1b0b0 + >; + }; + + pinctrl_uart3: uart3grp { + fsl,pins = < + MX6QDL_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1 + MX6QDL_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1 + >; + }; + + pinctrl_usdhc3: usdhc3grp { + fsl,pins = < + MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059 + MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10059 + MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x17059 + MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059 + MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059 + MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059 + MX6QDL_PAD_SD3_DAT4__SD3_DATA4 0x17059 + MX6QDL_PAD_SD3_DAT5__SD3_DATA5 0x17059 + MX6QDL_PAD_SD3_DAT6__SD3_DATA6 0x17059 + MX6QDL_PAD_SD3_DAT7__SD3_DATA7 0x17059 + >; + }; +}; diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig index d4ce38db8d..c6acba7f85 100644 --- a/arch/arm/mach-imx/mx6/Kconfig +++ b/arch/arm/mach-imx/mx6/Kconfig @@ -225,6 +225,34 @@ config TARGET_MX6MEMCAL config TARGET_MX6QARM2 bool "mx6qarm2" +config TARGET_MX6DL_MAMOJ + bool "Support BTicino Mamoj" + select MX6QDL + select OF_CONTROL + select PINCTRL + select DM + select DM_ETH + select DM_GPIO + select DM_MMC + select DM_THERMAL + select SPL + select SUPPORT_SPL + select SPL_DM if SPL + select SPL_OF_LIBFDT if SPL + select SPL_OF_CONTROL if SPL + select SPL_PINCTRL if SPL + select SPL_SEPARATE_BSS if SPL + select SPL_GPIO_SUPPORT if SPL + select SPL_LIBCOMMON_SUPPORT if SPL + select SPL_LIBDISK_SUPPORT if SPL + select SPL_LIBGENERIC_SUPPORT if SPL + select SPL_MMC_SUPPORT if SPL + select SPL_SERIAL_SUPPORT if SPL + select SPL_USB_HOST_SUPPORT if SPL + select SPL_USB_GADGET_SUPPORT if SPL + select SPL_USB_SDP_SUPPORT if SPL + select SPL_WATCHDOG_SUPPORT if SPL + config TARGET_MX6Q_ENGICAM bool "Support Engicam i.Core(RQS)" select BOARD_LATE_INIT @@ -458,6 +486,7 @@ source "board/bachmann/ot1200/Kconfig" source "board/barco/platinum/Kconfig" source "board/barco/titanium/Kconfig" source "board/boundary/nitrogen6x/Kconfig" +source "board/bticino/mamoj/Kconfig" source "board/ccv/xpress/Kconfig" source "board/compulab/cm_fx6/Kconfig" source "board/congatec/cgtqmx6eval/Kconfig" diff --git a/board/bticino/mamoj/Kconfig b/board/bticino/mamoj/Kconfig new file mode 100644 index 0000000000..e5aec589c8 --- /dev/null +++ b/board/bticino/mamoj/Kconfig @@ -0,0 +1,12 @@ +if TARGET_MX6DL_MAMOJ + +config SYS_BOARD + default "mamoj" + +config SYS_VENDOR + default "bticino" + +config SYS_CONFIG_NAME + default "imx6dl-mamoj" + +endif diff --git a/board/bticino/mamoj/MAINTAINERS b/board/bticino/mamoj/MAINTAINERS new file mode 100644 index 0000000000..c35b387a82 --- /dev/null +++ b/board/bticino/mamoj/MAINTAINERS @@ -0,0 +1,10 @@ +MX6DL_MAMOJ BOARD +M: Jagan Teki +M: Raffaele RECALCATI +M: Simone CIANNI +S: Maintained +F: board/bticino/mamoj +F: include/configs/imx6dl-mamoj.h +F: configs/imx6dl_mamoj_defconfig +F: arch/arm/dts/imx6dl-mamoj.dts +F: arch/arm/dts/imx6dl-mamoj-u-boot.dtsi diff --git a/board/bticino/mamoj/Makefile b/board/bticino/mamoj/Makefile new file mode 100644 index 0000000000..f1ddda4891 --- /dev/null +++ b/board/bticino/mamoj/Makefile @@ -0,0 +1,8 @@ +# Copyright (C) 2018 BTicino +# Copyright (C) 2017 Amarula Solutions B.V. +# +# SPDX-License-Identifier: GPL-2.0+ +# + +obj-y := mamoj.o +obj-$(CONFIG_SPL_BUILD) += spl.o diff --git a/board/bticino/mamoj/README b/board/bticino/mamoj/README new file mode 100644 index 0000000000..eda9e45ed1 --- /dev/null +++ b/board/bticino/mamoj/README @@ -0,0 +1,60 @@ +BTicino Mamoj board: +=================== + +Build: + + $ make mrproper + $ make imx6dl_mamoj_defconfig + $ make + + This will generate the SPL image called SPL and the u-boot-dtb.img. + +The following methods can be used for booting Mamoj boards: + +1. USB SDP boot + +1. USB SDP boot: +--------------- + + - Build imx_usb_loader + + $ git clone git://github.com/boundarydevices/imx_usb_loader.git + $ cd imx_usb_loader + $ make + + - Build the BSP and copy SPL, u-boot-dtb.img in imx_usb_loader directory + + - Put the board in "Serial Download Mode" + + - Plug-in USB-to-Serial, Open minicom 1152008N1 and USB OTG cables to Host + + - Turn-on board + + - Identify VID/PID using lsusb + + Bus 001 Device 010: ID 15a2:0061 Freescale Semiconductor, Inc. i.MX 6Solo/6DualLite SystemOnChip in RecoveryMode + + - Update the conf files + + imx_usb.conf + 0x15a2:0x0061, mx6_usb_rom.conf, 0x0525:0xb4a4, mx6_usb_sdp_spl.conf + + mx6_usb_rom.conf + mx6_usb + hid,1024,0x910000,0x10000000,512M,0x00900000,0x40000 + SPL:jump header2 + + mx6_usb_sdp_spl.conf + mx6_spl_sdp + hid,uboot_header,1024,0x910000,0x10000000,512M,0x00900000,0x40000 + u-boot-dtb.img:jump header2 + + - Launch the loader + + $ ./imx_usb + + We can see U-Boot boot from USB SDP on minicom + +-- +Jagan Teki +03/12/18 diff --git a/board/bticino/mamoj/mamoj.c b/board/bticino/mamoj/mamoj.c new file mode 100644 index 0000000000..478f673491 --- /dev/null +++ b/board/bticino/mamoj/mamoj.c @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2018 Simone CIANNI + * Copyright (C) 2018 Raffaele RECALCATI + * Copyright (C) 2018 Jagan Teki + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include +#include + +DECLARE_GLOBAL_DATA_PTR; + +int board_init(void) +{ + /* Address of boot parameters */ + gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; + + return 0; +} + +int dram_init(void) +{ + gd->ram_size = imx_ddr_size(); + + return 0; +} diff --git a/board/bticino/mamoj/spl.c b/board/bticino/mamoj/spl.c new file mode 100644 index 0000000000..82568f7af5 --- /dev/null +++ b/board/bticino/mamoj/spl.c @@ -0,0 +1,154 @@ +/* + * Copyright (C) 2018 Simone CIANNI + * Copyright (C) 2018 Raffaele RECALCATI + * Copyright (C) 2018 Jagan Teki + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include +#include + +#include +#include + +#include +#include +#include +#include + +DECLARE_GLOBAL_DATA_PTR; + +#define UART_PAD_CTRL (PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \ + PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST | PAD_CTL_HYS) + +static iomux_v3_cfg_t const uart3_pads[] = { + IOMUX_PADS(PAD_EIM_D24__UART3_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL)), + IOMUX_PADS(PAD_EIM_D25__UART3_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL)), +}; + +static int mx6dl_dcd_table[] = { + 0x020e0774, 0x000C0000, /* MX6_IOM_GRP_DDR_TYPE */ + 0x020e0754, 0x00000000, /* MX6_IOM_GRP_DDRPKE */ + + 0x020e04ac, 0x00000028, /* MX6_IOM_DRAM_SDCLK_0 */ + 0x020e04b0, 0x00000028, /* MX6_IOM_DRAM_SDCLK_1 */ + + 0x020e0464, 0x00000028, /* MX6_IOM_DRAM_CAS */ + 0x020e0490, 0x00000028, /* MX6_IOM_DRAM_RAS */ + 0x020e074c, 0x00000028, /* MX6_IOM_GRP_ADDDS */ + + 0x020e0494, 0x00000028, /* MX6_IOM_DRAM_RESET */ + 0x020e04a0, 0x00000000, /* MX6_IOM_DRAM_SDBA2 */ + 0x020e04b4, 0x00000028, /* MX6_IOM_DRAM_SDODT0 */ + 0x020e04b8, 0x00000028, /* MX6_IOM_DRAM_SDODT1 */ + 0x020e076c, 0x00000028, /* MX6_IOM_GRP_CTLDS */ + + 0x020e0750, 0x00020000, /* MX6_IOM_GRP_DDRMODE_CTL */ + 0x020e04bc, 0x00000028, /* MX6_IOM_DRAM_SDQS0 */ + 0x020e04c0, 0x00000028, /* MX6_IOM_DRAM_SDQS1 */ + 0x020e04c4, 0x00000028, /* MX6_IOM_DRAM_SDQS2 */ + 0x020e04c8, 0x00000028, /* MX6_IOM_DRAM_SDQS3 */ + + 0x020e0760, 0x00020000, /* MX6_IOM_GRP_DDRMODE */ + 0x020e0764, 0x00000028, /* MX6_IOM_GRP_B0DS */ + 0x020e0770, 0x00000028, /* MX6_IOM_GRP_B1DS */ + 0x020e0778, 0x00000028, /* MX6_IOM_GRP_B2DS */ + 0x020e077c, 0x00000028, /* MX6_IOM_GRP_B3DS */ + + 0x020e0470, 0x00000028, /* MX6_IOM_DRAM_DQM0 */ + 0x020e0474, 0x00000028, /* MX6_IOM_DRAM_DQM1 */ + 0x020e0478, 0x00000028, /* MX6_IOM_DRAM_DQM2 */ + 0x020e047c, 0x00000028, /* MX6_IOM_DRAM_DQM3 */ + + 0x021b001c, 0x00008000, /* MMDC0_MDSCR */ + + 0x021b0800, 0xA1390003, /* DDR_PHY_P0_MPZQHWCTRL */ + + 0x021b080c, 0x0042004b, /* MMDC1_MPWLDECTRL0 */ + 0x021b0810, 0x0038003c, /* MMDC1_MPWLDECTRL1 */ + + 0x021b083c, 0x42340230, /* MPDGCTRL0 PHY0 */ + 0x021b0840, 0x0228022c, /* MPDGCTRL1 PHY0 */ + + 0x021b0848, 0x42444646, /* MPRDDLCTL PHY0 */ + + 0x021b0850, 0x38382e2e, /* MPWRDLCTL PHY0 */ + + 0x021b081c, 0x33333333, /* DDR_PHY_P0_MPREDQBY0DL3 */ + 0x021b0820, 0x33333333, /* DDR_PHY_P0_MPREDQBY1DL3 */ + 0x021b0824, 0x33333333, /* DDR_PHY_P0_MPREDQBY2DL3 */ + 0x021b0828, 0x33333333, /* DDR_PHY_P0_MPREDQBY3DL3 */ + + 0x021b08b8, 0x00000800, /* DDR_PHY_P0_MPMUR0 */ + + 0x021b0004, 0x0002002D, /* MMDC0_MDPDC */ + 0x021b0008, 0x00333040, /* MMDC0_MDOTC */ + 0x021b000c, 0x3F4352F3, /* MMDC0_MDCFG0 */ + 0x021b0010, 0xB66D8B63, /* MMDC0_MDCFG1 */ + 0x021b0014, 0x01FF00DB, /* MMDC0_MDCFG2 */ + + 0x021b0018, 0x00011740, /* MMDC0_MDMISC */ + 0x021b001c, 0x00008000, /* MMDC0_MDSCR */ + 0x021b002c, 0x000026D2, /* MMDC0_MDRWD */ + 0x021b0030, 0x00431023, /* MMDC0_MDOR */ + 0x021b0040, 0x00000017, /* Chan0 CS0_END */ + 0x021b0000, 0x83190000, /* MMDC0_MDCTL */ + + 0x021b001c, 0x02008032, /* MMDC0_MDSCR MR2 write, CS0 */ + 0x021b001c, 0x00008033, /* MMDC0_MDSCR, MR3 write, CS0 */ + 0x021b001c, 0x00048031, /* MMDC0_MDSCR, MR1 write, CS0 */ + 0x021b001c, 0x15208030, /* MMDC0_MDSCR, MR0write, CS0 */ + 0x021b001c, 0x04008040, /* MMDC0_MDSCR */ + + 0x021b0020, 0x00007800, /* MMDC0_MDREF */ + + 0x021b0818, 0x00022227, /* DDR_PHY_P0_MPODTCTRL */ + + 0x021b0004, 0x0002556D, /* MMDC0_MDPDC */ + 0x021b0404, 0x00011006, /* MMDC0_MAPSR ADOPT */ + 0x021b001c, 0x00000000, /* MMDC0_MDSCR */ +}; + +static void ccgr_init(void) +{ + struct mxc_ccm_reg *ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR; + + writel(0x00003f3f, &ccm->CCGR0); + writel(0x0030fc00, &ccm->CCGR1); + writel(0x000fc000, &ccm->CCGR2); + writel(0x3f300000, &ccm->CCGR3); + writel(0xff00f300, &ccm->CCGR4); + writel(0x0f0000c3, &ccm->CCGR5); + writel(0x000003cc, &ccm->CCGR6); +} + +static void ddr_init(int *table, int size) +{ + int i; + + for (i = 0; i < size / 2 ; i++) + writel(table[2 * i + 1], table[2 * i]); +} + +void board_init_f(ulong dummy) +{ + ccgr_init(); + + /* setup AIPS and disable watchdog */ + arch_cpu_init(); + + gpr_init(); + + /* iomux */ + SETUP_IOMUX_PADS(uart3_pads); + + /* setup GP timer */ + timer_init(); + + /* UART clocks enabled and gd valid - init serial console */ + preloader_console_init(); + + /* DDR initialization */ + ddr_init(mx6dl_dcd_table, ARRAY_SIZE(mx6dl_dcd_table)); +} diff --git a/configs/imx6dl_mamoj_defconfig b/configs/imx6dl_mamoj_defconfig new file mode 100644 index 0000000000..e45ca9a05a --- /dev/null +++ b/configs/imx6dl_mamoj_defconfig @@ -0,0 +1,39 @@ +CONFIG_ARM=y +CONFIG_ARCH_MX6=y +CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_TARGET_MX6DL_MAMOJ=y +# CONFIG_CMD_BMODE is not set +CONFIG_DEFAULT_DEVICE_TREE="imx6dl-mamoj" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" +CONFIG_BOOTDELAY=3 +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="=> " +CONFIG_CRC32_VERIFY=y +CONFIG_CMD_MEMTEST=y +CONFIG_CMD_GPIO=y +CONFIG_CMD_MMC=y +CONFIG_CMD_MII=y +CONFIG_CMD_PING=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_EXT4_WRITE=y +CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y +CONFIG_CMD_USB=y +CONFIG_DISTRO_DEFAULTS=y +CONFIG_ENV_IS_IN_MMC=y +CONFIG_PHYLIB=y +CONFIG_PHY_MICREL=y +CONFIG_FEC_MXC=y +CONFIG_FSL_ESDHC=y +CONFIG_PINCTRL_IMX6=y +CONFIG_MXC_UART=y +CONFIG_USB=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_MANUFACTURER="FSL" +CONFIG_USB_GADGET_VENDOR_NUM=0x0525 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 +CONFIG_CI_UDC=y +CONFIG_IMX_THERMAL=y diff --git a/include/configs/imx6dl-mamoj.h b/include/configs/imx6dl-mamoj.h new file mode 100644 index 0000000000..929365af79 --- /dev/null +++ b/include/configs/imx6dl-mamoj.h @@ -0,0 +1,88 @@ +/* + * Copyright (C) 2018 Simone CIANNI + * Copyright (C) 2018 Raffaele RECALCATI + * Copyright (C) 2018 Jagan Teki + * + * Configuration settings for the BTicion i.MX6DL Mamoj board. + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __IMX6DL_MAMOJ_CONFIG_H +#define __IMX6DL_MAMOJ_CONFIG_H + +#include +#include "mx6_common.h" + +/* Size of malloc() pool */ +#define CONFIG_SYS_MALLOC_LEN (16 * SZ_1M) + +/* Total Size of Environment Sector */ +#define CONFIG_ENV_SIZE SZ_128K + +/* Allow to overwrite serial and ethaddr */ +#define CONFIG_ENV_OVERWRITE + +/* Environment */ +#ifndef CONFIG_ENV_IS_NOWHERE +/* Environment in MMC */ +# if defined(CONFIG_ENV_IS_IN_MMC) +# define CONFIG_ENV_OFFSET 0x100000 +# endif +#endif + +#ifndef CONFIG_SPL_BUILD +#define CONFIG_EXTRA_ENV_SETTINGS \ + "scriptaddr=0x14000000\0" \ + "fdt_addr_r=0x13000000\0" \ + "kernel_addr_r=0x10008000\0" \ + "fdt_high=0xffffffff\0" \ + BOOTENV + +#define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 2) + +#include +#endif + +/* UART */ +#define CONFIG_MXC_UART_BASE UART3_BASE + +/* MMC */ +#define CONFIG_SYS_MMC_ENV_DEV 2 +#define CONFIG_SUPPORT_EMMC_BOOT + +/* Ethernet */ +#define CONFIG_FEC_MXC_PHYADDR 1 +#define CONFIG_MII + +/* USB */ +#define CONFIG_EHCI_HCD_INIT_AFTER_RESET +#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CONFIG_MXC_USB_FLAGS 0 +#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 + +/* Miscellaneous configurable options */ +#define CONFIG_SYS_MEMTEST_START 0x80000000 +#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x8000000) + +#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_HZ 1000 + +/* Physical Memory Map */ +#define CONFIG_NR_DRAM_BANKS 1 +#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR + +#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM +#define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR +#define CONFIG_SYS_INIT_RAM_SIZE IRAM_SIZE + +#define CONFIG_SYS_INIT_SP_OFFSET (CONFIG_SYS_INIT_RAM_SIZE - \ + GENERATED_GBL_DATA_SIZE) +#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_SP_OFFSET) + +/* SPL */ +#include "imx6_spl.h" + +#endif /* __IMX6DL_MAMOJ_CONFIG_H */ From patchwork Wed Apr 11 12:36:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 897165 X-Patchwork-Delegate: sbabic@denx.de 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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="BNqO8o/C"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40LkDd0JMXz9s35 for ; Wed, 11 Apr 2018 22:41:20 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id AB63CC21DC1; Wed, 11 Apr 2018 12:37:30 +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_H2, T_DKIM_INVALID 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 5DE7BC21DD9; Wed, 11 Apr 2018 12:37:21 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6A629C21C51; Wed, 11 Apr 2018 12:36:39 +0000 (UTC) Received: from mail-pf0-f196.google.com (mail-pf0-f196.google.com [209.85.192.196]) by lists.denx.de (Postfix) with ESMTPS id D8CDEC21DCA for ; Wed, 11 Apr 2018 12:36:35 +0000 (UTC) Received: by mail-pf0-f196.google.com with SMTP id y69so881555pfb.5 for ; Wed, 11 Apr 2018 05:36:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Vis6A7atyTLC17OPHegHamfPOgLE56k+A/RmtLqTwXE=; b=BNqO8o/Co/OLgqwsEK8xoDHzod1NQmyL4lHxgMvdnmzeXwl2Ch1I/RekfFQkAWa8zO Uk63kJsqLJfb8rJejLWUD8IIU25sPW5t3ZVHH3D5YZelq2fyXpMubvFvMdT1A3F0ITQB RJhcaxTpbMOEB5vyNF7YYgxuLgr4okPvZuX1k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Vis6A7atyTLC17OPHegHamfPOgLE56k+A/RmtLqTwXE=; b=ttNRx6Cq74uG773ZQbKMUCaQqY+4/oeG4oujkQGf9OomcGSn+LUtAYIrZA9SKLYeno wPN+Ei6pjh88qmFIOuqyFrgnRd36MSEE2W3800fTPH3EW8g4InIkcYZ9keNU916OaXPl 9RYjdEbwWddzrDti6UYj8J7OOVcjU+fF2KhXrLF/fWbLlupTVNVAqKf5FGkXahL27ywZ bqNEj6mXrP6HnAk96MKkPwCIj/pgz6yhVgYc6UI2roU9XpJKyO2KzsDVXpduDek2DwlX Wa+DedC6gVWSuKNXh0KWOtmDzV8eVhCf5M4U30EZgsYPAc11i7nS//hV5+5ObfnrZp69 Kekg== X-Gm-Message-State: ALQs6tCcxOvHjT6BkyRox0GES+8Af7ZjaF+zXPwO2nVKwUZXjUM9r9JY oxtGiSIepCUcDm4EjGfJi6s8lA== X-Google-Smtp-Source: AIpwx49qWDUDEXFzcgpG2Ozg6Qij24vwi3ndH6n1abkwQUVJsSL8Ys/2n3aKB1L1w4q1T44bYId1Yw== X-Received: by 10.99.114.27 with SMTP id n27mr3260000pgc.177.1523450194443; Wed, 11 Apr 2018 05:36:34 -0700 (PDT) Received: from localhost.localdomain ([115.97.190.51]) by smtp.gmail.com with ESMTPSA id l10sm2316021pgp.35.2018.04.11.05.36.29 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 11 Apr 2018 05:36:34 -0700 (PDT) From: Jagan Teki To: Stefano Babic Date: Wed, 11 Apr 2018 18:06:10 +0530 Message-Id: <20180411123615.15130-3-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180411123615.15130-1-jagan@amarulasolutions.com> References: <20180411123615.15130-1-jagan@amarulasolutions.com> Cc: Simone CIANNI , Shyam Saini , u-boot@lists.denx.de, Davide Bonfanti , Andrea CORTESE , Fabio maggi , Fabio Estevam , Raffaele RECALCATI , lamiaposta71@gmail.com Subject: [U-Boot] [PATCH v2 2/7] i.MX6DL: mamoj: Add I2C support 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" i.MX6DL Mamoj has i2c3 and i2c4 buses, add support through DM_I2C with dt definition. i2c log: Reviewed-by: Stefano Babic ======= => i2c bus Bus 2: i2c@021a8000 Bus 3: i2c@021f8000 => i2c dev 2 Setting bus to 2 => i2c speed 400000 Setting bus speed to 400000 Hz => i2c probe Valid chip addresses: 20 51 53 => i2c md 53 0xff 00ff: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ................ => i2c md 51 0xff 00ff: a8 08 40 50 09 43 46 52 42 18 80 8e ae a9 d0 53 ..@P.CFRB......S => i2c dev 3 Setting bus to 3 => i2c speed 100000 Setting bus speed to 100000 Hz => i2c probe Valid chip addresses: 08 40 48 4B => i2c md 08 0xff 00ff: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ Signed-off-by: Jagan Teki Signed-off-by: Simone CIANNI Signed-off-by: Raffaele RECALCATI --- arch/arm/dts/imx6dl-mamoj.dts | 28 ++++++++++++++++++++++++++++ arch/arm/mach-imx/mx6/Kconfig | 1 + configs/imx6dl_mamoj_defconfig | 2 ++ 3 files changed, 31 insertions(+) diff --git a/arch/arm/dts/imx6dl-mamoj.dts b/arch/arm/dts/imx6dl-mamoj.dts index 068d518de3..558043445b 100644 --- a/arch/arm/dts/imx6dl-mamoj.dts +++ b/arch/arm/dts/imx6dl-mamoj.dts @@ -21,6 +21,20 @@ status = "okay"; }; +&i2c3 { + clock-frequency = <400000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c3>; + status = "okay"; +}; + +&i2c4 { + clock-frequency = <100000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c4>; + status = "okay"; +}; + &uart3 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart3>; @@ -60,6 +74,20 @@ >; }; + pinctrl_i2c3: i2c3grp { + fsl,pins = < + MX6QDL_PAD_GPIO_3__I2C3_SCL 0x4001b8b1 + MX6QDL_PAD_GPIO_6__I2C3_SDA 0x4001b8b1 + >; + }; + + pinctrl_i2c4: i2c4grp { + fsl,pins = < + MX6QDL_PAD_GPIO_7__I2C4_SCL 0x4001b8b1 + MX6QDL_PAD_GPIO_8__I2C4_SDA 0x4001b8b1 + >; + }; + pinctrl_uart3: uart3grp { fsl,pins = < MX6QDL_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1 diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig index c6acba7f85..5007fe3941 100644 --- a/arch/arm/mach-imx/mx6/Kconfig +++ b/arch/arm/mach-imx/mx6/Kconfig @@ -233,6 +233,7 @@ config TARGET_MX6DL_MAMOJ select DM select DM_ETH select DM_GPIO + select DM_I2C select DM_MMC select DM_THERMAL select SPL diff --git a/configs/imx6dl_mamoj_defconfig b/configs/imx6dl_mamoj_defconfig index e45ca9a05a..e2a18d2c30 100644 --- a/configs/imx6dl_mamoj_defconfig +++ b/configs/imx6dl_mamoj_defconfig @@ -12,6 +12,7 @@ CONFIG_SYS_PROMPT="=> " CONFIG_CRC32_VERIFY=y CONFIG_CMD_MEMTEST=y CONFIG_CMD_GPIO=y +CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y @@ -37,3 +38,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_IMX_THERMAL=y +CONFIG_SYS_I2C_MXC=y From patchwork Wed Apr 11 12:36:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 897162 X-Patchwork-Delegate: sbabic@denx.de 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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="PLUNkdgH"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40Lk8R3WVbz9s35 for ; Wed, 11 Apr 2018 22:37:43 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 2A782C21DB3; Wed, 11 Apr 2018 12:36:53 +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, T_DKIM_INVALID 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 C05EAC21DD9; Wed, 11 Apr 2018 12:36:50 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 57DBAC21DC1; Wed, 11 Apr 2018 12:36:44 +0000 (UTC) Received: from mail-pl0-f65.google.com (mail-pl0-f65.google.com [209.85.160.65]) by lists.denx.de (Postfix) with ESMTPS id 02C68C21DD3 for ; Wed, 11 Apr 2018 12:36:41 +0000 (UTC) Received: by mail-pl0-f65.google.com with SMTP id 59-v6so1291888plc.13 for ; Wed, 11 Apr 2018 05:36:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Hjs4oEXfETXPxUHPufvfj8VBCN8Rvd51nDy2ELoIaD0=; b=PLUNkdgHar5fo+uW0BciP6vFX2+27Fj03MYujcA+FUZyjGMLpJPFmUKYZwRom0dM1S nYkTmnch3EubKuifPeI6boP2rDxb90sQ76GBBRRpOGTnj9GHBc6yhy678/LKlItwc4ZV eCb/Sf8cqnJ6owIG8RLpu8LuxVrmIIt2NsKgc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Hjs4oEXfETXPxUHPufvfj8VBCN8Rvd51nDy2ELoIaD0=; b=KRQF7PWqyZqgGXhogrcHvWrx9iG1/JDMozZU1/kHms/C8oHdEHbePcxLTzzTTBea+b NGzJ07pT4Mw3nSvTsjcpk/OqQ5X6WjDZmgOV6Swm8B5V6rJtVJMACuUaOMSM3fpRxi5z zJUGNg3Rkw58opJQGfdN2E2qsZXZBg5vRKT0UCrW2NMjj830MQ0crgmr8hl5cgsCg04R 1oRB8lW4HjgfVYA3HOqPsms5iBhL0h4NnODC/wbFsuUEqERHYU8+njEF8DPy9vWoPs/I kJ97NIjYJlc04AxJkIo4M2NsBtfj3zrK96uW7A14BUyoXwJ14CuXdGXtx2LHHxVOT/oY XNaw== X-Gm-Message-State: ALQs6tDAW4riG0/M312pjMWozxrTLwnUQwD7wpzv2m64NXLS+ZPcJM1o ep1pRz49ebZRrLfNKR9ACXcygA== X-Google-Smtp-Source: AIpwx48b92TO5O95wYJcLFyVcAbymIWHimWktE2uA8NfWwmS+0DvJCc0ghYpKv+AiSM9q8S40FV5jg== X-Received: by 2002:a17:902:b609:: with SMTP id b9-v6mr251369pls.29.1523450199579; Wed, 11 Apr 2018 05:36:39 -0700 (PDT) Received: from localhost.localdomain ([115.97.190.51]) by smtp.gmail.com with ESMTPSA id l10sm2316021pgp.35.2018.04.11.05.36.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 11 Apr 2018 05:36:39 -0700 (PDT) From: Jagan Teki To: Stefano Babic Date: Wed, 11 Apr 2018 18:06:11 +0530 Message-Id: <20180411123615.15130-4-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180411123615.15130-1-jagan@amarulasolutions.com> References: <20180411123615.15130-1-jagan@amarulasolutions.com> Cc: Simone CIANNI , Shyam Saini , u-boot@lists.denx.de, Davide Bonfanti , Andrea CORTESE , Fabio maggi , Fabio Estevam , Raffaele RECALCATI , lamiaposta71@gmail.com Subject: [U-Boot] [PATCH v2 3/7] i.MX6DL: mamoj: Add PFUZE100 support 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" MX6DL Mamoj boards has Freescale PFUZE100 PMIC, add support for it through DM_PMIC dt definition. pmic log: Reviewed-by: Stefano Babic ======== => pmic list | Name | Parent name | Parent uclass @ seq | pfuze100@08 | i2c@021f8000 | i2c @ 3 => pmic dev pfuze100@08 dev: 0 @ pfuze100@08 => pmic dump Dump pmic: pfuze100@08 registers 0x00: 10 00 00 21 00 01 3f 01 00 7f 00 00 00 00 00 81 0x10: 00 00 3f 00 00 00 00 00 00 00 00 10 00 00 00 00 0x20: 2b 2b 2b 08 c4 00 00 00 00 00 00 00 00 00 2b 2b 0x30: 2b 08 c4 00 00 72 72 72 08 d4 00 00 2c 2c 2c 08 0x40: e4 00 00 2c 2c 2c 08 e4 00 00 6f 6f 6f 08 f4 00 0x50: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0x60: 00 00 00 00 00 00 48 00 00 00 10 06 1e 1e 17 10 0x70: 1a 1f 00 00 00 00 00 00 00 00 00 00 00 00 00 Signed-off-by: Jagan Teki Signed-off-by: Simone CIANNI Signed-off-by: Raffaele RECALCATI --- arch/arm/dts/imx6dl-mamoj.dts | 113 +++++++++++++++++++++++++++++++++++++++++ arch/arm/mach-imx/mx6/Kconfig | 2 + configs/imx6dl_mamoj_defconfig | 1 + 3 files changed, 116 insertions(+) diff --git a/arch/arm/dts/imx6dl-mamoj.dts b/arch/arm/dts/imx6dl-mamoj.dts index 558043445b..3f6d8aa4a2 100644 --- a/arch/arm/dts/imx6dl-mamoj.dts +++ b/arch/arm/dts/imx6dl-mamoj.dts @@ -33,6 +33,119 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_i2c4>; status = "okay"; + + pmic: pfuze100@08 { + compatible = "fsl,pfuze100"; + reg = <0x08>; + + regulators { + /* CPU vdd_arm core */ + sw1a_reg: sw1ab { + regulator-min-microvolt = <300000>; + regulator-max-microvolt = <1875000>; + regulator-boot-on; + regulator-always-on; + regulator-ramp-delay = <6250>; + }; + + /* SOC vdd_soc */ + sw1c_reg: sw1c { + regulator-min-microvolt = <300000>; + regulator-max-microvolt = <1875000>; + regulator-boot-on; + regulator-always-on; + regulator-ramp-delay = <6250>; + }; + + /* I/O power GEN_3V3 */ + sw2_reg: sw2 { + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <3300000>; + regulator-boot-on; + regulator-always-on; + }; + + /* DDR memory */ + sw3a_reg: sw3a { + regulator-min-microvolt = <400000>; + regulator-max-microvolt = <1975000>; + regulator-boot-on; + regulator-always-on; + }; + + /* DDR memory */ + sw3b_reg: sw3b { + regulator-min-microvolt = <400000>; + regulator-max-microvolt = <1975000>; + regulator-boot-on; + regulator-always-on; + }; + + /* not used */ + sw4_reg: sw4 { + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <3300000>; + }; + + /* not used */ + swbst_reg: swbst { + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5150000>; + }; + + /* PMIC vsnvs. EX boot mode */ + snvs_reg: vsnvs { + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <3000000>; + regulator-boot-on; + regulator-always-on; + }; + + vref_reg: vrefddr { + regulator-boot-on; + regulator-always-on; + }; + + /* not used */ + vgen1_reg: vgen1 { + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <1550000>; + }; + + /* not used */ + vgen2_reg: vgen2 { + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <1550000>; + }; + + /* not used */ + vgen3_reg: vgen3 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + }; + + /* 1v8 general power */ + vgen4_reg: vgen4 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + /* 2v8 general power IMX6 */ + vgen5_reg: vgen5 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + /* 3v3 Ethernet */ + vgen6_reg: vgen6 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + }; + }; }; &uart3 { diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig index 5007fe3941..ccc754b123 100644 --- a/arch/arm/mach-imx/mx6/Kconfig +++ b/arch/arm/mach-imx/mx6/Kconfig @@ -235,6 +235,8 @@ config TARGET_MX6DL_MAMOJ select DM_GPIO select DM_I2C select DM_MMC + select DM_PMIC + select DM_PMIC_PFUZE100 select DM_THERMAL select SPL select SUPPORT_SPL diff --git a/configs/imx6dl_mamoj_defconfig b/configs/imx6dl_mamoj_defconfig index e2a18d2c30..362962fdf3 100644 --- a/configs/imx6dl_mamoj_defconfig +++ b/configs/imx6dl_mamoj_defconfig @@ -16,6 +16,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_PMIC=y CONFIG_CMD_CACHE=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y From patchwork Wed Apr 11 12:36:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 897163 X-Patchwork-Delegate: sbabic@denx.de 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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="NE1l1TiS"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40Lk945kZxz9s35 for ; Wed, 11 Apr 2018 22:38:16 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 75786C21C3F; Wed, 11 Apr 2018 12:37:13 +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, T_DKIM_INVALID 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 6220DC21D8E; Wed, 11 Apr 2018 12:37:06 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 362DAC21D9A; Wed, 11 Apr 2018 12:36:46 +0000 (UTC) Received: from mail-pl0-f66.google.com (mail-pl0-f66.google.com [209.85.160.66]) by lists.denx.de (Postfix) with ESMTPS id 052B7C21DD3 for ; Wed, 11 Apr 2018 12:36:46 +0000 (UTC) Received: by mail-pl0-f66.google.com with SMTP id 59-v6so1292044plc.13 for ; Wed, 11 Apr 2018 05:36:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/PvXsqBHlqbQCcC4Sho9gdx7I3cCn5uTQi/6JOwuLKU=; b=NE1l1TiS7sGEhLf6pQCLfhWJ0c8FXfuxmdzsVXRmOhvNtBMCzBXvJUHxZLOFnFe4zw JUmVBNslCxheGHRfmNn6X0mSXd93PfVnQI74pVMqM1Wi12sa/3qLj4Vf9WTMCVhKHAoc J2Q7ZK+VQtC771Xg4qvzk1tfgooXJDryjMduk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=/PvXsqBHlqbQCcC4Sho9gdx7I3cCn5uTQi/6JOwuLKU=; b=sPCQbB6UOv7axg/CkU9zqK3TUzzowl0WbATowv7UkXP01vIooEfD0mWoXBAIKosL06 eeg93FsSM78QPgX2nka+4+BO9SJu9HD23fO6SYlxgw84P6lBhhGBtnzKBBTol0viHnXV zShPIfqCyFSonquq14jxKc2XersYCI4wtaQ7PMmsfiNx/GBQdE8PpKdsY4dqmn5aOR32 iNL1EmXtgQ9rvyk0V2AJ9yKD5+vFL9KjwkksY8XS3iZoc2CnKmiEikFiWBi0X6FCoO17 k2iZfgEwgM7pc8tYo85Hq3Z8fazT/erLsrkBoyD+YzaFFhzuCor/M8+iMxnPmWBeA2fK q+yw== X-Gm-Message-State: ALQs6tD7a7PliQBi+0MEF4ErdtMIVeq/gUuzCX08yGdSSp0LCSJOlVXW pCX7J4oZfudXTjBU/fF7pnC5+g== X-Google-Smtp-Source: AIpwx4++y0msV4GPqqgDIAJaNLELsBFXuvkR8Z/YWPe9FZsPAumJ8Tnovfjn6nBTPg/xJucbyViQ0Q== X-Received: by 2002:a17:902:b707:: with SMTP id d7-v6mr5008516pls.188.1523450204679; Wed, 11 Apr 2018 05:36:44 -0700 (PDT) Received: from localhost.localdomain ([115.97.190.51]) by smtp.gmail.com with ESMTPSA id l10sm2316021pgp.35.2018.04.11.05.36.39 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 11 Apr 2018 05:36:44 -0700 (PDT) From: Jagan Teki To: Stefano Babic Date: Wed, 11 Apr 2018 18:06:12 +0530 Message-Id: <20180411123615.15130-5-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180411123615.15130-1-jagan@amarulasolutions.com> References: <20180411123615.15130-1-jagan@amarulasolutions.com> Cc: Simone CIANNI , Shyam Saini , u-boot@lists.denx.de, Davide Bonfanti , Andrea CORTESE , Fabio maggi , Fabio Estevam , Raffaele RECALCATI , lamiaposta71@gmail.com Subject: [U-Boot] [PATCH v2 4/7] configs: imx6dl_mamoj: Enable fastboot and ums 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Enable fastboot and ums for host to interact eMMC on Mamoj board. Signed-off-by: Jagan Teki Signed-off-by: Simone CIANNI Signed-off-by: Raffaele RECALCATI --- configs/imx6dl_mamoj_defconfig | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/configs/imx6dl_mamoj_defconfig b/configs/imx6dl_mamoj_defconfig index 362962fdf3..08272077d2 100644 --- a/configs/imx6dl_mamoj_defconfig +++ b/configs/imx6dl_mamoj_defconfig @@ -8,6 +8,11 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6dl-mamoj" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" CONFIG_BOOTDELAY=3 CONFIG_HUSH_PARSER=y +CONFIG_FASTBOOT=y +CONFIG_FASTBOOT_BUF_ADDR=0x12000000 +CONFIG_FASTBOOT_BUF_SIZE=0x10000000 +CONFIG_FASTBOOT_FLASH=y +CONFIG_FASTBOOT_FLASH_MMC_DEV=2 CONFIG_SYS_PROMPT="=> " CONFIG_CRC32_VERIFY=y CONFIG_CMD_MEMTEST=y @@ -24,6 +29,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_USB=y +CONFIG_CMD_USB_MASS_STORAGE=y CONFIG_DISTRO_DEFAULTS=y CONFIG_ENV_IS_IN_MMC=y CONFIG_PHYLIB=y From patchwork Wed Apr 11 12:36:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 897168 X-Patchwork-Delegate: sbabic@denx.de 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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="AfN4QOTh"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40LkGr68PQz9s35 for ; Wed, 11 Apr 2018 22:43:16 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 07B2DC21DFF; Wed, 11 Apr 2018 12:39:44 +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_H2, T_DKIM_INVALID 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 8033EC21DD3; Wed, 11 Apr 2018 12:39:12 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4AC31C21C2F; Wed, 11 Apr 2018 12:36:55 +0000 (UTC) Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by lists.denx.de (Postfix) with ESMTPS id 298A8C21D8E for ; Wed, 11 Apr 2018 12:36:51 +0000 (UTC) Received: by mail-pf0-f194.google.com with SMTP id h69so868174pfe.13 for ; Wed, 11 Apr 2018 05:36:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=LvzVmV5BLZMGMhlJ4jEUfeuaTQeAoFhngVc91scW3JU=; b=AfN4QOThvU7nRI70jy5l9SX52Lq41Ocr+NF/wHD4dY0SYs6g7Cih5iWwXp4wSf0Lwp 6pGkLog3PVeGNOD4lViSft0+1/RaZfIAzNZOr6YDL8zvkPq60Ah8btaZtndFqX2PG7Cf F6cCH0nG0URnAvivHoWI0cDAfGtQ9HFd7CYzk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=LvzVmV5BLZMGMhlJ4jEUfeuaTQeAoFhngVc91scW3JU=; b=mroKLwcvpQIK30dgg96q1340ONrYtrzKRjLE1Qtt3fKxy7W3AG1QsSUaOFGLT8/F2x Htyfv+WjRx0Dnk3AJ/wtkatJrvbN+AxwUQr7DOQwpRwdZF7EyQ7aHlp9gyYBloNcA7Oz B4dVlUxucqu9xHDN/tpKiOF6V3mxbKQBV6TNi74NSf6GzCKtP6B3ftfTqzWUpFZkBHje feADYpOhY/1VDo2sHKLyt58Wrj8S/N/iUw69LNSxpQDbRt6X+GQ9Zp78u8Y8B3BcRcVv OMq9ySzdti2fAJs54cDs8m6vp254TyJotvSLFl6NWXoVH81N0HATsnmzDA9x6PK/AMAD kXAw== X-Gm-Message-State: ALQs6tA0zodxP3tLM8fYZVxdlZtrEjJVUrkpdhFlXLLdbvZ88kObRMSP 7uqdYI0F9iN9/17IwTl6N4GEYA== X-Google-Smtp-Source: AIpwx48DW26FnoYEBtTON8zejrhluo/Dw+b5TchFYIUcJwztaSEIEzQss7tD6yBbYv4b7UWJf6aNTQ== X-Received: by 10.101.77.145 with SMTP id p17mr3347188pgq.275.1523450209718; Wed, 11 Apr 2018 05:36:49 -0700 (PDT) Received: from localhost.localdomain ([115.97.190.51]) by smtp.gmail.com with ESMTPSA id l10sm2316021pgp.35.2018.04.11.05.36.44 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 11 Apr 2018 05:36:49 -0700 (PDT) From: Jagan Teki To: Stefano Babic Date: Wed, 11 Apr 2018 18:06:13 +0530 Message-Id: <20180411123615.15130-6-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180411123615.15130-1-jagan@amarulasolutions.com> References: <20180411123615.15130-1-jagan@amarulasolutions.com> Cc: Simone CIANNI , Shyam Saini , u-boot@lists.denx.de, Davide Bonfanti , Andrea CORTESE , Fabio maggi , Fabio Estevam , Raffaele RECALCATI , lamiaposta71@gmail.com Subject: [U-Boot] [PATCH v2 5/7] configs: imx6dl-mamoj: Add DFU support 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Add DFU support for BTicino Mamoj board and update the same steps in README. Signed-off-by: Jagan Teki Signed-off-by: Simone CIANNI Signed-off-by: Raffaele RECALCATI --- board/bticino/mamoj/README | 37 +++++++++++++++++++++++++++++++++++++ configs/imx6dl_mamoj_defconfig | 2 ++ include/configs/imx6dl-mamoj.h | 4 +++- 3 files changed, 42 insertions(+), 1 deletion(-) diff --git a/board/bticino/mamoj/README b/board/bticino/mamoj/README index eda9e45ed1..8b0e9c3e0c 100644 --- a/board/bticino/mamoj/README +++ b/board/bticino/mamoj/README @@ -13,6 +13,8 @@ The following methods can be used for booting Mamoj boards: 1. USB SDP boot +2. eMMC boot (via DFU) + 1. USB SDP boot: --------------- @@ -55,6 +57,41 @@ The following methods can be used for booting Mamoj boards: We can see U-Boot boot from USB SDP on minicom +2. eMMC boot via DFU: +-------------------- + + Once booted from USB SDP, program the eMMC as below(make sure to connect USB OTG) + + - Change eMMC partition config + + => mmc partconf 2 1 0 0 + + - Partition eMMC on host + + => ums 0 mmc 2 + + Host will able to detect the eMMC disk as UMS, partition the same. + + - Program SPL + + => setenv dfu_alt_info $dfu_alt_info_spl + => dfu 0 mmc 2 + + At Host + + # dfu-util -D SPL -a spl + + - Program u-boot-dtb.img + + => setenv dfu_alt_info $dfu_alt_info_uboot + => dfu 0 mmc 2 + + At Host + + # dfu-util -D u-boot-dtb.img -a u-boot + + Poweroff and Poweron the board and see U-Boot booting from eMMC. + -- Jagan Teki 03/12/18 diff --git a/configs/imx6dl_mamoj_defconfig b/configs/imx6dl_mamoj_defconfig index 08272077d2..e34c2d9be3 100644 --- a/configs/imx6dl_mamoj_defconfig +++ b/configs/imx6dl_mamoj_defconfig @@ -15,6 +15,7 @@ CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH_MMC_DEV=2 CONFIG_SYS_PROMPT="=> " CONFIG_CRC32_VERIFY=y +CONFIG_CMD_DFU=y CONFIG_CMD_MEMTEST=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y @@ -44,5 +45,6 @@ CONFIG_USB_GADGET_MANUFACTURER="FSL" CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y +CONFIG_DFU_MMC=y CONFIG_IMX_THERMAL=y CONFIG_SYS_I2C_MXC=y diff --git a/include/configs/imx6dl-mamoj.h b/include/configs/imx6dl-mamoj.h index 929365af79..0ac238b82d 100644 --- a/include/configs/imx6dl-mamoj.h +++ b/include/configs/imx6dl-mamoj.h @@ -15,7 +15,7 @@ #include "mx6_common.h" /* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (16 * SZ_1M) +#define CONFIG_SYS_MALLOC_LEN (35 * SZ_1M) /* Total Size of Environment Sector */ #define CONFIG_ENV_SIZE SZ_128K @@ -37,6 +37,8 @@ "fdt_addr_r=0x13000000\0" \ "kernel_addr_r=0x10008000\0" \ "fdt_high=0xffffffff\0" \ + "dfu_alt_info_spl=spl raw 0x2 0x400\0" \ + "dfu_alt_info_uboot=u-boot raw 0x8a 0x11400\0" \ BOOTENV #define BOOT_TARGET_DEVICES(func) \ From patchwork Wed Apr 11 12:36:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 897167 X-Patchwork-Delegate: sbabic@denx.de 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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="A2i7GPKR"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40LkDw0gRHz9s35 for ; Wed, 11 Apr 2018 22:41:35 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 776A7C21E02; Wed, 11 Apr 2018 12:38:34 +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, T_DKIM_INVALID 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 4D91BC21DB6; Wed, 11 Apr 2018 12:38:32 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 94C52C21C51; Wed, 11 Apr 2018 12:36:59 +0000 (UTC) Received: from mail-pl0-f66.google.com (mail-pl0-f66.google.com [209.85.160.66]) by lists.denx.de (Postfix) with ESMTPS id C854CC21D72 for ; Wed, 11 Apr 2018 12:36:55 +0000 (UTC) Received: by mail-pl0-f66.google.com with SMTP id b6-v6so1298827pla.11 for ; Wed, 11 Apr 2018 05:36:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=lAKY2Mjjdsq5t57ytXbg+a/2EGBVxP2O+c/Ecko7JbU=; b=A2i7GPKRr9mKKYI+QvD04Lg+bLmabx384KwKBcw50aMP2qXrXKN8ngdbO5psKK7iTi /33graxIIbuDzYWENe2qG2FkqREH9yh5NAewAwtiRykBkb3RLUPDT/ZYCxGvFpfrvxfS OFMTf7aoxkAvAkpGwNg+1pprGFSLWd3pnujgM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=lAKY2Mjjdsq5t57ytXbg+a/2EGBVxP2O+c/Ecko7JbU=; b=IqmHpVkKktjP7mGiAB9RH0dUuaV+W1sR5kCemyv0mMLoevEUZQxsouvj6/a6ePaFMM 0GxqzjqJL305BBZVlAHQ/0rISHY9nWXs44lAmgPmn46oc5ScpJ6RaLfY3OXEGp4i7WOw eBpxYg8XrADXlq7ylEPC+FcnT3h+Po2W7C2ULahwtBmTUH7Xep0fsq4MglD50EMun2s7 +rmrIdGdUnCeS2wIOJWV5oWQS7TcXjN+hEj4amqoOzw/mYQVoB+aJ8G1ffV3+KHFljiG yDS7riGRb0oGzwFySPiAOwM7CK+BMn+9fHa42sjdtRNCKc07dNVzLAzZQ9QebFkexRNY A4bg== X-Gm-Message-State: ALQs6tAziJm+ufQNa7Tn0bzrtbwxwT2sscMN7AvpbgE09cQn2lfWN/6B QJ2kKqWVK+6k8A56vWKgS2an/Q== X-Google-Smtp-Source: AIpwx4+HH1UOMF/LqGQQibZyc4fBtlsTMzHwUNNky11v8+fb1jeABfp5NzZpBLbEJCHkGrSWcxKmaA== X-Received: by 2002:a17:902:9892:: with SMTP id s18-v6mr4908839plp.95.1523450214424; Wed, 11 Apr 2018 05:36:54 -0700 (PDT) Received: from localhost.localdomain ([115.97.190.51]) by smtp.gmail.com with ESMTPSA id l10sm2316021pgp.35.2018.04.11.05.36.49 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 11 Apr 2018 05:36:53 -0700 (PDT) From: Jagan Teki To: Stefano Babic Date: Wed, 11 Apr 2018 18:06:14 +0530 Message-Id: <20180411123615.15130-7-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180411123615.15130-1-jagan@amarulasolutions.com> References: <20180411123615.15130-1-jagan@amarulasolutions.com> Cc: Shyam Saini , u-boot@lists.denx.de, Davide Bonfanti , Andrea CORTESE , Fabio maggi , Fabio Estevam , Raffaele RECALCATI , lamiaposta71@gmail.com Subject: [U-Boot] [PATCH v2 6/7] configs: imx6dl-mamoj: Add Falcon mode support 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Add Falcon mode support to boot Linux directly after SPL. Signed-off-by: Jagan Teki --- board/bticino/mamoj/README | 27 +++++++++++++++++++++++++++ board/bticino/mamoj/spl.c | 11 +++++++++++ configs/imx6dl_mamoj_defconfig | 1 + include/configs/imx6dl-mamoj.h | 12 ++++++++++++ 4 files changed, 51 insertions(+) diff --git a/board/bticino/mamoj/README b/board/bticino/mamoj/README index 8b0e9c3e0c..5333c72537 100644 --- a/board/bticino/mamoj/README +++ b/board/bticino/mamoj/README @@ -15,6 +15,8 @@ The following methods can be used for booting Mamoj boards: 2. eMMC boot (via DFU) +3. Falcon mode + 1. USB SDP boot: --------------- @@ -92,6 +94,31 @@ The following methods can be used for booting Mamoj boards: Poweroff and Poweron the board and see U-Boot booting from eMMC. +3. Falcon mode: +-------------- + + - Skip 10M space and create dual partitions for eMMC, start sector is 20480 + + Partition Map for MMC device 2 -- Partition Type: DOS + + Part Start Sector Num Sectors UUID Type + 1 20480 131072 c52e78be-01 83 + 2 151552 7581696 c52e78be-02 83 + + - Write uImage + + => fatload mmc 2:1 $kernel_addr_r uImage + => mmc write $kernel_addr_r 0x1000 0x4000 + + - Write dtb and args + + => setenv bootargs console=ttymxc2,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait rw quiet + => fatload mmc 2:1 $fdt_addr_r imx6dl-mamoj.dtb + => spl export fdt $kernel_addr_r - $fdt_addr_r + => mmc write 0x13000000 0x800 0x800 + + Poweroff and Poweron the board and see Linux booting directly after SPL. + -- Jagan Teki 03/12/18 diff --git a/board/bticino/mamoj/spl.c b/board/bticino/mamoj/spl.c index 82568f7af5..531064995f 100644 --- a/board/bticino/mamoj/spl.c +++ b/board/bticino/mamoj/spl.c @@ -27,6 +27,17 @@ static iomux_v3_cfg_t const uart3_pads[] = { IOMUX_PADS(PAD_EIM_D25__UART3_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL)), }; +#ifdef CONFIG_SPL_OS_BOOT +int spl_start_uboot(void) +{ + /* break into full u-boot on 'c' */ + if (serial_tstc() && serial_getc() == 'c') + return 1; + + return 0; +} +#endif + static int mx6dl_dcd_table[] = { 0x020e0774, 0x000C0000, /* MX6_IOM_GRP_DDR_TYPE */ 0x020e0754, 0x00000000, /* MX6_IOM_GRP_DDRPKE */ diff --git a/configs/imx6dl_mamoj_defconfig b/configs/imx6dl_mamoj_defconfig index e34c2d9be3..d789496dff 100644 --- a/configs/imx6dl_mamoj_defconfig +++ b/configs/imx6dl_mamoj_defconfig @@ -3,6 +3,7 @@ CONFIG_ARCH_MX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_MX6DL_MAMOJ=y +CONFIG_SPL_OS_BOOT=y # CONFIG_CMD_BMODE is not set CONFIG_DEFAULT_DEVICE_TREE="imx6dl-mamoj" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" diff --git a/include/configs/imx6dl-mamoj.h b/include/configs/imx6dl-mamoj.h index 0ac238b82d..2f5e212b88 100644 --- a/include/configs/imx6dl-mamoj.h +++ b/include/configs/imx6dl-mamoj.h @@ -64,6 +64,18 @@ #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 +/* Falcon */ +#define CONFIG_SPL_FS_LOAD_ARGS_NAME "args" +#define CONFIG_SPL_FS_LOAD_KERNEL_NAME "uImage" +#define CONFIG_CMD_SPL +#define CONFIG_SYS_SPL_ARGS_ADDR 0x13000000 +#define CONFIG_CMD_SPL_WRITE_SIZE (128 * SZ_1K) + +/* MMC support: args@1MB kernel@2MB */ +#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x800 /* 1MB */ +#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS (CONFIG_CMD_SPL_WRITE_SIZE / 512) +#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR 0x1000 /* 2MB */ + /* Miscellaneous configurable options */ #define CONFIG_SYS_MEMTEST_START 0x80000000 #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x8000000) From patchwork Wed Apr 11 12:36:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 897164 X-Patchwork-Delegate: sbabic@denx.de 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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="NmXWoZE3"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40LkCw3rGsz9s35 for ; Wed, 11 Apr 2018 22:40:44 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 248F5C21D8A; Wed, 11 Apr 2018 12:38:53 +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, T_DKIM_INVALID 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 E5F14C21DDC; Wed, 11 Apr 2018 12:38:39 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 458D8C21D8A; Wed, 11 Apr 2018 12:37:04 +0000 (UTC) Received: from mail-pl0-f66.google.com (mail-pl0-f66.google.com [209.85.160.66]) by lists.denx.de (Postfix) with ESMTPS id 163C3C21C50 for ; Wed, 11 Apr 2018 12:37:00 +0000 (UTC) Received: by mail-pl0-f66.google.com with SMTP id b6-v6so1298950pla.11 for ; Wed, 11 Apr 2018 05:37:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=riXpZi/wSY3zOL4HQx58+Y+htT6SknaiqEATdU3ZJiQ=; b=NmXWoZE330Oo13H2DU5esDe2oybA9jWpic+sLTpFejDqWklmrLEwVt46++nw5Uzxkf Ix+LfpQ/lPnRX74VB1EQI5TlRAWx05JyxJ6V9Xy16ui46KOHcXiZ90yGcfnJBtB4MNh2 g7g9NmHWxtF5fnM69f03RbcZH5O9xDZSFNSGk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=riXpZi/wSY3zOL4HQx58+Y+htT6SknaiqEATdU3ZJiQ=; b=cFQqhbaxz7GdxuWPu7R5QIkAz4hqt/JgfAC5SIJ6wpFIMDv8ERh1i/tNetmw1HUA/2 mmownSi9GOjxUMW9UqxGc0BsDzNLJNUzeRku4svtvRu0unMVEWOLYJtBiolEgIaX9Gje FbDmCJKlj0lsUhuusZqSEHAktlYaxnQiWuyc0R9HSilxfkdwBZFNpnq8sN3fNA9DGAzp YvxiiqA8aYScx/lcIc3r58p5ayouWjwHra8iHTGIdM3IFnLvJ8h9pDVTPIWaQnB8Jz2v iZRGSLM+DlJ2tBHiJJfI87w6/G8RKTzlMRs/QFF00sN8M8ayvIpMyg3K1yoR5MzZ5e7Z Z3MQ== X-Gm-Message-State: ALQs6tBJ59pNvoPCJpI8ECCD1/2Y6XUwUY+JYa2o4Ma7PpSMXRhOyhya dCdw2RP16yVpkmq+k7HkGZL0nA== X-Google-Smtp-Source: AIpwx49Gb9xwXEZ/VnZ7gEDc6/9zgzTOGeEyEpAEp0NDauZidgFzrmUzioKew8z/UdtgzbjJZlSmCA== X-Received: by 2002:a17:902:6085:: with SMTP id s5-v6mr4878304plj.307.1523450218748; Wed, 11 Apr 2018 05:36:58 -0700 (PDT) Received: from localhost.localdomain ([115.97.190.51]) by smtp.gmail.com with ESMTPSA id l10sm2316021pgp.35.2018.04.11.05.36.54 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 11 Apr 2018 05:36:58 -0700 (PDT) From: Jagan Teki To: Stefano Babic Date: Wed, 11 Apr 2018 18:06:15 +0530 Message-Id: <20180411123615.15130-8-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180411123615.15130-1-jagan@amarulasolutions.com> References: <20180411123615.15130-1-jagan@amarulasolutions.com> Cc: Shyam Saini , u-boot@lists.denx.de, Davide Bonfanti , Andrea CORTESE , Fabio maggi , Fabio Estevam , Raffaele RECALCATI , lamiaposta71@gmail.com Subject: [U-Boot] [PATCH v2 7/7] configs: imx6dl-mamoj: Enable HAB 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Enable Secure boot(HAB) for BTicino Mamoj board. Signed-off-by: Jagan Teki --- configs/imx6dl_mamoj_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/imx6dl_mamoj_defconfig b/configs/imx6dl_mamoj_defconfig index d789496dff..0001457f5d 100644 --- a/configs/imx6dl_mamoj_defconfig +++ b/configs/imx6dl_mamoj_defconfig @@ -49,3 +49,4 @@ CONFIG_CI_UDC=y CONFIG_DFU_MMC=y CONFIG_IMX_THERMAL=y CONFIG_SYS_I2C_MXC=y +CONFIG_SECURE_BOOT=y