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