From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 24 Oct 2022 08:59:04 +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 1omrQO-000MsU-6F for lore@lore.pengutronix.de; Mon, 24 Oct 2022 08:59:04 +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 1omrQN-0008RI-2e for lore@pengutronix.de; Mon, 24 Oct 2022 08:59:03 +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=Ei510Ju8vB7ZdMEm/6s8yIAaeIBzAR3ZuiSucoyV8iI=; b=ACMvGGcVYlNGPZ+0U4smti8lHt pxsXJCEflR/s5DuGkQKHQdp4VTLPdNvvIBlWWHcNWljPGsrOY451OS3FTVhvFizSEE0xbMFsy1o2p NFN2joMWioa6GmpebmwRuPwHyMfXGEK5Q2MfOSiaL2HoI5F7+ZhWhxmuIijS7dWUgysxSRJArxsjz AS0X4XHlo7Pht/uox/ImF64lTvuH0b30z+mFUvisP+Qa41seERBeK42+q5ODBxk8VMSFPHL0rDj89 KVWjhSr1aTEd8QSYyqkLJqIMLlyR8NBama1RfVixTr+2EMQYDs7ml9nVdljBheXKmWb3U0BAOLmw5 NtMxGDrA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1omrP9-00HMui-Qj; Mon, 24 Oct 2022 06:57:47 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1omrOl-00HMin-9R for barebox@lists.infradead.org; Mon, 24 Oct 2022 06:57:27 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1omrOi-0007rk-DM; Mon, 24 Oct 2022 08:57:20 +0200 Received: from [2a0a:edc0:0:1101:1d::ac] (helo=dude04.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1omrOi-0003s5-Lt; Mon, 24 Oct 2022 08:57:19 +0200 Received: from afa by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1omrOf-00567X-Jb; Mon, 24 Oct 2022 08:57:17 +0200 From: Ahmad Fatoum To: barebox@lists.infradead.org Cc: Ahmad Fatoum Date: Mon, 24 Oct 2022 08:57:14 +0200 Message-Id: <20221024065716.1215046-7-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221024065716.1215046-1-a.fatoum@pengutronix.de> References: <20221024065716.1215046-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221023_235723_373973_722D26E0 X-CRM114-Status: UNSURE ( 9.70 ) X-CRM114-Notice: Please train this message. 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,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH 6/8] ARM64: asm: drop __barebox_arm_head 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) Now that we have the common PBL head written in assembly, the 64-bit inline assembly version remains unused. Drop it. Signed-off-by: Ahmad Fatoum --- arch/arm/include/asm/barebox-arm-head.h | 17 ++--------------- .../mach-mvebu/include/mach/barebox-arm-head.h | 17 ----------------- 2 files changed, 2 insertions(+), 32 deletions(-) diff --git a/arch/arm/include/asm/barebox-arm-head.h b/arch/arm/include/asm/barebox-arm-head.h index 099e1bef3cb8..1a1d58c1aa35 100644 --- a/arch/arm/include/asm/barebox-arm-head.h +++ b/arch/arm/include/asm/barebox-arm-head.h @@ -18,13 +18,13 @@ void barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2); #define ARM_HEAD_SPARE_OFS 0x30 #define ARM_HEAD_SPARE_MARKER 0x55555555 +#ifdef CONFIG_CPU_32 #ifdef CONFIG_HAVE_MACH_ARM_HEAD #include #else static inline void __barebox_arm_head(void) { __asm__ __volatile__ ( -#ifdef CONFIG_CPU_32 #ifdef CONFIG_THUMB2_BAREBOX ".arm\n" "adr r9, 1f + 1\n" @@ -44,32 +44,18 @@ static inline void __barebox_arm_head(void) "1: b 1b\n" "1: b 1b\n" "1: b 1b\n" -#endif -#else - /* 5 instructions added by ENTRY_FUNCTION */ - /* two instruction long function prologue */ - /* only use if stack is initialized! */ - "b 2f\n" #endif ".asciz \"barebox\"\n" -#ifdef CONFIG_CPU_32 ".word _text\n" /* text base. If copied there, * barebox can skip relocation */ -#else - ".word 0xffffffff\n" -#endif ".word _barebox_image_size\n" /* image size to copy */ ".rept 8\n" ".word 0x55555555\n" ".endr\n" "2:\n" #ifdef CONFIG_PBL_BREAK -#ifdef CONFIG_CPU_V8 - "brk #17\n" -#else "bkpt #17\n" -#endif "nop\n" #else "nop\n" @@ -85,6 +71,7 @@ static inline void barebox_arm_head(void) ); } #endif +#endif #endif /* __ASSEMBLY__ */ diff --git a/arch/arm/mach-mvebu/include/mach/barebox-arm-head.h b/arch/arm/mach-mvebu/include/mach/barebox-arm-head.h index 12f8cfc5a029..2ef3377402f1 100644 --- a/arch/arm/mach-mvebu/include/mach/barebox-arm-head.h +++ b/arch/arm/mach-mvebu/include/mach/barebox-arm-head.h @@ -6,7 +6,6 @@ static inline void __barebox_arm_head(void) { __asm__ __volatile__ ( -#ifdef CONFIG_CPU_32 #ifdef CONFIG_THUMB2_BAREBOX ".arm\n" "adr r9, 1f + 1\n" @@ -26,23 +25,11 @@ static inline void __barebox_arm_head(void) "1: b 1b\n" "1: b 1b\n" "1: b 1b\n" -#endif -#else - "b 2f\n" - "nop\n" - "nop\n" - "nop\n" - "nop\n" - "nop\n" #endif ".asciz \"barebox\"\n" -#ifdef CONFIG_CPU_32 ".word _text\n" /* text base. If copied there, * barebox can skip relocation */ -#else - ".word 0xffffffff\n" -#endif ".word _barebox_image_size\n" /* image size to copy */ /* @@ -58,11 +45,7 @@ static inline void __barebox_arm_head(void) ".endr\n" "2:\n" #ifdef CONFIG_PBL_BREAK -#ifdef CONFIG_CPU_V8 - "brk #17\n" -#else "bkpt #17\n" -#endif "nop\n" #else "nop\n" -- 2.30.2