From patchwork Tue Aug 24 07:55:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ZHIZHIKIN Andrey X-Patchwork-Id: 1520110 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=leica-geosystems.com header.i=@leica-geosystems.com header.a=rsa-sha256 header.s=selector1 header.b=FXctJPBS; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4Gv1dQ1qCrz9sX5 for ; Tue, 24 Aug 2021 17:56:08 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5BB9080612; Tue, 24 Aug 2021 09:55:57 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=leica-geosystems.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=leica-geosystems.com header.i=@leica-geosystems.com header.b="FXctJPBS"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E1D7882D95; Tue, 24 Aug 2021 09:55:55 +0200 (CEST) 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,MSGID_FROM_MTA_HEADER, SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-ve1eur02on0705.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe06::705]) (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 CAD1F81F74 for ; Tue, 24 Aug 2021 09:55:50 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=leica-geosystems.com Authentication-Results: phobos.denx.de; spf=fail smtp.mailfrom=andrey.zhizhikin@leica-geosystems.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cvDFgywG8gT/34d8YxluGEvUd0jWAK35RaWzL2dnp6GyC1627v3YyxzInqAvTkFup0JqoHbnjTmMYzG9uAKuofL5gDPmmsMZPXBqBSjU50W+mFV50gCFF9hjnMDZ3n2QrFLZtiDejKwRMyBTyydAVDJgpCQW3xW0Pjt64pj/KuxjgbPcSnoi3VDIUtCSaSZ8LUH0Z53sY9GGdGUYUWI953Sx9dzy9KiwiL28vrLN9gan4a5tDFQ1jr0gk+/iaZtJs2irUVNKpTHBwW9Q6Y1gHAulnvZRu93yX7BDPPtKB8YUuC86a/D8KbtjhdPQLrK7rKfr+Z4hMXLrZC8s3QNswQ== 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=4rzVog6nhshqnjOT1KJGhph34rgkn1b2nysS+6H4+c8=; b=JolHYY8gfx3+PuLjJgHibylzdhQi63I6anCSPwL35fneLxnlDzxly7nJoUv6UstkwAm+8pVz5+pIaHfI2QV31F5bPBIdWUdmCkg3ooXnknmi68dvrM4ZFEYzNwpmrv0xAigEaxSCPToPRYRalmehFubmlHrCHn97gmdyUhj9lohu3O4Wc8ZAtVxU75iqM1zAwLR0DknVBg4fhfAbaW1/gJ6rktXJ1XlxW2OKNhxo1XmGO/IjzILcGg7dyxG5vaFnDsTPK8JnnRH0YE7vO+04vq8Zk8/PEDpQoP+kcVCWC47MfeY0hZwWvI1FKf2hvk6OeRjuN/FRDZrQuyVlm28z5w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=leica-geosystems.com; dmarc=pass action=none header.from=leica-geosystems.com; dkim=pass header.d=leica-geosystems.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=leica-geosystems.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4rzVog6nhshqnjOT1KJGhph34rgkn1b2nysS+6H4+c8=; b=FXctJPBSltToZL4cMihtkMyMyPO9FZJhs8XLaukWkAxCoLd51M/Pk9brvLMnouibJFaVZn75wnjqb/AiFCdFaCf0m7Cztx33cU5/1VogOwMvwourcHjMiPVKEbSj5l9OoW0qFn47jpROGgeTW8fAwmkU/ws6jsOFc/+scYY3wdE= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=leica-geosystems.com; Received: from DBAPR06MB6664.eurprd06.prod.outlook.com (2603:10a6:10:18b::18) by DB6PR0601MB2519.eurprd06.prod.outlook.com (2603:10a6:4:6c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.22; Tue, 24 Aug 2021 07:55:49 +0000 Received: from DBAPR06MB6664.eurprd06.prod.outlook.com ([fe80::eda8:eb73:b82c:359c]) by DBAPR06MB6664.eurprd06.prod.outlook.com ([fe80::eda8:eb73:b82c:359c%8]) with mapi id 15.20.4436.024; Tue, 24 Aug 2021 07:55:49 +0000 From: Andrey Zhizhikin To: u-boot@lists.denx.de Cc: sbabic@denx.de, festevam@gmail.com, sjg@chromium.org, oliver.graute@kococonnector.com, jh80.chung@samsung.com, jagan@amarulasolutions.com, peng.fan@nxp.com, alice.guo@nxp.com, ye.li@nxp.com, aford173@gmail.com, marek.behun@nic.cz, tharvey@gateworks.com, hs@denx.de, t.remmet@phytec.de, Andrey Zhizhikin Subject: [PATCH][RFC] tree: imx: remove old fit generator script Date: Tue, 24 Aug 2021 09:55:14 +0200 Message-Id: <20210824075514.21153-1-andrey.zhizhikin@leica-geosystems.com> X-Mailer: git-send-email 2.25.1 X-ClientProxiedBy: ZR0P278CA0016.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:16::26) To DBAPR06MB6664.eurprd06.prod.outlook.com (2603:10a6:10:18b::18) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from GEO-HfyyrYQLnZo.lgs-net.com (193.8.40.112) by ZR0P278CA0016.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:16::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.17 via Frontend Transport; Tue, 24 Aug 2021 07:55:48 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b9079fa7-a984-475a-e65b-08d966d49662 X-MS-TrafficTypeDiagnostic: DB6PR0601MB2519: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4125; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oUWhvjx0trSUgbvqpSGc64ROlgKiUPL4ec1KmjA70j4db6cUscWN3qQNM/wcVddUgC2UAloC+/SJCwj4nAyEgC2ANnflfbuQW9EtErJcnenOVQBCdTl3Cz/cSoaQOevrqdnabRR8EF1VEk1sAlKCs1o2hvqJF/THS3weAa7QUWAcMIrlr0VlaiZpU+QbKjgtp+AtJ1zk2XHTHs83dLtE4IIpTWuBTyqYIGVFf7UFy9h3Dm0qiMW9C2fbVGsP3byTex4OoS4igOat6d4fwxzdoboCibaVR6RJOYRu1dlvHE8wbxY55Qp85SrxWzJg68HSjA6Xovg1v5SqLsCmiiuptyZtQR/X6PBvv0NYgA4mYd2t3rsgO027/OQz5u3XAZkbb4SjQAQYUqWGmp3eeGxdkEV1K/izyVNRwYPSTJ0hSgT/xataVlm4ZV71178UNXB04oKmgpbD657K/ceclgj1gAvtzLfTN/uhmlhEmd5qmS9SDRX/kuBAyVbOHnoQ/DRNw3VfoplISpv614wa/jywpr+FU9+XTcZBzy38l7FZLIuJoNg6lSteXTHST7jvIQz1V58rlQgjypWLixuzLJ/W0on9L/ZZg6AVKFg8xLCuNb1s2fESQ8IgoD5GNoFOm0eVrgBTBIzxfkT1lR3N9PFuPyXfrW7k6GthR2X8JgSvwU9OgJ02ZHe6PXjFo18/HJGxn0j6qJiD0hfPjNJqjcju2A== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DBAPR06MB6664.eurprd06.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(136003)(39860400002)(376002)(396003)(366004)(346002)(6666004)(6486002)(107886003)(52116002)(44832011)(1076003)(478600001)(86362001)(7416002)(186003)(6512007)(2906002)(26005)(6916009)(316002)(6506007)(38100700002)(66556008)(36756003)(4326008)(956004)(38350700002)(5660300002)(2616005)(8676002)(83380400001)(66476007)(66946007)(8936002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: HPyimEZo+okisHHSgruHWeZQogAUwJHP6lhfzOEuOW0DFOooWrmUHS2tHtW/lSwTJiIEBxb9xn8gz6hPOyX9wQk47CMp02yGIiEcIcUubMFpmW2g+ujm4zsISPJs9b9Tw7yW2ErmLCiVmMYgqFdYWDJU0etg5/H5BUqplmgaMH2uxLeawh5FWVEXt4t7fzW2piI6Grlr4OS2HFlBiVJaceW9a242E+VyigbzrKMb0x3r3uwJAs94MyxtDlCXWUokInVTG/b3ZsC1V8L+IRZBvp5TkTBjGkXPfeZSgXExkmqleASCl9c2LdNG9gILzfa7EF+y4gZZRvzJrNzncEro1YhhTDqaq91Cd+PryFjt0hdky0GrjCeS+iTSDVaXBOGX2/arfXOv/JBGzLKXkLnt1/+84Z/T3KulYibfJVpgHpmp8PU19sEg4SPE9kHv6lL47VZsKg3bhLz6zwfqvjzKZi6YPjrkq8m+kfrf4906owqqEM0/7FwqOsKx9qRt+W/m7BP+oRoQ8HfER7RJY3q0g6dfEh+ubB4B2X4vVuJxwKdkghGV3FElberCrFCVxScQ7/ut1YFDu5VISfojO3zg+RA3IgTlqHtPKR28gtpeQUWJ7qMhe17SZ08CbywvU/cXfVSGdIe8fI1Pi9/PoBmu556LSXlyrvaMrHphNdRZsaflzjaLBTKLbLfTkcf9M2/W7HxjnfXwWniD5tAfXgWi7FLnp0huOWMUKMkrhdEyOPwX138/9kSpkTKAPdJHluGrtWyGawz2uPOTWx7N5DMOECI1WNGFpVF7U8y/PtntJCOGfms1bccjLI9Mdqiylo4UVU3k1vI9U8IOMRxu7DeTFkTTG7jtRY54klJXDKPoPPaFDC8rl7vvWyAZ7NWlGmdcafNKRwilLFfpAy5XwpMs9dR36eF6upTuajvG/AiGZieCqXbi5oAEQmEAAnbJWFy5kIQa/fU+8JTX2qzKrPsOhj6OhgGaSwErQSKFn9AXQH7iBgQ3nWTahfGZtFTcGDH4gugB3B+YWxkvL/ETnCZH36IQI6gQ34ALjdT+DU8N/HE/xGBijboWdHMQANEhkNU78xRdLSfkQR9yJwjs9FgMxXQtv9jj35ilHJiHsos5HFhOGXZT6SDWXRATIoAROCe7eleZY8XOed1tJL66HoiQS+5nrvdnKh5Gy5Z23KhjqJ05FzXZFv+s7Lf9ycaV/wbMoJhePwqIIV1fDDAiMg4Pkbz3Abim7G0ERVyU7ZwGj9I4j7RORDRs4UhC+wibWZI5cQiPt3byoEfuyNCGAefOFFQMGDVi5WWxAjUJCmGoitG+0DHKQgh7ygP4Zt/SpkYL X-OriginatorOrg: leica-geosystems.com X-MS-Exchange-CrossTenant-Network-Message-Id: b9079fa7-a984-475a-e65b-08d966d49662 X-MS-Exchange-CrossTenant-AuthSource: DBAPR06MB6664.eurprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Aug 2021 07:55:49.2426 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 1b16ab3e-b8f6-4fe3-9f3e-2db7fe549f6a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: +5CIEZWAYx6pnzbKlVsON3i5KFfRe6n4BCgSGqlIKNtmhTm5eoK0DgW82xKY/2SD2B/V/zQUOatQUSaROc0iv+cRuxCmgdQOQXckTETNbeI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0601MB2519 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.2 at phobos.denx.de X-Virus-Status: Clean Since derivatives are moving to binman from usage of the FIT generator script, and considering the warning introduced in f4a43d2925 ("Makefile: Warn against using CONFIG_SPL_FIT_GENERATOR"), usage of FIT generator is discouraged. Current FIT generator also generates broken output, since commit 3f04db891a ("image: Check for unit addresses in FITs") prohibits using '@' for unit addresses but the generator script still emits the old sematics. Remove the generator script and corresponding call in Makefile, all derivatives should be migrated to binman in order to provide binary images. Signed-off-by: Andrey Zhizhikin Reviewed-by: Simon Glass Reviewed-by: Fabio Estevam --- Makefile | 3 - arch/arm/mach-imx/mkimage_fit_atf.sh | 143 --------------------------- 2 files changed, 146 deletions(-) delete mode 100755 arch/arm/mach-imx/mkimage_fit_atf.sh diff --git a/Makefile b/Makefile index 3c8437d21a..6760ddc826 100644 --- a/Makefile +++ b/Makefile @@ -1350,9 +1350,6 @@ $(U_BOOT_ITS): $(subst ",,$(CONFIG_SPL_FIT_SOURCE)) else ifneq ($(CONFIG_USE_SPL_FIT_GENERATOR),) U_BOOT_ITS := u-boot.its -ifeq ($(CONFIG_SPL_FIT_GENERATOR),"arch/arm/mach-imx/mkimage_fit_atf.sh") -U_BOOT_ITS_DEPS += u-boot-nodtb.bin -endif ifeq ($(CONFIG_SPL_FIT_GENERATOR),"arch/arm/mach-rockchip/make_fit_atf.py") U_BOOT_ITS_DEPS += u-boot endif diff --git a/arch/arm/mach-imx/mkimage_fit_atf.sh b/arch/arm/mach-imx/mkimage_fit_atf.sh deleted file mode 100755 index 2a17968794..0000000000 --- a/arch/arm/mach-imx/mkimage_fit_atf.sh +++ /dev/null @@ -1,143 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: GPL-2.0+ -# -# script to generate FIT image source for i.MX8MQ boards with -# ARM Trusted Firmware and multiple device trees (given on the command line) -# -# usage: $0 [ [&2 - exit 0 -else - echo "$BL31 size: " >&2 - stat -c %s $BL31 >&2 -fi - -BL32="tee.bin" - -if [ ! -f $BL32 ]; then - BL32=/dev/null -else - echo "Building with TEE support, make sure your $BL31 is compiled with spd. If you do not want tee, please delete $BL31" >&2 - echo "$BL32 size: " >&2 - stat -c %s $BL32 >&2 -fi - -BL33="u-boot-nodtb.bin" - -if [ ! -f $BL33 ]; then - echo "ERROR: $BL33 file NOT found" >&2 - exit 0 -else - echo "u-boot-nodtb.bin size: " >&2 - stat -c %s u-boot-nodtb.bin >&2 -fi - -for dtname in $* -do - echo "$dtname size: " >&2 - stat -c %s $dtname >&2 -done - - -cat << __HEADER_EOF -/dts-v1/; - -/ { - description = "Configuration to load ATF before U-Boot"; - - images { - uboot@1 { - description = "U-Boot (64-bit)"; - os = "u-boot"; - data = /incbin/("$BL33"); - type = "standalone"; - arch = "arm64"; - compression = "none"; - load = <$BL33_LOAD_ADDR>; - }; -__HEADER_EOF - -cnt=1 -for dtname in $* -do - cat << __FDT_IMAGE_EOF - fdt@$cnt { - description = "$(basename $dtname .dtb)"; - data = /incbin/("$dtname"); - type = "flat_dt"; - compression = "none"; - }; -__FDT_IMAGE_EOF -cnt=$((cnt+1)) -done - -cat << __HEADER_EOF - atf@1 { - description = "ARM Trusted Firmware"; - os = "arm-trusted-firmware"; - data = /incbin/("$BL31"); - type = "firmware"; - arch = "arm64"; - compression = "none"; - load = <$ATF_LOAD_ADDR>; - entry = <$ATF_LOAD_ADDR>; - }; -__HEADER_EOF - -if [ -f $BL32 ]; then -cat << __HEADER_EOF - tee@1 { - description = "TEE firmware"; - data = /incbin/("$BL32"); - type = "firmware"; - arch = "arm64"; - compression = "none"; - load = <$TEE_LOAD_ADDR>; - entry = <$TEE_LOAD_ADDR>; - }; -__HEADER_EOF -fi - -cat << __CONF_HEADER_EOF - }; - configurations { - default = "config@1"; - -__CONF_HEADER_EOF - -cnt=1 -for dtname in $* -do -if [ -f $BL32 ]; then -cat << __CONF_SECTION_EOF - config@$cnt { - description = "$(basename $dtname .dtb)"; - firmware = "uboot@1"; - loadables = "atf@1", "tee@1"; - fdt = "fdt@$cnt"; - }; -__CONF_SECTION_EOF -else -cat << __CONF_SECTION1_EOF - config@$cnt { - description = "$(basename $dtname .dtb)"; - firmware = "uboot@1"; - loadables = "atf@1"; - fdt = "fdt@$cnt"; - }; -__CONF_SECTION1_EOF -fi -cnt=$((cnt+1)) -done - -cat << __ITS_EOF - }; -}; -__ITS_EOF