From patchwork Wed Apr 24 03:59:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Nie X-Patchwork-Id: 1089878 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=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="VSX+w7bp"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44pmtX29Gnz9s3q for ; Wed, 24 Apr 2019 14:05:08 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id EE7F7C21E38; Wed, 24 Apr 2019 04:01:57 +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.8 required=5.0 tests=T_DKIM_INVALID, UPPERCASE_50_75 autolearn=no autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id D861CC21E0D; Wed, 24 Apr 2019 04:01:44 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id BB4D8C21E15; Wed, 24 Apr 2019 04:00:10 +0000 (UTC) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by lists.denx.de (Postfix) with ESMTPS id 69449C21DDC for ; Wed, 24 Apr 2019 04:00:08 +0000 (UTC) Received: by mail-wr1-f52.google.com with SMTP id h4so22978207wre.7 for ; Tue, 23 Apr 2019 21:00:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=F5UAVNgf7lnciKABGBTlfMoqALAD8zrKBHSeGijBofQ=; b=VSX+w7bpqOcYM5SlYLs4GbbzAUmLmOoTU3/z5tR/QXqvbi0MS/jzJ41zZ2weJhVZFC JBLEapYIuFU2ZEK3XRl8Kn4RVOf7IWpMGb4Nt0eAyWX4svbiuYqqdOGhOcEvyaZv6m/u 8RzUqsOl1UnALQV1I4oV8AiM92cVilcg78l0KgSyQtZwne9nnQl3KpOJxi4CSC/RZLdA D01v2kYfB5y6HJLhVlYK2oO+kNXBOiyDvvLyoh9gLWkJ7KVyKWUWm4n6cY2EvUKximgQ EZfr1v6QmGu2XU3Lyu1ECoQgcMFD/A2oLYyrqVRL05lefw1lOqyec9BoFvnQNqPr/8HH z6iw== 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=F5UAVNgf7lnciKABGBTlfMoqALAD8zrKBHSeGijBofQ=; b=Asg+HW/UXrfIeOdho9Er2ItsDwKWjifzLZNyXq7BXK7JczrYK6VOG0GKRvwmTq5hjt v6TkEdVUyiIVD84edezyXrxdy1zeOY1uXLwbwzndflDQB7bJ+sPgIRntSH+GcfX2kvMY bRBV14uj/Dj3hTtgNfcR2qoKylx/jqYCYBl4atKjGaNfV8mk9OQ98cb+7npSoxCkypbW /GyMqfyfunQwABkF+8jzKE3glt025rE2SdvdF6lI4ei3BTq/wAqTUBYkc6xIq2IUL6Jf mJKjd+z/uPqXYgOH0bedPWi6X7vGt7jGJis+NzJRAYdq3YRXh8OUfdkNEWNJoqGQ+UkB r0oA== X-Gm-Message-State: APjAAAUWn8/5Ttq6Vezsm4v8lInlNk1/OzHfVOnjwqCsGObkyVtW767h LyM2YRBi20n9R5ZHj6eeWMqI9A== X-Google-Smtp-Source: APXvYqxEmHdwkU9osq21TqpUlpy3kBtjj32cOOqijs9t95nhqJfJTUjF8CLM8P2wGyskvsqN5JkM1g== X-Received: by 2002:a5d:464f:: with SMTP id j15mr19744577wrs.265.1556078408029; Tue, 23 Apr 2019 21:00:08 -0700 (PDT) Received: from localhost.localdomain (li1805-140.members.linode.com. [172.104.229.140]) by smtp.gmail.com with ESMTPSA id x192sm26613948wmf.48.2019.04.23.21.00.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Apr 2019 21:00:07 -0700 (PDT) From: Jun Nie To: festevam@gmail.com, otavio@ossystems.com.br, peng.fan@nxp.com, vanessa.maegima@nxp.com, bryan.odonoghue@linaro.org, u-boot@lists.denx.de Date: Wed, 24 Apr 2019 11:59:24 +0800 Message-Id: <1556078372-26851-2-git-send-email-jun.nie@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1556078372-26851-1-git-send-email-jun.nie@linaro.org> References: <1556078372-26851-1-git-send-email-jun.nie@linaro.org> Subject: [U-Boot] [PATCH v3 1/9] Revert "pico-imx7d: Add LCD 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" This reverts commit 9e3c0174da842dd88f5feaffbf843ba332233897. --- board/technexion/pico-imx7d/pico-imx7d.c | 55 -------------------------------- configs/pico-hobbit-imx7d_defconfig | 1 - configs/pico-imx7d_defconfig | 1 - configs/pico-pi-imx7d_defconfig | 1 - include/configs/pico-imx7d.h | 12 ------- 5 files changed, 70 deletions(-) diff --git a/board/technexion/pico-imx7d/pico-imx7d.c b/board/technexion/pico-imx7d/pico-imx7d.c index 767d13d..53e1469 100644 --- a/board/technexion/pico-imx7d/pico-imx7d.c +++ b/board/technexion/pico-imx7d/pico-imx7d.c @@ -39,16 +39,8 @@ DECLARE_GLOBAL_DATA_PTR; #define I2C_PAD_CTRL (PAD_CTL_DSE_3P3V_32OHM | PAD_CTL_SRE_SLOW | \ PAD_CTL_HYS | PAD_CTL_PUE | PAD_CTL_PUS_PU100KOHM) - -#define LCD_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_PUS_PU100KOHM | \ - PAD_CTL_DSE_3P3V_49OHM) - -#define LCD_SYNC_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_PUS_PU100KOHM | \ - PAD_CTL_DSE_3P3V_196OHM) - #ifdef CONFIG_SYS_I2C_MXC #define PC MUX_PAD_CTRL(I2C_PAD_CTRL) - /* I2C4 for PMIC */ static struct i2c_pads_info i2c_pad_info4 = { .scl = { @@ -254,58 +246,11 @@ int board_early_init_f(void) return 0; } -#ifdef CONFIG_VIDEO_MXS -static iomux_v3_cfg_t const lcd_pads[] = { - MX7D_PAD_LCD_CLK__LCD_CLK | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_ENABLE__LCD_ENABLE | MUX_PAD_CTRL(LCD_SYNC_PAD_CTRL), - MX7D_PAD_LCD_HSYNC__LCD_HSYNC | MUX_PAD_CTRL(LCD_SYNC_PAD_CTRL), - MX7D_PAD_LCD_VSYNC__LCD_VSYNC | MUX_PAD_CTRL(LCD_SYNC_PAD_CTRL), - MX7D_PAD_LCD_DATA00__LCD_DATA0 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA01__LCD_DATA1 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA02__LCD_DATA2 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA03__LCD_DATA3 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA04__LCD_DATA4 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA05__LCD_DATA5 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA06__LCD_DATA6 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA07__LCD_DATA7 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA08__LCD_DATA8 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA09__LCD_DATA9 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA10__LCD_DATA10 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA11__LCD_DATA11 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA12__LCD_DATA12 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA13__LCD_DATA13 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA14__LCD_DATA14 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA15__LCD_DATA15 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA16__LCD_DATA16 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA17__LCD_DATA17 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA18__LCD_DATA18 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA19__LCD_DATA19 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA20__LCD_DATA20 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA21__LCD_DATA21 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA22__LCD_DATA22 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_LCD_DATA23__LCD_DATA23 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_GPIO1_IO06__GPIO1_IO6 | MUX_PAD_CTRL(LCD_PAD_CTRL), - MX7D_PAD_GPIO1_IO11__GPIO1_IO11 | MUX_PAD_CTRL(NO_PAD_CTRL), -}; - -void setup_lcd(void) -{ - imx_iomux_v3_setup_multiple_pads(lcd_pads, ARRAY_SIZE(lcd_pads)); - /* Set Brightness to high */ - gpio_direction_output(IMX_GPIO_NR(1, 11) , 1); - /* Set LCD enable to high */ - gpio_direction_output(IMX_GPIO_NR(1, 6) , 1); -} -#endif - int board_init(void) { /* address of boot parameters */ gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; -#ifdef CONFIG_VIDEO_MXS - setup_lcd(); -#endif #ifdef CONFIG_FEC_MXC setup_fec(); #endif diff --git a/configs/pico-hobbit-imx7d_defconfig b/configs/pico-hobbit-imx7d_defconfig index f58d517..cb4a6bf 100644 --- a/configs/pico-hobbit-imx7d_defconfig +++ b/configs/pico-hobbit-imx7d_defconfig @@ -57,5 +57,4 @@ CONFIG_USB_GADGET_MANUFACTURER="FSL" CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y -CONFIG_VIDEO=y CONFIG_OF_LIBFDT=y diff --git a/configs/pico-imx7d_defconfig b/configs/pico-imx7d_defconfig index 7e13923..f90d757 100644 --- a/configs/pico-imx7d_defconfig +++ b/configs/pico-imx7d_defconfig @@ -57,5 +57,4 @@ CONFIG_USB_GADGET_MANUFACTURER="FSL" CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y -CONFIG_VIDEO=y CONFIG_OF_LIBFDT=y diff --git a/configs/pico-pi-imx7d_defconfig b/configs/pico-pi-imx7d_defconfig index c8ac2ff..8e48ba7 100644 --- a/configs/pico-pi-imx7d_defconfig +++ b/configs/pico-pi-imx7d_defconfig @@ -57,5 +57,4 @@ CONFIG_USB_GADGET_MANUFACTURER="FSL" CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y -CONFIG_VIDEO=y CONFIG_OF_LIBFDT=y diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h index 0f6d6b7..1884c58 100644 --- a/include/configs/pico-imx7d.h +++ b/include/configs/pico-imx7d.h @@ -64,12 +64,10 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ - "splashpos=m,m\0" \ "console=ttymxc4\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ - "videomode=video=ctfb:x:800,y:480,depth:24,mode:0,pclk:30000,le:46,ri:210,up:22,lo:23,hs:20,vs:10,sync:0,vmode:0\0" \ BOOTMENU_ENV \ "fdt_addr=0x83000000\0" \ "fdt_addr_r=0x83000000\0" \ @@ -133,16 +131,6 @@ #define CONFIG_POWER_PFUZE3000 #define CONFIG_POWER_PFUZE3000_I2C_ADDR 0x08 -#ifdef CONFIG_VIDEO -#define CONFIG_VIDEO_MXS -#define CONFIG_VIDEO_LOGO -#define CONFIG_SPLASH_SCREEN -#define CONFIG_SPLASH_SCREEN_ALIGN -#define CONFIG_BMP_16BPP -#define CONFIG_VIDEO_BMP_RLE8 -#define CONFIG_VIDEO_BMP_LOGO -#endif - /* FLASH and environment organization */ #define CONFIG_ENV_SIZE SZ_8K From patchwork Wed Apr 24 03:59:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Nie X-Patchwork-Id: 1089879 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=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="Poto84Kv"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44pmv9695sz9s3q for ; Wed, 24 Apr 2019 14:05:41 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 57F48C21DA2; Wed, 24 Apr 2019 04:01:43 +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_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 1D511C21DF3; Wed, 24 Apr 2019 04:01:42 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 55E87C21C27; Wed, 24 Apr 2019 04:00:16 +0000 (UTC) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by lists.denx.de (Postfix) with ESMTPS id 17A4DC21DCA for ; Wed, 24 Apr 2019 04:00:13 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id h18so2872630wml.1 for ; Tue, 23 Apr 2019 21:00:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dx5X40rwCpMyDxgxlMSACSKGbHBQ4NdUsTItU+h96zA=; b=Poto84Kv/WpFA0s3f+Ge2qQiObkU0q6BcFtFK/KfSUkvUrv39z6x2K8aaA888kHVMe 4nX/oNfuIL/P3J7AifWoqGbAFi/s2HMbm8cgAN5zvN7ae/QVhmJy/7ylu1rIToDAMIEW Qkr0B3jShDbDSfZZoLOMSfu8j5j9ybAXMg8IW6G8aQdkYOVS+h0Gf7dw04xGpT3YYG2F cdLoyYn7CI+n5PQf7ZM4wRpdUlZ9lwqVCpPsl0BtoA3xCO0Zt72zGPO+a9WcmLIdRPsD CTlLDOUmF4bTeAMszVpH+UUY5n/sJWeNWXp3PKmiY0MHgpTysSMgKQKejH0tv7RCkmCD 449A== 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=dx5X40rwCpMyDxgxlMSACSKGbHBQ4NdUsTItU+h96zA=; b=t0JTC950RhaGs55ByqBZ2pQCsNz9ZD11++EkjBuKWe/eJR/KUSIdnGb7O/Apsp2TZo uxXOosjFOMPKpZUTXIvzkL6OyFtNia1IStgPZ5kVqH4vp4y+qkaBqu/+trIgLzjyaptj mheZ29GcbtDXWX4Zve+eX5TZbLCOtEt9kBC4EwFhRjdi+elfqYLqKjwCrSJD2Fjuz5Yn bFESl8ZzHCG93vTG39bN+35AR2FI0FXcFURPsbU2mldr2uVBrZTV0l0DkIZwKdVdJYc/ mGwbu6R+J5HbCrXFsWSZeavy41Zzp+B/rOq31iaIUdpIurrFwMNUPLQV6U+7oh4kyc8x RMWw== X-Gm-Message-State: APjAAAVmDwePXkCMIpbj+AGhicxTeSr1zFReDtcY8IOy6J8pMMDoJEJB ZZaYZK6vvO2+uo09XXpX5CNKmQ== X-Google-Smtp-Source: APXvYqwtOkC1LkxEHhlIhmZ+7wyK5/As4DgnZ9uvWr0h0aUu/8wDrEW0vogMJ43DnmDBFzNwxUySDw== X-Received: by 2002:a1c:ef10:: with SMTP id n16mr823585wmh.70.1556078412749; Tue, 23 Apr 2019 21:00:12 -0700 (PDT) Received: from localhost.localdomain (li1805-140.members.linode.com. [172.104.229.140]) by smtp.gmail.com with ESMTPSA id x192sm26613948wmf.48.2019.04.23.21.00.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Apr 2019 21:00:12 -0700 (PDT) From: Jun Nie To: festevam@gmail.com, otavio@ossystems.com.br, peng.fan@nxp.com, vanessa.maegima@nxp.com, bryan.odonoghue@linaro.org, u-boot@lists.denx.de Date: Wed, 24 Apr 2019 11:59:25 +0800 Message-Id: <1556078372-26851-3-git-send-email-jun.nie@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1556078372-26851-1-git-send-email-jun.nie@linaro.org> References: <1556078372-26851-1-git-send-email-jun.nie@linaro.org> Subject: [U-Boot] [PATCH v3 2/9] mx7_common: Share configs to skip low level init 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" Share configs in mx7 to skip low level init if we are in the case where OPTEE is loaded already (maybe by ARM Trusted Firmware) and that most of the low level initialization is already done and that we may/should skip it doing them here. Fix the definition detection with size detection to decide whether to skip it. Signed-off-by: Jun Nie --- include/configs/mx7_common.h | 11 +++++++++++ include/configs/warp7.h | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h index cc7e872..57fbec7 100644 --- a/include/configs/mx7_common.h +++ b/include/configs/mx7_common.h @@ -54,4 +54,15 @@ #endif #endif +/* + * If we have defined the OPTEE ram size and not OPTEE it means that we were + * launched by OPTEE, because of that we shall skip all the low level + * initialization since it was already done by ATF or OPTEE + */ +#if (CONFIG_OPTEE_TZDRAM_SIZE != 0) +#ifndef CONFIG_OPTEE +#define CONFIG_SKIP_LOWLEVEL_INIT +#endif +#endif + #endif diff --git a/include/configs/warp7.h b/include/configs/warp7.h index 043f286..80ddd72 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -13,17 +13,6 @@ #define PHYS_SDRAM_SIZE SZ_512M -/* - * If we have defined the OPTEE ram size and not OPTEE it means that we were - * launched by OPTEE, because of that we shall skip all the low level - * initialization since it was already done by ATF or OPTEE - */ -#ifdef CONFIG_OPTEE_TZDRAM_SIZE -#ifndef CONFIG_OPTEE -#define CONFIG_SKIP_LOWLEVEL_INIT -#endif -#endif - #define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR /* Size of malloc() pool */ From patchwork Wed Apr 24 03:59:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Nie X-Patchwork-Id: 1089877 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=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="Q9qW4G4O"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44pmtG5Sm8z9s4Y for ; Wed, 24 Apr 2019 14:04:54 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 49577C21E07; Wed, 24 Apr 2019 04:01:25 +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=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 5CA6FC21E12; Wed, 24 Apr 2019 04:01:22 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 20C2BC21DB6; Wed, 24 Apr 2019 04:00:21 +0000 (UTC) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by lists.denx.de (Postfix) with ESMTPS id EBCDAC21DD7 for ; Wed, 24 Apr 2019 04:00:17 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id n25so2854858wmk.4 for ; Tue, 23 Apr 2019 21:00:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=nHvYCmZbA1HGtecMnmEyjjYbEPQ4+kzgda18L3QNFX4=; b=Q9qW4G4OR+XW2hqu7He5tUkcDapZ08laglIELA9ZBOvELqngAcgQi+dX+A8/Hcb5jS 7vU2+be81WJf9Xz7BN2O8ORuSbTkXF6MTyX6lQp6amfzKmG2DdUtJUNusYCExeCLUetW qboQ9Z4T8eYzvGVZh00kEpgT6yDb/6fRcuWgHo3MVFW12pYBUXCQ6QA0xF14/DaOJpAb CrihSrarliyBmLcKbZtLVcacXQn4+JHvXvPm4tnxj9eSFmp1Gszk2RNv6UQxAzwfaCrl vybInxfZPU654UdR+B8z+X2zqpNMi3kMxwCkgfhrTaXdRUfbgctTKnzrGKmR8UZYyl6c Lzjg== 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=nHvYCmZbA1HGtecMnmEyjjYbEPQ4+kzgda18L3QNFX4=; b=oAKE1lJf2BFvAJP3MfG6t4VuoTyomUtKoMIsfdUtqSZuHhlR2Eh8aqpux5NdUJei3f QV/epGsOklmcZ1sIpyX1KddlSBOmLgXqS3LJezm068CjciTeXGictqkwcSVV/amN4hN2 UL/3aC6peGpMG2Z23XtsSShuyjcOVYYipSblEzJieXr5nBpEB70ZS4s+F8mj+tYCayNo mpWcB1vabt08pH48zYRwl2eBsLi6/1yfkGAHZ8Dj+YkDVA4u05ULfS/IsX8meG21ykmr QlYbVGBw/NntXipKOqqaPRdTRBq9FYu58ETneitFeusm4qFblbAvp3pkH6WMOqsoDJDL +q4A== X-Gm-Message-State: APjAAAVeSOcu5DYGgKYDiJBfEhw/VpRihGWfqXc8RY3wZuABhuh5ufTC 4PMBDh8eVFRN4d2v6yDtJzEBxQ== X-Google-Smtp-Source: APXvYqykZ9BRgUz+9P7zoTQtbeZapEcqQl8dn68IfCXrpHYK1p3YvBlfmrrvSgBEtGhdDdeWxYmrMA== X-Received: by 2002:a7b:cd08:: with SMTP id f8mr4563716wmj.86.1556078417661; Tue, 23 Apr 2019 21:00:17 -0700 (PDT) Received: from localhost.localdomain (li1805-140.members.linode.com. [172.104.229.140]) by smtp.gmail.com with ESMTPSA id x192sm26613948wmf.48.2019.04.23.21.00.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Apr 2019 21:00:16 -0700 (PDT) From: Jun Nie To: festevam@gmail.com, otavio@ossystems.com.br, peng.fan@nxp.com, vanessa.maegima@nxp.com, bryan.odonoghue@linaro.org, u-boot@lists.denx.de Date: Wed, 24 Apr 2019 11:59:26 +0800 Message-Id: <1556078372-26851-4-git-send-email-jun.nie@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1556078372-26851-1-git-send-email-jun.nie@linaro.org> References: <1556078372-26851-1-git-send-email-jun.nie@linaro.org> Subject: [U-Boot] [PATCH v3 3/9] imx: mx7: Add empty arch_cpu_init if skipped 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 empty arch_cpu_init if low level init is skipped. So that it does not break spl compile though spl is not needed in the skipped case actually. Signed-off-by: Jun Nie --- arch/arm/mach-imx/mx7/soc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm/mach-imx/mx7/soc.c b/arch/arm/mach-imx/mx7/soc.c index 7cfdff0..9b04013 100644 --- a/arch/arm/mach-imx/mx7/soc.c +++ b/arch/arm/mach-imx/mx7/soc.c @@ -286,6 +286,11 @@ int arch_cpu_init(void) return 0; } +#else +int arch_cpu_init(void) +{ + return 0; +} #endif #ifdef CONFIG_ARCH_MISC_INIT From patchwork Wed Apr 24 03:59:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Nie X-Patchwork-Id: 1089881 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=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="OQV/h+tw"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44pmvl0vN8z9s3q for ; Wed, 24 Apr 2019 14:06:10 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 98C8BC21E13; Wed, 24 Apr 2019 04:05:27 +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_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 1313CC21DD7; Wed, 24 Apr 2019 04:05:26 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A0CF5C21E02; Wed, 24 Apr 2019 04:00:22 +0000 (UTC) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by lists.denx.de (Postfix) with ESMTPS id A867BC21E0D for ; Wed, 24 Apr 2019 04:00:22 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id t17so22945045wrw.13 for ; Tue, 23 Apr 2019 21:00:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=V7Xx9rAdsAJtBVgm2n+4hoe9P6aerO6tv2Zuugy3Yso=; b=OQV/h+twSZN6g1iNbA4avlnEa3vkMcncdxFrCJLSLdJqCWxAMMGUFkoOtlp2RJD/Pt oqZCkkHG7p73Kb/CX4FhbLbPU9OuyuKWQPC7cy+KgDxG8LV9QEnsw35WyjQGj1X00bzK ntmCz6A2dNHw8+G4+/8VbSLznMrWJopmlgkWUJiVULod6H75CE196wxYVhntJkrAHWd+ EIabfekApeuH1dS4bOMrlS+Vgr/5eDK1PUbyaOD058W7vgWlbPmLUwMAkeymStxZd8ZT tMkTLV5Q699UGDLyuf/tMUzQnhh/ra0kqZe98MQW8g15UoxGTbAhfKSZLtWRMdb0p4C+ Vd4Q== 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=V7Xx9rAdsAJtBVgm2n+4hoe9P6aerO6tv2Zuugy3Yso=; b=S1CTcGDap6CtftGv+Fiq4xCQMyDAE/rInklpMEdnaShyXWBvW1Ijn2p6tRajXSkvpT IEgsyi9qGLBWyQppMAjaev8Vy3YTFpcLtwIEoOyMTBXUCvYsGbUAPdBQQ8/9zKamN9VM 0uS4FmxaUhtm+LXoWT1RAZ3nWVuii88TOQNb66uFDrVZE616WHs2r3tJa+HuiRERMtfJ qpp81dnxR79hmyer2uyOSFrTDZAP1sa9z6kZeevR6jxhs4MEa0/epKG0iSMvv3uTqAwN Nki+/Fe932KUepA/UxeCEM2h7cgjXbP8SEO+gYF9Nhzb76QVV0FBbahMV2c1JgK6AMrg yrfA== X-Gm-Message-State: APjAAAW8+g17bqGAv0acj/So7RPlbPt79S+JK2Zf2T8BFwdRXoDoPWa8 nKrLmGeEbKuPhJzLWVHv8ns4Rg== X-Google-Smtp-Source: APXvYqyieHuQtYndmEBFbZ6+zXU47u7IFUSSBMMM0tTii6nGGjfq+AXaTOeWRT1zGX6jbWgo872VTA== X-Received: by 2002:a5d:6646:: with SMTP id f6mr5736366wrw.68.1556078422345; Tue, 23 Apr 2019 21:00:22 -0700 (PDT) Received: from localhost.localdomain (li1805-140.members.linode.com. [172.104.229.140]) by smtp.gmail.com with ESMTPSA id x192sm26613948wmf.48.2019.04.23.21.00.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Apr 2019 21:00:21 -0700 (PDT) From: Jun Nie To: festevam@gmail.com, otavio@ossystems.com.br, peng.fan@nxp.com, vanessa.maegima@nxp.com, bryan.odonoghue@linaro.org, u-boot@lists.denx.de Date: Wed, 24 Apr 2019 11:59:27 +0800 Message-Id: <1556078372-26851-5-git-send-email-jun.nie@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1556078372-26851-1-git-send-email-jun.nie@linaro.org> References: <1556078372-26851-1-git-send-email-jun.nie@linaro.org> Subject: [U-Boot] [PATCH v3 4/9] pico-imx7d: Correct uart clock root 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" Correct uart clock root ID. Incorrect ID may result the clock is gated because rate value 0 is returned in imx_get_uartclk() Signed-off-by: Jun Nie --- arch/arm/include/asm/arch-mx7/clock.h | 18 ++++++++++++++++++ arch/arm/mach-imx/Kconfig | 7 +++++++ arch/arm/mach-imx/mx7/clock.c | 2 +- 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/arch/arm/include/asm/arch-mx7/clock.h b/arch/arm/include/asm/arch-mx7/clock.h index f56564e..dc91111 100644 --- a/arch/arm/include/asm/arch-mx7/clock.h +++ b/arch/arm/include/asm/arch-mx7/clock.h @@ -175,6 +175,24 @@ enum clk_root_index { CLK_ROOT_MAX, }; +#if (CONFIG_IMX_CONSOLE_UART_ID == 1) +#define UART_CLK_ROOT UART1_CLK_ROOT +#elif (CONFIG_IMX_CONSOLE_UART_ID == 2) +#define UART_CLK_ROOT UART2_CLK_ROOT +#elif (CONFIG_IMX_CONSOLE_UART_ID == 3) +#define UART_CLK_ROOT UART3_CLK_ROOT +#elif (CONFIG_IMX_CONSOLE_UART_ID == 4) +#define UART_CLK_ROOT UART4_CLK_ROOT +#elif (CONFIG_IMX_CONSOLE_UART_ID == 5) +#define UART_CLK_ROOT UART5_CLK_ROOT +#elif (CONFIG_IMX_CONSOLE_UART_ID == 6) +#define UART_CLK_ROOT UART6_CLK_ROOT +#elif (CONFIG_IMX_CONSOLE_UART_ID == 7) +#define UART_CLK_ROOT UART7_CLK_ROOT +#else +#error "Invalid IMX UART ID for serial console is defined" +#endif + struct clk_root_setting { enum clk_root_index root; u32 setting; diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index ec09ef2..7c5db30 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -27,6 +27,13 @@ config IMX_BOOTAUX help bootaux [addr] to boot auxiliary core. +config IMX_CONSOLE_UART_ID + int "UART ID for console" + default 1 + depends on ARCH_MX7 + help + Specify the UART ID that's for serial console. + config USE_IMXIMG_PLUGIN bool "Use imximage plugin code" depends on ARCH_MX7 || ARCH_MX6 diff --git a/arch/arm/mach-imx/mx7/clock.c b/arch/arm/mach-imx/mx7/clock.c index 8cda71c..e364b16 100644 --- a/arch/arm/mach-imx/mx7/clock.c +++ b/arch/arm/mach-imx/mx7/clock.c @@ -53,7 +53,7 @@ static u32 get_ipg_clk(void) u32 imx_get_uartclk(void) { - return get_root_clk(UART1_CLK_ROOT); + return get_root_clk(UART_CLK_ROOT); } u32 imx_get_fecclk(void) From patchwork Wed Apr 24 03:59:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Nie X-Patchwork-Id: 1089886 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=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="pf3xFNH5"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44pmyb6ZLSz9s55 for ; Wed, 24 Apr 2019 14:08:39 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 67C91C21E12; Wed, 24 Apr 2019 04:03:57 +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=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 01378C21DC1; Wed, 24 Apr 2019 04:03:56 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 93943C21DB3; Wed, 24 Apr 2019 04:00:27 +0000 (UTC) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by lists.denx.de (Postfix) with ESMTPS id 4FE9AC21DEC for ; Wed, 24 Apr 2019 04:00:27 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id z24so2859417wmi.5 for ; Tue, 23 Apr 2019 21:00:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=eBo9SoCQOhhEwgHqF4Uh0NfZ8ouiRBr62/Y4tVYLMfk=; b=pf3xFNH5BOUwhg6Vs/50WUqXsQL3zUsbJzdV2keuv9uSbHZzVjrQgHUEZj3yFjFuai zHhloPbl9b0K337PJybD19OPwJas/V58Qt+Tkmocq0Uz45WcyLXVummltwqEcicihgWb K1Jt877lUILYtJl3ZWpGKD3oycHlP/bHQnPo21FZa0SGr+AKVVtzIwJQB0n/2ZV83ACi uWWDNbV5I3cVUbvKsM9EFx0PvxtN5GWgSHys6i5IlkKNZM3eejs5GmnYoEEKt0vl+FyH nkE0ZvYmbWrGZRBMpTkadYWsabN8iWskSbUf9hg/FqCv8cZa31/XvOURS77YnJOhJVSq GMGg== 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=eBo9SoCQOhhEwgHqF4Uh0NfZ8ouiRBr62/Y4tVYLMfk=; b=KvkAyCANF44HWaT8zP3e4iaYts1nw4Lf4xN6yqhkxEkkwJXNELyHrKIUCRhVG7Jwte 8fsYZYDOSd3WcK+FAdc2byLTqNgE9vxeD6rOoA4jXFqBwfHRAWKEio73HFBDn5HEFu0g Hc7w7CPWvd4SuiuLrJd67M71KZLkvi9C0oX1K8Bw9+GCyqgWcZm0RA7hzenhM6oM+8NG VsKmYHDH5Y8ACT2yxSFw8eqKhd35+JqmTnYpjRll+8xcaKvybuIK0omIgGzYRjqnt+7m RMc3vs5qHz/PKyvjxVhjmSTEodTR2olgApf1lnczuGbzgSg/CFu9uYCnN78S/KNkJU8b NZgA== X-Gm-Message-State: APjAAAUG4kq1y2km8ryonFs6M60UcTnX2XEW5QHvO8MlCq6XVmelN1Jk bMdzAllsqJUvEI4LTWe9C4Qp+w== X-Google-Smtp-Source: APXvYqy/npfmWBxH45a6hMMznuQt5NAiw3/SVTp2R+KmLdfR7oPKuovbOGDlio3+Uml8MfSh58WN0Q== X-Received: by 2002:a7b:c458:: with SMTP id l24mr4913414wmi.75.1556078427040; Tue, 23 Apr 2019 21:00:27 -0700 (PDT) Received: from localhost.localdomain (li1805-140.members.linode.com. [172.104.229.140]) by smtp.gmail.com with ESMTPSA id x192sm26613948wmf.48.2019.04.23.21.00.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Apr 2019 21:00:26 -0700 (PDT) From: Jun Nie To: festevam@gmail.com, otavio@ossystems.com.br, peng.fan@nxp.com, vanessa.maegima@nxp.com, bryan.odonoghue@linaro.org, u-boot@lists.denx.de Date: Wed, 24 Apr 2019 11:59:28 +0800 Message-Id: <1556078372-26851-6-git-send-email-jun.nie@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1556078372-26851-1-git-send-email-jun.nie@linaro.org> References: <1556078372-26851-1-git-send-email-jun.nie@linaro.org> Subject: [U-Boot] [PATCH v3 5/9] pico-imx7d: Reserve region of memory to OPTEE 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" Subtracts CONFIG_OPTEE_TZDRAM_SIZE from the available DRAM size so that the OPTEE memory is not override during u-boot relocation. Note the OPTEE boot process will itself subtract the DRAM region it lives in from the memory map passed to Linux. Signed-off-by: Jun Nie Reviewed-by: Peng Fan --- board/technexion/pico-imx7d/pico-imx7d.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/board/technexion/pico-imx7d/pico-imx7d.c b/board/technexion/pico-imx7d/pico-imx7d.c index 53e1469..7c9e145 100644 --- a/board/technexion/pico-imx7d/pico-imx7d.c +++ b/board/technexion/pico-imx7d/pico-imx7d.c @@ -60,6 +60,11 @@ int dram_init(void) { gd->ram_size = imx_ddr_size(); + /* Subtract the defined OPTEE runtime firmware length */ +#ifdef CONFIG_OPTEE_TZDRAM_SIZE + gd->ram_size -= CONFIG_OPTEE_TZDRAM_SIZE; +#endif + return 0; } From patchwork Wed Apr 24 03:59:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Nie X-Patchwork-Id: 1089882 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=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="RLXzmu8U"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44pmxN1NFCz9s3q for ; Wed, 24 Apr 2019 14:07:35 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id A4A96C21E1B; Wed, 24 Apr 2019 04:02:23 +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_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 5258BC21DCA; Wed, 24 Apr 2019 04:02:10 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 38851C21D74; Wed, 24 Apr 2019 04:00:32 +0000 (UTC) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by lists.denx.de (Postfix) with ESMTPS id 8360CC21E07 for ; Wed, 24 Apr 2019 04:00:32 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id t17so22945398wrw.13 for ; Tue, 23 Apr 2019 21:00:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=HiL9Swht3sy9H3RnMHt239KJcMqMrzbGw0dz9Q9sJ+I=; b=RLXzmu8UjjuA28fqFS03NlilBE1fRvI0BdNbDiFtuGCMG095Az7gkIOS6I8Hs6WpTc QNU55vVpWxCt0JcWMLtWR4WG6pdS8YExDBg4jm94UwqZ01o3zHI1pD7x0PFcDXVME3fc jydJMY3ndhwRlyinJGQjcDgr/+bla6cITA2sz2Zw6Ji9fZ51QXoB7M0nSSigZhCdnmpL BpXYerWjHxdiBO6VJgPFLsssmzA4Zqv/l3QCEgW350beeZQXBjHDxm4TFGUtml8s2jZo ECup+NoCmkAuVYw/qsSu5MuZB7Zg53XtqBDtUKit8q3NadF5CjxJ0PgdgYvQqUkRYiSs vjxw== 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=HiL9Swht3sy9H3RnMHt239KJcMqMrzbGw0dz9Q9sJ+I=; b=V+gl0IJdPUcl2AfIHwPCm56y+89pGi333kOAIiaVZ51RkHfLKK/yjPf5XnG4IPMQGo 5nwvAaeDTlRhi2Rv7cnYM+D2B3bs132PY3dKXsILXqOy6pWh6c+CfXHJuLg0Eo9UTC0W waM5ITT3BcSxZeXNM5QWnqTljGE3EFdDPJ/s6mTdMM4cb+LjOBB15aYj+akRaGuABvO4 mMPFiM9HLwja+JR7ct7g88VplxYUDU4f2n99Bjl3qE3XmsoXKv1ExHCbQizkx6OGTmBZ DLKKE/SR1ugEVDz/2GxxvWiZw26iUHFPiN0/CCH08pHIsWQ86RQkC/pRwmXF04X8juRy gIyg== X-Gm-Message-State: APjAAAVI7X/3bSCBhtnFQGB9DK93cX+pQm9ZnAxJK9ILEcQgH8rsMC3x x8x8f+TH6pmKLIJ8tINRR8t8nVVAqD3bDw== X-Google-Smtp-Source: APXvYqzDkiSmoWuLROdS6Y8Mdt1zgrlUaGi7v1mrB9GwbGUeQRYGLrA5BbWsyKEVG2gBMIRqpSW96A== X-Received: by 2002:adf:9e86:: with SMTP id a6mr9432589wrf.178.1556078432077; Tue, 23 Apr 2019 21:00:32 -0700 (PDT) Received: from localhost.localdomain (li1805-140.members.linode.com. [172.104.229.140]) by smtp.gmail.com with ESMTPSA id x192sm26613948wmf.48.2019.04.23.21.00.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Apr 2019 21:00:31 -0700 (PDT) From: Jun Nie To: festevam@gmail.com, otavio@ossystems.com.br, peng.fan@nxp.com, vanessa.maegima@nxp.com, bryan.odonoghue@linaro.org, u-boot@lists.denx.de Date: Wed, 24 Apr 2019 11:59:29 +0800 Message-Id: <1556078372-26851-7-git-send-email-jun.nie@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1556078372-26851-1-git-send-email-jun.nie@linaro.org> References: <1556078372-26851-1-git-send-email-jun.nie@linaro.org> Subject: [U-Boot] [PATCH v3 6/9] pico-imx7d: Add boot option for verified boot 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 boot option to boot from fitimage to support verified boot. The boot script plain text file should be packed into fit blob as image with name of bootscr. Signed-off-by: Jun Nie --- include/configs/pico-imx7d.h | 38 +++++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h index 1884c58..8eb9064 100644 --- a/include/configs/pico-imx7d.h +++ b/include/configs/pico-imx7d.h @@ -52,11 +52,29 @@ "/boot/imx7d-pico-pi.dtb ext4 0 1;" \ "rootfs part 0 1\0" \ -#define BOOTMENU_ENV \ +/* When booting with FIT specify the node entry containing boot.scr */ +#if defined(CONFIG_FIT) +#define PICO_BOOT_ENV \ + "bootscr_fitimage_name=bootscr\0" \ + "bootscriptaddr=0x83200000\0" \ + "fdtovaddr=0x83100000\0" \ + "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \ + "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \ + "mmcargs=setenv bootargs console=${console},${baudrate} " \ + "rootwait rw;\0" \ + "loadbootscript=" \ + "load mmc ${mmcdev}:${mmcpart} ${bootscriptaddr} ${script};\0" \ + "bootscript=echo Running bootscript from mmc ...; " \ + "source ${bootscriptaddr}:${bootscr_fitimage_name}\0" +#else +#define PICO_BOOT_ENV \ "bootmenu_0=Boot using PICO-Hobbit baseboard=" \ "setenv fdtfile imx7d-pico-hobbit.dtb\0" \ "bootmenu_1=Boot using PICO-Pi baseboard=" \ "setenv fdtfile imx7d-pico-pi.dtb\0" \ + BOOTENV +#endif + #define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */ #define CONFIG_SYS_MMC_IMG_LOAD_PART 1 @@ -68,7 +86,6 @@ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ - BOOTMENU_ENV \ "fdt_addr=0x83000000\0" \ "fdt_addr_r=0x83000000\0" \ "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ @@ -88,7 +105,22 @@ "name=rootfs,size=0,uuid=${uuid_gpt_rootfs}\0" \ "fastboot_partition_alias_system=rootfs\0" \ "setup_emmc=mmc dev 0; gpt write mmc 0 $partitions; reset;\0" \ - BOOTENV + PICO_BOOT_ENV + +#if defined(CONFIG_FIT) +#define CONFIG_BOOTCOMMAND \ + "mmc dev ${mmcdev};" \ + "mmc dev ${mmcdev}; if mmc rescan; then " \ + "if run loadbootscript; then " \ + "iminfo ${bootscriptaddr};" \ + "if test $? -eq 1; then hab_failsafe; fi;" \ + "run bootscript; " \ + "else " \ + "echo Fail to load fitImage with boot script;" \ + "hab_failsafe;" \ + "fi; " \ + "fi" +#endif #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) \ From patchwork Wed Apr 24 03:59:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Nie X-Patchwork-Id: 1089884 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=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="Kqb8yTFx"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44pmyR69tkz9s4Y for ; Wed, 24 Apr 2019 14:08:31 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 8214FC21E44; Wed, 24 Apr 2019 04:02:50 +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=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 DD354C21E02; Wed, 24 Apr 2019 04:02:17 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E3332C21DEC; Wed, 24 Apr 2019 04:00:38 +0000 (UTC) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by lists.denx.de (Postfix) with ESMTPS id 2DB39C21DA2 for ; Wed, 24 Apr 2019 04:00:38 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id w15so2856395wmc.3 for ; Tue, 23 Apr 2019 21:00:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hlSHvZh992j/ujG3U+JfPrsbiACmFgsr9RiNH5ycNzQ=; b=Kqb8yTFxsMgWuw1CJZk/EDpJT7eSM29fbMC6LMMe1DoE6n/OO++LRlH15bFlKH9uyc 6VsJ6cwVlM40RWf0UuY99LpL34Vw05ypjenPerjeXtzyqYRIMZSvZqJxZ5h+Y8p9Ai1e jQTNnMtQePB91+L1EXrUFQ0I05Va3cSvFKCQT1B0Fp2sPmEWFHXadepwItcFQFvZCPPm 2UUC5BSdZvw+Hdpkmr3tT5j6tJnGKjnSJupq0slXUJXGbOGC2tycE6aB0FfZN2x40CUp eysTsQTNASUbIByR9CZ8Z33w3+csaTrVe8XPdNeoxbzSHprLNGOiiz2hP5kf+d2aCsAA /WtA== 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=hlSHvZh992j/ujG3U+JfPrsbiACmFgsr9RiNH5ycNzQ=; b=IGoQKkSb3b/zcrubiQiVMm96zBWXwY7Xgr/uTe9RjNNl+3OFwy7V94s3Vw4/CeQEKm T3EZujaVlkddAkzNDzhsYcfNdK+CUacTWoYGvo6ilB/0foVE4v5Ry03Fp4vYOCLL3C/+ jlNXp/bSDDxpiwwtfUQQp5FueInwfGX79mTHMFQQAkJi/PgIw3JhdBCJmrls4NSx1pcB I+aQBLe07x1b1cZF38cMr0NXqN0zznwLqWAuIzt0Q8EhlLVbpmNQACxX3jHEYxQlMK0N 0zgbSLGH1KOY44TRD/2VKGvJOq0G3i6yV0IiFksw+YqmFhRM2askId0RKRfwqvDVxpwJ cloQ== X-Gm-Message-State: APjAAAU5Xjbj1jgN+Y3SP9m2Y7YVqK3Go3/0hpENLenpIHHbdGB3kPTa WH8G1777OTDs+/O5gyv4xWeQkQ== X-Google-Smtp-Source: APXvYqyXIuz4gTU3lx1bCgl57B2FSDon8g7Q16XxhJekt534/J+nor25AfDzNnyqQbGbJ2UBklX9hg== X-Received: by 2002:a1c:6502:: with SMTP id z2mr4481292wmb.119.1556078437576; Tue, 23 Apr 2019 21:00:37 -0700 (PDT) Received: from localhost.localdomain (li1805-140.members.linode.com. [172.104.229.140]) by smtp.gmail.com with ESMTPSA id x192sm26613948wmf.48.2019.04.23.21.00.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Apr 2019 21:00:36 -0700 (PDT) From: Jun Nie To: festevam@gmail.com, otavio@ossystems.com.br, peng.fan@nxp.com, vanessa.maegima@nxp.com, bryan.odonoghue@linaro.org, u-boot@lists.denx.de Date: Wed, 24 Apr 2019 11:59:30 +0800 Message-Id: <1556078372-26851-8-git-send-email-jun.nie@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1556078372-26851-1-git-send-email-jun.nie@linaro.org> References: <1556078372-26851-1-git-send-email-jun.nie@linaro.org> Subject: [U-Boot] [PATCH v3 7/9] pico-imx7d: Add device tree for pico-imx7d 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" Copy device tree files from Linux directly. Signed-off-by: Jun Nie --- arch/arm/dts/Makefile | 1 + arch/arm/dts/imx7d-pico-pi.dts | 93 +++++++ arch/arm/dts/imx7d-pico.dtsi | 585 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 679 insertions(+) create mode 100644 arch/arm/dts/imx7d-pico-pi.dts create mode 100644 arch/arm/dts/imx7d-pico.dtsi diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 0aee8df..e6cb1d3 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -555,6 +555,7 @@ dtb-$(CONFIG_ARCH_MX6) += \ dtb-$(CONFIG_MX7) += imx7d-sdb.dtb \ imx7d-sdb-qspi.dtb \ + imx7d-pico-pi.dtb \ imx7-colibri-emmc.dtb \ imx7-colibri-rawnand.dtb \ imx7s-warp.dtb diff --git a/arch/arm/dts/imx7d-pico-pi.dts b/arch/arm/dts/imx7d-pico-pi.dts new file mode 100644 index 0000000..70bea95 --- /dev/null +++ b/arch/arm/dts/imx7d-pico-pi.dts @@ -0,0 +1,93 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// +// Copyright 2017 NXP + +#include "imx7d-pico.dtsi" + +/ { + model = "TechNexion PICO-IMX7D Board and PI baseboard"; + compatible = "technexion,imx7d-pico-pi", "fsl,imx7d"; + + leds { + compatible = "gpio-leds"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpio_leds>; + + led { + label = "gpio-led"; + gpios = <&gpio2 6 GPIO_ACTIVE_HIGH>; + }; + }; + + sound { + compatible = "simple-audio-card"; + simple-audio-card,name = "imx7-sgtl5000"; + simple-audio-card,format = "i2s"; + simple-audio-card,bitclock-master = <&dailink_master>; + simple-audio-card,frame-master = <&dailink_master>; + simple-audio-card,cpu { + sound-dai = <&sai1>; + }; + + dailink_master: simple-audio-card,codec { + sound-dai = <&sgtl5000>; + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + }; + }; +}; + +&i2c1 { + sgtl5000: codec@a { + #sound-dai-cells = <0>; + reg = <0x0a>; + compatible = "fsl,sgtl5000"; + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + VDDA-supply = <®_2p5v>; + VDDIO-supply = <®_vref_1v8>; + }; +}; + +&i2c4 { + polytouch: touchscreen@38 { + compatible = "edt,edt-ft5x06"; + reg = <0x38>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_touchscreen>; + interrupt-parent = <&gpio2>; + interrupts = <13 IRQ_TYPE_EDGE_FALLING>; + reset-gpios = <&gpio2 4 GPIO_ACTIVE_LOW>; + touchscreen-size-x = <800>; + touchscreen-size-y = <480>; + }; +}; + +&iomuxc { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hog>; + + pinctrl_hog: hoggrp { + fsl,pins = < + MX7D_PAD_EPDC_DATA00__GPIO2_IO0 0x14 + MX7D_PAD_EPDC_DATA01__GPIO2_IO1 0x14 + MX7D_PAD_EPDC_DATA02__GPIO2_IO2 0x14 + MX7D_PAD_EPDC_DATA03__GPIO2_IO3 0x14 + MX7D_PAD_EPDC_DATA05__GPIO2_IO5 0x14 + MX7D_PAD_EPDC_DATA12__GPIO2_IO12 0x14 + MX7D_PAD_EPDC_DATA07__GPIO2_IO7 0x14 + >; + }; + + pinctrl_gpio_leds: gpioledsgrp { + fsl,pins = < + MX7D_PAD_EPDC_DATA06__GPIO2_IO6 0x14 + >; + }; + + pinctrl_touchscreen: touchscreengrp { + fsl,pins = < + MX7D_PAD_EPDC_DATA04__GPIO2_IO4 0x14 + MX7D_PAD_EPDC_DATA13__GPIO2_IO13 0x14 + >; + }; + +}; diff --git a/arch/arm/dts/imx7d-pico.dtsi b/arch/arm/dts/imx7d-pico.dtsi new file mode 100644 index 0000000..3fd595a --- /dev/null +++ b/arch/arm/dts/imx7d-pico.dtsi @@ -0,0 +1,585 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// +// Copyright 2017 NXP + +/dts-v1/; + +#include "imx7d.dtsi" + +/ { + /* Will be filled by the bootloader */ + memory@80000000 { + device_type = "memory"; + reg = <0x80000000 0>; + }; + + reg_wlreg_on: regulator-wlreg_on { + compatible = "regulator-fixed"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_reg_wlreg_on>; + regulator-name = "wlreg_on"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + gpio = <&gpio4 16 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; + + reg_2p5v: regulator-2p5v { + compatible = "regulator-fixed"; + regulator-name = "2P5V"; + regulator-min-microvolt = <2500000>; + regulator-max-microvolt = <2500000>; + regulator-always-on; + }; + + reg_3p3v: regulator-3p3v { + compatible = "regulator-fixed"; + regulator-name = "3P3V"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + reg_usb_otg1_vbus: regulator-usb-otg1-vbus { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usbotg1_pwr>; + compatible = "regulator-fixed"; + regulator-name = "usb_otg1_vbus"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + gpio = <&gpio4 5 GPIO_ACTIVE_LOW>; + }; + + reg_usb_otg2_vbus: regulator-usb-otg2-vbus { + compatible = "regulator-fixed"; + regulator-name = "usb_otg2_vbus"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + }; + + reg_vref_1v8: regulator-vref-1v8 { + compatible = "regulator-fixed"; + regulator-name = "vref-1v8"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + usdhc2_pwrseq: usdhc2_pwrseq { + compatible = "mmc-pwrseq-simple"; + clocks = <&clks IMX7D_CLKO2_ROOT_DIV>; + clock-names = "ext_clock"; + }; +}; + +&clks { + assigned-clocks = <&clks IMX7D_CLKO2_ROOT_SRC>, + <&clks IMX7D_CLKO2_ROOT_DIV>; + assigned-clock-parents = <&clks IMX7D_CKIL>; + assigned-clock-rates = <0>, <32768>; +}; + +&ecspi3 { + cs-gpios = <&gpio4 11 GPIO_ACTIVE_LOW>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ecspi3>; + status = "okay"; +}; + +&fec1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_enet1>; + assigned-clocks = <&clks IMX7D_ENET1_TIME_ROOT_SRC>, + <&clks IMX7D_ENET1_TIME_ROOT_CLK>; + assigned-clock-parents = <&clks IMX7D_PLL_ENET_MAIN_100M_CLK>; + assigned-clock-rates = <0>, <100000000>; + phy-mode = "rgmii"; + phy-handle = <ðphy0>; + fsl,magic-packet; + phy-reset-gpios = <&gpio6 11 GPIO_ACTIVE_LOW>; + status = "okay"; + + mdio { + #address-cells = <1>; + #size-cells = <0>; + + ethphy0: ethernet-phy@1 { + compatible = "ethernet-phy-ieee802.3-c22"; + reg = <1>; + status = "okay"; + }; + }; +}; + +&flexcan1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_can1>; + status = "okay"; +}; + +&flexcan2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_can2>; + status = "okay"; +}; + +&i2c1 { + clock-frequency = <100000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c1>; + status = "okay"; +}; + +&i2c2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c2>; + status = "okay"; +}; + +&i2c4 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c4>; + status = "okay"; + + pmic: pfuze3000@8 { + compatible = "fsl,pfuze3000"; + reg = <0x08>; + + regulators { + sw1a_reg: sw1a { + regulator-min-microvolt = <700000>; + regulator-max-microvolt = <3300000>; + regulator-boot-on; + regulator-always-on; + regulator-ramp-delay = <6250>; + }; + /* use sw1c_reg to align with pfuze100/pfuze200 */ + sw1c_reg: sw1b { + regulator-min-microvolt = <700000>; + regulator-max-microvolt = <1475000>; + regulator-boot-on; + regulator-always-on; + regulator-ramp-delay = <6250>; + }; + + sw2_reg: sw2 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1850000>; + regulator-boot-on; + regulator-always-on; + }; + + sw3a_reg: sw3 { + regulator-min-microvolt = <900000>; + regulator-max-microvolt = <1650000>; + regulator-boot-on; + regulator-always-on; + }; + + swbst_reg: swbst { + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5150000>; + }; + + 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; + }; + + vgen1_reg: vldo1 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + vgen2_reg: vldo2 { + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <1550000>; + }; + + vgen3_reg: vccsd { + regulator-min-microvolt = <2850000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + vgen4_reg: v33 { + regulator-min-microvolt = <2850000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + vgen5_reg: vldo3 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + vgen6_reg: vldo4 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + }; + }; +}; + +&sai1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sai1>; + assigned-clocks = <&clks IMX7D_SAI1_ROOT_SRC>, + <&clks IMX7D_SAI1_ROOT_CLK>; + assigned-clock-parents = <&clks IMX7D_PLL_AUDIO_POST_DIV>; + assigned-clock-rates = <0>, <24576000>; + status = "okay"; +}; + + +&pwm1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pwm1>; + status = "okay"; +}; + +&pwm2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pwm2>; + status = "okay"; +}; + +&pwm3 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pwm3>; + status = "okay"; +}; + +&pwm4 { /* Backlight */ + status = "okay"; +}; + +&uart5 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart5>; + assigned-clocks = <&clks IMX7D_UART5_ROOT_SRC>; + assigned-clock-parents = <&clks IMX7D_PLL_SYS_MAIN_240M_CLK>; + status = "okay"; +}; + +&uart6 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart6>; + assigned-clocks = <&clks IMX7D_UART6_ROOT_SRC>; + assigned-clock-parents = <&clks IMX7D_OSC_24M_CLK>; + uart-has-rtscts; + status = "okay"; +}; + +&uart7 { /* Bluetooth */ + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart7>; + assigned-clocks = <&clks IMX7D_UART7_ROOT_SRC>; + assigned-clock-parents = <&clks IMX7D_PLL_SYS_MAIN_240M_CLK>; + uart-has-rtscts; + status = "okay"; +}; + +&usbotg1 { + vbus-supply = <®_usb_otg1_vbus>; + status = "okay"; +}; + +&usbotg2 { + vbus-supply = <®_usb_otg2_vbus>; + dr_mode = "host"; + status = "okay"; +}; + +&usdhc1 { + pinctrl-names = "default", "state_100mhz", "state_200mhz"; + pinctrl-0 = <&pinctrl_usdhc1>; + pinctrl-1 = <&pinctrl_usdhc1_100mhz>; + pinctrl-2 = <&pinctrl_usdhc1_200mhz>; + cd-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>; + bus-width = <4>; + tuning-step = <2>; + vmmc-supply = <®_3p3v>; + wakeup-source; + no-1-8-v; + keep-power-in-suspend; + status = "okay"; +}; + +&usdhc2 { /* Wifi SDIO */ + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usdhc2 &pinctrl_wifi_clk>; + no-1-8-v; + non-removable; + keep-power-in-suspend; + wakeup-source; + vmmc-supply = <®_wlreg_on>; + mmc-pwrseq = <&usdhc2_pwrseq>; + status = "okay"; +}; + +&usdhc3 { + pinctrl-names = "default", "state_100mhz", "state_200mhz"; + pinctrl-0 = <&pinctrl_usdhc3>; + pinctrl-1 = <&pinctrl_usdhc3_100mhz>; + pinctrl-2 = <&pinctrl_usdhc3_200mhz>; + assigned-clocks = <&clks IMX7D_USDHC3_ROOT_CLK>; + assigned-clock-rates = <400000000>; + bus-width = <8>; + no-1-8-v; + fsl,tuning-step = <2>; + non-removable; + status = "okay"; +}; + +&wdog1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_wdog>; + fsl,ext-reset-output; + status = "okay"; +}; + +&iomuxc { + pinctrl_ecspi3: ecspi3grp { + fsl,pins = < + MX7D_PAD_I2C1_SCL__ECSPI3_MISO 0x2 + MX7D_PAD_I2C1_SDA__ECSPI3_MOSI 0x2 + MX7D_PAD_I2C2_SCL__ECSPI3_SCLK 0x2 + MX7D_PAD_I2C2_SDA__GPIO4_IO11 0x14 + >; + }; + + pinctrl_i2c1: i2c1grp { + fsl,pins = < + MX7D_PAD_UART1_TX_DATA__I2C1_SDA 0x4000007f + MX7D_PAD_UART1_RX_DATA__I2C1_SCL 0x4000007f + >; + }; + + pinctrl_i2c2: i2c2grp { + fsl,pins = < + MX7D_PAD_UART2_TX_DATA__I2C2_SDA 0x4000007f + MX7D_PAD_UART2_RX_DATA__I2C2_SCL 0x4000007f + >; + }; + + pinctrl_enet1: enet1grp { + fsl,pins = < + MX7D_PAD_SD2_CD_B__ENET1_MDIO 0x3 + MX7D_PAD_SD2_WP__ENET1_MDC 0x3 + MX7D_PAD_ENET1_RGMII_TXC__ENET1_RGMII_TXC 0x1 + MX7D_PAD_ENET1_RGMII_TD0__ENET1_RGMII_TD0 0x1 + MX7D_PAD_ENET1_RGMII_TD1__ENET1_RGMII_TD1 0x1 + MX7D_PAD_ENET1_RGMII_TD2__ENET1_RGMII_TD2 0x1 + MX7D_PAD_ENET1_RGMII_TD3__ENET1_RGMII_TD3 0x1 + MX7D_PAD_ENET1_RGMII_TX_CTL__ENET1_RGMII_TX_CTL 0x1 + MX7D_PAD_ENET1_RGMII_RXC__ENET1_RGMII_RXC 0x1 + MX7D_PAD_ENET1_RGMII_RD0__ENET1_RGMII_RD0 0x1 + MX7D_PAD_ENET1_RGMII_RD1__ENET1_RGMII_RD1 0x1 + MX7D_PAD_ENET1_RGMII_RD2__ENET1_RGMII_RD2 0x1 + MX7D_PAD_ENET1_RGMII_RD3__ENET1_RGMII_RD3 0x1 + MX7D_PAD_ENET1_RGMII_RX_CTL__ENET1_RGMII_RX_CTL 0x1 + MX7D_PAD_SD3_RESET_B__GPIO6_IO11 0x1 /* Ethernet reset */ + >; + }; + + pinctrl_can1: can1frp { + fsl,pins = < + MX7D_PAD_SAI1_RX_DATA__FLEXCAN1_RX 0x59 + MX7D_PAD_SAI1_TX_BCLK__FLEXCAN1_TX 0x59 + >; + }; + + pinctrl_can2: can2frp { + fsl,pins = < + MX7D_PAD_SAI1_TX_SYNC__FLEXCAN2_RX 0x59 + MX7D_PAD_SAI1_TX_DATA__FLEXCAN2_TX 0x59 + >; + }; + + pinctrl_i2c4: i2c4grp { + fsl,pins = < + MX7D_PAD_SAI1_RX_BCLK__I2C4_SDA 0x4000007f + MX7D_PAD_SAI1_RX_SYNC__I2C4_SCL 0x4000007f + >; + }; + + pinctrl_pwm1: pwm1 { + fsl,pins = < + MX7D_PAD_GPIO1_IO08__PWM1_OUT 0x7f + >; + }; + + pinctrl_pwm2: pwm2 { + fsl,pins = < + MX7D_PAD_GPIO1_IO09__PWM2_OUT 0x7f + >; + }; + + pinctrl_pwm3: pwm3 { + fsl,pins = < + MX7D_PAD_GPIO1_IO10__PWM3_OUT 0x7f + >; + }; + + pinctrl_reg_wlreg_on: regregongrp { + fsl,pins = < + MX7D_PAD_ECSPI1_SCLK__GPIO4_IO16 0x59 + >; + }; + + pinctrl_sai1: sai1grp { + fsl,pins = < + MX7D_PAD_ENET1_RX_CLK__SAI1_TX_BCLK 0x1f + MX7D_PAD_ENET1_CRS__SAI1_TX_SYNC 0x1f + MX7D_PAD_ENET1_COL__SAI1_TX_DATA0 0x30 + MX7D_PAD_ENET1_TX_CLK__SAI1_RX_DATA0 0x1f + >; + }; + + pinctrl_uart5: uart5grp { + fsl,pins = < + MX7D_PAD_I2C4_SDA__UART5_DCE_TX 0x79 + MX7D_PAD_I2C4_SCL__UART5_DCE_RX 0x79 + >; + }; + + pinctrl_uart6: uart6grp { + fsl,pins = < + MX7D_PAD_EPDC_DATA08__UART6_DCE_RX 0x79 + MX7D_PAD_EPDC_DATA09__UART6_DCE_TX 0x79 + MX7D_PAD_EPDC_DATA10__UART6_DCE_RTS 0x79 + MX7D_PAD_EPDC_DATA11__UART6_DCE_CTS 0x79 + >; + }; + + pinctrl_uart7: uart7grp { + fsl,pins = < + MX7D_PAD_ECSPI2_MOSI__UART7_DCE_TX 0x79 + MX7D_PAD_ECSPI2_SCLK__UART7_DCE_RX 0x79 + MX7D_PAD_ECSPI2_SS0__UART7_DCE_CTS 0x79 + MX7D_PAD_ECSPI2_MISO__UART7_DCE_RTS 0x79 + >; + }; + + pinctrl_usbotg1_pwr: usbotg_pwr { + fsl,pins = < + MX7D_PAD_UART3_TX_DATA__GPIO4_IO5 0x14 + >; + }; + + pinctrl_usdhc1: usdhc1grp { + fsl,pins = < + MX7D_PAD_SD1_CMD__SD1_CMD 0x59 + MX7D_PAD_SD1_CLK__SD1_CLK 0x19 + MX7D_PAD_SD1_DATA0__SD1_DATA0 0x59 + MX7D_PAD_SD1_DATA1__SD1_DATA1 0x59 + MX7D_PAD_SD1_DATA2__SD1_DATA2 0x59 + MX7D_PAD_SD1_DATA3__SD1_DATA3 0x59 + MX7D_PAD_SD1_CD_B__GPIO5_IO0 0x15 + >; + }; + + pinctrl_usdhc1_100mhz: usdhc1grp_100mhz { + fsl,pins = < + MX7D_PAD_SD1_CMD__SD1_CMD 0x5a + MX7D_PAD_SD1_CLK__SD1_CLK 0x1a + MX7D_PAD_SD1_DATA0__SD1_DATA0 0x5a + MX7D_PAD_SD1_DATA1__SD1_DATA1 0x5a + MX7D_PAD_SD1_DATA2__SD1_DATA2 0x5a + MX7D_PAD_SD1_DATA3__SD1_DATA3 0x5a + MX7D_PAD_SD1_CD_B__GPIO5_IO0 0x15 + >; + }; + + pinctrl_usdhc1_200mhz: usdhc1grp_200mhz { + fsl,pins = < + MX7D_PAD_SD1_CMD__SD1_CMD 0x5b + MX7D_PAD_SD1_CLK__SD1_CLK 0x1b + MX7D_PAD_SD1_DATA0__SD1_DATA0 0x5b + MX7D_PAD_SD1_DATA1__SD1_DATA1 0x5b + MX7D_PAD_SD1_DATA2__SD1_DATA2 0x5b + MX7D_PAD_SD1_DATA3__SD1_DATA3 0x5b + MX7D_PAD_SD1_CD_B__GPIO5_IO0 0x15 + >; + }; + + pinctrl_usdhc2: usdhc2grp { + fsl,pins = < + MX7D_PAD_SD2_CMD__SD2_CMD 0x59 + MX7D_PAD_SD2_CLK__SD2_CLK 0x19 + MX7D_PAD_SD2_DATA0__SD2_DATA0 0x59 + MX7D_PAD_SD2_DATA1__SD2_DATA1 0x59 + MX7D_PAD_SD2_DATA2__SD2_DATA2 0x59 + MX7D_PAD_SD2_DATA3__SD2_DATA3 0x59 + >; + }; + + pinctrl_usdhc3: usdhc3grp { + fsl,pins = < + MX7D_PAD_SD3_CMD__SD3_CMD 0x59 + MX7D_PAD_SD3_CLK__SD3_CLK 0x19 + MX7D_PAD_SD3_DATA0__SD3_DATA0 0x59 + MX7D_PAD_SD3_DATA1__SD3_DATA1 0x59 + MX7D_PAD_SD3_DATA2__SD3_DATA2 0x59 + MX7D_PAD_SD3_DATA3__SD3_DATA3 0x59 + MX7D_PAD_SD3_DATA4__SD3_DATA4 0x59 + MX7D_PAD_SD3_DATA5__SD3_DATA5 0x59 + MX7D_PAD_SD3_DATA6__SD3_DATA6 0x59 + MX7D_PAD_SD3_DATA7__SD3_DATA7 0x59 + >; + }; + + pinctrl_usdhc3_100mhz: usdhc3grp_100mhz { + fsl,pins = < + MX7D_PAD_SD3_CMD__SD3_CMD 0x5a + MX7D_PAD_SD3_CLK__SD3_CLK 0x1a + MX7D_PAD_SD3_DATA0__SD3_DATA0 0x5a + MX7D_PAD_SD3_DATA1__SD3_DATA1 0x5a + MX7D_PAD_SD3_DATA2__SD3_DATA2 0x5a + MX7D_PAD_SD3_DATA3__SD3_DATA3 0x5a + MX7D_PAD_SD3_DATA4__SD3_DATA4 0x5a + MX7D_PAD_SD3_DATA5__SD3_DATA5 0x5a + MX7D_PAD_SD3_DATA6__SD3_DATA6 0x5a + MX7D_PAD_SD3_DATA7__SD3_DATA7 0x5a + >; + }; + + pinctrl_usdhc3_200mhz: usdhc3grp_200mhz { + fsl,pins = < + MX7D_PAD_SD3_CMD__SD3_CMD 0x5b + MX7D_PAD_SD3_CLK__SD3_CLK 0x1b + MX7D_PAD_SD3_DATA0__SD3_DATA0 0x5b + MX7D_PAD_SD3_DATA1__SD3_DATA1 0x5b + MX7D_PAD_SD3_DATA2__SD3_DATA2 0x5b + MX7D_PAD_SD3_DATA3__SD3_DATA3 0x5b + MX7D_PAD_SD3_DATA4__SD3_DATA4 0x5b + MX7D_PAD_SD3_DATA5__SD3_DATA5 0x5b + MX7D_PAD_SD3_DATA6__SD3_DATA6 0x5b + MX7D_PAD_SD3_DATA7__SD3_DATA7 0x5b + >; + }; +}; + +&iomuxc_lpsr { + pinctrl_wifi_clk: wificlkgrp { + fsl,pins = < + MX7D_PAD_LPSR_GPIO1_IO03__CCM_CLKO2 0x7d + >; + }; + + pinctrl_wdog: wdoggrp { + fsl,pins = < + MX7D_PAD_LPSR_GPIO1_IO00__WDOG1_WDOG_B 0x74 + >; + }; +}; From patchwork Wed Apr 24 03:59:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Nie X-Patchwork-Id: 1089887 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=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="YkESBsek"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44pmyq47TBz9s4Y for ; Wed, 24 Apr 2019 14:08:51 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 3B87FC21DA1; Wed, 24 Apr 2019 04:05: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.8 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID, UPPERCASE_50_75 autolearn=no autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id CDF60C21DD4; Wed, 24 Apr 2019 04:05:42 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4CA30C21E1B; Wed, 24 Apr 2019 04:00:42 +0000 (UTC) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by lists.denx.de (Postfix) with ESMTPS id 9F6B4C21DD7 for ; Wed, 24 Apr 2019 04:00:42 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id f14so22409468wrj.5 for ; Tue, 23 Apr 2019 21:00:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=k0CTb7LbRxTC7bjhnR76OtY+HFSA7l0BYOcIDOwXo8k=; b=YkESBsekztimqCxWX1zldnmOH4VE/hc3W+fcA7bPYlhPE/ll8urBCe3F2vJApqIjjI 3vBjcyyRS1w+nxUPQqQiA+I5aJs4VD9BsrMdnFhWtSSUVd3oIyY4GjaIKkRv/pbKVfq9 RPRg5taxoHfbwxWO0FzlBuu31wqULKqIcKD0lRRdtvFgL7vUkuXNvyZJmkVvOFX4Nk8z ht95iGHqmPBDnWUm9cVbLBdsJdDWGqO/ENqqjl3L/oI/mfEWn29W1O5dw8t/U8Q4TNVJ Tt3miINCkBOf11Aka5TPjK6GFemUKDKuJbeVETzVTT1Pnb4b/we+gd9jH7vkph4hPOx8 mcdQ== 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=k0CTb7LbRxTC7bjhnR76OtY+HFSA7l0BYOcIDOwXo8k=; b=dz5QQNJynAjpQcVUaj2prcmR46SmdutOf7hf0EnufFY+g/O+b0JGLwOjd1lhW9Q4yu 9fwvI5T3hw5K1hEh092dcxkqbk8jPmETgTPmnRhqRU0zgBPGQ7PMEVBUCXmr2XEb0gMH KpCvy5nCZW2clAXe6jmb/X3cuS5+mru79lSbDXHLNr4xHIksMo+hFh+TXmxjGyPu9IW5 GgcPqzoRQqBKgJ8SzElDDqAQa/Uf4HEEuE48gaSy5VuJA+AhSdKpt/txNpgWgWuxUc+A p7xyfaOgqg/4Wl7TwfJR8N2Fm5B144akusTiuv+NN8eo37Ccck4EZi3P6zmq3Hvb4V3C MdOw== X-Gm-Message-State: APjAAAUW0PfncBRCvQEkloDC+hL8yuqFsA8DyZjTkE4ggLrLDBbP0gTB HlnL/MsFwsmudC2leoNiZY7SaA== X-Google-Smtp-Source: APXvYqxge5YvwRckS8IMy3tofV61FhNcTH2VKWNjRKbmgAW/IRvhDiLIPPoaf8aAOe4NQ8GMaeYJRg== X-Received: by 2002:a5d:424b:: with SMTP id s11mr20382750wrr.158.1556078442365; Tue, 23 Apr 2019 21:00:42 -0700 (PDT) Received: from localhost.localdomain (li1805-140.members.linode.com. [172.104.229.140]) by smtp.gmail.com with ESMTPSA id x192sm26613948wmf.48.2019.04.23.21.00.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Apr 2019 21:00:41 -0700 (PDT) From: Jun Nie To: festevam@gmail.com, otavio@ossystems.com.br, peng.fan@nxp.com, vanessa.maegima@nxp.com, bryan.odonoghue@linaro.org, u-boot@lists.denx.de Date: Wed, 24 Apr 2019 11:59:31 +0800 Message-Id: <1556078372-26851-9-git-send-email-jun.nie@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1556078372-26851-1-git-send-email-jun.nie@linaro.org> References: <1556078372-26851-1-git-send-email-jun.nie@linaro.org> Subject: [U-Boot] [PATCH v3 8/9] pico-imx7d: Add bl33 config 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 default configuration to run u-boot as BL33 in the boot flow case of ATF(ARM Trusted Firmware) -> OPTEE -> U-boot. Signed-off-by: Jun Nie --- configs/pico-imx7d_bl33_defconfig | 63 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 configs/pico-imx7d_bl33_defconfig diff --git a/configs/pico-imx7d_bl33_defconfig b/configs/pico-imx7d_bl33_defconfig new file mode 100644 index 0000000..a896cb3 --- /dev/null +++ b/configs/pico-imx7d_bl33_defconfig @@ -0,0 +1,63 @@ +CONFIG_ARM=y +CONFIG_ARCH_MX7=y +CONFIG_SYS_TEXT_BASE=0x87800000 +CONFIG_SPL_GPIO_SUPPORT=y +CONFIG_SPL_LIBCOMMON_SUPPORT=y +CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_SECURE_BOOT=y +CONFIG_TARGET_PICO_IMX7D=y +CONFIG_SPL_MMC_SUPPORT=y +CONFIG_SPL_SERIAL_SUPPORT=y +CONFIG_SPL=y +CONFIG_ARMV7_BOOT_SEC_DEFAULT=y +CONFIG_IMX_CONSOLE_UART_ID=5 +CONFIG_FIT=y +CONFIG_FIT_SIGNATURE=y +CONFIG_FIT_VERBOSE=y +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" +CONFIG_DEFAULT_FDT_FILE="imx7d-pico-pi.dtb" +CONFIG_BOUNCE_BUFFER=y +CONFIG_SPL_I2C_SUPPORT=y +CONFIG_SPL_USB_HOST_SUPPORT=y +CONFIG_SPL_USB_GADGET=y +CONFIG_SPL_USB_SDP_SUPPORT=y +CONFIG_HUSH_PARSER=y +# CONFIG_CMD_BOOTD is not set +CONFIG_CMD_BOOTZ=y +CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_WRITE_SIZE=0x20000 +CONFIG_CMD_MEMTEST=y +CONFIG_CMD_DFU=y +CONFIG_CMD_GPIO=y +CONFIG_CMD_GPT=y +CONFIG_CMD_I2C=y +CONFIG_CMD_MMC=y +CONFIG_CMD_USB=y +CONFIG_CMD_USB_SDP=y +CONFIG_CMD_USB_MASS_STORAGE=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PXE=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y +CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-pi" +CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_DFU_MMC=y +CONFIG_FSL_ESDHC=y +CONFIG_PHYLIB=y +CONFIG_MII=y +CONFIG_USB=y +CONFIG_USB_EHCI_HCD=y +CONFIG_MXC_USB_OTG_HACTIVE=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_USB_GADGET_DOWNLOAD=y +CONFIG_USB_ETHER=y +CONFIG_USB_ETH_CDC=y +CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00" +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_OPTEE_TZDRAM_SIZE=0x2000000 From patchwork Wed Apr 24 03:59:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Nie X-Patchwork-Id: 1089883 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=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="tTy2fc7q"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44pmyB6r0Rz9s3q for ; Wed, 24 Apr 2019 14:08:18 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 829B2C21E08; Wed, 24 Apr 2019 04:04:26 +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=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 EE950C21DFA; Wed, 24 Apr 2019 04:04:24 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 0DEA3C21DC1; Wed, 24 Apr 2019 04:00:47 +0000 (UTC) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by lists.denx.de (Postfix) with ESMTPS id 3DFE9C21E07 for ; Wed, 24 Apr 2019 04:00:47 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id c6so17307373wrm.1 for ; Tue, 23 Apr 2019 21:00:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/ZKFrtkUlBWsVq/skUDCFdBAKNMIWRByFM1Q9x8LXaE=; b=tTy2fc7q/NVs9F7cT0MDviYmpn5MNALusOfdSjgtFVbF+yF5tPlyHMaIdyhdFvnWiz RDEqKAQ/clXpkbj7tC7dKO1xAsO2yct7VJ9ZXOsOawI694yimR+bB2IKxzvIG0+kZOFn fRRsx7BpLoVk4kmkTcPH9rVgICPtxzbnwzlQR5nrHsI+NY1TB4gtYYozQK2AasNJa9V9 us+01zUxLlq+EfTvKIGuN7SKyWaUTvVE1hVoRkpU6hjwZW7x9++jrRgr4At2CrbaAkV6 yJyqXvk92ve/2A2UK3iw2Ez+fpl2VosppVC1xVnSbRM2rCq48ee9qwXpyoHoA0DiT9d4 Qdtw== 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=/ZKFrtkUlBWsVq/skUDCFdBAKNMIWRByFM1Q9x8LXaE=; b=GJ1qsBj5xFVnaRqfxojVQx0Z+eUvGP2G7yaHeG8iLOjO503G+N+S45owJRGB+WIfHr d5wBEHldu6BP8FTdGlJECmKWBhQx0wNm85cNni1hK0zvUgE9cucVh1avkGNhchmRpw/e eJKnEFxc/tnHM2M295SB2WxxM26dRU50skpQiLlpte12q27YRRZWAsqo8gqUirvD9+8Z BPHaA7hJeE+bu8tilGxB2I8hNudiNzzytT4sMcwbEyiTx1+bcsF5kiGUS8/xL3BRn/Gc Jzt8SP2bQkt6JT1Qb6Q2vWjBgOrFy9X/0aKtb6LqydpoGmJlJqyXMRTkq1Wb4UuD2NoF 0KjA== X-Gm-Message-State: APjAAAXL5+JHruCLxXUH58D4cFb1a7uhszaOGP7QBIYJptEm52VfO17x 3KlkgVJkyVYeP7+XAJ4mx03Mcg== X-Google-Smtp-Source: APXvYqwD5bNYo8C1/8fwagojPaNyJizg/AQybZWaJ0z6c9VU1YTGGOOVqjgNG72FlQVBpRb8QCD4iQ== X-Received: by 2002:adf:dd89:: with SMTP id x9mr2420079wrl.8.1556078446896; Tue, 23 Apr 2019 21:00:46 -0700 (PDT) Received: from localhost.localdomain (li1805-140.members.linode.com. [172.104.229.140]) by smtp.gmail.com with ESMTPSA id x192sm26613948wmf.48.2019.04.23.21.00.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Apr 2019 21:00:46 -0700 (PDT) From: Jun Nie To: festevam@gmail.com, otavio@ossystems.com.br, peng.fan@nxp.com, vanessa.maegima@nxp.com, bryan.odonoghue@linaro.org, u-boot@lists.denx.de Date: Wed, 24 Apr 2019 11:59:32 +0800 Message-Id: <1556078372-26851-10-git-send-email-jun.nie@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1556078372-26851-1-git-send-email-jun.nie@linaro.org> References: <1556078372-26851-1-git-send-email-jun.nie@linaro.org> Subject: [U-Boot] [PATCH v3 9/9] pico-imx7d: README: Add BL33 usage case 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 Documentation of BL33 usage case. U-boot is in non-secure world in this case. Signed-off-by: Jun Nie --- board/technexion/pico-imx7d/README.pico-imx7d_BL33 | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 board/technexion/pico-imx7d/README.pico-imx7d_BL33 diff --git a/board/technexion/pico-imx7d/README.pico-imx7d_BL33 b/board/technexion/pico-imx7d/README.pico-imx7d_BL33 new file mode 100644 index 0000000..40324ff --- /dev/null +++ b/board/technexion/pico-imx7d/README.pico-imx7d_BL33 @@ -0,0 +1,44 @@ +This document describes the instruction to build and flash ATF/OPTEE/U-Boot on +pico-imx7d board. U-Boot is loaded as part of FIP image by ATF in this setup. +The boot sequence is ATF -> OPTEE -> U-Boot -> Linux. U-Boot is in non-secure +world in this case. + +- Build u-boot + Set environment variable of CROSS_COMPILE for your toolchain and ARCH=arm + $ make pico-imx7d_bl33_defconfig + $ make all + +- Download and build OPTEE + $ git clone git@github.com:OP-TEE/optee_os.git + $ make PLATFORM=imx PLATFORM_FLAVOR=mx7dpico_mbl CFG_BOOT_SECONDARY_REQUEST=y ARCH=arm + +- Download and build ATF + $ git clone https://git.linaro.org/landing-teams/working/mbl/arm-trusted-firmware.git -b linaro-imx7 + $ make DEBUG=1 PLAT=picopi ARCH=aarch32 ARM_ARCH_MAJOR=7 \ + CROSS_COMPILE=arm-linux-gnueabihf- LOG_LEVEL=50 V=1 \ + CRASH_REPORTING=1 AARCH32_SP=optee all + Save file content in this link to file pico-imx7d.cfg: + http://git.linaro.org/landing-teams/working/mbl/u-boot.git/tree/board/technexion/pico-imx7d/pico-imx7d.cfg?h=linaro-imx + $ u-boot/tools/mkimage -n pico-imx7d.cfg -T imximage -e 0x9df00000 -d \ + build/picopi/debug/bl2.bin bl2.imx + +- Create FIP image + Create a fiptool_images/ folder in ATF folder, copy u-boot.bin in u-boot +folder and tee*.bin in optee out/arm-plat-imx/core/tee/ folder to +fiptool_images. Run below command in ATF folder to generate FIP image. + $ make -C tools/fiptool/ + $ tools/fiptool/fiptool create --tos-fw fiptool_images/tee-header_v2.bin \ + --tos-fw-extra1 fiptool_images/tee-pager_v2.bin \ + --tos-fw-extra2 fiptool_images/tee-pageable_v2.bin \ + --nt-fw fiptool_images/u-boot.bin \ + fip.bin + +- Burn the images to eMMC for test. + Run below command in atf folder: + $ dd if=build/picopi/debug/bl2.bin.imx of=/dev/disk/by-id/usb- bs=1024 seek=1;sync + $ dd if=fip.bin of=/dev/disk/by-id/usb- bs=1024 seek=1;sync + +- Test + Just boot up your board and wait for u-boot start up after ATF's log. + For booting Linux in FIT image, please reference the FIT files in + u-boot doc/uImage.FIT/ folder.