From patchwork Wed Mar 29 19:21:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ruchika Gupta X-Patchwork-Id: 744815 X-Patchwork-Delegate: yorksun@freescale.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 3vtVDH08YBz9s3w for ; Thu, 30 Mar 2017 01:15:57 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 70334C21C3E; Wed, 29 Mar 2017 14:15:52 +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=2.4 required=5.0 tests=BAD_ENC_HEADER, DATE_IN_FUTURE_03_06,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 06E64C21BE6; Wed, 29 Mar 2017 14:15:49 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 5764FC21BE6; Wed, 29 Mar 2017 14:15:47 +0000 (UTC) Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-bl2nam02on0051.outbound.protection.outlook.com [104.47.38.51]) by lists.denx.de (Postfix) with ESMTPS id 7A9DDC21BE5 for ; Wed, 29 Mar 2017 14:15:46 +0000 (UTC) Received: from BN3PR0301CA0006.namprd03.prod.outlook.com (10.160.180.144) by BN1PR03MB188.namprd03.prod.outlook.com (10.255.200.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.991.14; Wed, 29 Mar 2017 14:15:44 +0000 Received: from BL2FFO11OLC003.protection.gbl (2a01:111:f400:7c09::178) by BN3PR0301CA0006.outlook.office365.com (2a01:111:e400:4000::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1005.10 via Frontend Transport; Wed, 29 Mar 2017 14:15:44 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BL2FFO11OLC003.mail.protection.outlook.com (10.173.161.187) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.977.7 via Frontend Transport; Wed, 29 Mar 2017 14:15:44 +0000 Received: from perf-idc04.ap.freescale.net (perf-idc04.ap.freescale.net [10.232.14.49]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v2TEFea4022593; Wed, 29 Mar 2017 07:15:42 -0700 From: Ruchika Gupta To: , Date: Thu, 30 Mar 2017 00:51:03 +0530 Message-ID: <1490815265-30405-1-git-send-email-ruchika.gupta@nxp.com> X-Mailer: git-send-email 1.8.1.4 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131352705448761489; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(39840400002)(39860400002)(39380400002)(39850400002)(39400400002)(39410400002)(39450400003)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(9170700003)(86362001)(50986999)(189998001)(106466001)(33646002)(48376002)(105606002)(36756003)(50466002)(4326008)(8936002)(50226002)(5660300001)(81166006)(8656002)(38730400002)(356003)(77096006)(8676002)(305945005)(85426001)(104016004)(5003940100001)(47776003)(6306002)(54906002)(6666003)(2906002)(53936002)(6636002)(4720700003); DIR:OUT; SFP:1101; SCL:1; SRVR:BN1PR03MB188; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; MX:1; A:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11OLC003; 1:w2z9+fIY2UX0UUxegoEkReyIOYGLjGW0Wkd8uI8XqCjUYCleWX0WGuoEtn/nIMOU4PWxvJ4u/1hHuyF1oYXiHo9Z/ffnoVyT7hcnUzEMV5My+Uo8UnLr5vc5rAJTO7JiLc9zseVFIN89pfk9VOFE8QAcBAq84Z/b5UpvS62ZuPikIWugBYM6Xh/l3XkJ7GwZSbGhyQlStXrEOFOV9m6R5E2yhMXaC++e1sKwFC4RoYuEK1c0hrMInV1kGV17OeoM3mLlEC5EZnYD4R3hcBGQiOe2ItFBZ8V+7+p5Q1iz+b9E/x//bxq8AR9jwZ417Ny4qL4Xs7hKzfe04y8NYFXE8lyXjDfcmWfQdlMroUZbGD7racV+wSDrfqrB3rlLEzCpZFU0rAoFMCzhq274aRuvgEvlG5XUw4rwoUE/WjJ8C+gBwyPU1JUqjKxGkJqXWji2DxvGwutG/i8/9Ut3VKZObfK3I66a36vQFhp6fgW88oTCvCugWACIvTqjrCQu2QMjS1/L7r+OjTj+80yek0c7ziglS7IYZxNAYY3l6SWsJI60zJXhIT+QdvhiqxnHjj7/tLBJbew74lY2JBrKVH78Bg8BhdPAz31K/F9B4IMx/utf4svzUPiSXEAQYlPC4gw1kjdtjfQrTPoBwTEt2gdJT8Ui1yyK2s4OK6u0ZjbQ4OQ9sUHYYS5hFoWObCLacdo7hIL7tt4Nx7CifKePM9LW8g== MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 112d37f7-b4c4-4f59-8adb-08d476ae16ee X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030255075)(201703131430075)(201703131517081); SRVR:BN1PR03MB188; X-Microsoft-Exchange-Diagnostics: 1; BN1PR03MB188; 3:eEuCn+sDzClAyy4ddR/r8odPISjkNMldMRU3AF8OnBq8jNw9GN8HFDTnpacAEusP0xT0gzKCi5z4OmNTGvfdQn4SbQO944Oin0qzK8soykyIiURXWNTjTfKb72oYajyWBFKjyfKG6IPA/rCnecXAJFZLKEzZNxUrQTrjTuZOz6MKm7rWezED0Ml5njwwChIGg+cm9k79yZPnIqub+hPHrBkVtXIYxAREbWgORbirVqGEMHMFYUJRMfkHbzaMzLS28sh5iIrCJGHTknhtqJFR5pxQE3yOh3MYrgxbpreig7Ti6skTdF1apUCMSawCrxh4cNwVlME5ODTrHkUIYBdqVi0CP28GS5rNJ8adxwDPl7YJpypxJVXMYsjfSx6gujePPzYnNs7SsCUF4/xFHGGv0JPeXrNH/eA7yi402wZAj6dSV3pF5GSlJBFbf2fyMI83W1QhallweHNHUFxxR1gqNQ==; 25:qgTtfMmI1e1HjAztNs9pu26TltYSYaf/CmZI3Cdrba6e2FVOTeT1Nf8Eav5Y/yI05wNAsez/TCuOajH5eecbhxiPlk1SQ/C34581NUR4voiCOr3Ggre+0rQnLGPCW/zZT88OzMwWM0y6KgYHM9h0CGu4+65rQR3YwyHOXD0ch9o6GssEFmkxxJHV+US4azI+XhtqXf2nWDacRtTMXXMYrdScDiTsGf8kHDM70t0eeitm48kEV3WCsK3AmIbQufYn4fP5HpqqXbxQBZdS/PBFPtDvux5wrGgwiVsVdzfUkbzFaGDTWXn4WXQEm3bps4NDB7HZRR+HDvmsvf40OODzcqcLWc5kQMD61ONTw5gdqW2RrSVuKoTbeewySNh9pkqjVD40fO4l4xPuHNnjL73dF2NiTE7hcpU+/HEtwjhHcBOS1w5T1kun7Tc0JCr8xAfy198DzlKgzIJImufqw9DQ8A== X-Microsoft-Exchange-Diagnostics: 1; BN1PR03MB188; 31:+hY3AWeuIXG4JdNuA5nl5rStScAiATIgAC31QHea4bbeZAGI2MFAWfuDzuiYZKS9827hSMHTTSm8Vo0trSBmR0UiZgbbTc1dEpAoCrRYFxlAQPWXUAlb21ddcAxRqQTLRpEFQaDyg+8TDfy0CG24514PO5wd+a+MMaZfUA8cZ27DmCyGjgwdU1BrCpyzCjnKp5SqMhtU2L78brGu/xxCN5ZxMAyL9qaii6sIMav3oSRaUpf/OA3ZvO0vVWmCzXqCYHPLgH1nHhb1HzjuRtfT/Q== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(601004)(2401047)(13023025)(13017025)(13018025)(5005006)(13024025)(13015025)(8121501046)(10201501046)(3002001)(6055026)(6096035)(20161123561025)(20161123563025)(20161123556025)(20161123565025)(201703131430075)(201703131448075)(201703131433075)(201703161259075)(201703151042075)(20161123559025); SRVR:BN1PR03MB188; BCL:0; PCL:0; RULEID:(400006); SRVR:BN1PR03MB188; X-Microsoft-Exchange-Diagnostics: 1; BN1PR03MB188; 4:DIvVH/En/f34g34QZz2v2haqkBIbP8uN6MLP2BRGBIoW7zaslo77W9RC16i14sbwU1/155coYnx66IAMpaKqXAq3JKyv66uMH0BDurJxZ+UzW/v92jmZwaRWhKKUh/RuvpbkwwZoLvG6iqMSngG0X9wvBqDfa85zFGTLEfAl/hlqHk09wSHSUvXiqXRRw0lLtVTYm8GFfHUz5uSl3FBgKpMrORND6kJ5mPpEinPwSFkyoguoWyZXpRImMdNwGv+ZLzOqWeAAEghNCO4o/2v12q4RKPZWmUD24bXqgSaiaSbTfO9bbK2hlH+BuIeleyrDDITx6BqbGkZP3NgdJBhZcUTYSHz5PjcnTLcXWKRSskcTYCl3lANjI/7TWuAIuq7vytq1HopJGTXHDFlJcuxQuKHgejoohb/fFwehRf4RQ/8YoHFTFDK5EpRLmUvskLnNc9K1glT6nc7aLJYUFgVVJgtAUytjRijY3ae7egKqt8gZxN6+wjxkbFmAYdHNVVJ3lxINE42Slpe3DpfE1rK8bh3QBovBbQQ31H53V7LOyC+j6be7/gC0bb1QxseFlJChRmSAB8r/XPs/rafhXgy4CAq/OyLUd+8KJJs8uRGmpexx0BYT7nyJjzIyZ92ll4a0d4iv9UW7U0Wsho7g5qNoiOlOZIh5mcjRTT0pB1CEiQTZp4Eu01q8wB5DBUNSfkB5YCgwky2WhH+u31ZhgrDCCUPkk0qeLxIR0XxSuLt8DfuLxiTjpwf3TG98VPMkcw0p/F3Ed08fi3ViAzGXCGAYFtGW83BayCAsy4pMVqGXYj2mOSw/oLiyW7RzrGjO3ucuE4+NlAlHm3sz5Bj/9Lrvr3BoSK4bpvwsEAQGeIDROykRz4VtQt7c1ANSqedm+LT3JvYP1YQYCO1+qx5rgWqPExt/QCBgx9hFrBCq0hgHRCs= X-Forefront-PRVS: 0261CCEEDF X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN1PR03MB188; 23:mAPslsaGxfOXfK9P12m7ZwdbqBlYPapaJhrx8k9jFD?= =?us-ascii?Q?Mf8Ocd83n3f6WwKzBa8HLBoynXpNpOY7SIQh+y05lUbPLyAQUsYhmf2cj5bb?= =?us-ascii?Q?4cbjFs7aoWneCRzjT9WIjbYIUtk6VxlsfN7bjEsa87anAOoXP+2expQiuzYv?= =?us-ascii?Q?LHZy3uuXz7ryyZmrDD/AmnuqOFdFYn1l8fO+kqf127KCti7kP7JCrG9Q7llZ?= =?us-ascii?Q?NAIv1+sVb3kuB63QR+yGs2XlWGeAtHHBTRw7tIzRyOCNE5aVqiI980VkrVXE?= =?us-ascii?Q?WbzzFasEaJEZAir/cUro86MeqVyACgfSixJUaClWNVfLu3nkUxwEx86RfqG0?= =?us-ascii?Q?jfdWbSZwtAt5xmR6Nn72DR3B1f2c3Ll1f5CKSh+9EwGrQOWB08oQdxapXdQ/?= =?us-ascii?Q?m+pylI/PRncb0YvAbEcx33eu+Hpw1QIoU2vhEaBOmzfcPqlDAFxcyTxzdvuC?= =?us-ascii?Q?4Al46AbFn6QaKmUinJxud1xsGr1eRvAoxeROSqmB/RhCHF3DD9I/X/0F/0Tw?= =?us-ascii?Q?BIjGdDPJRSxfsB6lfBuHV5WIeWMy7vcXC/BI2NCI5KiPPAQV7nKdhu3ahI98?= =?us-ascii?Q?2YaocWPmRGOTIIjdOeHCc2ykDRMLmvBV5pSZ+f9IvthJH3feF98kL9YHIPEp?= =?us-ascii?Q?zfJyiN2BSSDAGu/AMOE0dpIgZD6SChh6sqM8ORJK5lHjMJqMEx4Mfskuiz3q?= =?us-ascii?Q?aSZQhP14aLfrEJjvj5frUEdPfKNDGqCd6azG3ME8a1anaJKicJXKiSY8qzns?= =?us-ascii?Q?HiYVAQbRufkIKiSAjDz/pVJgJW/upNxavJuyEdrGNh024AxWW5FWGCWMcbqF?= =?us-ascii?Q?1VZQCm7tkFn01aqXV4LM394Efi8zU5N+CT1UrPanShFXAa1iAfMM7NJ+3XP9?= =?us-ascii?Q?wupB2QUDLs25xYR0CwdR/82N1KnN939SyF/ZbtcaGnt9+UYlDKXhh32vRpyB?= =?us-ascii?Q?B3E3emI5BberZ5DTaJJ9f/IIpSHLbrWRO2fghoj/N+wwFjGYOFyvCdH2MEmd?= =?us-ascii?Q?EBMwlf9G7P9MHSgGu4U2/Dm//xIxllrFlchtSFOuaKD2/8KEG+pHaMYctLuR?= =?us-ascii?Q?jdtUcmCRCemV4JXEwt8cPO5HWkArDRDZr3s8Of25fQqP04yAPuT5thsaKO7D?= =?us-ascii?Q?tmHtcgxChRwLMRgcwiCRC8EzQSxnraTMFT3hR8C9SkLm8B4Kam/DMe9amrBA?= =?us-ascii?Q?XIXETcuSQKjds=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN1PR03MB188; 6:Y8YaEpX7mpi38qImn066omiTDcdoamSXBIqqW5SIk55S8EkB1Zszha8r9h5O5VQTI7dFX/D7fwl/lKGur0RMafzzAnyHjWv447PJplH++63uI6tQZnj5BY6t4gQnzWz6yzdlnoNS8I1gb63ZKJEv0bmPBEn0K7vAlv9eumfq19p54Qe8aDPgVMmZX+rfw+hY+pSVuNhUzi0KMgK+RQEm0p+KHSla+DwoRVoK3V/He1vCuJKDNHAg0WqzJqsEyJYFJd/JgCGjWcsJLG5Ni9c2YrVMrzTx3C7vY1WXdSoZtM9NC7+wUmtDKacJAzrim470l+50j0P/Ejp96BuVwROQzoIwqqUKV3LVlwlP9kB9wkSkiJvYzT1YDBeVNF7RJMnj/zjEdmLLjscWpKT4EpGEGg==; 5:9MIgTEaQTlF3Htf+vFozMRYYDsFDe1QXlSRruygx/+MsL2p7onbggDzYDQuKcVX0LUIrlm+M6ynCvSm4sWSBWWQe61wiYqFIzE5sF49NWspcsW+ggf9a1aIr9pDqEC+aZXjpnl7sc0C+owjCj2DbhWtT4ud9kxSdh7sPON8i+e3XDUi3BSLskf1z0XFmDqCv; 24:7YqyQCxf6ZBnY1YaOZrGWv5ZqnzbtgXM2MlcGox1tAq25ip1FZ0RlXjAX2REm3xnCfpQLFec3uceKuP4+Rq3QKIE+lD782Xb/SPCIEZPBdY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN1PR03MB188; 7:Iuu+v1VdDZFkZDoGZeV018sVe0d1336E/9CGpIhf31e5R8QqLra08gZD5NpvQiew1eBIEZsthHkGbVaoeRITnuKoJXP7/PonM0mQjqBi2rWAZVZCOVR5CfESk5ZF8nomfBJrtgUNCgZTeANW+0KLo31KXF2PxUkaZWsKMeBuyjfkUvq/SHT8U04yKNDafTQmKfl2tD8YNOnT+kh6Xje9b6EARDtmARlx+a5GSYE04/4QsDUjCuSbM0uPwiOwQRoSZ6LRTFQTnFyoOze55cwLt77fRNp1c7fKIESEq6NMeIqFxRaKL/2BXBxWHO73XeazWsomPXFTeRYDk+ylyiI/ew== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Mar 2017 14:15:44.5641 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN1PR03MB188 Cc: Ruchika Gupta , Vinitha Pillai-B57223 Subject: [U-Boot] [PATCH 1/3][v2] arm: ls1043ardb: Add SD secure boot target 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" - Add SD secure boot target for ls1043ardb. - Implement board specific spl_board_init() to setup CAAM stream ID and corresponding stream ID in SMMU. - Change the u-boot size defined by a macro for copying the main U-Boot by SPL to also include the u-boot Secure Boot header size as header is appended to u-boot image. So header will also be copied from SD to DDR. - CONFIG_MAX_SPL_SIZE is limited to 90K.SPL is copied to OCRAM (128K) where 32K are reserved for use by boot ROM and 6K for secure boto header - Error messages during SPL boot are limited to error code numbers instead of strings to reduce the size of SPL image Signed-off-by: Vinitha Pillai-B57223 Signed-off-by: Sumit Garg Signed-off-by: Ruchika Gupta --- Changes from v1: Rebased to latest dependent patches: - No change Dependent patch set: SECURE boot target addition for NOR on LS1043, LS1046 https://patchwork.ozlabs.org/patch/742548/ https://patchwork.ozlabs.org/patch/742552/ https://patchwork.ozlabs.org/patch/742549/ https://patchwork.ozlabs.org/patch/742551/ https://patchwork.ozlabs.org/patch/742550/ https://patchwork.ozlabs.org/patch/742553/ https://patchwork.ozlabs.org/patch/742554/ and SPL size reduction patches https://patchwork.ozlabs.org/patch/744755/ https://patchwork.ozlabs.org/patch/744756/ arch/arm/include/asm/fsl_secure_boot.h | 9 +++- board/freescale/common/fsl_validate.c | 4 ++ board/freescale/ls1043ardb/ls1043ardb.c | 19 +++++++++ configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig | 57 +++++++++++++++++++++++++ include/configs/ls1043a_common.h | 16 ++++++- 5 files changed, 101 insertions(+), 4 deletions(-) create mode 100644 configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig diff --git a/arch/arm/include/asm/fsl_secure_boot.h b/arch/arm/include/asm/fsl_secure_boot.h index 69cd35d..266db4c 100644 --- a/arch/arm/include/asm/fsl_secure_boot.h +++ b/arch/arm/include/asm/fsl_secure_boot.h @@ -27,10 +27,11 @@ #define CONFIG_SPL_UBOOT_KEY_HASH NULL #endif /* ifdef CONFIG_SPL_BUILD */ +#define CONFIG_KEY_REVOCATION + #ifndef CONFIG_SPL_BUILD #define CONFIG_CMD_BLOB #define CONFIG_CMD_HASH -#define CONFIG_KEY_REVOCATION #ifndef CONFIG_SYS_RAMBOOT /* The key used for verification of next level images * is picked up from an Extension Table which has @@ -87,7 +88,11 @@ /* For SD boot address and size are assigned in terms of sector * offset and no. of sectors respectively. */ -#define CONFIG_BS_HDR_ADDR_DEVICE 0x00000900 +#if defined(CONFIG_LS1043A) +#define CONFIG_BS_HDR_ADDR_DEVICE 0x00000920 +#else +#define CONFIG_BS_HDR_ADDR_DEVICE 0x00000900 +#endif #define CONFIG_BS_ADDR_DEVICE 0x00000940 #define CONFIG_BS_HDR_SIZE 0x00000010 #define CONFIG_BS_SIZE 0x00000008 diff --git a/board/freescale/common/fsl_validate.c b/board/freescale/common/fsl_validate.c index 2b723a4..235c6ab 100644 --- a/board/freescale/common/fsl_validate.c +++ b/board/freescale/common/fsl_validate.c @@ -356,6 +356,7 @@ static void fsl_secboot_bootscript_parse_failure(void) */ void fsl_secboot_handle_error(int error) { +#ifndef CONFIG_SPL_BUILD const struct fsl_secboot_errcode *e; for (e = fsl_secboot_errcodes; e->errcode != ERROR_ESBC_CLIENT_MAX; @@ -363,6 +364,9 @@ void fsl_secboot_handle_error(int error) if (e->errcode == error) printf("ERROR :: %x :: %s\n", error, e->name); } +#else + printf("ERROR :: %x\n", error); +#endif /* If Boot Mode is secure, transition the SNVS state and issue * reset based on type of failure and ITS setting. diff --git a/board/freescale/ls1043ardb/ls1043ardb.c b/board/freescale/ls1043ardb/ls1043ardb.c index 6de7f9a..bd72e30 100644 --- a/board/freescale/ls1043ardb/ls1043ardb.c +++ b/board/freescale/ls1043ardb/ls1043ardb.c @@ -36,6 +36,25 @@ int board_early_init_f(void) return 0; } +#if defined(CONFIG_SPL_BUILD) +void spl_board_init(void) +{ +#ifdef CONFIG_SECURE_BOOT + /* + * In case of Secure Boot, the IBR configures the SMMU + * to allow only Secure transactions. + * SMMU must be reset in bypass mode. + * Set the ClientPD bit and Clear the USFCFG Bit + */ + u32 val; + val = (in_le32(SMMU_SCR0) | SCR0_CLIENTPD_MASK) & ~(SCR0_USFCFG_MASK); + out_le32(SMMU_SCR0, val); + val = (in_le32(SMMU_NSCR0) | SCR0_CLIENTPD_MASK) & ~(SCR0_USFCFG_MASK); + out_le32(SMMU_NSCR0, val); +#endif +} +#endif + #ifndef CONFIG_SPL_BUILD int checkboard(void) diff --git a/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig b/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig new file mode 100644 index 0000000..3f35d64 --- /dev/null +++ b/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig @@ -0,0 +1,57 @@ +CONFIG_ARM=y +CONFIG_TARGET_LS1043ARDB=y +CONFIG_SPL_LIBCOMMON_SUPPORT=y +CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_SPL_MMC_SUPPORT=y +CONFIG_SPL_SERIAL_SUPPORT=y +CONFIG_SPL_ENV_SUPPORT=y +CONFIG_SPL_DRIVERS_MISC_SUPPORT=y +CONFIG_SPL_WATCHDOG_SUPPORT=y +CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-rdb" +CONFIG_FIT=y +CONFIG_FIT_VERBOSE=y +CONFIG_OF_BOARD_SETUP=y +CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT" +CONFIG_SECURE_BOOT=y +CONFIG_SD_BOOT=y +CONFIG_BOOTDELAY=10 +CONFIG_SPL=y +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x110 +CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y +CONFIG_HUSH_PARSER=y +CONFIG_CMD_GPT=y +CONFIG_CMD_MMC=y +CONFIG_CMD_SF=y +CONFIG_CMD_I2C=y +CONFIG_CMD_USB=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PXE=y +CONFIG_CMD_MII=y +CONFIG_CMD_PING=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_FAT=y +# CONFIG_SPL_EFI_PARTITION is not set +CONFIG_OF_CONTROL=y +CONFIG_DM=y +CONFIG_SPL_DM=y +CONFIG_MTD_NOR_FLASH=y +CONFIG_SPI_FLASH=y +CONFIG_NETDEVICES=y +CONFIG_E1000=y +CONFIG_PCI=y +CONFIG_DM_PCI=y +CONFIG_DM_PCI_COMPAT=y +CONFIG_PCIE_LAYERSCAPE=y +CONFIG_SYS_NS16550=y +CONFIG_DM_SPI=y +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_DWC3=y +CONFIG_USB_STORAGE=y +CONFIG_RSA=y +CONFIG_SPL_RSA=y +CONFIG_SPL_CRYPTO_SUPPORT=y +CONFIG_SPL_HASH_SUPPORT=y diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index 19a808a..c9ab2bf 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -66,7 +66,7 @@ #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" #define CONFIG_SPL_TEXT_BASE 0x10000000 -#define CONFIG_SPL_MAX_SIZE 0x1d000 +#define CONFIG_SPL_MAX_SIZE 0x17000 #define CONFIG_SPL_STACK 0x1001e000 #define CONFIG_SPL_PAD_TO 0x1d000 @@ -75,7 +75,19 @@ #define CONFIG_SYS_SPL_MALLOC_SIZE 0x100000 #define CONFIG_SPL_BSS_START_ADDR 0x80100000 #define CONFIG_SPL_BSS_MAX_SIZE 0x80000 -#define CONFIG_SYS_MONITOR_LEN 0xa0000 + +#ifdef CONFIG_SECURE_BOOT +#define CONFIG_U_BOOT_HDR_SIZE (16 << 10) +/* + * HDR would be appended at end of image and copied to DDR along + * with U-Boot image. Here u-boot max. size is 512K. So if binary + * size increases then increase this size in case of secure boot as + * it uses raw u-boot image instead of fit image. + */ +#define CONFIG_SYS_MONITOR_LEN (0x100000 + CONFIG_U_BOOT_HDR_SIZE) +#else +#define CONFIG_SYS_MONITOR_LEN 0x100000 +#endif /* ifdef CONFIG_SECURE_BOOT */ #endif /* NAND SPL */