mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Ahmad Fatoum <a.fatoum@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH] Revert "clocksource: ARMv8 timer can only be built on ARMv8"
Date: Thu, 16 Jan 2020 09:34:05 +0100	[thread overview]
Message-ID: <20200116083405.62dy2zjf63l6f246@pengutronix.de> (raw)
In-Reply-To: <20200115111409.24129-1-a.fatoum@pengutronix.de>

On Wed, Jan 15, 2020 at 12:14:09PM +0100, Ahmad Fatoum wrote:
> This reverts commit 33ec8cb5872617fa95aea08d9f7f2b684d95b6de,
> so that barebox can once again match against "arm,armv7-timer"
> compatibles. The reverted commit restricted the timer to CPU_V8,
> because in i.MX multi-image configuration with MACH_SCB9328 set,
> we can have both CPU_32v7 and CPU_32v4T in the same build.
> 
> To avoid this issue properly, force use of -march=armv7-a for
> non-CONFIG_CPU_V8 targets. This is acceptable as we don't expect
> non-ARMv7 device trees to have the architected arm,armv7-timer.
> 
> Suggested-by: Lucas Stach <l.stach@pengutronix.de>
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
>  drivers/clocksource/Kconfig  | 2 +-
>  drivers/clocksource/Makefile | 5 ++++-
>  2 files changed, 5 insertions(+), 2 deletions(-)

Applied, thanks

> 
> diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
> index 44a6cef6fbae..43c5bfc9736a 100644
> --- a/drivers/clocksource/Kconfig
> +++ b/drivers/clocksource/Kconfig
> @@ -73,7 +73,7 @@ config CLOCKSOURCE_ATMEL_PIT
>  config CLOCKSOURCE_ARMV8_TIMER
>  	bool
>  	default y
> -	depends on ARM && CPU_V8
> +	depends on ARM && (CPU_64v8 || CPU_V7)

Is it worth renaming the driver to something not v8 specific?
ARM_ARCHITECTED_TIMER maybe?

Sascha


-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

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

  reply	other threads:[~2020-01-16  8:34 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-15 11:14 Ahmad Fatoum
2020-01-16  8:34 ` Sascha Hauer [this message]
2020-01-16 14:40   ` Ahmad Fatoum

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=20200116083405.62dy2zjf63l6f246@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=a.fatoum@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