From patchwork Mon Jul 17 17:59:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 789650 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xBB206hYzz9sRg for ; Tue, 18 Jul 2017 04:01:44 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ti.com header.i=@ti.com header.b="IT7ihvqC"; dkim-atps=neutral Received: by lists.denx.de (Postfix, from userid 105) id 8CE31C21EB9; Mon, 17 Jul 2017 18:00:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_DNSWL_NONE, 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 A2973C21E20; Mon, 17 Jul 2017 18:00:01 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 7D776C21DBE; Mon, 17 Jul 2017 17:59:53 +0000 (UTC) Received: from fllnx209.ext.ti.com (fllnx209.ext.ti.com [198.47.19.16]) by lists.denx.de (Postfix) with ESMTPS id B3AC8C21E4A for ; Mon, 17 Jul 2017 17:59:48 +0000 (UTC) Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by fllnx209.ext.ti.com (8.15.1/8.15.1) with ESMTP id v6HHxLeA018109; Mon, 17 Jul 2017 12:59:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1500314361; bh=zjA0enrY14DlFwxm0HU0aegways78ddCIvizxhgULik=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=IT7ihvqCaeCoagqtQcxK0RFzN5xAo/XiZiZ+4v2uMrS2FWk+yqCywoJm9Wxs5vznm x3x7NKAH+R+5GIckouahnIzNBxCC7EWn/IC1o5VX7+s/XlkgcnkeWYY/fRcYdyDyx2 JfFnhkHjM7nSjSZTvh5nQDh1cNQlvdVH33XXLTCk= Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id v6HHxGni020981; Mon, 17 Jul 2017 12:59:16 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.3.294.0; Mon, 17 Jul 2017 12:59:16 -0500 Received: from legion.dal.design.ti.com (legion.dal.design.ti.com [128.247.22.53]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id v6HHxGPn000864; Mon, 17 Jul 2017 12:59:16 -0500 Received: from localhost (uda0226330.dhcp.ti.com [128.247.58.236]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id v6HHxG323535; Mon, 17 Jul 2017 12:59:16 -0500 (CDT) From: "Andrew F. Davis" To: Tom Rini , Lokesh Vutla Date: Mon, 17 Jul 2017 12:59:13 -0500 Message-ID: <20170717175915.12898-3-afd@ti.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170717175915.12898-1-afd@ti.com> References: <20170717175915.12898-1-afd@ti.com> MIME-Version: 1.0 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH 2/4] configs: k2x_evm: Adds environment variables for secure devices X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Madan Srinivas Updates the default u-boot environment variables to support secure boot. On secure devices, a secure boot monitor (sec-bm) needs to be installed by u-boot. Signed-off-by: Madan Srinivas Reviewed-by: Tom Rini --- include/configs/k2g_evm.h | 7 +++++++ include/configs/ti_armv7_keystone2.h | 10 ++++++++++ 2 files changed, 17 insertions(+) diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h index 95317bb001..3c999df350 100644 --- a/include/configs/k2g_evm.h +++ b/include/configs/k2g_evm.h @@ -52,11 +52,18 @@ "get_mon_mmc=load mmc ${bootpart} ${addr_mon} ${bootdir}/${name_mon}\0"\ "name_fs=arago-base-tisdk-image-k2g-evm.cpio\0" +#ifndef CONFIG_TI_SECURE_DEVICE #define CONFIG_BOOTCOMMAND \ "run envboot; " \ "run set_name_pmmc init_${boot} init_fw_rd_${boot} " \ "get_pmmc_${boot} run_pmmc get_mon_${boot} run_mon " \ "findfdt get_fdt_${boot} get_kern_${boot} run_kern" +#else +#define CONFIG_BOOTCOMMAND \ + "run envboot; run run_mon_hs set_name_pmmc init_${boot} " \ + "get_pmmc_${boot} run_pmmc findfdt get_fit_${boot};" \ + "bootm ${fit_loadaddr}#${name_fdt} " +#endif /* SPL SPI Loader Configuration */ #define CONFIG_SPL_TEXT_BASE 0x0c080000 diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index e7706c4818..e7dc522da2 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -252,7 +252,11 @@ "addr_secdb_key=0xc000000\0" \ "name_kern=zImage\0" \ "addr_mon=0x87000000\0" \ + "addr_non_sec_mon=0x0c087fc0\0" \ + "addr_load_sec_bm=0x0c08c000\0" \ "run_mon=mon_install ${addr_mon}\0" \ + "run_mon_hs=mon_install ${addr_non_sec_mon} " \ + "${addr_load_sec_bm}\0" \ "run_kern=bootz ${loadaddr} ${rd_spec} ${fdtaddr}\0" \ "init_net=run args_all args_net\0" \ "init_nfs=setenv autoload no; dhcp; run args_all args_net\0" \ @@ -304,9 +308,15 @@ "1024k(bootloader)ro,512k(params)ro,-(ubifs)\0" #ifndef CONFIG_BOOTCOMMAND +#ifndef CONFIG_TI_SECURE_DEVICE #define CONFIG_BOOTCOMMAND \ "run init_${boot} get_mon_${boot} run_mon init_fw_rd_${boot} " \ "get_fdt_${boot} get_kern_${boot} run_kern" +#else +#define CONFIG_BOOTCOMMAND \ + "run run_mon_hs init_${boot} init_fw_rd_${boot} " \ + "get_fit_${boot}; bootm ${fit_loadaddr}#${name_fdt}" +#endif #endif #define CONFIG_BOOTARGS \