From patchwork Tue Apr 4 22:42:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ruchika Gupta X-Patchwork-Id: 746898 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 3vyGQZ4Ddzz9s9c for ; Wed, 5 Apr 2017 03:37:58 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 48809C21C80; Tue, 4 Apr 2017 17:37:55 +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 98CB1C21C39; Tue, 4 Apr 2017 17:37:53 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B2006C21C39; Tue, 4 Apr 2017 17:37:51 +0000 (UTC) Received: from NAM03-CO1-obe.outbound.protection.outlook.com (mail-co1nam03on0087.outbound.protection.outlook.com [104.47.40.87]) by lists.denx.de (Postfix) with ESMTPS id BA579C21C2E for ; Tue, 4 Apr 2017 17:37:50 +0000 (UTC) Received: from BN6PR03CA0039.namprd03.prod.outlook.com (10.175.124.25) by BLUPR03MB277.namprd03.prod.outlook.com (10.255.213.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1005.10; Tue, 4 Apr 2017 17:37:47 +0000 Received: from BL2FFO11FD008.protection.gbl (2a01:111:f400:7c09::135) by BN6PR03CA0039.outlook.office365.com (2603:10b6:404:10c::25) 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; Tue, 4 Apr 2017 17:37:48 +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 BL2FFO11FD008.mail.protection.outlook.com (10.173.161.4) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1005.5 via Frontend Transport; Tue, 4 Apr 2017 17:37:47 +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 v34HbiET029879; Tue, 4 Apr 2017 10:37:45 -0700 From: Ruchika Gupta To: , Date: Wed, 5 Apr 2017 04:12:57 +0530 Message-ID: <1491345778-6890-1-git-send-email-ruchika.gupta@nxp.com> X-Mailer: git-send-email 1.8.1.4 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131358010680800100; (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)(39400400002)(39410400002)(39380400002)(39850400002)(39860400002)(39840400002)(39450400003)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(9170700003)(105606002)(189998001)(4326008)(47776003)(6666003)(6636002)(4720700003)(305945005)(50986999)(81166006)(77096006)(54906002)(8676002)(5660300001)(6306002)(8656002)(85426001)(106466001)(356003)(8936002)(5003940100001)(50466002)(50226002)(48376002)(53936002)(36756003)(33646002)(2906002)(86362001)(38730400002)(104016004); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR03MB277; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; A:1; MX:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD008; 1:hSpyCDdNApuFi/y8qFSnMqIovPS4ERqV/ArQiAUFZo/2brtZzZTJAqZwMQYcDXdrftEYOvPNhj/Qn38kkdW0xqN/YkY9yZxub1xiVqNV2aF1Kapb+PpcnPDC5XOtyaqYGUa5kobUl55IfvHNNI/AkaQM4JYonhPsjI628mrXgSAYHFwqw9iJ8kfix/s5vc084dF76yDA7yd1oqfnBOFRv66Md9tMKvDYoXYrIw+swBY5XlFLanXOzgIL00w04jqNewgxLGL/l1eRP0SBigVsTjuDjc9CZk25Gzy5ZxHEt2Mx+iJ9OXFGtNrVQCXZ5URReYsp9LvQ3cLpPy7VQwjMsNqB15aIBHc/o9yW5E+Zhi3W7N+iye7kkXc/DIfZavjP5k1nuh1iBOR1Q7ClUu4dVcSPjrVE6uUUr5ggNyLKl2GaHUIfcncbqjwprti7MzvzMr0YGN4FI2DSc17JhdPdO03Y1qy8rxMRXBAC1I6yzB+ozKxnJTyodHN+8SpOB1Ym0gNT68U73PXaz19xHfHkqN8WC4Xo96cvDSmzcKlGo9PhR0tEDv5Bq0uv2wX99z322TyUaQt10F7OA+ftu6/u8d6SxBISZjBRI1gt44yqbqkFChxQxwzoycPNVuRbEyiHlMAu9PKIcJ1qT+9EzDVrNKkWcFIpQKnwU0vgZuPJMgy/BMSIqcSx2gy0YQpFidBTqDkB1i5sNDmT5jOA0MkApKx0rtfErKErZDbzjlx6UpU= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: d33f06e3-25dc-4976-9204-08d47b814f7c X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131430075)(201703131517081); SRVR:BLUPR03MB277; X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB277; 3:yoftyF+oyw3sXUDPczRoudeYDdTz1k0mfzSW4nYGSfzCvsr9537X0b7fHDuReEkHYa8/8gjDbxMQeLo4xdJ5gD/zWj5e0IVhMcJpxQGUXni/SY9myVooF/0PCR4qtbCtYN4rOaauO8GxsKo8exbkE4/s+MsSx3wSXdpCCQStUiqQeF4AEcBxdPJTFRXUtbgbDTvCVjfzwv5rM5YSDMPXT4MlwHjjmOUEpKvmx1nmTHqi0+T+zLYqMye6HLYkWY32NckDssiBBVjt13ZpsHczR54wpqwPjPlSPWJsy4/PDe+hV8IjhsQ5oh5x8gbfhmub/0Hg/RdLZz4sxsF95szTpK//xOYjAo+zOEBH6tFI2XcUiQ4xMprI6W5sRlhvCGMCutfEUagO+sFiwqLgpEvDSXeqqjKvjZMcWZQKSwzH0vESK/c3IjGlerYQnBtQitN1; 25:FS/C1M4v7/3Sy1yMKYuMpIUFxZSWGcUZhCcwds/OwznXDWEBVuZNg/NQdl/1v+vhsTuE23x9cAjNTOmB7gjuya8IyitAcH12Vx0kHGzJjqa8a1l8lJjMpc7DKA2JEBtHi87p7PtBIkuttVTVoCJQRAOTzGQLIt97ZGJz48BHTG4r6PI0Nf+XfNecWo8BGBasqM0yP9ITk3a60UEBkeZdHRhpfbI8gh38iLOuL7Vh6lkeHMTKNGdvvXFIvpKqBR98TuKiMblgQWxlohUrr9fvmsh86X0T0YlAxcpd1VsWkAxfjcRjdR68geTXlTW2Jsu0r/kk+IdW4uAf0yDRc+62yToyH7UaQnuJem/asYRdUvAW9DQ51LKDDBSJmBb9b5a+RaPeuiOK/jf89mMl/bNJbh97VFTqOgPCQ/W5OtdvrbD+slWyjqoChHlLjslSG7W/RENxuMT/WNKc0KsC1Xpcow== X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB277; 31://MxkoUhnPrjvhar6oYOAEZbKVQd8pu28JnZM9uZpaV4vzNenjZU3MiVBPxteFAkSBgPsoMztLTr2qOm74SeznNHmTIE1QbrV3N3/oy/Zxf4v4Ie+gTktiyQyKuqZwsBpuJymuAkwJd3j9DjMm86S7CBiZh8I5T7XNNW0vxMKcpwtsifnIe8J9ksk1m6tQYpMxTkoCAlgxs5ngF4+A3VOjO0bxHG0eNTzrnfPZAZW8NR3UgxbdHstDH2B6tF9znLcsFKSZCgs7n7ZeDSiD0iz0Krk8IK9x3LxMt1yLImxjc= 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)(13024025)(13018025)(13023025)(8121501046)(13015025)(13017025)(5005006)(3002001)(93006095)(93001095)(10201501046)(6055026)(6096035)(20161123556025)(201703131430075)(201703131433075)(201703131441075)(201703131448075)(201703161259075)(20161123563025)(20161123565025)(20161123561025); SRVR:BLUPR03MB277; BCL:0; PCL:0; RULEID:(400006); SRVR:BLUPR03MB277; X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB277; 4:mRSg7+l7D+N4dOtvR4JcP32OjtHoJFYDu+1ZAK0/sBqXrJnV/rZZo3MBcjgQhM9A/ZMo3V+9fW8sff/YFfC1zmzNnW7cGQ26nX7HGBugSLTZ33vZ6x3IlDnn66vpQH/K8Pcxjcq3ZXSUyPNVloyloY1Amq9k7+fWIsY3tcgagmK30r3loYfAeWYPWnF4k1uyJDtYshE9sktkvJEp9A0YiLzuPW+iMiXSK+OL8JepCjP+4y4EVZ7BbtS5RNIa7oIiMY2LJFxdTnr3Abzmuitqnhrj5aTjsP3eIV9ogGiaR+zlbVTiBvKRx2Six/bXFJuQnSnN1ZBCooOtNHkAjrUwq+DHd+WTLEzUHItu7Ek+X3sD7AsVYl2PgzR7eZ/W0u5BQt0iIMsV0bw6pksJq0Ocv0ppykoBels57w6wXrJv44IWx66tdWQd6pUbBmYQoIWA2Sx+xx835Cn3IXdPYhUKuQgWGVHKjS/xno28pUcbNsT64+yxpKTyW3bTFYvXFcOZx6iM8GfkVGqcXYfqYiQjVaSteVILabnTViA4uDPBp1Tnxf39G9kgQvC0eHY64Q10JXS0cqScXpKUfsRMH51LMoXtVlUoUtvvLpkWbXolWpdmtbOION6nAlRHzT3m4ts2f+uBbLoV4vHhTxchgwHXKA5L+08oRuxJkjsI4orhQk8CAkjELUNom2aczQesDya/72hdq9lqgwKA7onDbV5Kp3oBZcTWz2JaFrGrbzbh7BOug+SOX8y9Zj0Xao2oDqeXZT06TIrepMgSNLrK+TYOhmeoD/1BZuQvBagxMHGyEX7JW8JGSsGXAXRX/ailZ0fRH5zSeaAydo4MTiOJChE9jv0FSHIQgP9sBLcAxReo3BHPs/LRcjzEOAmzss1r3MbClbrpNTuVUYH21gDE3k46Gta4Et/RCNiLmeZiXNi/TIw= X-Forefront-PRVS: 0267E514F9 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR03MB277; 23:bVHc4UTCV3oxXFaXL4p31J00WkB3zFaGtKbFC4I2my?= =?us-ascii?Q?1EocA40wSljS3lYzaMvTo+PBg0jRU0fXtPBNM3WzRf+PF1MdBCRuBGVVoscy?= =?us-ascii?Q?cxtY+Enuz/krFRzyaT9ZcGl1kfIXMlrXJlxD5yHjHSwQCYCPIKBTpzyN5jAy?= =?us-ascii?Q?EES+z427EBK6v8iKX83NxW2UFdWgn3POoGlK6DP8+9Ubfveq6QVVsSK51eMa?= =?us-ascii?Q?+fsmekjUeX0D6EHuzsreeFTRS4pAD3y1lLJHY6IUAHZczbNqKvU+ZAvskLvs?= =?us-ascii?Q?QSDxpqC9vr2Rfdhc87/9IPHa2wbpxUN4gQ04WWgJFEfNOh37r0UlE+ae6Kea?= =?us-ascii?Q?NhLPahUEL8lITqsBIrP9a5o3Aym8Es/sRJr6a4U9Djij3BW+xdwrIzO+bwRg?= =?us-ascii?Q?we+Pb80IqmwYi50qxtO/N4Xt0f1AFoG9d90+3SbkwJPEIUzEeZOP84HOQnU4?= =?us-ascii?Q?fnHyDge8bTpEKggjTLhF3ucUyKO3Qn5a9WE7L9m1+GPzYO4aGR2+VtF5l/KD?= =?us-ascii?Q?/KBILTPz52SIF6Q72gGL7ftRwiEknuaWd45ZmiHz/7Dau8YK0Tjk6rPIBlyl?= =?us-ascii?Q?o+xlZE59iZ5qjFU0JdvNpQFGVzZsGImJfNROjh6hGcNFXJH11krMI45w1ce/?= =?us-ascii?Q?njpvg3aehx7vO8XxSp9NAoG7Tn3hMmi5kDRB2ggdxIsg+bG8Z9Sgh7i+xOwF?= =?us-ascii?Q?JS591ZJlJ5TVuFbGgmACGbPDyqHPn+WO42/+hFSId+peyw9zmoHyMoUfGzbj?= =?us-ascii?Q?ys6DxrDd+cVt0RbdEcpF02fHn2OLjc1ttayemtFBshrpXtRYtLO82fieCUl0?= =?us-ascii?Q?nYPt+8FuBa4bNw0G/zt5+uhwD0CCMIvKori5SSvrgrLc+09h3dccsBR3tu6T?= =?us-ascii?Q?xTam1wOOdGh7hPVesyXTRNOoLpInL9MveLOrhyFP4IVxFsmBJPa1Xbp97s2o?= =?us-ascii?Q?JNXkabP7CQ8fVM2MmtglAZnbn+yGTkJjUC4Q0p+K6qVSrqkOs+Qj95Pww0s6?= =?us-ascii?Q?AR3Cf8x8295+U8DMxAiS9d4TsHuuxymeilZyb38wDe2Km6pGs33YOjyUrllC?= =?us-ascii?Q?/z9FPIjWsgbpHPcCUJ/J0BkvDAZXVkBdkhSVNyJ1Y3NmUwmS87LoZ73Zpu4m?= =?us-ascii?Q?n98eHBcyKG7kzABM8tHvlgE1h6w/VLTvfLGqNg3tdg7qhBMZ5kXWNO8qxSDT?= =?us-ascii?Q?RRW6TwjB0Cgos=3D?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB277; 6:Rh4AICX4PC9fcUZ1zmsKySA5Pl6+zREwWlBPHw0e4juylTfw2e5iTidb7zt/+NXwRQFGWmHtEin+3qTcp9D/T71iNoPpVp9AOqFXiagBWg8/o495e0EAD6pR4hQThcblveq+URiex3X65JYZe23XPblaG0JQvrSUslkidP0/KiihfI4E+Fz21m73fEpniXO5rn6eJgaokStPL2Ev8A9LDLCG09d7gHzJw4lxAtYiHiWXrX699sb7aAi6abdMaoHTz2WKjWzzEl5ccnDL70fMMsAgSX0Zn2Bhz3k0wfAbf9KcCrRg2fFck9fQzxIHbPAVmPw+W1jjKilMtjIkloWCRKCvb8c8dC9LY1EqDjUj3VS3o3rier+0UtpRXWhWSFwo7+C6O4RuB0gIBWUBtIaOfg==; 5:plT7aPKLh+avLJHm1tyk2JDi0tiIAtutAQzSHW+d1brWf82KqPhwvH8UPfoI3APWzhsSV/Ijt96tgDEBX6tFymC4MMXFsh/1/TExKIH6pvsZajf41xNklibSmST/PPO7+woxnrjy97x00us9aFjC+yDp4UnM6p8FJh5iAf5btu6pFO2s9bwmxuEVTQRhHIra; 24:0EqIHKOFg2ooohcK6fK3l5quCIipG8WiXE+1gt7/2zZiFhLr8lkt/CiFXG1lGo80SiIH1POA0ToMikiVnblaNxbXHA+/ue/RMo8vNXGshvw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB277; 7:V9NqNgriox1hcWRZWNb667/CiUW0fzGtU08syey6nbpn50ICv55N6pucJlILSdhuwthVCumc7fWMZGN4LV+P+TrV9rBi3j8n6IJkdGXM2Uy++UJn+djA4x7qkB6aIhw9dNHv2lP+6C1OYMuyxS18HMz7TH73jOLBkZM+n0kSywjLoRcv15tHpJc7nq6nOGlLJwCAvNMn5yx5iUXzM25iUl56veCSndqkpJMHhtQ4OJl9F65lNThR6WpcAxyw8TFL2H70e/QjpB/P3cUjH6sCRCN0Bna0OeybYZNBhm2D/IvEtAGH4UDwpS1YIDEmysFYq1Eu9O6J+IqtzVg84BP9Kg== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Apr 2017 17:37:47.8928 (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: BLUPR03MB277 Cc: Ruchika Gupta , Vinitha Pillai Subject: [U-Boot] [PATCH 2/3][v3] arm: ls1043ardb: Add NAND 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 NAND secure boot target for ls1043ardb. - 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. - MACRO for CONFIG_BOOTSCRIPT_COPY_RAM is enabled to copy Bootscript from NAND to DDR. Offsets for Bootscript on NAND and DDR have been also defined. Signed-off-by: Vinitha Pillai Signed-off-by: Sumit Garg Signed-off-by: Ruchika Gupta --- Changes in v3: Removed changes to ls1043ardb.c Changes in v2: - Rebased this patch to the latest dependent patch-set. 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 | 7 +++- configs/ls1043ardb_nand_SECURE_BOOT_defconfig | 57 +++++++++++++++++++++++++++ include/config_fsl_chain_trust.h | 9 +++-- include/configs/ls1043a_common.h | 18 ++++++++- include/configs/ls1043ardb.h | 2 +- 5 files changed, 86 insertions(+), 7 deletions(-) create mode 100644 configs/ls1043ardb_nand_SECURE_BOOT_defconfig diff --git a/arch/arm/include/asm/fsl_secure_boot.h b/arch/arm/include/asm/fsl_secure_boot.h index 56a6ba0..9ca7abe 100644 --- a/arch/arm/include/asm/fsl_secure_boot.h +++ b/arch/arm/include/asm/fsl_secure_boot.h @@ -70,7 +70,7 @@ /* Copying Bootscript and Header to DDR from NOR for LS2 and for rest, from * Non-XIP Memory (Nand/SD)*/ #if defined(CONFIG_SYS_RAMBOOT) || defined(CONFIG_FSL_LSCH3) || \ - defined(CONFIG_SD_BOOT) + defined(CONFIG_SD_BOOT) || defined(CONFIG_NAND_BOOT) #define CONFIG_BOOTSCRIPT_COPY_RAM #endif /* The address needs to be modified according to NOR, NAND, SD and @@ -96,6 +96,11 @@ #define CONFIG_BS_ADDR_DEVICE 0x00000940 #define CONFIG_BS_HDR_SIZE 0x00000010 #define CONFIG_BS_SIZE 0x00000008 +#elif defined(CONFIG_NAND_BOOT) +#define CONFIG_BS_HDR_ADDR_DEVICE 0x00800000 +#define CONFIG_BS_ADDR_DEVICE 0x00802000 +#define CONFIG_BS_HDR_SIZE 0x00002000 +#define CONFIG_BS_SIZE 0x00001000 #elif defined(CONFIG_QSPI_BOOT) #ifdef CONFIG_ARCH_LS1046A #define CONFIG_BS_HDR_ADDR_DEVICE 0x40780000 diff --git a/configs/ls1043ardb_nand_SECURE_BOOT_defconfig b/configs/ls1043ardb_nand_SECURE_BOOT_defconfig new file mode 100644 index 0000000..66c89fa --- /dev/null +++ b/configs/ls1043ardb_nand_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_NAND_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,NAND_BOOT" +CONFIG_NAND_BOOT=y +CONFIG_SECURE_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=0xf0 +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/config_fsl_chain_trust.h b/include/config_fsl_chain_trust.h index eb45e98..40d323e 100644 --- a/include/config_fsl_chain_trust.h +++ b/include/config_fsl_chain_trust.h @@ -81,17 +81,18 @@ "setenv bs_size " __stringify(CONFIG_BS_SIZE)";" /* For secure boot flow, default environment used will be used */ -#if defined(CONFIG_SYS_RAMBOOT) -#if defined(CONFIG_RAMBOOT_NAND) +#if defined(CONFIG_SYS_RAMBOOT) || defined(CONFIG_NAND_BOOT) || \ + defined(CONFIG_SD_BOOT) +#if defined(CONFIG_RAMBOOT_NAND) || defined(CONFIG_NAND_BOOT) #define CONFIG_BS_COPY_CMD \ "nand read $bs_hdr_ram $bs_hdr_device $bs_hdr_size ;" \ "nand read $bs_ram $bs_device $bs_size ;" -#endif /* CONFIG_RAMBOOT_NAND */ #elif defined(CONFIG_SD_BOOT) #define CONFIG_BS_COPY_CMD \ "mmc read $bs_hdr_ram $bs_hdr_device $bs_hdr_size ;" \ "mmc read $bs_ram $bs_device $bs_size ;" -#else /* CONFIG_SD_BOOT */ +#endif +#else #define CONFIG_BS_COPY_CMD \ "cp.b $bs_hdr_device $bs_hdr_ram $bs_hdr_size ;" \ "cp.b $bs_device $bs_ram $bs_size ;" diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index b71456e..202372d 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -105,7 +105,23 @@ #define CONFIG_SPL_BSS_START_ADDR 0x80100000 #define CONFIG_SYS_SPL_MALLOC_SIZE 0x100000 #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) +#endif /* ifdef CONFIG_SECURE_BOOT */ + +#ifdef CONFIG_U_BOOT_HDR_SIZE +/* + * 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_U_BOOT_HDR_SIZE */ + #endif /* IFC */ diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h index 7ef5c25..6455393 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -149,7 +149,7 @@ #ifdef CONFIG_NAND_BOOT #define CONFIG_SPL_PAD_TO 0x20000 /* block aligned */ #define CONFIG_SYS_NAND_U_BOOT_OFFS CONFIG_SPL_PAD_TO -#define CONFIG_SYS_NAND_U_BOOT_SIZE (640 << 10) +#define CONFIG_SYS_NAND_U_BOOT_SIZE (1024 << 10) #endif /*