From patchwork Mon Dec 4 02:05:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 844060 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3yqpJv0jJCz9rxm for ; Mon, 4 Dec 2017 13:11:26 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id A612AC22033; Mon, 4 Dec 2017 02:09:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 4F8D5C22047; Mon, 4 Dec 2017 02:06:30 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id C8228C2204B; Mon, 4 Dec 2017 02:06:05 +0000 (UTC) Received: from foss.arm.com (usa-sjc-mx-foss1.foss.arm.com [217.140.101.70]) by lists.denx.de (Postfix) with ESMTP id 57D9AC22056 for ; Mon, 4 Dec 2017 02:06:01 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B62841435; Sun, 3 Dec 2017 18:06:00 -0800 (PST) Received: from slackpad.lan (usa-sjc-mx-foss1.foss.arm.com [217.140.101.70]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 77B5A3F236; Sun, 3 Dec 2017 18:05:59 -0800 (PST) From: Andre Przywara To: Simon Glass , Tom Rini Date: Mon, 4 Dec 2017 02:05:13 +0000 Message-Id: <20171204020513.18708-8-andre.przywara@arm.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171204020513.18708-1-andre.przywara@arm.com> References: <20171204020513.18708-1-andre.przywara@arm.com> Cc: Pantelis Antoniou , u-boot@lists.denx.de Subject: [U-Boot] [PATCH 7/7] armv8: secure firmware: fix incorrect unit address in node name X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" The DT spec demands a unit-address in a node name to match the "reg" property in that node. Newer dtc versions will throw warnings if this is not the case. Remove the unit address from the config node name when U-Boot deals with secure firmware FIT images. Signed-off-by: Andre Przywara Reviewed-by: Simon Glass Reviewed-by: Simon Glass Reviewed-by: Simon Glass --- arch/arm/cpu/armv8/sec_firmware.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/cpu/armv8/sec_firmware.c b/arch/arm/cpu/armv8/sec_firmware.c index 927eae4f74..b56ea785c5 100644 --- a/arch/arm/cpu/armv8/sec_firmware.c +++ b/arch/arm/cpu/armv8/sec_firmware.c @@ -30,7 +30,7 @@ phys_addr_t sec_firmware_addr; #define SEC_FIRMWARE_FIT_IMAGE "firmware" #endif #ifndef SEC_FIRMEWARE_FIT_CNF_NAME -#define SEC_FIRMEWARE_FIT_CNF_NAME "config@1" +#define SEC_FIRMEWARE_FIT_CNF_NAME "config-1" #endif #ifndef SEC_FIRMWARE_TARGET_EL #define SEC_FIRMWARE_TARGET_EL 2