mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Lucas Stach <l.stach@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 2/2] ARM: throw out no-MMU vector base fixup when ARMv7 isn't selected
Date: Thu,  7 Jun 2018 11:42:35 +0200	[thread overview]
Message-ID: <20180607094235.29848-2-l.stach@pengutronix.de> (raw)
In-Reply-To: <20180607094235.29848-1-l.stach@pengutronix.de>

May save some code space, but more importantly fixes the ARMv8 build.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 arch/arm/cpu/no-mmu.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/cpu/no-mmu.c b/arch/arm/cpu/no-mmu.c
index 7268fa9b9d78..eff4cdcba4be 100644
--- a/arch/arm/cpu/no-mmu.c
+++ b/arch/arm/cpu/no-mmu.c
@@ -37,7 +37,8 @@ static int nommu_v7_vectors_init(void)
 	void *vectors;
 	u32 cr;
 
-	if (cpu_architecture() < CPU_ARCH_ARMv7)
+	if (!IS_ENABLED(CONFIG_CPU_32v7) ||
+	    (cpu_architecture() < CPU_ARCH_ARMv7))
 		return 0;
 
 	/*
-- 
2.17.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  reply	other threads:[~2018-06-07  9:42 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-07  9:42 [PATCH 1/2] wdt: da9053: fix missed dev->hwdev conversion Lucas Stach
2018-06-07  9:42 ` Lucas Stach [this message]
2018-06-07 12:53   ` [PATCH 2/2] ARM: throw out no-MMU vector base fixup when ARMv7 isn't selected Andrey Smirnov
2018-06-07 13:00     ` Lucas Stach
2018-06-07 13:03       ` Andrey Smirnov
2018-06-08  6:01 ` [PATCH 1/2] wdt: da9053: fix missed dev->hwdev conversion Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180607094235.29848-2-l.stach@pengutronix.de \
    --to=l.stach@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox