From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 15 Jun 2023 17:59:11 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1q9pNQ-008Bp2-GU for lore@lore.pengutronix.de; Thu, 15 Jun 2023 17:59:11 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1q9pNN-00023l-Nz for lore@pengutronix.de; Thu, 15 Jun 2023 17:59:10 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=EVDtsqTKWFRos5Yq6+LauJb40+u+Jn7gSFJE78pz6ZE=; b=fMX24pMVIbo2j1f3fqLFF71EWt U2HSyGs0joVIJJVes5YpH7MAr/Yo7+7pYC9OgXfGQbsHNFDksNEkc092DVRg6NSWTdMTFDlRcLN+u OHnscnvUnvhSmHWi2OzrUTIUz03uBP30vOXXnV9U0CBnXJSBNuUyARajZOUEBnoPKi9S9EH9x+eR6 CJbfTQqEIwL6+YWCNPv32ai837clpB+MGqI7iwTPhKHSNNVoNg52bXmcisfTce/aybpDwd6Wv24gL uzZE9f0JqwJGZBoYEAoAH5s9E4Ro2ISPYjIg3I10lwqmIXD0kpvin7EugLNrgwUmH8dITVBdQWH/p 13xlfIyg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q9pMH-00FMFP-05; Thu, 15 Jun 2023 15:58:01 +0000 Received: from smtp72.ord1d.emailsrvr.com ([184.106.54.72]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q9pMD-00FMEq-36 for barebox@lists.infradead.org; Thu, 15 Jun 2023 15:57:59 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mev.co.uk; s=20221208-6x11dpa4; t=1686844674; bh=y8JrkcxSgu675xx8y7DjcE4nhXzdJxW4L8fhF1Rxmb4=; h=From:To:Subject:Date:From; b=vKWd590gEyQerqDOUSdy3tQbPZ8RDABvqUvHme91O/iIpunuHHfMVZMAhOo+yCbd6 IEGabYnsueIVf85h+39u0nwLRQNBchuYteNV3SX1eWrdbgNHtcmTJwykGG14PxVoZk +qFzxxVwMAjGbfO7BeuQqKXpcdNZ0Hpb7iJcrWBs= X-Auth-ID: abbotti@mev.co.uk Received: by smtp2.relay.ord1d.emailsrvr.com (Authenticated sender: abbotti-AT-mev.co.uk) with ESMTPSA id A407520058; Thu, 15 Jun 2023 11:57:53 -0400 (EDT) From: Ian Abbott To: barebox@lists.infradead.org Cc: Ian Abbott Date: Thu, 15 Jun 2023 16:57:38 +0100 Message-Id: <20230615155738.39998-1-abbotti@mev.co.uk> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230615135526.30878-1-abbotti@mev.co.uk> References: <20230615135526.30878-1-abbotti@mev.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Classification-ID: 8437969e-7efe-4806-a51d-291efaa53aad-1-1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230615_085758_044473_D0F0CDF5 X-CRM114-Status: GOOD ( 11.11 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.8 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH v2] scripts: socfpga_import_preloader: Translate DOS line endings X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) If the handoff files were generated on a Windows system, they will have DOS line endings. The `indent` program (with the options used by the script) does a lousy job tidying up those files, leaving ASCII CR characters embedded in the lines. This is particularly bad for array initializers that have one value per line, because they all end up on a single line with embedded ASCII CR characters between each value. Add an initial `sed` command to `copy_source()` to match and remove an ASCII CR character from the end of each input line. Also output a message before running `unifdef` and fix the spelling of "paths" in one of the other messages. Signed-off-by: Ian Abbott --- v2: Corrected tabs in echoed output. --- scripts/socfpga_import_preloader | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/socfpga_import_preloader b/scripts/socfpga_import_preloader index bd54e1b913..26a8556b1a 100755 --- a/scripts/socfpga_import_preloader +++ b/scripts/socfpga_import_preloader @@ -79,6 +79,10 @@ copy_source() { cp $src $tgt + echo " Translating DOS line endings..." + sed -i "s/`echo -e '\r'`$//" $tgt + + echo " Fixing conditional compilation..." unifdef -D HCX_COMPAT_MODE=1 -D ENABLE_INST_ROM_WRITE=1 $tgt -o $tgt echo " Fixing extern/static keywords..." @@ -99,7 +103,7 @@ copy_source() { sed -i 's/alt_8/int8_t/g' $tgt sed -i 's/#include "alt_types.h"//g' $tgt - echo " Fixing include pathes..." + echo " Fixing include paths..." # Fix include pathes sed -i 's/#include /#include /g' $tgt sed -i 's/#include /#include /g' $tgt -- 2.39.2