From patchwork Thu Mar 24 18:23:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1609166 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=seco.com header.i=@seco.com header.a=rsa-sha256 header.s=selector1 header.b=dPKgmqBK; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4KPYWc6fQTz9s5V for ; Fri, 25 Mar 2022 05:23:39 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DFCF884107; Thu, 24 Mar 2022 19:23:23 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=seco.com header.i=@seco.com header.b="dPKgmqBK"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1B4BE84101; Thu, 24 Mar 2022 19:23:22 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2061a.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1b::61a]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 4E48F84021 for ; Thu, 24 Mar 2022 19:23:19 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sean.anderson@seco.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WZCkYsyEaQnB5hLAOe0rCFsa1OU3Otjd6s+NyOlleJeDDSiqtqT4UIFxkhdy0Vi9E8ZPIL42XNJ2Vo2T8NdErF8zd9tMYnqs8WhiQClJVYTvgQzvY5nlYmRQkUNxkDZUa1/X1QG6wlEwa6XBbBSsryuihcMmi6ZO6qhMh56k/i+EyAr6LZfxmejB7YM1kywuw+z3Beup/CWMhKzAJO2vrp4kP7qUNzZJ4xZG5XKWqE8Vdw7C8U2hLk/Ylmay7xcx1067v9LWb45U3Ypik9m7LVM1MTYn5oh/oco/8cpJ+FaEBtd38vIj9DLDzKp0AkljpiiiZzdCuGM43Rj1e/Xa0Q== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=1Gs+x1UYEhyKbFN7o7S8veS/5C26faAMB3QwJWKoECY=; b=YaavYRNsLdsbCHaIvZRv8aB53vqhi1RBfNlHahIuAYwKKdlWlNynOjzG7PLINefRR0G73jqEVUhELvmYnw24EzrFlkRfcgDraeNtDm/QprS//u1PuabACKakGhPyJir5uGIGNsrjINaxjVNuwA/l/ynn+ERV2VXNW1ltoKrsP8InMVI6fmd46SM4PdJLb1Uk+zEZJh02gMtxCYry4NWdPqZI/7qBdpjlK6MqDQHc1yoAAEU+ra/8RYCdJSR2RFpXhRoMeH9auUoXDd58+fPrDJxvmGkIPAfus1vU76JIgu3i0XY6ztsqusMNXqVieM0EJ2t7IBGr/QVW8YDr5eDpbA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=seco.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1Gs+x1UYEhyKbFN7o7S8veS/5C26faAMB3QwJWKoECY=; b=dPKgmqBK8vvP43BBCQfv/0ID5gO3z6MKcIu9ARaphlakgCZQQl/2OEfPJburD827G53kUYNZwrw98reES5Nu9lr1juSOUreBH2qP0JquacyN3BJzrE/HqSRGsdogzpVY9EPSNngLZdj5S3CMignf6ZBsED0xeJAlteW1/Hi1dFZ8CKCSrIxC8gGYEh3MquluIL58n2V2Bf7tLVJuSQ9IkBzpqzH65DOcL6ElgBXUkd0Yy2bpc/NHQ9OwsTasP17m34WXPtUGPdeOds13kryGWGlegdkR3kfhoiqX+/A57SxG9pVvdZLnqHpezaKYcwwqrsWniiVGi2FM1CzxcUIrmw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from DB7PR03MB4972.eurprd03.prod.outlook.com (2603:10a6:10:7d::22) by AM6PR03MB4664.eurprd03.prod.outlook.com (2603:10a6:20b:12::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5102.17; Thu, 24 Mar 2022 18:23:18 +0000 Received: from DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::2414:8ad5:9fd6:3bff]) by DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::2414:8ad5:9fd6:3bff%5]) with mapi id 15.20.5102.018; Thu, 24 Mar 2022 18:23:18 +0000 From: Sean Anderson To: Joe Hershberger , Ramon Fried , u-boot@lists.denx.de Cc: Simon Glass , York Sun , Priyanka Jain , Sean Anderson Subject: [PATCH 1/6] ARMv8/sec_firmware: Remove SEC_FIRMWARE_FIT_CNF_NAME Date: Thu, 24 Mar 2022 14:23:00 -0400 Message-Id: <20220324182306.2037094-2-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220324182306.2037094-1-sean.anderson@seco.com> References: <20220324182306.2037094-1-sean.anderson@seco.com> X-ClientProxiedBy: MN2PR10CA0005.namprd10.prod.outlook.com (2603:10b6:208:120::18) To DB7PR03MB4972.eurprd03.prod.outlook.com (2603:10a6:10:7d::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 60f15a42-d15f-4d51-f6b0-08da0dc35e6d X-MS-TrafficTypeDiagnostic: AM6PR03MB4664:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EMkRNVQblRmsnfG968ulNiTyq0EpgaNGRtuFiN3Ub5DNyR0tevOfMeDQfexa+q0zo1F+rH2PWyi0xRTkH/3P/OS6T2C/On/l1Gr+RKpYyGW8Gwtdi+xzlSSQORdYU5IxgDvjyAHOTxc8t9GpvGpVe5+iGhG/8BMObq0GprXet8s2bBMtSPzsBzcKkBjipVIB/49UTkLGKDGPDXOR5fQ9iXcrlqNuercffSs9TNn8Wy4hmwb6kjW6nBB58m8gPDU5pOeCYPdgBnUhbFgDlTd2CIxQS6pdWOFOEdiqwifLUe+KE9UwB3sl0QHQvq8wAIOZL0qqpOMrAwMHo0tsiThVLnxFUT+dqNDLD+Dk3jAD9lRFFnDcutLN5nqj/mzYlKgN6Ysb7VxmpbUm1s3aVUv4fCFUyXZMBdKlkQ7cl9eKUoTnIUf/3KZ6TBEXgkXBVNiR2haOU7CM+NVbWTOhGk+++KE1hNAbTA/daeTPJUTVqWAGvR2ekvPV3rRCCgrp+3nYrkY9wnFdgwVbX0lPmoQR+ahKvIOsuEhaOrHl3sqA1Ox+Y3FN8b8jkyWBReTZFEi4S8fBWmzr+6K72UiMW0ZCuWyK9xxjHG8uRwGs8nfUfm5oxOFwHSE8hGbyrCYDXa/a8uPE5BVFx4Nn07LXI4SNDHJ+w2gzS3mavniGG8oQPVjFHBr35Zu48ixBpoHUOlsRgwsAccPy3MLN3fY3k6suGw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB7PR03MB4972.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(366004)(4326008)(8676002)(6486002)(66476007)(66946007)(508600001)(66556008)(38350700002)(86362001)(26005)(110136005)(316002)(54906003)(1076003)(186003)(2616005)(6666004)(6506007)(52116002)(6512007)(38100700002)(83380400001)(36756003)(8936002)(5660300002)(44832011)(2906002)(107886003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: AYO/ux9Ru3en/mNusTCJZR7zMuKw7yuDapXeRRlYBL3s2H3ckftSh/Pe5VCS72OhcOI0JlnyjvvR7IZwrPe18XgB+Qmob5lgjpZUh8SU6n3OfiCo06L9q423k9R7YXGJJpF+f7dM0qmEsb+84KDmV/83idfoRk4oCwEs2zU2Qjzk+nuCuD1fjhg1AnQeSrgQU3sQmHdGRpWqrRiUA8q0Xwr5bwYGsQiMIvOy9gV8ysHNzXtwDkdrTxziHj+NqgHJKDSAOHgADG78LAcBAHevJ877VBDmLpGBTxt9IMOJMptagXqVmHBtVnGrxQ9JG686OQJ7/juwZr/B9AzlJuq8zoiHb8fmQE/RFwY7iV8Pu5BA1pzIz+HcpeavwJRkLa5wiQ+z+997lP/6TMQuyvhstVuzVMCpVgkqrvLbap8EyN3O5xkHr3tpLEn+jok12RmRJ9bvGFUzuLTf8SM3JfyM57mvg4Rg+y/xfAbv9Xf9R4l1vglBBULRsjddBXnfXZQFPW4HRN25waZ3I0VVDRdiJx3cEqbUugTzBLjyaLoxZY94r6hWsNo35pFpB+dAafBa99/WHOjdeBtCtngci/kjZpqUfAD/RuTd3bIkEaJL4sC1pmgiMnIHvUe+A9iuIr2eKZ6+6//nebKwtlYHhYiYNHiVCPjG60C9w6SgL3By9piz2gOgUHH1wmI4Esgqwqx5xZtmSTgMqlr46LZnsqXF0PyViW2ym15pgyZSyPvA2ZM5tISUn2tbtiMq1fVxWTxr0d6fw6vC1+OqVYv703tWhD61BrUo6wqnWnq9XKv6SYeDIkqnumLXfL3MLYiSIL69623cJN64tyqPVOjNBA2sISJPorUloH1d1YxwjjE1u8kWtMTnwAhYe1VBp6zWBGzDc5uj1Ln5eRXjOdEuFHux5wz/spEXUHBCqzvoq/Wbbc9LjoGEax13Xsv8o3cAhnAU7FyCPCHvy9RZp8vMFWySn7WqiKgEOj/sAVv+tLsKiHGn19dZiXCpLMTOQxznlVQ8CW3I1pjjwCOxgTwl67LMWIgdwLY4za0xTUShakeiNdyXpN8lOvmrsKOpWNIn0Zy9tXxgLP45gb3W5XOhXl7JRmV+eU1b4EmLfLDub0q3jz8FbgzBP4y/rbgS7zK/0lejajwF0rs5rjC7TV7i4jb3Ov9gSgWVhqN4e3KLD+aKqbxG/bw8aBy7Af4Gzs3KMVXmtOIoSJx9RLRGROfB5oWb7R0CA+DM/l1hTcsY7QhZmBr3qIIZvwv9QOqsHTCfofk/QhATLDO9y11coKCrwJw24QJm9F9kWlXoDUS7NqxtXdDY1q7KQ0CIq/sxLykqpw59YKSI2kqAbel0/nGGD7eipYJMXTqDDrQZqBJNhWifGX9VJu+0ljJr+qmvRI71HAUqxi/zpHwGd725DuZqMKYmJfWgHkrMzr2qw9Inf8pI0gkdOTHmc/9wIFz74O+r9arzHNLDGW7qmNv1QTpPumHi8Q== X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 60f15a42-d15f-4d51-f6b0-08da0dc35e6d X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2022 18:23:18.1645 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: fsRprE2JSjTsuoCuD7IVhkfNIgnx9UL7GW6/BsYuRJ0mtz7QF4pneQ2a1mmiY6aTkDTF/rQ/UeF686JbOOETOw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR03MB4664 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean The config to use for FIT images can be better specified by enabling CONFIG_MULTI_DTB_FIT and implementing board_fit_config_name_match. Signed-off-by: Sean Anderson --- arch/arm/cpu/armv8/sec_firmware.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/arch/arm/cpu/armv8/sec_firmware.c b/arch/arm/cpu/armv8/sec_firmware.c index 267894fbcb..41525a10d5 100644 --- a/arch/arm/cpu/armv8/sec_firmware.c +++ b/arch/arm/cpu/armv8/sec_firmware.c @@ -35,9 +35,6 @@ phys_addr_t sec_firmware_addr; #ifndef SEC_FIRMWARE_FIT_IMAGE #define SEC_FIRMWARE_FIT_IMAGE "firmware" #endif -#ifndef SEC_FIRMWARE_FIT_CNF_NAME -#define SEC_FIRMWARE_FIT_CNF_NAME "config-1" -#endif #ifndef SEC_FIRMWARE_TARGET_EL #define SEC_FIRMWARE_TARGET_EL 2 #endif @@ -46,15 +43,12 @@ static int sec_firmware_get_data(const void *sec_firmware_img, const void **data, size_t *size) { int conf_node_off, fw_node_off; - char *conf_node_name = NULL; char *desc; int ret; - conf_node_name = SEC_FIRMWARE_FIT_CNF_NAME; - - conf_node_off = fit_conf_get_node(sec_firmware_img, conf_node_name); + conf_node_off = fit_conf_get_node(sec_firmware_img, NULL); if (conf_node_off < 0) { - printf("SEC Firmware: %s: no such config\n", conf_node_name); + puts("SEC Firmware: no config\n"); return -ENOENT; } @@ -123,18 +117,15 @@ static int sec_firmware_check_copy_loadable(const void *sec_firmware_img, { phys_addr_t sec_firmware_loadable_addr = 0; int conf_node_off, ld_node_off, images; - char *conf_node_name = NULL; const void *data; size_t size; ulong load; const char *name, *str, *type; int len; - conf_node_name = SEC_FIRMWARE_FIT_CNF_NAME; - - conf_node_off = fit_conf_get_node(sec_firmware_img, conf_node_name); + conf_node_off = fit_conf_get_node(sec_firmware_img, NULL); if (conf_node_off < 0) { - printf("SEC Firmware: %s: no such config\n", conf_node_name); + puts("SEC Firmware: no config\n"); return -ENOENT; }