From patchwork Sun Oct 18 05:14:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 1383801 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=NdM1x4EU; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.a=rsa-sha256 header.s=dkim.wdc.com header.b=NiFirYXL; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-sharedspace-onmicrosoft-com header.b=DyFuZhJR; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CDSlB0l0Xz9sTD for ; Sun, 18 Oct 2020 16:15:31 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=D4AANF+EgXULvewq4ggsQXyUUXyYRuUw1L0omCgpAG8=; b=NdM1x4EUB9wLi6GASedZXLDUo PhbzAnFm4byFNMCeGnZtiZ4DfeFbLWAulqeIMdLFIiUggPhydQ59YdhNtoK0zQ1wSX0f9a3dMNiSO /vxTOrTDeRIN1DkyHuSokgbtzcta9NEeTo2yC3gRdFEPKaAsxnfM1ZO5NLWh0fopUaTbwVedHwHb0 7eYlY5VP00P9jU5EEpexu/RELpxPvj9ImowkQavpTbK9i9kIsypqtd4f+WDP+gjafGMfR+TPzLL/b 1XOfy+Zm6KJONdNI+GM7afWfjMCVGQskOIROhnbSQP5hnYq1RuWGFu08N4VnBJmfFcH/7cl3T674z nTESDc/lw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kU12Q-00014W-Rh; Sun, 18 Oct 2020 05:15:22 +0000 Received: from esa1.hgst.iphmx.com ([68.232.141.245]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kU12M-00013T-Db for opensbi@lists.infradead.org; Sun, 18 Oct 2020 05:15:20 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1602998118; x=1634534118; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=scTsY8IEN6CNyerNThu8QzwaH3ITrYWuLEfTynzJd10=; b=NiFirYXLLnDYKgRos2AtQOO4lpXYw9Zld1+8hhX/g0dH/bGUBH7NPOhx vwAagYe+YJbTB0EIap0tAu+u0FPE9yGZO44mDpS48+Ar0SVvWoi8neU6j cZ6Os7b/kQbnvNO3ScBCfrE5m5+RQTCRM8HzMQtcFfQVKuhgLtE9P5DrK y2PADz78bENil9RGhoA4SWxE38cboHNYwxathCqwOAd3ITjxIfDtbL/Iu Hjpi1sKT0mt/qN4NRxjJqQWR5BwAIRC35Mku4vyuu8NZKnybNv49vL4Dg 5CFWKTmhoHsOPb4Xn0K5mpjL1faog0d5djkpLY2qXe8APPd8ct3iUh4k+ w==; IronPort-SDR: Q6G/b3qdLL9hDiWS8ixzqWEbb1QLoqXB4PhHvG2inLZ8S6j+fXUweLC0m10laVHFBsCj9bEl5H yziu95bdjrP/HF7mjAU0046qyvXudijn2+PdgqGOzv4w7ORFaDuFgwBUeB82y6ono59z/gVK+c s+umKcPK7sU4wC8h6aeO9+gUByC+y70NFQDOQrwtKpcFMVpk3V6TjolPoM3h52l5XleT7P1p+i 6HDjm6lJfIe2Fys5zMODSuBwQYfq7WJW0WaE999GwcTvmZWd28G1mA8zq1ZNGt/zU0cE3j6w2L Y08= X-IronPort-AV: E=Sophos;i="5.77,388,1596470400"; d="scan'208";a="260120082" Received: from mail-co1nam11lp2177.outbound.protection.outlook.com (HELO NAM11-CO1-obe.outbound.protection.outlook.com) ([104.47.56.177]) by ob1.hgst.iphmx.com with ESMTP; 18 Oct 2020 13:15:17 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ntt4tYujzCvvGzxaLx8EozomvxpcjA1ZrAfMs4poXfxsvWS5jPBlKMhDxigwhwUEUYEWKCJKwf6v3fh6TVoWcvfM9+7/h8Y4THDSx8pNSMtmQN0Xk0B1mDEYoluVgjVANxgCAst4Sw6ruj1wVJE9Llul0rHe+LP7LfRyy0aU5LaDUTIXhjHzuKvKqXhF/8gnmwvzLsY5S7OiAbPVhAi7+wWLrtYCVjmvWEvrczxVSnIJLRD8BYsHU9GVJXEceG1xsK4q9WAnohZj1/U7OqSnDV95EbPKuBC5o2uYKzUZiRAcd+ZmQl0YR2NS+O7YvSFGi60Hi6hyEV4GKVimDTbrgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=C3fj1isVqVxiQNwFxJ3LRibLisEFgndlHdo/BpMeP+0=; b=NQD+RTbupG4oGmjCJCFwTfAPgzku9zx1y3NeWwYOPHnb6URQDyfMmzavEhN/amXA+jcf1qUvss8Klady+ahdGL1p+wxc7OMWH7QRA3duyIpZu3v5Ai0ofmGyyYuJvPn7U53rCLd9do2y8hoFEpMrLs+7nhORrPLcvVukubAFAYMSTweq1LY/GBCVDjOIRLv4Qtcivmqvv1zsvg9/64gH1jJxmqaoumDh8KGjbgJ46bTLDcCRp42BoLCvrfZhPdW3iWKtRrl3vwgGDlvlCqMz2hRM0am4kXzS28uVb1VtM72QKHmsA8lJJgV6KXLU62uYDUivALg9as6P7MqciuWj+A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wdc.com; dmarc=pass action=none header.from=wdc.com; dkim=pass header.d=wdc.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector2-sharedspace-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=C3fj1isVqVxiQNwFxJ3LRibLisEFgndlHdo/BpMeP+0=; b=DyFuZhJRF29kqEv04O0AbD+alVOhLbuiQZw3bPx20l+G0kKvRgyqJ5bvzYLZtrRzsK3dBrvfTzvZZxCD0K5FclAvAnXzIy9IO87azsgVymn/wP8kS2JEoivQewBSaPIK01my+JMCRR7TesxxwBrLs3ieWG0LoIyMMfGsb+9UcNM= Authentication-Results: wdc.com; dkim=none (message not signed) header.d=none;wdc.com; dmarc=none action=none header.from=wdc.com; Received: from DM6PR04MB6201.namprd04.prod.outlook.com (2603:10b6:5:127::32) by DM5PR04MB0348.namprd04.prod.outlook.com (2603:10b6:3:72::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.20; Sun, 18 Oct 2020 05:15:16 +0000 Received: from DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::d035:e2c6:c11:51dd]) by DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::d035:e2c6:c11:51dd%6]) with mapi id 15.20.3477.028; Sun, 18 Oct 2020 05:15:16 +0000 From: Anup Patel To: Atish Patra , Alistair Francis Subject: [PATCH v2 1/5] Makefile: Build ELF, BIN and LD script in platform build directory Date: Sun, 18 Oct 2020 10:44:45 +0530 Message-Id: <20201018051449.2368918-2-anup.patel@wdc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201018051449.2368918-1-anup.patel@wdc.com> References: <20201018051449.2368918-1-anup.patel@wdc.com> X-Originating-IP: [122.179.120.189] X-ClientProxiedBy: MAXPR0101CA0033.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:d::19) To DM6PR04MB6201.namprd04.prod.outlook.com (2603:10b6:5:127::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from wdc.com (122.179.120.189) by MAXPR0101CA0033.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:d::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.21 via Frontend Transport; Sun, 18 Oct 2020 05:15:13 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 53516926-ba51-46ce-0379-08d87324cc24 X-MS-TrafficTypeDiagnostic: DM5PR04MB0348: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: WDCIPOUTBOUND: EOP-TRUE X-MS-Oob-TLC-OOBClassifiers: OLM:4714; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: B9pfPY2r85jy49CdFwYEeJAKGTq2aJU77ec4yLWHzzNg0RMLwWGgzKB+q8s5Do9TJXeJlxR4IpiLjHNZkEF2numiTNwDgKDyfzkKHGNXrbJgT2fE2/td7t6YIYOhFTTzdCwLAkFeDVj7lVmuuDgVLJ3ON4FEVrQqINBOcmkwSOX1J4aXIwgQuxe+vOOOljIZyxRza0UTd36nuepioC+iBgiBw4wsbIMRfyLtOLJxWZnwT5xNG3cIc4WiaHVXRwxKFl+VFvCyuUdtK1fRc+khXqh4umT+LIqptsshhCzLDIHO6ou2QZ4zArnIRiAraYlNYs0EMhT7IzJWnAj91wJ9Vw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM6PR04MB6201.namprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(376002)(396003)(39850400004)(136003)(366004)(110136005)(316002)(478600001)(36756003)(6636002)(2906002)(956004)(2616005)(44832011)(6666004)(66946007)(5660300002)(86362001)(83380400001)(54906003)(66556008)(66476007)(8886007)(52116002)(7696005)(26005)(8936002)(8676002)(4326008)(55016002)(186003)(16526019)(1076003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: hLPZW67chla3eDw4VJ1CO1tLShWxwqCrR/iwreDRFmNet2/ojxyZZ1/8uPWnSlaDQ7+is0iXiwnTcEJ9bc+8MJ5iddchGfhrAAWmWWo3FCNehNljfBcOwa18Loq91q0zTW4UoWPA/zsrptydiHKr2PBT4iYbaNB9oueg+No8C2g9MDiZXsEI0LH0ooXeBylZRrAst+A20ehxxOYdIeNRDwOljtfv+oeMx6Wiuuhf/zzvyonvPMTLhAG6Ru9eD/g+qUvkZN8nt0Ppi/dxpSwpRUjKtGMzmxBFyUGGPavYrqQWX7kJRc3APPktHMxIDhIylM6nv5CeMxe+xkxtWtOyJovOs9G9ZKGSrHiG4b/hwSVqzgz0Q0hlrWJfwZR7uw3B1zSJPRePH49cz/AqvslAltioo2F/5zChNbe0JUMp1z0qz8jJ9YsP3RsxwhYrg+wRYAkT0q8EwnSQoi8yqQu55RH0B7R/kjRduoYmg8mbcr8sgqkO9yTvu+u2iIY8gQ3jf3LwLETYb/lwXUupG+Up88GmRaxI1RKJY6XT8wHQ5aS3T6aidqeo4NK0tOyfAX0oJVhl9Tvj2F3E2r3Jl1NGDjw+vNe1B3YNgy1nwzwAcA6gBhNAWfi92etRiNpmZ9k/R7SowW/pNBrit5e4W0VFmQ== X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 53516926-ba51-46ce-0379-08d87324cc24 X-MS-Exchange-CrossTenant-AuthSource: DM6PR04MB6201.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2020 05:15:16.1709 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: jG40Qn+bVY382jfVawe3k6sAc/gntU9w3PJNe+WSNY+3PV6q7t55zfzMWhNNZYHm+cuq9xqleXIIR1+vGDOGjg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR04MB0348 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201018_011518_680662_E1B93697 X-CRM114-Status: GOOD ( 12.89 ) X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [68.232.141.245 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.0 MSGID_FROM_MTA_HEADER Message-Id was added by a relay X-BeenThere: opensbi@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Anup Patel , Damien Le Moal , Anup Patel , opensbi@lists.infradead.org Sender: "opensbi" Errors-To: opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Currently, the make rules for ELF, BIN and LD script are little generic to allowing ELF, BIN and LD script to be anywhere in the build directory. For OpenSBI firmwares, the ELF, BIN, and LD script are always platform specific so we update make rules accordingly. Signed-off-by: Anup Patel Reviewed-by: Atish Patra --- Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 2a352ef..6c36f09 100644 --- a/Makefile +++ b/Makefile @@ -310,15 +310,6 @@ all: $(targets-y) # Preserve all intermediate files .SECONDARY: -$(build_dir)/%.bin: $(build_dir)/%.elf - $(call compile_objcopy,$@,$<) - -$(build_dir)/%.elf: $(build_dir)/%.o $(build_dir)/%.elf.ld $(platform_build_dir)/lib/libplatsbi.a - $(call compile_elf,$@,$@.ld,$< $(platform_build_dir)/lib/libplatsbi.a) - -$(platform_build_dir)/%.ld: $(src_dir)/%.ldS - $(call compile_cpp,$@,$<) - $(build_dir)/lib/libsbi.a: $(libsbi-objs-path-y) $(call compile_ar,$@,$^) @@ -340,6 +331,15 @@ $(build_dir)/%.dep: $(src_dir)/%.S $(build_dir)/%.o: $(src_dir)/%.S $(call compile_as,$@,$<) +$(platform_build_dir)/%.bin: $(platform_build_dir)/%.elf + $(call compile_objcopy,$@,$<) + +$(platform_build_dir)/%.elf: $(platform_build_dir)/%.o $(platform_build_dir)/%.elf.ld $(platform_build_dir)/lib/libplatsbi.a + $(call compile_elf,$@,$@.ld,$< $(platform_build_dir)/lib/libplatsbi.a) + +$(platform_build_dir)/%.ld: $(src_dir)/%.ldS + $(call compile_cpp,$@,$<) + $(platform_build_dir)/%.dep: $(platform_src_dir)/%.c $(call compile_cc_dep,$@,$<) From patchwork Sun Oct 18 05:14:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 1383800 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=FcvSFk++; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.a=rsa-sha256 header.s=dkim.wdc.com header.b=Z7d7KtLf; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-sharedspace-onmicrosoft-com header.b=XtW8Shag; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CDSlB12yWz9sTL for ; Sun, 18 Oct 2020 16:15:31 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=jgYbly5h9rlYDUunKU9wrGvjbphDB+9iUgW+9Sl+XjY=; b=FcvSFk++JBqDruHj2amSFt+lV nBbnF+Q63vsvq1Ob3U4BWB4KXA5ma/2HIhXb65T2uJQE4LNavwj8mtEPT85yZg0Z6YKGJ5WawvmEt XzChuJGvu97fGPridrAgPjuDSafwFYoY7Ihd0TUJfnHfIXLoDatBPSLHrnuiNMkdH0kM7JU8g9P0w CSpnsuVItY16CIYkC6vsLpTN+fB0t/AXe7kb4RMXkrVMrilYg8bSyTRnxRi9l3iWitsuWfeF1WkRP X1nxUmtjgTOM/GnIJD6bqEtf7ACqiHhZ2IfG0gjcDokQwYbCei0jF6SO1yPPNsx+/mTSOb7i9DT6a TXCJXk53w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kU12U-00015m-Q7; Sun, 18 Oct 2020 05:15:26 +0000 Received: from esa3.hgst.iphmx.com ([216.71.153.141]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kU12R-00014X-96 for opensbi@lists.infradead.org; Sun, 18 Oct 2020 05:15:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1602998124; x=1634534124; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=okhVt+iMTdVfXszS0dsLcNuV8ShhwR4ytQW+4mn/iYI=; b=Z7d7KtLfXbmhJYRwVwgxwQhsC3NwaDvxcnvu+p4er74ZlBfig/euoRdX 34SpjL9tdpEgUQ1x2tnqSxkADJDAJm6Mhr2VImJKLDlKuvk7ecwezrtnN +oYENM8apSznvl5IiHW6NAMPhdXHx67S8Vnql2kAeuu/S6jekqgB1CCNo 9cRjhDV/09oATwQm+fAFqA9xomjbrWjwYmeIrWsBj+ij0QvRdLQZtE2L1 cbROakE/jkWTZxFRukAlkf2z6nwpl97PnYuLR83jC203WGa2Kfjo1NNmC xWHMo+pAfrsQCLXlOm3xgi0gihKS8SAkTv5EpFqqnHaSBMsGh/zXnRJAs A==; IronPort-SDR: /y76+EfsaiOA6P8+ckcx+qZCKo0xxMziKFr7Bn529/zt3yz+yxlqA51Do3pJ89hXHRFdzgJpbb KQUhjzUj+/YRPe+UncDCj8paKgjXRdplMNAMXd6O/WDTC1DMPF/9MPIgRmPAquN7Q6WHZ61+/m cWVXGnHv+haRqizB0B6JFixB2HmruJHj1KD8fzmO3IFvolxYra7RIzvnFErjSMsw8dMrrN0+9f bfOCTzhys18UPILW1TUuAilKgX6aGMdrOCvVtYeBN2fr5Y3ckNDgxm5+zK+8TCFHa6w1Nfz53N 39s= X-IronPort-AV: E=Sophos;i="5.77,388,1596470400"; d="scan'208";a="154677432" Received: from mail-co1nam11lp2175.outbound.protection.outlook.com (HELO NAM11-CO1-obe.outbound.protection.outlook.com) ([104.47.56.175]) by ob1.hgst.iphmx.com with ESMTP; 18 Oct 2020 13:15:21 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nnhl97FT5g1rldMGLTXutZzlTzIwDvi2Sk780npUIUhDEHBTuLNEw3kDdJzbTAtMfvk320RXYN+Qsg1EfcqDA3gjBbOoNmDzZpUFEkv0zXJJRrcZn1QqQ/8lT5fq6UPU2hgpxF3l7ihURveqCtnxmKCooKBS2ZRCgyGJ9YHXLi9Ca2JWzL2/+q2g7WvslBoGlbdzaEl66Cwa3qEl9PwY3QxlvbBjn1bYsZ0+kEEtaLfjWDFnr85N4uXY6XxqezbveFY3uY2tGFSwPRRUmalId3anvP23AmuQ9c3UkBPWMbnJc4soGBkUNFMU4p2S+lhYVlaHRsadMSOLlCLV9ozHvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DdPr6LoDEYMC+6U/8Pt+p9t2bBwepKOERAgw7gtZ9Hs=; b=lKFNzdkRQhlznBPICJupvDxZ+fgCqY5QYu4efMlPBGJSjSH6AYo92LRf0tI7mIqGSUxHCBWD9+FpvoKBy9U2JhuoaNtWoni0rzEtaN6rcmIUKNi806ZaUtlDa12H1LiVYtaD7CmbOexxAJ2OnJQih6hauAbvQQ/XpppOrPDklY/1h/5CmNoEBKTqqNlOVXAay/9Kj/gLTltR+Km8/atIE4RCuo7X86ZAfN2wYIUshXUGJivh4SV4XytbQ9tyoZBXhzZvFN/9t99V56Qu4fj6z5tOaQON5vKXK7aDc8RW6SvjMSwdYPu8nDIL+oKEIoaHLlon392KibfyTowF46GCWg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wdc.com; dmarc=pass action=none header.from=wdc.com; dkim=pass header.d=wdc.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector2-sharedspace-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DdPr6LoDEYMC+6U/8Pt+p9t2bBwepKOERAgw7gtZ9Hs=; b=XtW8ShagnWz7pFW0GcuMr61t/U8Qj+sG69vx2hna+eGVV5gIVVULB+IPua9Q4inc1aOAZNd2o8pwxvpXZS0v5Smo/0PNlaP3zlJvC98aVG/6qD/xk5j/KF7qaZG1jTV+mU++ke5DjuIdO43AlIdJmeK0li1GVmY4Xxaf7dpw9pE= Authentication-Results: wdc.com; dkim=none (message not signed) header.d=none;wdc.com; dmarc=none action=none header.from=wdc.com; Received: from DM6PR04MB6201.namprd04.prod.outlook.com (2603:10b6:5:127::32) by DM5PR04MB0348.namprd04.prod.outlook.com (2603:10b6:3:72::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.20; Sun, 18 Oct 2020 05:15:18 +0000 Received: from DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::d035:e2c6:c11:51dd]) by DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::d035:e2c6:c11:51dd%6]) with mapi id 15.20.3477.028; Sun, 18 Oct 2020 05:15:18 +0000 From: Anup Patel To: Atish Patra , Alistair Francis Subject: [PATCH v2 2/5] firmware: Add common FW_FDT_PATH compile-time option Date: Sun, 18 Oct 2020 10:44:46 +0530 Message-Id: <20201018051449.2368918-3-anup.patel@wdc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201018051449.2368918-1-anup.patel@wdc.com> References: <20201018051449.2368918-1-anup.patel@wdc.com> X-Originating-IP: [122.179.120.189] X-ClientProxiedBy: MAXPR0101CA0033.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:d::19) To DM6PR04MB6201.namprd04.prod.outlook.com (2603:10b6:5:127::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from wdc.com (122.179.120.189) by MAXPR0101CA0033.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:d::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.21 via Frontend Transport; Sun, 18 Oct 2020 05:15:16 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 672769f1-2211-4bab-dd0a-08d87324cdfe X-MS-TrafficTypeDiagnostic: DM5PR04MB0348: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: WDCIPOUTBOUND: EOP-TRUE X-MS-Oob-TLC-OOBClassifiers: OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Op993t0cuam4OxhbGxLZDzuUPsc06WR6XGvUJ5WipyeKbf9hm68+6uCeU2BaKd4xO6+syz5liGAj1xUX1N0E6D8BoEGhrkcWzxQoxNzIo9E1ZCJnJOiDzrYJLH+x4X7lM3C5WvHUt41po3NvZIlldoJRK5wTQm5MzsQHPJ9F8qTE0QWFvSTVgz9t6GloLLnx9dOAprhRm34OsekHSTOpl4Nc1n9cB0W5XIFgpXLOyH/ySkVe+SijMyUUJKu6dhfYlWv0mGXxTHqX7HyR/ZVItZG8at9Xpg6PyZ5BUL7mnxRYbl+pKbBSc80FcHXx9eRa7fRFrG0/lzh8RLDuhAcgqA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM6PR04MB6201.namprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(376002)(396003)(39850400004)(136003)(366004)(110136005)(316002)(478600001)(36756003)(6636002)(2906002)(956004)(2616005)(44832011)(6666004)(66946007)(5660300002)(86362001)(83380400001)(54906003)(66556008)(66476007)(8886007)(52116002)(7696005)(26005)(8936002)(8676002)(4326008)(55016002)(186003)(16526019)(1076003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: n77uqUYuFW2+ozn+Lv+0r/SZsJAhf99FghkXQ6RUmpGessu5v4kR3iIe/8p8ASZy/mXCRcICESctTQ0vgvj/+Po8ibeCP2DM578xJMkP9d2VgMDjZIgmJ2/uFOdgoL+MMVlLjUeHAm+6xQ/MHoGlpXuxWZzwnpkkxrZMxGPjVy4mvUk2zZUXWKAVILx7wB9EF21ABBrVHwo5aM1A1bRn4/9vgbkWM5SlSzJFa2ZRbvSWLO4tPFQJ2QKPL5+sGDawwAgruTHCF7uC6zjlIsQ8tDMjS8rFQv3ftihLpRSLE6drroeS/zTfrua6T9/IWVv0/IPxx9hmetLS6M3oJRqjZtCq1jOj+L8w0m1bQGxtjkhVXHFA7yBVG7jgdXH4Ldj4BW+fAu2MpTwLgxKco84MDhiro2k4Fym648KzWKEpabRYK7BEmLgHwBvwu5YkSk80Zpm6TEISUloIrAWFySWWkMgkoGMUDDJCu3nUqbSTLJGM38AukV+TJyO6shmIzEbk7JYMOueIXwfGQk53Z92zMHbxpa098i68j6DUn9IQ2wP01/GgmXbAVJYCu3qdmAGWwdmuCccAqSseTJvuiMRXucMJ+cGvywkW1HMpFkWWBg6PGqp/U4jdFfZCAmY/XcizgLtNPDNRo+xRWJJxnYfOXQ== X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 672769f1-2211-4bab-dd0a-08d87324cdfe X-MS-Exchange-CrossTenant-AuthSource: DM6PR04MB6201.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2020 05:15:18.6902 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: TjurNycN00QF9Guafsk3rk/ucLGWpqPHgSSoMbvjvXPk03IMF5hf3h4LMXSbBr6zzP57g+7rSlxwuTzTzk9fjQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR04MB0348 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201018_011523_710988_A3CE2D9F X-CRM114-Status: GOOD ( 15.96 ) X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [216.71.153.141 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.0 MSGID_FROM_MTA_HEADER Message-Id was added by a relay X-BeenThere: opensbi@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Anup Patel , Damien Le Moal , Anup Patel , opensbi@lists.infradead.org Sender: "opensbi" Errors-To: opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Currently, only FW_PAYLOAD has mechanism to embed external FDT using FW_PAYLOAD_FDT_PATH compile-time option. This patch adds a common FW_FDT_PATH compile-time option to embed external FDT for all OpenSBI firmwares (i.e FW_JUMP, FW_PAYLOAD, and FW_DYNAMIC). Signed-off-by: Anup Patel Reviewed-by: Atish Patra --- docs/firmware/fw.md | 16 +++++++++++----- firmware/external_deps.mk | 4 ++++ firmware/fw_base.S | 16 ++++++++++++++++ firmware/objects.mk | 7 +++++++ 4 files changed, 38 insertions(+), 5 deletions(-) diff --git a/docs/firmware/fw.md b/docs/firmware/fw.md index 4133c23..cc0cc9e 100644 --- a/docs/firmware/fw.md +++ b/docs/firmware/fw.md @@ -51,11 +51,17 @@ case, a *FW_PAYLOAD* firmware allows embedding a flattened device tree in the Firmware Configuration and Compilation -------------------------------------- -All firmware types mandate the definition of the following compile time -configuration parameter. - -* **FW_TEXT_ADDR** - Defines the address at which the previous booting stage - loads OpenSBI firmware. +All firmware types support the following common compile time configuration +parameters: + +* **FW_TEXT_ADDR** - Defines the execution address of the OpenSBI firmware. + This configuration parameter is mandatory. +* **FW_FDT_PATH** - Path to an external flattened device tree binary file to + be embedded in the *.rodata* section of the final firmware. If this option + is not provided then the firmware will expect the FDT to be passed as an + argument by the prior booting stage. +* **FW_FDT_PADDING** - Optional zero bytes padding to the embedded flattened + device tree binary file specified by **FW_FDT_PATH** option. Additionally, each firmware type as a set of type specific configuration parameters. Detailed information for each firmware type can be found in the diff --git a/firmware/external_deps.mk b/firmware/external_deps.mk index 2b8f9f6..f43ac06 100644 --- a/firmware/external_deps.mk +++ b/firmware/external_deps.mk @@ -7,5 +7,9 @@ # Anup Patel # +$(platform_build_dir)/firmware/fw_dynamic.o: $(FW_FDT_PATH) +$(platform_build_dir)/firmware/fw_jump.o: $(FW_FDT_PATH) +$(platform_build_dir)/firmware/fw_payload.o: $(FW_FDT_PATH) + $(platform_build_dir)/firmware/fw_payload.o: $(FW_PAYLOAD_PATH_FINAL) $(platform_build_dir)/firmware/fw_payload.o: $(FW_PAYLOAD_FDT_PATH) diff --git a/firmware/fw_base.S b/firmware/fw_base.S index 0271d9a..95197da 100644 --- a/firmware/fw_base.S +++ b/firmware/fw_base.S @@ -182,6 +182,11 @@ _bss_zero: call fw_save_info MOV_5R a0, s0, a1, s1, a2, s2, a3, s3, a4, s4 +#ifdef FW_FDT_PATH + /* Override previous arg1 */ + la a1, fw_fdt_bin +#endif + /* Override previous arg1 */ MOV_3R s0, a0, s1, a1, s2, a2 call fw_prev_arg1 @@ -668,3 +673,14 @@ _reset_regs: csrw CSR_MSCRATCH, 0 ret + +#ifdef FW_FDT_PATH + .section .rodata + .align 4 + .globl fw_fdt_bin +fw_fdt_bin: + .incbin FW_FDT_PATH +#ifdef FW_FDT_PADDING + .fill FW_FDT_PADDING, 1, 0 +#endif +#endif diff --git a/firmware/objects.mk b/firmware/objects.mk index c980362..2eea54c 100644 --- a/firmware/objects.mk +++ b/firmware/objects.mk @@ -17,6 +17,13 @@ ifdef FW_TEXT_START firmware-genflags-y += -DFW_TEXT_START=$(FW_TEXT_START) endif +ifdef FW_FDT_PATH +firmware-genflags-y += -DFW_FDT_PATH=\"$(FW_FDT_PATH)\" +ifdef FW_FDT_PADDING +firmware-genflags-y += -DFW_FDT_PADDING=$(FW_FDT_PADDING) +endif +endif + firmware-bins-$(FW_DYNAMIC) += fw_dynamic.bin firmware-bins-$(FW_JUMP) += fw_jump.bin From patchwork Sun Oct 18 05:14:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 1383799 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=OQAfeEeq; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.a=rsa-sha256 header.s=dkim.wdc.com header.b=dpIZSLQu; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-sharedspace-onmicrosoft-com header.b=RuWyBCdn; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CDSlB3YYbz9sTR for ; Sun, 18 Oct 2020 16:15:33 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=jN6z59NZMfZIrldjwZK0FiiRxQHc5qTKZx/GXu+esoA=; b=OQAfeEeq6miWmKEaeLG8oBuGq lsy4Emfj7ZNzP+tbgmkCHryMxthzYw7MRTonQFH8VHiZ/25OrwuQ1m13hsl1XoQRVFcMJLjC9S1gI E4MmhFHS40iu1e3QtO6SRPsATkHhVS9oq9BXv4d5uY8ov+wlHJe5ipcLQ6QLwwjTEtsZ5zWASY0az VHuHG6L7ahRtTQVIZVRSmoxBYg10MVsMoDn9+mD/K64K+QGY4LbgwiMRReBV+TLYM/+qX9aldpIBd HeYYW6M8QsZzI5TJbVNuVukE3fmTgB65I6Mb/TjIRquQiSpeK5WxFZaweBoOwDLkEGCDSa3Q9BFDD RshfY2kAg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kU12V-000160-MK; Sun, 18 Oct 2020 05:15:27 +0000 Received: from esa3.hgst.iphmx.com ([216.71.153.141]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kU12S-00014v-80 for opensbi@lists.infradead.org; Sun, 18 Oct 2020 05:15:25 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1602998125; x=1634534125; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=gEZRgpeOC5lRb3pFi87RjPwRMLH4/O5KR2V6xEN7pUE=; b=dpIZSLQu4m2wTS1Fb/0yS8sMsx3D9W5iahNrKk+qJ08BqYBIf/uiRt71 4eLCW694WA6+v/X3BX7RxBmHuOy5Cq/k2VwNsbzAl66pzlXlt8D1xajDV WMOmFaO2I6WzjNTvx3Odweu1LIOhS8Iohm1jhFKTVMxecLikR26yRn3HD N5nybnb8rGumazBmKnZMUjuTuA+ijBbHPXVB24L/oT16pzvhnagXJfQxR mL1o1jtfJr8X6iSRO5AtQ7P8nh7jKRK7sCACiw18rOs+Qkw4XYRZj1HbE d6Y4Bp+dnDFJ6Ign998YdFlOB86+RjRp+E/YY01pWYt84+DS88fMd465x w==; IronPort-SDR: 9xLFafjVgAH3rbABNJkj0sQ3d/xg5q/Mj1Tarye7id3EklnMnjnXmyZI8gkZE+5RmsXIrbgWbT n9KJOxKCFwsuSOk0JuLa7Ge4LAa/ULgYenjeQlikgOU9aNW1qer+q1CnNf+W61uRMQE63ylW41 Mg9qtVdfegq+bwyn30n0UIfXMQFg6asGaVsLsITud2L1bTJX4Tcw68SsrMUOZSIeRldnXRzpYA GlxVTdZNwvh6a42hxEUOSc61aYmItdwtr3hDqXuUIcj5dbgXcC5HZ32Mlzef7wbBnNKJGbYofJ 8ys= X-IronPort-AV: E=Sophos;i="5.77,388,1596470400"; d="scan'208";a="154677435" Received: from mail-co1nam11lp2171.outbound.protection.outlook.com (HELO NAM11-CO1-obe.outbound.protection.outlook.com) ([104.47.56.171]) by ob1.hgst.iphmx.com with ESMTP; 18 Oct 2020 13:15:24 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gzZjLs7HkfHYz7fQaaXjII8Tgea8bSxtGUhE3I/rbrz/YRgLVJEk1KcrV5BJGUvo5PG3Sr0Y60W3mZtsiFHLZF7c/9Wl8u4Od8R0YHTalGi59SS+2QhsPkkqee1XwzebSQXF4uREVxNvD9/wtB+q4NmVb68WpWXwCle4cg+htugMZuwZLxvQXbaciawFwmmcgNbBu1V49T8OkLacG619XepK3K7w85oTpBas0ftfeyODni2n9W0y9deAFRp23a6TPu2rRfl89OfcbJDxKrRug4dO5jgOKR73qbQQXiqUD7Cx+yIBzB+99xF+dxeMdFbnvAWZtpf2Be+B0UblSnMAbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=88Ug7gQZZ3nRSqCoihNIFlE47iwZoWSaWdBhCcBZtn0=; b=itp9m43NJVEz7aas7W36FLjY0tLuzMnKiLVP6sP9N1OI8UmYLvBhV3V1AspQtUfwezbU/1NqcXUW6MDay7dAZ2UKmR8bHm1DHzBdMeXxj0SMAwxjXKwA9EpucnyPxtqJmUWjPZYEdIwUlZBOPHkeYKs+stZzvH83l/nUPIOX2D+0c6i/o+3E01fKdfLWX42vY1XOPxJ29s7OtkT6ICUYZ8jUTUchlEfTwqHLZODPTnawEO/9EtJ2ePHRu9cCE3jlvfPgzOo2cLmxkIVkAppTkQttG3JpUw5roo+bH2iYLDUZF/q83kYYzEMlCq9MepXKRv/kei4CfaNOYTR+zp1gqg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wdc.com; dmarc=pass action=none header.from=wdc.com; dkim=pass header.d=wdc.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector2-sharedspace-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=88Ug7gQZZ3nRSqCoihNIFlE47iwZoWSaWdBhCcBZtn0=; b=RuWyBCdnfQjdeoyGrX4owsKdJG1W5HMdaPjmzd4Tu1/SAh9AzN9TSJ5ilqJj5Hx8L5kUJC/FotUto64yJOVdXPCbkHZ1r81uqfU7MVsvf+4NI/ebW0HKoAQaj7Cy6uc27JpjTwjD9Gk2OljA+/LmUHdJkRQH5hZfh+kGxSboTrA= Authentication-Results: wdc.com; dkim=none (message not signed) header.d=none;wdc.com; dmarc=none action=none header.from=wdc.com; Received: from DM6PR04MB6201.namprd04.prod.outlook.com (2603:10b6:5:127::32) by DM5PR04MB0348.namprd04.prod.outlook.com (2603:10b6:3:72::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.20; Sun, 18 Oct 2020 05:15:22 +0000 Received: from DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::d035:e2c6:c11:51dd]) by DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::d035:e2c6:c11:51dd%6]) with mapi id 15.20.3477.028; Sun, 18 Oct 2020 05:15:22 +0000 From: Anup Patel To: Atish Patra , Alistair Francis Subject: [PATCH v2 3/5] firmware: Remove FW_PAYLOAD_FDT_PATH compile-time option Date: Sun, 18 Oct 2020 10:44:47 +0530 Message-Id: <20201018051449.2368918-4-anup.patel@wdc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201018051449.2368918-1-anup.patel@wdc.com> References: <20201018051449.2368918-1-anup.patel@wdc.com> X-Originating-IP: [122.179.120.189] X-ClientProxiedBy: MAXPR0101CA0033.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:d::19) To DM6PR04MB6201.namprd04.prod.outlook.com (2603:10b6:5:127::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from wdc.com (122.179.120.189) by MAXPR0101CA0033.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:d::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.21 via Frontend Transport; Sun, 18 Oct 2020 05:15:19 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 2c7bb33e-fa86-4ab5-f784-08d87324cfab X-MS-TrafficTypeDiagnostic: DM5PR04MB0348: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: WDCIPOUTBOUND: EOP-TRUE X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3PYfcXdOqW0k/3h92LyZeTkPeKx1qyMZwFDSvdvj2c2+tmKRAuhBizuLCg/RepGyxwB/LWa06+Yvc1ZMMBtHlpWHzsij4PQlP39w4+9iKTKnZQ/C0G94OXRKNzTOL39O4pL0rWtp2PUdx1HU9ex6iGqpnWlr5zHKDqga3WyJh5bgfoNeDH99Tjdt8eSTxbyNAxTUihfgeIGcxYOXaUpgrvUUJQ0tkv/ZZFZEFzBKteHpmDD9Yqx2CXqW63/9lI7fMJ8BFLBrl7gyw1HivNIE53udsOqRsSNK8qoDWRRl85q5YKVccDmVDXXanFpok7tIIubkmaXlRMJXVZLsYgOlzu3F5qWaeiyPHIPCAyJYnLze4Sud/JdojCcHZAVMN4J3hCMs6B9PO7/Sz7g0b9yvhw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM6PR04MB6201.namprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(376002)(396003)(39850400004)(136003)(366004)(110136005)(316002)(478600001)(36756003)(966005)(6636002)(2906002)(956004)(2616005)(44832011)(6666004)(66946007)(5660300002)(86362001)(83380400001)(54906003)(66556008)(66476007)(8886007)(52116002)(7696005)(26005)(8936002)(8676002)(4326008)(55016002)(186003)(16526019)(1076003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: yr8f6U9wEzqmuEBI/kbyAfnfWUZepoo1iz+MCuYjHvwaCITMFW6ZOyWmoBX6JPyFzRGqfEfTP/BGPLPj+e0939UGqA8rBNeYl6VYYNEazmUUrNprTPWlg7C6MfSdqEICLCY1OQObA0TEMdVBXRSbBAekUbQdUNmjxHHXNWZbIbOUcQywvpaOj7xV9Q7ZJO/ZggSEmW8uwp9wiSRcQ1tCe6d/3uYi7qmvdgDxRNpP9+DlOSBWpUdmRoOiCA6RxUYpoYY5s9xOicbhBiDRAoci7/nEUVOd5hCJcnRUBWkWBUQ5WqhmJWYHezg5pl62goAVg0Tea9vtgfMXejllbU4/+LH7fdTjr+L3yNdoOS29VIkcngLe2djLbPRu1vj4jRNE74pZAjafTkxr4HV7x0tyg7qH4h4roE8n3mZy/Tq8iAvSclM23yMp2Fmvki3Ug9wNtkHoF9O4mCfUFNIhxDnm95bQkzdoEPx7fMvr97NVM96ChFQgiwHDS5Xa5EccU55htFnogcvIDwpI3hBEv+ZBc4l13VdI9tNSq6i7brCWsXpSi1IQQLt1krMQNUR7r9T0+AgsZCwhdGBpqhTonEAptqzZ9np4lcyUqjh+5/j83MUJ1RjIZZsRdQvRKqM1QBFgqUb4vG+gLkl4kWUMposVNQ== X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2c7bb33e-fa86-4ab5-f784-08d87324cfab X-MS-Exchange-CrossTenant-AuthSource: DM6PR04MB6201.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2020 05:15:21.7063 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: tAx7pUGCuOvDshalWKynzlaYSagQGX7idxSuf/G3LRnkXW7VbwqzTnJmRlqutuSDXEPenBBDepPZ4cPo76VsWA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR04MB0348 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201018_011524_569558_6355A406 X-CRM114-Status: GOOD ( 20.18 ) X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [216.71.153.141 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.0 MSGID_FROM_MTA_HEADER Message-Id was added by a relay X-BeenThere: opensbi@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Anup Patel , Damien Le Moal , Anup Patel , opensbi@lists.infradead.org Sender: "opensbi" Errors-To: opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org The FW_PAYLOAD_FDT_PATH compile-time option is replaced by FW_FDT_PATH compile-time option which is more flexible and common across all OpenSBI firmwares. This patch removes FW_PAYLOAD_FDT_PATH and updates related documentation to use FW_FDT_PATH. Signed-off-by: Anup Patel Reviewed-by: Atish Patra --- docs/firmware/fw_payload.md | 9 ++------- docs/platform/andes-ae350.md | 4 ++-- docs/platform/shakti_cclass.md | 4 ++-- docs/platform/sifive_fu540.md | 6 +++--- firmware/external_deps.mk | 1 - firmware/fw_base.S | 9 --------- firmware/fw_dynamic.S | 13 ------------- firmware/fw_jump.S | 13 ------------- firmware/fw_payload.S | 25 ------------------------- firmware/objects.mk | 3 --- platform/template/config.mk | 4 +++- 11 files changed, 12 insertions(+), 79 deletions(-) diff --git a/docs/firmware/fw_payload.md b/docs/firmware/fw_payload.md index bc712d2..0947448 100644 --- a/docs/firmware/fw_payload.md +++ b/docs/firmware/fw_payload.md @@ -55,14 +55,9 @@ file. The parameters currently defined are as follows: automatically generated and used as a payload. This test payload executes an infinite `while (1)` loop after printing a message on the platform console. -* **FW_PAYLOAD_FDT_PATH** - Path to an external flattened device tree binary - file to be embedded in the *.text* section of the final firmware. If this - option is not provided then the firmware will expect the FDT to be passed - as an argument by the prior booting stage. - * **FW_PAYLOAD_FDT_ADDR** - Address where the FDT passed by the prior booting - stage or specified by the *FW_PAYLOAD_FDT_PATH* parameter and embedded in - the *.text* section will be placed before executing the next booting stage, + stage or specified by the *FW_FDT_PATH* parameter and embedded in the + *.rodata* section will be placed before executing the next booting stage, that is, the payload firmware. If this option is not provided, then the firmware will pass the FDT address passed by the previous booting stage to the next booting stage. diff --git a/docs/platform/andes-ae350.md b/docs/platform/andes-ae350.md index 5a98707..46889a1 100644 --- a/docs/platform/andes-ae350.md +++ b/docs/platform/andes-ae350.md @@ -19,12 +19,12 @@ Building Andes AE350 Platform ----------------------------- To use Linux v5.2 should be used to build Andes AE350 OpenSBI binaries by using -the compile time option FW_PAYLOAD_FDT_PATH. +the compile time option FW_FDT_PATH. AE350's dts is included in https://github.com/andestech/linux/tree/ast-v3_2_0-release-public **Linux Kernel Payload** ``` -make PLATFORM=andes/ae350 FW_PAYLOAD_PATH=/arch/riscv/boot/Image FW_PAYLOAD_FDT_PATH= +make PLATFORM=andes/ae350 FW_PAYLOAD_PATH=/arch/riscv/boot/Image FW_FDT_PATH= ``` diff --git a/docs/platform/shakti_cclass.md b/docs/platform/shakti_cclass.md index 2f4a699..05c9b3a 100644 --- a/docs/platform/shakti_cclass.md +++ b/docs/platform/shakti_cclass.md @@ -23,11 +23,11 @@ Building Shakti C-class Platform **Linux Kernel Payload** ``` -make PLATFORM=generic FW_PAYLOAD_PATH=/arch/riscv/boot/Image FW_PAYLOAD_FDT_PATH= +make PLATFORM=generic FW_PAYLOAD_PATH=/arch/riscv/boot/Image FW_FDT_PATH= ``` **Test Payload** ``` -make PLATFORM=generic FW_PAYLOAD_FDT_PATH= +make PLATFORM=generic FW_FDT_PATH= ``` diff --git a/docs/platform/sifive_fu540.md b/docs/platform/sifive_fu540.md index 1008432..c9513eb 100644 --- a/docs/platform/sifive_fu540.md +++ b/docs/platform/sifive_fu540.md @@ -29,13 +29,13 @@ DT (device tree) is not backward compatible with the DT passed from FSBL. To use Linux v5.2 (or higher, the pre-built DTB (DT binary) from Linux v5.2 (or higher) should be used to build SiFive FU540 OpenSBI binaries by using -the compile time option *FW_PAYLOAD_FDT_PATH*. +the compile time option *FW_FDT_PATH*. ``` make PLATFORM=sifive/fu540 FW_PAYLOAD_PATH=/arch/riscv/boot/Image or (For Linux v5.2 or higher) -make PLATFORM=sifive/fu540 FW_PAYLOAD_PATH=/arch/riscv/boot/Image FW_PAYLOAD_FDT_PATH= +make PLATFORM=sifive/fu540 FW_PAYLOAD_PATH=/arch/riscv/boot/Image FW_FDT_PATH= ``` **U-Boot Payload** @@ -147,7 +147,7 @@ booti ${kernel_addr_r} - ${fdt_addr_r} QEMU Specific Instructions -------------------------- If you want to test OpenSBI with QEMU 'sifive_u' machine, please follow the -same instructions above, with the exception of not passing FW_PAYLOAD_FDT_PATH. +same instructions above, with the exception of not passing FW_FDT_PATH. This is because QEMU generates a device tree blob on the fly based on the command line parameters and it's compatible with the one used in the upstream diff --git a/firmware/external_deps.mk b/firmware/external_deps.mk index f43ac06..6264005 100644 --- a/firmware/external_deps.mk +++ b/firmware/external_deps.mk @@ -12,4 +12,3 @@ $(platform_build_dir)/firmware/fw_jump.o: $(FW_FDT_PATH) $(platform_build_dir)/firmware/fw_payload.o: $(FW_FDT_PATH) $(platform_build_dir)/firmware/fw_payload.o: $(FW_PAYLOAD_PATH_FINAL) -$(platform_build_dir)/firmware/fw_payload.o: $(FW_PAYLOAD_FDT_PATH) diff --git a/firmware/fw_base.S b/firmware/fw_base.S index 95197da..1d9b375 100644 --- a/firmware/fw_base.S +++ b/firmware/fw_base.S @@ -187,15 +187,6 @@ _bss_zero: la a1, fw_fdt_bin #endif - /* Override previous arg1 */ - MOV_3R s0, a0, s1, a1, s2, a2 - call fw_prev_arg1 - add t1, a0, zero - MOV_3R a0, s0, a1, s1, a2, s2 - beqz t1, _prev_arg1_override_done - add a1, t1, zero -_prev_arg1_override_done: - /* * Initialize platform * Note: The a0 to a4 registers passed to the diff --git a/firmware/fw_dynamic.S b/firmware/fw_dynamic.S index d658011..8b56947 100644 --- a/firmware/fw_dynamic.S +++ b/firmware/fw_dynamic.S @@ -86,19 +86,6 @@ fw_save_info: 2: ret - .section .entry, "ax", %progbits - .align 3 - .global fw_prev_arg1 - /* - * We can only use a0, a1, and a2 registers here. - * The a0, a1, and a2 registers will be same as passed by - * previous booting stage. - * The previous arg1 should be returned in 'a0'. - */ -fw_prev_arg1: - add a0, zero, zero - ret - .section .entry, "ax", %progbits .align 3 .global fw_next_arg1 diff --git a/firmware/fw_jump.S b/firmware/fw_jump.S index afbcec0..8553f8c 100644 --- a/firmware/fw_jump.S +++ b/firmware/fw_jump.S @@ -34,19 +34,6 @@ fw_boot_hart: fw_save_info: ret - .section .entry, "ax", %progbits - .align 3 - .global fw_prev_arg1 - /* - * We can only use a0, a1, and a2 registers here. - * The a0, a1, and a2 registers will be same as passed by - * previous booting stage. - * The previous arg1 should be returned in 'a0'. - */ -fw_prev_arg1: - add a0, zero, zero - ret - .section .entry, "ax", %progbits .align 3 .global fw_next_arg1 diff --git a/firmware/fw_payload.S b/firmware/fw_payload.S index 9805d8c..1ef121e 100644 --- a/firmware/fw_payload.S +++ b/firmware/fw_payload.S @@ -34,23 +34,6 @@ fw_boot_hart: fw_save_info: ret - .section .entry, "ax", %progbits - .align 3 - .global fw_prev_arg1 - /* - * We can only use a0, a1, and a2 registers here. - * The a0, a1, and a2 registers will be same as passed by - * previous booting stage. - * The previous arg1 should be returned in 'a0'. - */ -fw_prev_arg1: -#ifdef FW_PAYLOAD_FDT_PATH - la a0, fdt_bin -#else - add a0, zero, zero -#endif - ret - .section .entry, "ax", %progbits .align 3 .global fw_next_arg1 @@ -102,14 +85,6 @@ fw_options: add a0, zero, zero ret -#ifdef FW_PAYLOAD_FDT_PATH - .section .text, "ax", %progbits - .align 4 - .globl fdt_bin -fdt_bin: - .incbin FW_PAYLOAD_FDT_PATH -#endif - .section .payload, "ax", %progbits .align 4 .globl payload_bin diff --git a/firmware/objects.mk b/firmware/objects.mk index 2eea54c..b2ace75 100644 --- a/firmware/objects.mk +++ b/firmware/objects.mk @@ -48,9 +48,6 @@ ifdef FW_PAYLOAD_ALIGN firmware-genflags-$(FW_PAYLOAD) += -DFW_PAYLOAD_ALIGN=$(FW_PAYLOAD_ALIGN) endif -ifdef FW_PAYLOAD_FDT_PATH -firmware-genflags-$(FW_PAYLOAD) += -DFW_PAYLOAD_FDT_PATH=\"$(FW_PAYLOAD_FDT_PATH)\" -endif ifdef FW_PAYLOAD_FDT_ADDR firmware-genflags-$(FW_PAYLOAD) += -DFW_PAYLOAD_FDT_ADDR=$(FW_PAYLOAD_FDT_ADDR) endif diff --git a/platform/template/config.mk b/platform/template/config.mk index 7bcf937..f817342 100644 --- a/platform/template/config.mk +++ b/platform/template/config.mk @@ -34,6 +34,9 @@ platform-ldflags-y = # Firmware load address configuration. This is mandatory. FW_TEXT_START=0x80000000 +# Optional parameter for path to external FDT +# FW_FDT_PATH="path to platform flattened device tree file" + # # Dynamic firmware configuration. # Optional parameters are commented out. Uncomment and define these parameters @@ -71,5 +74,4 @@ FW_PAYLOAD_OFFSET=0x200000 endif # FW_PAYLOAD_ALIGN=0x1000 # FW_PAYLOAD_PATH="path to next boot stage binary image file" -# FW_PAYLOAD_FDT_PATH="path to platform flattened device tree file" # FW_PAYLOAD_FDT_ADDR=0x82200000 From patchwork Sun Oct 18 05:14:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 1383803 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=cWG7bsnO; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.a=rsa-sha256 header.s=dkim.wdc.com header.b=MdL/oHx8; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-sharedspace-onmicrosoft-com header.b=AdXqwkb2; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CDSlC2XCXz9sTc for ; Sun, 18 Oct 2020 16:15:35 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=E3v3YQhFHe9SSIputYdOJ8OGJSTUXGYg2atXyS4zaEU=; b=cWG7bsnOoT2GSC501oOdj53p7 aszpgzGUEMoZg05Sv4+trrejo7Q5YK81Xohcv092Ot7WxUtz/PtVb5sTinOAxm2aEyD+Pc8bH46pw CIxcXPTlWTfWF8N4qCoxndEDgZXfPtIIOnMAU8KR3qNm4RLEHZl4YbEh/Mn5/DbZLe0OUI/vBSo+p p/uB0HBU9diLvL1vo1htum8xvqiPId/N/xa+Vs1Rd1DdnQznFv5AYD0XO5TepdubsJLxXfspV7CF0 fAtP3UKpuiLb1UsYx7AMyQByvF3rZWg1+QiY6vkFSvBsKaI9DvPSHkQsI1tmTRhrKLq09V2vsejtr Jvj+Dd2FQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kU12X-00016u-Tf; Sun, 18 Oct 2020 05:15:29 +0000 Received: from esa3.hgst.iphmx.com ([216.71.153.141]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kU12V-00015q-Cc for opensbi@lists.infradead.org; Sun, 18 Oct 2020 05:15:28 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1602998128; x=1634534128; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=MKifoK5BiuiankC+T+8WJT+xuAcAMvBzyM7/A+PEmtQ=; b=MdL/oHx8roayHvRjzohIDl0zLgFHrkIrxZ7z3NPApZ+T56ddBsk+V3JT 8SVG0+qtYjZRO8OrBduwg80FN6CJ8sVmQPepaghH6+Dvwqp5mH9qjJqOv Y06Ete+AEoBDudHzPCx2cEoETL0d5rFYCPV4bxWPtul9ovujgi+9FjKRz 5jlT29iYlXwIR+WaZGTksDO2mlavgav7Ki6ryBRtYptz2AaL8RubgFHii I/ToL1SmcrSsqwL0emFDDjk2g4N8msIZFAwq04rit2STZpL2r1erBZuQt RW0mG1tsfyCo+mZuURdavzkXSWFPlXNog3zBQchYh0q/pFasgewdedyob Q==; IronPort-SDR: XTeaV7KqYauubtu4rhRIBmqUFIQ25A9SvpQM6OjEHqiLGYi83YYeKDdGkJP9xNiZvVS6iyinCC xb7qJFjvvLEVUH3Umb+8K7KX0qcFEXV1zdo+5QAT/m/cDPjJ8yJb/WFl1GSxJrSBiz3/Et+Mvz o3y3J3o7ykTfLRZLA+EencfmCTk43qIefG+MTrLtmcABeOi8dQ7SQ2Ss6JFn27WbgMSF3C09gy iWFFgP0JQ6lAhHMVVHmkiRU0VZygJMSp2Gw9ulXxS5jDcNbzmXfoYsBLe2pZVtcN1JFpwNQKQl 4O4= X-IronPort-AV: E=Sophos;i="5.77,388,1596470400"; d="scan'208";a="154677438" Received: from mail-co1nam11lp2174.outbound.protection.outlook.com (HELO NAM11-CO1-obe.outbound.protection.outlook.com) ([104.47.56.174]) by ob1.hgst.iphmx.com with ESMTP; 18 Oct 2020 13:15:27 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SQ62XPLVh5e6tXCD32rhwcuyiaxVTTCKLBlA9TeGGodJU3L6uhCuCMRlB7jnoNEVtrehmQ/NvXliUGme7fzbd+gZupO8B5f/VZdDcyqlDYHLMNJ/aKVNuIdfFbDqTzPCQd+GyQu6zgmI5Qz/ITG67p6KCZV5lZryx3Evt0/Yjm8n/FH2B6X7vWsY/lEajvuw4p9ccg6KoYsgka3Q2XQU950TK1Bk6xPX/olgMSFaS8wLGi1P4H30q9OzOFy7/MugjTFLYmRKp9/ME7ZJszdPRnBFREsX6iC+tynL1EjSfw7VwmQrzhegCXkp6zd+uASEnONQnfEw1lodPl3lvM6vwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ePLQNB49tRh6M9jU9oM4++a/I1UJmhFR+596/JHyOng=; b=CWVNBS+ovsx+lMG5wqcl8320ZD+dFVz/cnc6JX1UO9TYNsLaJj4a2dWcP+o4Q3JrCAE1aELYcQ9YBEWvSZMHyW3TP0axU6jzP5HFBPNNDXjfTfRI71LhPeNXyrsWLvcTbakGenL0r2Z/MbdPqkK5HTZT5+12zDOOpIzBneu6HXmNbf0x1dlkdEpI7vGML17GMV8f6BTu/fHQidt7+uPw0xSg2Efx6npaeBb3VEJNtHo4VW9l12RqzfepKpJ1lr0+o30iOUG7D9MDpw2oLTS2oycq2gcnnoEUxZZyoRh9PzPnoAq6+gX7MaoAKZyq+yoLtjeL9VeJqVK2F9NDBpk9QQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wdc.com; dmarc=pass action=none header.from=wdc.com; dkim=pass header.d=wdc.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector2-sharedspace-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ePLQNB49tRh6M9jU9oM4++a/I1UJmhFR+596/JHyOng=; b=AdXqwkb2bEhDYU4UIvKNHkerTw3Ge2lTOZzjw2xxpjYJtseX4cb0kIvDt1LJr+oeLkNJZsCjhPiCcbDJoTI0Uaq+rjg4LLuW3mBWsxklxyF8iQE9A6Sb5c+NXbAVeWpV4ytpbJscbau7A+N5NFII8lAXmGBNqZWd5tGj1V48+fk= Authentication-Results: wdc.com; dkim=none (message not signed) header.d=none;wdc.com; dmarc=none action=none header.from=wdc.com; Received: from DM6PR04MB6201.namprd04.prod.outlook.com (2603:10b6:5:127::32) by DM5PR04MB0348.namprd04.prod.outlook.com (2603:10b6:3:72::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.20; Sun, 18 Oct 2020 05:15:25 +0000 Received: from DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::d035:e2c6:c11:51dd]) by DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::d035:e2c6:c11:51dd%6]) with mapi id 15.20.3477.028; Sun, 18 Oct 2020 05:15:25 +0000 From: Anup Patel To: Atish Patra , Alistair Francis Subject: [PATCH v2 4/5] Makefile: Allow padding zeros when converting DTB to C source Date: Sun, 18 Oct 2020 10:44:48 +0530 Message-Id: <20201018051449.2368918-5-anup.patel@wdc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201018051449.2368918-1-anup.patel@wdc.com> References: <20201018051449.2368918-1-anup.patel@wdc.com> X-Originating-IP: [122.179.120.189] X-ClientProxiedBy: MAXPR0101CA0033.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:d::19) To DM6PR04MB6201.namprd04.prod.outlook.com (2603:10b6:5:127::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from wdc.com (122.179.120.189) by MAXPR0101CA0033.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:d::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.21 via Frontend Transport; Sun, 18 Oct 2020 05:15:22 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: eaaf2544-535c-4ed0-543a-08d87324d1ac X-MS-TrafficTypeDiagnostic: DM5PR04MB0348: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: WDCIPOUTBOUND: EOP-TRUE X-MS-Oob-TLC-OOBClassifiers: OLM:275; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BwDxxbXeczp0312HD5q4MVDjyJAOsk+WECgAzoXcUSWDr+l4k0dEUrWY7C5Ix9YTcKoSTQzM+Ok+Xy0C7D8+7LgNypMNOUIe+e1ARNG90b3A/4jsc9I26g/9XWiMZ1o+u9NucyeBTbeGSZquafMmxlaSFS1XAutX4u2D4SHDDNZKLOb6MT2dZWP5zKe51aqyD7sCBX6ZwlJ/1pqlyw4yt+Ra2SjwS/e3aDVOYCfCpj7BnpEmfjq/1cP9wTNRsbZvpPhmOoWkYYzYIk4Fytb4obaj7PFuWkbw6E+G227OVE7qDOFTiDBKrN+nGkcYtIl+mlGvfEIVYvQsSoD1rjFC1g== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM6PR04MB6201.namprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(376002)(396003)(39850400004)(136003)(366004)(110136005)(316002)(478600001)(36756003)(6636002)(2906002)(956004)(2616005)(44832011)(6666004)(66946007)(5660300002)(86362001)(83380400001)(54906003)(66556008)(66476007)(8886007)(52116002)(7696005)(26005)(8936002)(8676002)(4326008)(55016002)(186003)(16526019)(1076003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: oceLR9z8OL9xMDf+B+w6ImkV7yz2OWsRL4UJB5bHF3ORjgGnhSpoP64FsxtEAvi0AnfXzZbyTXTxhDoZu1dyDJwDH1FK8UKR6AMVxK3j/ZrWRCIr8tGGtC7folmIrwPXFO/RWpyU19DlaMBnH+HFu2I55VdlpCCrmMBxrtjraWXCKxqR9U7yun/nvuX7hVhXQOSMuY1nIsvWjYW7o83meCKfmTK7u675A5YE9igF6Ok8qxeEsXY/fzmfHevbk2BsyoS5o5hRd7wcrhFZSPPj2BBx+QA/1g1nLPgU2Wr0iVOyuLWOwv8alptSy0n4PYp+a28UjQWtJdbV2LYe7D3GpvYUv2ojmh36sY3sayKeoRFSUTP0EyXRunjMJTaPs++EWjHv/2DedpoMpNS2K2ysR7HtBfVvRsKSQGdXju0vtWm9ry15Kkbbdvoq0JnopTCaYUZsgyHVFz5rRJajdFF1A8WlozwYrDSV9J99q5x/PCaZ/MGraO2mzhTFaBq7BY+gqgl7yxorPmnEaptgR9+1VDbfiPfNzjGKhM/sJhApmOyGj6XvR/JUWV0YHqWGXGctn3CqeoMKFYRo33Sr2w5M0jM0ZFyyHW1CUAVzRZ9jpyi40tj44rp1Q1gJQ3UhbaWI4/V0o/5tqAOQU9j0yh07MA== X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: eaaf2544-535c-4ed0-543a-08d87324d1ac X-MS-Exchange-CrossTenant-AuthSource: DM6PR04MB6201.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2020 05:15:25.0371 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: NPdLeQVMNArHN0Xcr4VEqya0v5ARWCK7aF4WbXOQGI35LyNRAztiOI0m3JcewMHd/cAYl+9/eNiCTg0lUSkozg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR04MB0348 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201018_011527_614142_F0CC420F X-CRM114-Status: GOOD ( 13.86 ) X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [216.71.153.141 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.0 MSGID_FROM_MTA_HEADER Message-Id was added by a relay X-BeenThere: opensbi@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Anup Patel , Damien Le Moal , Anup Patel , opensbi@lists.infradead.org, Heinrich Schuchardt Sender: "opensbi" Errors-To: opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Heinrich Schuchardt We extend d2c.sh to allow padding zeros in output C source when converting DTB to C source. Using this feature, platforms can create extra room for in-place FDT fixups on built-in DTBs. Signed-off-by: Heinrich Schuchardt Signed-off-by: Anup Patel Reviewed-by: Atish Patra --- Makefile | 7 +++++-- scripts/d2c.sh | 9 ++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 6c36f09..a231881 100644 --- a/Makefile +++ b/Makefile @@ -291,7 +291,10 @@ compile_dts = $(CMD_PREFIX)mkdir -p `dirname $(1)`; \ $(CPP) $(DTSCPPFLAGS) $(2) | $(DTC) -O dtb -i `dirname $(2)` -o $(1) compile_d2c = $(CMD_PREFIX)mkdir -p `dirname $(1)`; \ echo " D2C $(subst $(build_dir)/,,$(1))"; \ - $(src_dir)/scripts/d2c.sh -i $(4) -a $(3) -p $(2) > $(1) + $(if $($(2)-varalign-$(3)),$(eval D2C_ALIGN_BYTES := $($(2)-varalign-$(3))),$(eval D2C_ALIGN_BYTES := $(4))) \ + $(if $($(2)-varprefix-$(3)),$(eval D2C_NAME_PREFIX := $($(2)-varprefix-$(3))),$(eval D2C_NAME_PREFIX := $(5))) \ + $(if $($(2)-padding-$(3)),$(eval D2C_PADDING_BYTES := $($(2)-padding-$(3))),$(eval D2C_PADDING_BYTES := 0)) \ + $(src_dir)/scripts/d2c.sh -i $(6) -a $(D2C_ALIGN_BYTES) -p $(D2C_NAME_PREFIX) -t $(D2C_PADDING_BYTES) > $(1) compile_gen_dep = $(CMD_PREFIX)mkdir -p `dirname $(1)`; \ echo " GEN-DEP $(subst $(build_dir)/,,$(1))"; \ echo "$(1:.dep=$(2)): $(3)" >> $(1) @@ -361,7 +364,7 @@ $(platform_build_dir)/%.dep: $(platform_src_dir)/%.dts $(call compile_gen_dep,$@,.o,$(@:.dep=.c)) $(platform_build_dir)/%.c: $(platform_build_dir)/%.dtb - $(call compile_d2c,$@,$(platform-varprefix-$(subst .dtb,.o,$(subst /,-,$(subst $(platform_build_dir)/,,$<)))),16,$<) + $(call compile_d2c,$@,platform,$(subst .dtb,.o,$(subst /,-,$(subst $(platform_build_dir)/,,$<))),16,dt,$<) $(platform_build_dir)/%.dtb: $(platform_src_dir)/%.dts $(call compile_dts,$@,$<) diff --git a/scripts/d2c.sh b/scripts/d2c.sh index 821a995..33a3ccf 100755 --- a/scripts/d2c.sh +++ b/scripts/d2c.sh @@ -9,6 +9,7 @@ function usage() echo " -i Input binary file path" echo " -a Output C array alignment" echo " -p Output C array name prefix" + echo " -t Output padding zero bytes" exit 1; } @@ -16,8 +17,9 @@ function usage() INPUT_PATH="" OUTPUT_C_ALIGN="" OUTPUT_C_PREFIX="" +NUM_ZERO_BYTES=0 -while getopts "hi:a:p:o:" o; do +while getopts "hi:a:p:t:" o; do case "${o}" in h) usage @@ -31,6 +33,9 @@ while getopts "hi:a:p:o:" o; do p) OUTPUT_C_PREFIX=${OPTARG} ;; + t) + NUM_ZERO_BYTES=${OPTARG} + ;; *) usage ;; @@ -62,6 +67,8 @@ printf "const char __attribute__((aligned(%s))) %s_start[] = {\n" "${OUTPUT_C_AL od -v -t x1 -An ${INPUT_PATH} | awk '{for (i=1; i<=NF; i++) printf " 0x%s,", $i; printf "\n"; }' +echo __dummy__ | awk "{for (i=1; i<=${NUM_ZERO_BYTES}; i++) { printf \" 0x00,\"; if (i % 16 == 0) printf \"\n\"; } }" + printf "};\n" printf "const unsigned long %s_size = sizeof(%s_start);\n" "${OUTPUT_C_PREFIX}" "${OUTPUT_C_PREFIX}" From patchwork Sun Oct 18 05:14:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 1383804 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=dWJztvz0; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.a=rsa-sha256 header.s=dkim.wdc.com header.b=iXz3YozR; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-sharedspace-onmicrosoft-com header.b=CCZ7Z1mK; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CDSlJ0THKz9sTq for ; Sun, 18 Oct 2020 16:15:39 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=1kc+1AGOR8N6xxQ6sI31QgELTaeYgufnnsNsLpAHNrk=; b=dWJztvz0iqLZ6wcCKIkDpMCGd 4KsgxwURYKMqtGL6zLENBmbfFTCAuu2u/JPYcXOXO7VUTt2JlfOGAWg2RAB9k1PH5/LINfmrWVmYI gTQMZtTC81tXWgHkddoEWdXGC7of4g9vqFlQNmOUzIFvirLnyPKQto6manCjnCxVnefq+uTh7denc T3rFZiV01TdznBLcF5sIi+XfcupLgre0OSiEjoZO9oO+Bn5KVSAEGVFr/n19r0SrmSqdNbDZwQGFv vCRXX81q7cStcOpuJqTdAqEl99ObgTy3wqmwCEP6n6E31Qlu71sgbgbEMx9jYFxpAZFrG9leroqMQ IhklHZevQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kU12Z-00017g-Vq; Sun, 18 Oct 2020 05:15:32 +0000 Received: from esa3.hgst.iphmx.com ([216.71.153.141]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kU12X-00015q-Kp for opensbi@lists.infradead.org; Sun, 18 Oct 2020 05:15:30 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1602998130; x=1634534130; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=0xXiHE+x8DPHGZKhgAWroqSVSm/t5aXwJBYljBr2Nuk=; b=iXz3YozRxRm6b0QDGdS6kQt8MQbUjVVLQ1d9uy+ZtbokTlVh9VnLQVL0 79GkERmJ5Youe+UZ2U3J1D5vEt9q2/Q618EhgU7EKO+tibLpDgmcgU2Fg qrhOFo0kFz2xV2xxQUqAk+tMyAAGOgo6CKumjYkzLWP6TrzdKt/yWaxss Ab8XfvKdlCLU4Bo5SYQ81sZbPzhB8sqMfNDNf9exQQ+MM7Bn9LT7272U4 yg8dqyBSN5m9eAnTyNEzqY4Uc9JMOtgv9tzSoY7dOCtC9ra/qh+QqXbPx hFkg0zwd3KE3zNh5pDFu9mJilruousuzN7PWJMY3xe6hBridhpZ2lG8T2 w==; IronPort-SDR: jOP+DYx7Y/CvEUzXeCaUzsRFce9L6nFVMr8FqEqFZ7v0O3byzMRkYa7o1FdMXzTJgEL6XH7Uvf fWbhWnoSaWm6ofFvWJiQtkuChlnWjng7qC2BA3WDEXqrkV8aW4FG4tkAK8kEMLMiDIdH/Z5P6/ cqhTOdwnip3iXrYpEPa0nAzcA4drljEE/E2WSOEkLVKfFrFWZVBr8gT1AWT1TPgCh3lLPEPfCF kAGsxEbD0BWP6ebzSn2D1+HIQLR7LSrZ9E1B2uk0YFrrc1sZRE6+jVXLszfgp5066rn45pq+tq 0X4= X-IronPort-AV: E=Sophos;i="5.77,388,1596470400"; d="scan'208";a="154677442" Received: from mail-co1nam11lp2176.outbound.protection.outlook.com (HELO NAM11-CO1-obe.outbound.protection.outlook.com) ([104.47.56.176]) by ob1.hgst.iphmx.com with ESMTP; 18 Oct 2020 13:15:30 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZWCMXL37GChCfYTDmLZRTaC3Yph5UF/KM/g5GOSfWG9o9NcYRlxu3aDBGNnQLMzxfocL0HXSLmCpkQahDfFJ85cZRr+9Ow4ZVNEUzAgjxMRpZfrraiIHzy3alHYdyxpzQIxCC/BNUx+0FgBQuWm1XCOuttzB6yPqRrfzZOxv8wyrWT08oMR1YtqwhY1SKHr0bIuBceCvGeOI7MYLgshu9HecJCtmpV9qlIdZQDue7CI+arLsoNuxEE+Sv12TMuhpbC7BDKW5ICuyy2bMROMSsn9dkDLl+ZQqVOY1m9Bwc17nLwhSKTfAKjUW/Wbek4ua5pcjIRKWGk80LOjIk6hxUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=AS8zwmJVW7AwpKVB3A1C34+GaHNlvlkeJA2MRLo8IYA=; b=I5aUPwOPqfJSm4QU++FcR9Ps68koA9GXlFeSfUPwfmhjzs80ztZ1/U5/+YsSt7b5AK+Peji0m/Iy4l/GQ69TZ/SUG/oLUo+gYzzmedeyOYlQL5MYO37NOqoo6qcvJUTi8uX8b56v0ABxYVwLjwgCN0eZPmlo0B1KbrRdLaGgve3qwZ8oWCxXO+N+XceaaA67lNXVPFKMy6igpRCo0FJ/IQmUUqbUjS06f3RGPCl2m2X39W0cLr7SWk6i+TUKt2BIgxCMCKXMMAx7iyBs3OG24fdw2UN9wGtBRJ2A2oyB0rUhwiq2OJhI0cKWZaXiINstUFsIepEWOZRpNn/9BwQpXA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wdc.com; dmarc=pass action=none header.from=wdc.com; dkim=pass header.d=wdc.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector2-sharedspace-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=AS8zwmJVW7AwpKVB3A1C34+GaHNlvlkeJA2MRLo8IYA=; b=CCZ7Z1mKPLIunN+Mmg1IUc9qu8Ik/iz4BmFTVMoLK0LQxSJP/xoTJRhPYdH4yr7xeQqSRSmMPqXgmkLacJby9HKGz5o0vs40YCjIkBcRy6f7d3UMU1MDJzqEUS2Tp+gZQ4GIXlGMXMP6diXCHPqIk0WAjGcdjsv9H7yO4A5Qlc4= Authentication-Results: wdc.com; dkim=none (message not signed) header.d=none;wdc.com; dmarc=none action=none header.from=wdc.com; Received: from DM6PR04MB6201.namprd04.prod.outlook.com (2603:10b6:5:127::32) by DM5PR04MB0348.namprd04.prod.outlook.com (2603:10b6:3:72::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.20; Sun, 18 Oct 2020 05:15:28 +0000 Received: from DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::d035:e2c6:c11:51dd]) by DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::d035:e2c6:c11:51dd%6]) with mapi id 15.20.3477.028; Sun, 18 Oct 2020 05:15:28 +0000 From: Anup Patel To: Atish Patra , Alistair Francis Subject: [PATCH v2 5/5] platform: kendryte/k210: Add some padding for FDT fixups Date: Sun, 18 Oct 2020 10:44:49 +0530 Message-Id: <20201018051449.2368918-6-anup.patel@wdc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201018051449.2368918-1-anup.patel@wdc.com> References: <20201018051449.2368918-1-anup.patel@wdc.com> X-Originating-IP: [122.179.120.189] X-ClientProxiedBy: MAXPR0101CA0033.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:d::19) To DM6PR04MB6201.namprd04.prod.outlook.com (2603:10b6:5:127::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from wdc.com (122.179.120.189) by MAXPR0101CA0033.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:d::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.21 via Frontend Transport; Sun, 18 Oct 2020 05:15:25 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 8de055fd-5c2c-44bf-5bd3-08d87324d36a X-MS-TrafficTypeDiagnostic: DM5PR04MB0348: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: WDCIPOUTBOUND: EOP-TRUE X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: y9YAkcgY9LuB0/GVYUYDHenxvbNEdkB/WNcJx26+eT4dFsfEmhHggL2KPur+UdzgBc2FwV3QqCWQvG1Sd/WBMQ7W2qBpw2P49EInl6JVFhP2CSLviwaDEOnFOewy84S3xRosryoEAyaniB7e6NDbYIh/w0bO0d7C6xXKkB70b2fYqMRek4t+1oMnsgBz1adad5eejXbzXt8329H0qlr11S9emzu1IzOvNbTXoleH5ttNmbnut6yfkPAinm5y2/sj0AnT9SBsYLOEcDCI/Cw7Wbx+6r4/kaOrBz1+sM2spIZ6jgVHdDMGTgn4gGFW8lsk X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM6PR04MB6201.namprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(376002)(396003)(39850400004)(136003)(366004)(110136005)(316002)(478600001)(36756003)(4744005)(6636002)(2906002)(956004)(2616005)(44832011)(6666004)(66946007)(5660300002)(86362001)(54906003)(66556008)(66476007)(8886007)(52116002)(7696005)(26005)(8936002)(8676002)(4326008)(55016002)(186003)(16526019)(1076003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: UyXnjTVMjUfNXRESilQoe+9gMw12cvI+dcf+ZFE/BsYP394bJH4uC5eXw6ELpbZxo/QV4wyXcUhfbK4BvW3zyc43oE9MlVnAvdsyv1zX5AotYa/yUMEvty6zlSqWCGOIYh+HPCnUK8oC/tw4dLYb8lvashTHkjzCLsdniSUy01j1gMpTGNS1nxe1BZarMW6h/dL208Gh13SkuXx8+n4hl4PrtqUj3U0jNjhggdarV3fJdxON7YqPaJ48Nr1jnXOFBEi1sCVNVRdGRj7j9wkhX88wlzStnyxpM5BMcF5092DKG+MPa3Xgll/ImqwYfRelRjcC90/VRcJ9OrCcdJ/ZUsob13xRDBMao06OwYhLf89QIiSsrsbP9BYCBYhb/1ilOZcDAvQeXnqDiI9EvcBFSQuxXMZHw++9sf+/wlbQUUwIt7aDaoZzicoXd1LGDm9o4p/73jqlzS97UpviRodrIyW+HPKjFCDXMg3EC56+et6qkMRMTd4q+YRV/J9Fp1L9kX31Ov11PxR60+yaQ0BH7FRMEsLmJQZBw6x7BNJrnyoRg73rX4pJ0Am87SOjDcuptrNM88s0PLAnSHoIGHYlL1s6qpsAKOl5+mZocLx27/29wb1fbk7093jSgpK3Q8vq6Hts91Xo5NxmKLUEGe/Shg== X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8de055fd-5c2c-44bf-5bd3-08d87324d36a X-MS-Exchange-CrossTenant-AuthSource: DM6PR04MB6201.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2020 05:15:28.0891 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Qal4mRd8Ckfs9TneQMyhORHi4rEzf78SklAWz0Z90jZI0509bJW8OrE1rjlcyN20wcYNQluB0fuXDZFswUmC8w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR04MB0348 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201018_011529_902549_539DF97F X-CRM114-Status: GOOD ( 14.14 ) X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [216.71.153.141 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.0 MSGID_FROM_MTA_HEADER Message-Id was added by a relay X-BeenThere: opensbi@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Anup Patel , Damien Le Moal , Anup Patel , opensbi@lists.infradead.org Sender: "opensbi" Errors-To: opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org The Kendryte K210 platform has built-in DTB and does not provides FW_PAYLOAD_FDT_ADDR. This means the FDT fixups will be done on the built-in DTB in absence of FW_PAYLOAD_FDT_ADDR. This patch adds some padding in built-in DTB for FDT fixups. Signed-off-by: Anup Patel Reviewed-by: Atish Patra --- platform/kendryte/k210/objects.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/platform/kendryte/k210/objects.mk b/platform/kendryte/k210/objects.mk index 106f9f2..b74da74 100644 --- a/platform/kendryte/k210/objects.mk +++ b/platform/kendryte/k210/objects.mk @@ -11,3 +11,4 @@ platform-objs-y += platform.o platform-objs-y += k210.o platform-varprefix-k210.o = dt_k210 +platform-padding-k210.o = 2048