From patchwork Mon Nov 27 23:02:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Breno Matheus Lima X-Patchwork-Id: 841897 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ozf2nNR8"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3ym2Qf4tVFz9ryQ for ; Tue, 28 Nov 2017 10:03:21 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id D5598C21D79; Mon, 27 Nov 2017 23:03: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=FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, 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 D828BC21C4C; Mon, 27 Nov 2017 23:03:09 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 5C2FCC21C4C; Mon, 27 Nov 2017 23:03:08 +0000 (UTC) Received: from mail-qt0-f194.google.com (mail-qt0-f194.google.com [209.85.216.194]) by lists.denx.de (Postfix) with ESMTPS id 962FDC21C29 for ; Mon, 27 Nov 2017 23:03:07 +0000 (UTC) Received: by mail-qt0-f194.google.com with SMTP id 33so32507570qtv.1 for ; Mon, 27 Nov 2017 15:03:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=wcX1DkEeN+eGRKAGKvmmM3D7HUV5Pbpyism72txMivI=; b=ozf2nNR8YeegVwEh6uRzP7ulL/v4LoqH2wcQkZ2ZpYKk+ZHge96Q/FA0yNGOv1AKt+ zEjAY3bmepVW/gm3pFAeW80fkJvBrvSvyC1/5DmKwPibaJdp83cGo79d+pVoOOqAa+Cj oENxgFovbPMLqflN6eoCDxMbgYO0EWVv0ifF8FmzeJBcTeSnSTrmjHw5cgDHNb+3S39N 3UTG83QENMkzyjIof5U2eyRxZuzelBTOkA/HF3grzHjwiSsqKMQ/VOipKsTsWA6AAtqU 08AzGLZiiqwdUDNVwHbp9vnZ5p9IHUo0uZruWxL6xonC3ftC81QYZjVEd/r2ZLUL7eiO 8DTQ== 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; bh=wcX1DkEeN+eGRKAGKvmmM3D7HUV5Pbpyism72txMivI=; b=TOnkXkUDIELXnvmuR5VtqFW8PvDubsF3bhP6K14UOZuvtYNdjPXbPK0K5K25NKuqlk 0MieRkWhvEF9p3dJlY4GHxYu2LZA0Ijj26FQowxuXxcHncrW/g1Kky/6sqkVbadtBuSo c1zd2i6fbNmL1QFcsgmdhH4zapZzasqSn69mvBdKgU3goQYXJI7kinv+LBok34hmHpEo MQ76aFzfpNz7rseTKz2OyfLDJADADb0IjZR1uclpxWJH/qXhp1UabmXdOpSPuCWbIDjO Gd1TRfBlCh6Nb/PqeCnX42XvaGYcoE3jHfr6hdyqX99DhaTihUK826yr5TFhgfY+rQUo FHAw== X-Gm-Message-State: AJaThX5NsApsk+EPN0zuGlgoq/7poFfcE+SmbXetoSn6N6NQy+xsWThK oFZhWytKk1GyOOtcJJLk4+A= X-Google-Smtp-Source: AGs4zMYMutk5Iitwm4tnPRnIxeBn5XUMTSW3wSabV2qPwgysvlOql5VcdhIGu65m+df1v7IW+fiVkA== X-Received: by 10.200.40.15 with SMTP id 15mr59931601qtq.74.1511823786393; Mon, 27 Nov 2017 15:03:06 -0800 (PST) Received: from localhost.localdomain ([177.137.137.188]) by smtp.gmail.com with ESMTPSA id x7sm3055221qtx.51.2017.11.27.15.03.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 27 Nov 2017 15:03:05 -0800 (PST) From: Breno Lima To: fabio.estevam@nxp.com, sbabic@denx.de Date: Mon, 27 Nov 2017 21:02:43 -0200 Message-Id: <1511823763-21123-1-git-send-email-brenomatheus@gmail.com> X-Mailer: git-send-email 2.7.4 Cc: Breno Lima , u-boot@lists.denx.de Subject: [U-Boot] [PATCH 1/5] mx6slevk: imximage.cfg: Handle the CONFIG_SECURE_BOOT 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" From: Breno Lima Secure boot is not enabled in mx6slevk imximage.cfg, add support for it. Signed-off-by: Breno Lima Reviewed-by: Fabio Estevam Acked-by: Peng Fan --- board/freescale/mx6slevk/imximage.cfg | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/board/freescale/mx6slevk/imximage.cfg b/board/freescale/mx6slevk/imximage.cfg index 024de9c..9722eb5 100644 --- a/board/freescale/mx6slevk/imximage.cfg +++ b/board/freescale/mx6slevk/imximage.cfg @@ -8,6 +8,8 @@ * * The syntax is taken as close as possible with the kwbimage */ +#define __ASSEMBLY__ +#include /* image version */ @@ -21,6 +23,13 @@ IMAGE_VERSION 2 BOOT_FROM sd /* + * Secure boot support + */ +#ifdef CONFIG_SECURE_BOOT +CSF CONFIG_CSF_SIZE +#endif + +/* * Device Configuration Data (DCD) * * Each entry must have the format: From patchwork Mon Nov 27 23:04:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Breno Matheus Lima X-Patchwork-Id: 841898 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="O6b8H6oJ"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3ym2Rs6px3z9ryQ for ; Tue, 28 Nov 2017 10:04:25 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 873AFC21DCE; Mon, 27 Nov 2017 23:04:24 +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=FREEMAIL_FROM, 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 1D440C21C4C; Mon, 27 Nov 2017 23:04:22 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 655A6C21C4C; Mon, 27 Nov 2017 23:04:20 +0000 (UTC) Received: from mail-qt0-f193.google.com (mail-qt0-f193.google.com [209.85.216.193]) by lists.denx.de (Postfix) with ESMTPS id D96F7C21C29 for ; Mon, 27 Nov 2017 23:04:19 +0000 (UTC) Received: by mail-qt0-f193.google.com with SMTP id r58so41425210qtc.0 for ; Mon, 27 Nov 2017 15:04:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=BtbaXN1yT1nKqHP+8AJYAAWMi8flCaNwO9iCwYLDf8s=; b=O6b8H6oJh8lRT1yWPJL+9otNYlHFlsrzOxZ7WU0l7EFAG9LeECsg/SzuicntgFFtVG SiarBVkgs0KR/+s9Hdzu0bSqaHlxNL78YnOOObfDG8pbxIE0Nr7LEo4/kQnutdoHpZuc hVg8jak/+sG3/9umnHDk+9JSrMFkyDAu9VEE1nGij2T3SB1Pua8tmL2ScjS5Lf1OVWJ0 buHDCGKsvnQJx9i5em2ZDzkKZIQtmwDaF/DT+gu60vl6On6Nb7DmNY+cfZw5FJ4g0bs1 sTvAv3ri/QJ0nn8Wb+34JnST2SPSzIjJOyFg47Kw6xN5ZB/Fm+RNrBTjnkxzxivW8wD4 dg9Q== 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; bh=BtbaXN1yT1nKqHP+8AJYAAWMi8flCaNwO9iCwYLDf8s=; b=kZuCpKBo6IB1DgGFrf1A0HyXugJTJ9NI/ONyi/NQUg9WWjauNfXIOg5T3UY9qex/wn kLoJXUDixs+wqzIwkLQ0xRxsRVv3uwyyCmRjLoPJ1oVtK5GtwQ2xkr/T2aC0kKE+VeSS ayYa0vEPcyFx1xq6eTg1bbLeaesI050h4FpzrluH3QhE6M1Sx/FgK1dLzKW6whV9+NSa jzwZ7Z5yZz+p25HkhuWcu0+jczFzgPTasmDBjexguVr091AFWErpotyG8TbzYomr66oS TGNAWbITzWOZ012jKvZUFh+8mCN42voWMPWsZqWWAezbqBT879H0wnDY53mJWCEiUW5A wQhQ== X-Gm-Message-State: AJaThX6KDOqzevcAeoKTvSYwWf/0Lnfh3dOp1UxL+hwtgywONiHFUqgz kWSf5LCd6w+2Dd+lzPStn6s= X-Google-Smtp-Source: AGs4zMZpqAY3o/zM4HCrxMjx4ILTrKzA6mz6b0kM8Chd1ATjxuMukRB9OIKhgL0QRDzG3Epyv1XzNA== X-Received: by 10.200.3.234 with SMTP id z42mr65528503qtg.25.1511823858908; Mon, 27 Nov 2017 15:04:18 -0800 (PST) Received: from localhost.localdomain ([177.137.137.188]) by smtp.gmail.com with ESMTPSA id 43sm7526618qtp.28.2017.11.27.15.04.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 27 Nov 2017 15:04:17 -0800 (PST) From: Breno Lima To: fabio.estevam@nxp.com, sbabic@denx.de Date: Mon, 27 Nov 2017 21:04:11 -0200 Message-Id: <1511823851-21187-1-git-send-email-brenomatheus@gmail.com> X-Mailer: git-send-email 2.7.4 Cc: Breno Lima , u-boot@lists.denx.de, otavio@ossystems.com.br Subject: [U-Boot] [PATCH 2/5] warp: imximage.cfg: Handle the CONFIG_SECURE_BOOT 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" From: Breno Lima Secure boot is not enabled in warp imximage.cfg, add support for it. Signed-off-by: Breno Lima Reviewed-by: Fabio Estevam --- board/warp/imximage.cfg | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/board/warp/imximage.cfg b/board/warp/imximage.cfg index 771dbb3..8420968 100644 --- a/board/warp/imximage.cfg +++ b/board/warp/imximage.cfg @@ -8,6 +8,8 @@ * * The syntax is taken as close as possible with the kwbimage */ +#define __ASSEMBLY__ +#include /* image version */ @@ -21,6 +23,13 @@ IMAGE_VERSION 2 BOOT_FROM sd /* + * Secure boot support + */ +#ifdef CONFIG_SECURE_BOOT +CSF CONFIG_CSF_SIZE +#endif + +/* * Device Configuration Data (DCD) * * Each entry must have the format: From patchwork Mon Nov 27 23:06:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Breno Matheus Lima X-Patchwork-Id: 841899 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="SuzrC6sO"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3ym2VP3W4Wz9ryQ for ; Tue, 28 Nov 2017 10:06:37 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 2D82CC21DB2; Mon, 27 Nov 2017 23:06: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=FREEMAIL_FROM, 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 29E8AC21C4C; Mon, 27 Nov 2017 23:06:28 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6CB37C21C4C; Mon, 27 Nov 2017 23:06:26 +0000 (UTC) Received: from mail-qk0-f196.google.com (mail-qk0-f196.google.com [209.85.220.196]) by lists.denx.de (Postfix) with ESMTPS id D51C1C21C29 for ; Mon, 27 Nov 2017 23:06:25 +0000 (UTC) Received: by mail-qk0-f196.google.com with SMTP id 78so34698185qkz.0 for ; Mon, 27 Nov 2017 15:06:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=lFaVKzGy4/5m9p9cD/flCLcTNjRoLKRV2ayUxz4g7m8=; b=SuzrC6sOgfXvpTDc5bRPlp+AF6ia9YDcmTylOtvDkzDInoocnPlkHlDJIQpgq1onqE AHVxbAdriRmZSY/hwg12wtbPNGQHvWr1sj1ICR/wY5GsnHlshLAXAkV7hi2ltgYhwrOI LOguvghWLI/8Ul+uQvEOXxySLXpt8CSQgCuIOz05TR0tvnH56VLmrM9w8g6xijDa5np5 Dzvl7rWfftWPGdYvbKjJdQAub7P1JxpONNFrCIbCBB+n6zQx07pBeRko+Lb2AE44mr7c 8q+LH5B47yb5XM36/iDeufPb3C7AWwRnUJN2lD28UtamNzLW1lnISmCd5w02mgIqgCPl Z2DQ== 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; bh=lFaVKzGy4/5m9p9cD/flCLcTNjRoLKRV2ayUxz4g7m8=; b=lfIOkYzuOWOMvy73GrxznLdmfcfUF8w0VPmMX1jNNSR8kSXEWs+bchkjYSZDQPT1Kk +BPz1/jZpgshqKkLXiC+qFW/5C1zfhfWErFZnlR5bNg5xLoGDa0iAav5PyxU5bi4lmpq 4gNvZ0yedQXrEKUuMymPf7/62Lj42GYzt9fbG3sKqq/pvHS293lx/u7RIdVlSLzwTs45 fPLic1Yi0hwtTIsL1hIO6GA2amQ8WNw0VfZHy+UxxUcikVmJcCwWSm7uUzBLSKEy8RKD XnBDh1ZT3j3kWxy5NwAyqmfjyyvcz4xjLj8K0Ee0wyqSS6EjKgdUrK7TAOI1T1MUPW8Q DgRQ== X-Gm-Message-State: AJaThX7BiJby7zz5GaLUmZw7cEMFTdcM5n1DeIBHOre9ZvIpIIkFbier RLmo6fMdt/TOmBQniBPIxB6GCf/D X-Google-Smtp-Source: AGs4zMbEdA9mRsLl34Jp0TM1rrVaScltfdQR0akmP0Zy8fuz5zfLnM33LaVKKr7BHdW+zrgHY7s52Q== X-Received: by 10.55.16.162 with SMTP id 34mr63034581qkq.78.1511823984769; Mon, 27 Nov 2017 15:06:24 -0800 (PST) Received: from localhost.localdomain ([177.137.137.188]) by smtp.gmail.com with ESMTPSA id d198sm11308155qkg.16.2017.11.27.15.06.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 27 Nov 2017 15:06:23 -0800 (PST) From: Breno Lima To: fabio.estevam@nxp.com, sbabic@denx.de Date: Mon, 27 Nov 2017 21:06:01 -0200 Message-Id: <1511823961-21258-1-git-send-email-brenomatheus@gmail.com> X-Mailer: git-send-email 2.7.4 Cc: Breno Lima , u-boot@lists.denx.de, otavio@ossystems.com.br Subject: [U-Boot] [PATCH 3/5] mx6sl: Select MX6SL option via Kconfig 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" From: Breno Lima Currently the MX6SL option is selected via CONFIG_SYS_EXTRA_OPTIONS, but it is better to select it directly via Kconfig. Signed-off-by: Breno Lima Reviewed-by: Fabio Estevam Reviewed-by: Peng Fan --- arch/arm/mach-imx/mx6/Kconfig | 2 ++ configs/mx6slevk_defconfig | 2 +- configs/mx6slevk_spinor_defconfig | 2 +- configs/mx6slevk_spl_defconfig | 2 +- configs/warp_defconfig | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig index bee7eab..4f8bb8f 100644 --- a/arch/arm/mach-imx/mx6/Kconfig +++ b/arch/arm/mach-imx/mx6/Kconfig @@ -244,6 +244,7 @@ config TARGET_MX6SABRESD config TARGET_MX6SLEVK bool "mx6slevk" + select MX6SL select SUPPORT_SPL config TARGET_MX6SLLEVK @@ -395,6 +396,7 @@ config TARGET_WANDBOARD config TARGET_WARP bool "WaRP" + select MX6SL select BOARD_LATE_INIT config TARGET_XPRESS diff --git a/configs/mx6slevk_defconfig b/configs/mx6slevk_defconfig index 7b1ddac..aafddfa 100644 --- a/configs/mx6slevk_defconfig +++ b/configs/mx6slevk_defconfig @@ -3,7 +3,7 @@ CONFIG_ARCH_MX6=y CONFIG_TARGET_MX6SLEVK=y # CONFIG_CMD_BMODE is not set CONFIG_DEFAULT_DEVICE_TREE="imx6sl-evk" -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg,MX6SL" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg" CONFIG_BOOTDELAY=3 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y diff --git a/configs/mx6slevk_spinor_defconfig b/configs/mx6slevk_spinor_defconfig index 4b9c04e..0d3cb59 100644 --- a/configs/mx6slevk_spinor_defconfig +++ b/configs/mx6slevk_spinor_defconfig @@ -3,7 +3,7 @@ CONFIG_ARCH_MX6=y CONFIG_TARGET_MX6SLEVK=y # CONFIG_CMD_BMODE is not set CONFIG_DEFAULT_DEVICE_TREE="imx6sl-evk" -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg,MX6SL" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg" CONFIG_SPI_BOOT=y CONFIG_BOOTDELAY=3 CONFIG_BOARD_EARLY_INIT_F=y diff --git a/configs/mx6slevk_spl_defconfig b/configs/mx6slevk_spl_defconfig index 05a5c9e..0dbd308 100644 --- a/configs/mx6slevk_spl_defconfig +++ b/configs/mx6slevk_spl_defconfig @@ -10,7 +10,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y # CONFIG_CMD_BMODE is not set CONFIG_DEFAULT_DEVICE_TREE="imx6sl-evk" -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6SL" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" CONFIG_BOOTDELAY=3 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SPL=y diff --git a/configs/warp_defconfig b/configs/warp_defconfig index 5e7eef0..2ac1c6c 100644 --- a/configs/warp_defconfig +++ b/configs/warp_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_WARP=y # CONFIG_CMD_BMODE is not set -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/warp/imximage.cfg,MX6SL" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/warp/imximage.cfg" CONFIG_BOOTDELAY=3 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y From patchwork Mon Nov 27 23:07:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Breno Matheus Lima X-Patchwork-Id: 841900 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="mAPueclO"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3ym2XF08T3z9ryQ for ; Tue, 28 Nov 2017 10:08:12 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id AD515C21C4F; Mon, 27 Nov 2017 23:08:02 +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=FREEMAIL_FROM, 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 ECAC5C21C4C; Mon, 27 Nov 2017 23:08:00 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id AF762C21C4C; Mon, 27 Nov 2017 23:07:59 +0000 (UTC) Received: from mail-qk0-f196.google.com (mail-qk0-f196.google.com [209.85.220.196]) by lists.denx.de (Postfix) with ESMTPS id 3C082C21C29 for ; Mon, 27 Nov 2017 23:07:59 +0000 (UTC) Received: by mail-qk0-f196.google.com with SMTP id o6so34709212qkh.3 for ; Mon, 27 Nov 2017 15:07:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=Vtwq8ANFdhHuS3D3Ll/A+l5fh0NXTF+X1pAqOfsuBtY=; b=mAPueclOSBN99BBrDGUNoEKL7/Tw+MtUizOZPf3hihiokW+wUX35JsZ4gU7qdRFRWa BeYkzdMePRg4h+62jYCY8S8cAxY5AVjtxRQhyRC/8OnqOj1sRN5mj+Px2w/vlUrD2rAY rKSptsCuEsZ6fRRCENyknLK0glWtaMHjS99rwphQ2Q+ZqHf5MU2cJryPV9E0TVKODIT6 yhLZPmV49sWyjRHl1y70gcB6oJOYDd8AnhfcAT19FUG+Vmc//46GfPLeh/5jgv0FxWDZ O4ujDh1jH3d0Y//FpOhP5bGaxqnBnZbIzbKJueh2ua1yzJpYCNAInaMbdZVXtd15sscg JFFg== 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; bh=Vtwq8ANFdhHuS3D3Ll/A+l5fh0NXTF+X1pAqOfsuBtY=; b=igU74qQHveJ6MrnFQLUjL3nQBm195YkoSPmOR0DryeFu0nMWnhy42uNEHiTl1nqLL+ M8OsJHpSLyx5ePllgiIlNiRZwkCLN4gnR8xbskFkaR6ZHuVhDgqZxUAm8EjszjJjKz/0 MxP/Za4Wq/2dcmvaclNQoDGw8ht16ukXuWppOHtoDMp0D3OArgsrzwPpW+epkktJGcDV LFn+AxnWdBMVP3v9cuHeoFCY5JpLrywJ02Kok6+FbVnKbO4myKqEosztirSJ6KPN3dGS 2JkSyxZa4q0pXmeckHIg7advY+O8KJISMQD3ccu9uZrMLjs5AGFasTQIfeheL2w0Ej+X iv5A== X-Gm-Message-State: AJaThX7YLD7j3p4AeB+IA9FiuxoZvNwmsDWhL7Dfy0OBFd82JUP8VmQ0 C0gfNU5BCo3mA0a03BsNdB4= X-Google-Smtp-Source: AGs4zMaEfZtarsu/qRK9f+AF+p1S0XeZZMhlUSRL+L4ifjb8zNa39wDo24rVWgOEMg89gwnkHMX8rQ== X-Received: by 10.55.93.198 with SMTP id r189mr27462608qkb.210.1511824078303; Mon, 27 Nov 2017 15:07:58 -0800 (PST) Received: from localhost.localdomain ([177.137.137.188]) by smtp.gmail.com with ESMTPSA id n145sm20654360qke.38.2017.11.27.15.07.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 27 Nov 2017 15:07:57 -0800 (PST) From: Breno Lima To: fabio.estevam@nxp.com, sbabic@denx.de Date: Mon, 27 Nov 2017 21:07:40 -0200 Message-Id: <1511824060-21323-1-git-send-email-brenomatheus@gmail.com> X-Mailer: git-send-email 2.7.4 Cc: Breno Lima , u-boot@lists.denx.de Subject: [U-Boot] [PATCH 4/5] Kconfig: mx6ull: Deselect MX6UL from CONFIG_MX6ULL 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" From: Breno Lima MX6UL contains features that MX6ULL doesn't support. Deselect CONFIG_MX6UL and select SYS_L2CACHE_OFF and ROM_UNIFIED_SECTIONS. The motivation for doing this change is that MX6UL supports CAAM and MX6ULL does not. Signed-off-by: Breno Lima Reviewed-by: Fabio Estevam --- arch/arm/mach-imx/mx6/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig index 4f8bb8f..279f088 100644 --- a/arch/arm/mach-imx/mx6/Kconfig +++ b/arch/arm/mach-imx/mx6/Kconfig @@ -66,8 +66,9 @@ config MX6UL_OPOS6UL select SUPPORT_SPL config MX6ULL + select SYS_L2CACHE_OFF + select ROM_UNIFIED_SECTIONS bool - select MX6UL config MX6_DDRCAL bool "Include dynamic DDR calibration routines" From patchwork Mon Nov 27 23:09:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Breno Matheus Lima X-Patchwork-Id: 841901 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="bJztzmUc"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3ym2Yp4bg4z9rxl for ; Tue, 28 Nov 2017 10:09:34 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 508A8C21DB9; Mon, 27 Nov 2017 23:09: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=FREEMAIL_FROM, 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 E212CC21C4F; Mon, 27 Nov 2017 23:09:20 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 66CAFC21C29; Mon, 27 Nov 2017 23:09:19 +0000 (UTC) Received: from mail-qk0-f193.google.com (mail-qk0-f193.google.com [209.85.220.193]) by lists.denx.de (Postfix) with ESMTPS id C11CCC21C4C for ; Mon, 27 Nov 2017 23:09:18 +0000 (UTC) Received: by mail-qk0-f193.google.com with SMTP id 78so34706906qkz.0 for ; Mon, 27 Nov 2017 15:09:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=g7RE2TOrl2QGEdJtAa9oVJegGoIlgqF3BIpV43JWKlc=; b=bJztzmUcOoXwf/YYQ7F56ysVkbCVUI9lQUFuN835iizubR2raMWK46HFcE78wZcE6v Kwq/Zo0rjOVoSc8GE7v7/dDovokPUbTmGtryvoNLVCgrHjLKRuM9zk34LlQL5VWqZVBl Bp1Bd+HBlM5li2R4+BKPqVaAxaqId2sZOlJPkGUF69qDuiHYAf5Zd5NVnJLcoAvXxfQp biTKBhvQU8aX978DNJ23xUdbpN59ULHudKBKOMdDcKZpTqeIx0jb9F7pcVNMM/E2llQV N0Kam7YPmkfCDb6sIxxHwZvuyhRRBJAg83H6fd9w0lTdQ+N8l0HpnlZuqqkCLrQ5dEG0 fOfA== 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; bh=g7RE2TOrl2QGEdJtAa9oVJegGoIlgqF3BIpV43JWKlc=; b=LGVSXlx5FCkHctIjCzJROqIDGJ01dvVEuS4TxC7Cyc58L0JIwMPJ3/jMRtG9J6f/h6 asSY+KUPR96G0EPvdH3/+k5JHgqn6qcTf0nALAy0feymSG0yEYlDT3LpzNgNBUqFZVT0 RFv27im2NRLwROZ4XAmrvac8fFaFRXnwdSFWCkV9iRPC9RnWkhsmJq/WKkjSrZGr2okh OjL4P4PF1H7mw7g/ucYZi+AVB/Lry1kbvFif7wCC5fIjAGck/e+HzFdiatvgtEt3KFhk BMvz0YPuqvgzZtkcC3vodqhupLTgM3SZhIRwnq8lWdnY1gk83YWhiNAZC/jXdIbV/xgE pg0Q== X-Gm-Message-State: AJaThX711DFNHXaAgubrxFcblU//4kRop1hkiBwG2FpAKhnsuuw6blL5 9dAeobo4iimykIwZmmxdKIw= X-Google-Smtp-Source: AGs4zMYkvxpXgyREOvP+5W1aJgw7fqDZXPSYjAf48W2bAIhtbmzf5oOAX7QuDpQVTjh07h5zSREORQ== X-Received: by 10.55.78.15 with SMTP id c15mr44940933qkb.105.1511824157788; Mon, 27 Nov 2017 15:09:17 -0800 (PST) Received: from localhost.localdomain ([177.137.137.188]) by smtp.gmail.com with ESMTPSA id m22sm20836455qtf.85.2017.11.27.15.09.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 27 Nov 2017 15:09:16 -0800 (PST) From: Breno Lima To: fabio.estevam@nxp.com, sbabic@denx.de Date: Mon, 27 Nov 2017 21:09:00 -0200 Message-Id: <1511824140-21384-1-git-send-email-brenomatheus@gmail.com> X-Mailer: git-send-email 2.7.4 Cc: Breno Lima , u-boot@lists.denx.de Subject: [U-Boot] [PATCH 5/5] imx: Kconfig: Add HAS_CAAM option 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" From: Breno Lima Currently CONFIG_SECURE_BOOT is selecting FSL_CAAM for all i.MX devices, this causes the following error when building mx6sl boards since this SoC doesn't have the CAAM block: In file included from drivers/crypto/fsl/jobdesc.c:12:0: drivers/crypto/fsl/jobdesc.c: In function 'inline_cnstr_jobdesc_blob_dek': include/fsl_sec.h:268:25: error: 'CAAM_ARB_BASE_ADDR' undeclared (first use in this function) #define SEC_MEM_PAGE1 (CAAM_ARB_BASE_ADDR + 0x1000) ^ drivers/crypto/fsl/jobdesc.c:140:21: note: in expansion of macro 'SEC_MEM_PAGE1' memcpy((uint32_t *)SEC_MEM_PAGE1, (uint32_t *)plain_txt, in_sz); ^ include/fsl_sec.h:268:25: note: each undeclared identifier is reported only once for each function it appears in #define SEC_MEM_PAGE1 (CAAM_ARB_BASE_ADDR + 0x1000) ^ drivers/crypto/fsl/jobdesc.c:140:21: note: in expansion of macro 'SEC_MEM_PAGE1' memcpy((uint32_t *)SEC_MEM_PAGE1, (uint32_t *)plain_txt, in_sz); ^ scripts/Makefile.build:280: recipe for target 'drivers/crypto/fsl/jobdesc.o' failed make[3]: *** [drivers/crypto/fsl/jobdesc.o] Error 1 scripts/Makefile.build:425: recipe for target 'drivers/crypto/fsl' failed make[2]: *** [drivers/crypto/fsl] Error 2 scripts/Makefile.build:425: recipe for target 'drivers/crypto' failed make[1]: *** [drivers/crypto] Error 2 Add HAS_CAAM configuration to avoid this error. Signed-off-by: Breno Lima Reviewed-by: Fabio Estevam --- arch/arm/mach-imx/Kconfig | 5 ++++- arch/arm/mach-imx/mx6/Kconfig | 7 +++++++ arch/arm/mach-imx/mx7/Kconfig | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index cd8b8d2..a6f67c8 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -1,3 +1,6 @@ +config HAS_CAAM + bool + config IMX_CONFIG string @@ -28,7 +31,7 @@ config USE_IMXIMG_PLUGIN config SECURE_BOOT bool "Support i.MX HAB features" depends on ARCH_MX7 || ARCH_MX6 || ARCH_MX5 - select FSL_CAAM + select FSL_CAAM if HAS_CAAM imply CMD_DEKBLOB help This option enables the support for secure boot (HAB). diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig index 279f088..8f98d9f 100644 --- a/arch/arm/mach-imx/mx6/Kconfig +++ b/arch/arm/mach-imx/mx6/Kconfig @@ -14,28 +14,34 @@ config MX6 imply CMD_FUSE config MX6D + select HAS_CAAM select MX6_SMP bool config MX6DL + select HAS_CAAM select MX6_SMP bool config MX6Q + select HAS_CAAM select MX6_SMP bool config MX6QDL + select HAS_CAAM select MX6_SMP bool config MX6S + select HAS_CAAM bool config MX6SL bool config MX6SX + select HAS_CAAM select ROM_UNIFIED_SECTIONS bool @@ -44,6 +50,7 @@ config MX6SLL bool config MX6UL + select HAS_CAAM select SYS_L2CACHE_OFF select ROM_UNIFIED_SECTIONS bool diff --git a/arch/arm/mach-imx/mx7/Kconfig b/arch/arm/mach-imx/mx7/Kconfig index 365501d..4f8b4e1 100644 --- a/arch/arm/mach-imx/mx7/Kconfig +++ b/arch/arm/mach-imx/mx7/Kconfig @@ -10,6 +10,7 @@ config MX7 default y config MX7D + select HAS_CAAM select ROM_UNIFIED_SECTIONS imply CMD_FUSE bool