All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tom Rini <trini@konsulko.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 1/3] rockchip: arm: use 'arch-rockchip' for common header
Date: Mon, 1 Apr 2019 09:13:30 -0400	[thread overview]
Message-ID: <20190401131330.GH4664@bill-the-cat> (raw)
In-Reply-To: <4e0ae811-fbee-4ac0-61e5-f9e55731d9b2@baylibre.com>

On Mon, Apr 01, 2019 at 09:12:07AM +0200, Neil Armstrong wrote:
> On 28/03/2019 04:01, Kever Yang wrote:
> > rockchip platform header file is in 'arch-rockchip'
> > instead of arch-$(SOC) for all SoCs.
> > 
> > Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
> > ---
> > 
> >  arch/arm/cpu/armv8/start.S  | 4 ++++
> >  arch/arm/include/asm/gpio.h | 2 +-
> >  arch/arm/lib/vectors.S      | 5 ++++-
> >  3 files changed, 9 insertions(+), 2 deletions(-)
> > 
> > diff --git a/arch/arm/cpu/armv8/start.S b/arch/arm/cpu/armv8/start.S
> > index fe52166e28..ecee9e37a5 100644
> > --- a/arch/arm/cpu/armv8/start.S
> > +++ b/arch/arm/cpu/armv8/start.S
> > @@ -26,7 +26,11 @@ _start:
> >   * order to boot, allow them to set that in their boot0.h file and then
> >   * use it here.
> >   */
> > +#ifdef CONFIG_ARCH_ROCKCHIP
> > +#include <asm/arch-rockchip/boot0.h>
> > +#else
> >  #include <asm/arch/boot0.h>
> > +#endif
> >  #else
> >  	b	reset
> >  #endif
> > diff --git a/arch/arm/include/asm/gpio.h b/arch/arm/include/asm/gpio.h
> > index 3039e66bf9..b0c8c47c95 100644
> > --- a/arch/arm/include/asm/gpio.h
> > +++ b/arch/arm/include/asm/gpio.h
> > @@ -1,5 +1,5 @@
> >  #if !defined(CONFIG_ARCH_UNIPHIER) && !defined(CONFIG_ARCH_STI) && \
> > -	!defined(CONFIG_ARCH_K3)
> > +	!defined(CONFIG_ARCH_K3) && !defined(CONFIG_ARCH_ROCKCHIP)
> >  #include <asm/arch/gpio.h>
> >  #endif
> >  #include <asm-generic/gpio.h>
> > diff --git a/arch/arm/lib/vectors.S b/arch/arm/lib/vectors.S
> > index 2ca6e2494a..20f485142e 100644
> > --- a/arch/arm/lib/vectors.S
> > +++ b/arch/arm/lib/vectors.S
> > @@ -67,8 +67,11 @@
> >   *   (1) defines '_start:' as appropriate
> >   *   (2) inserts the vector table using ARM_VECTORS as appropriate
> >   */
> > +#ifdef CONFIG_ARCH_ROCKCHIP
> > +#include <asm/arch-rockchip/boot0.h>
> > +#else
> >  #include <asm/arch/boot0.h>
> > -
> > +#endif
> >  #else
> >  
> >  /*
> > 
> 
> Hi,
> 
> All vendors has the same issue here, like Amlogic, but we use "meson" as $(SOC),
> if every vendor add its own specific include in common headers like this,
> this won't scale...
> 
> We should fix all this CONFIG_SOC instead of adding this, by maybe using the SYS_VENDOR
> for the arch include dir ?

We should either:
- Grab the mechanism currently used in the kernel to allow for another
  high-level symlink to happen and re-org our files like this to allow
  for that
- In these cases, at least for now have <asm/arch-$(SOC)/boot0.h> grab
  the appropriate <asm/subdir/boot0.h> like we do on other files, and do
  the first option later.

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190401/faf8d229/attachment.sig>

  reply	other threads:[~2019-04-01 13:13 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-28  3:01 [U-Boot] [PATCH 0/3] rockchip: correct SYS_SOC name for all rockchip SoCs Kever Yang
2019-03-28  3:01 ` [U-Boot] [PATCH 1/3] rockchip: arm: use 'arch-rockchip' for common header Kever Yang
2019-03-28  7:02   ` Philipp Tomsich
2019-04-01  7:12   ` Neil Armstrong
2019-04-01 13:13     ` Tom Rini [this message]
2019-04-02  0:58       ` Kever Yang
2019-05-01 13:06   ` Philipp Tomsich
2019-03-28  3:01 ` [U-Boot] [PATCH 2/3] rockchip: use 'arch-rockchip' as header file path Kever Yang
2019-03-30 21:18   ` Simon Glass
2019-04-01  1:02     ` [U-Boot] [PATCH 2/3] rockchip: use 'arch-rockchip' as header file path【请注意，邮件由sjg@google.com代发】 Kever Yang
2019-04-01  2:00       ` Simon Glass
2019-04-01  2:46         ` Kever Yang
2019-04-01 19:00           ` Simon Glass
2019-04-02  1:11             ` Kever Yang
2019-04-05  2:33               ` Simon Glass
2019-04-03 19:57     ` [U-Boot] [PATCH 2/3] rockchip: use 'arch-rockchip' as header file path Simon Glass
2019-04-04 13:11       ` [U-Boot] [PATCH 2/3] rockchip: use 'arch-rockchip' as header file path【请注意，邮件由sjg@google.com代发】 Kever Yang
2019-04-05  2:33         ` Simon Glass
2019-04-28 23:34   ` [U-Boot] [PATCH 2/3] rockchip: use 'arch-rockchip' as header file path Philipp Tomsich
2019-05-01 13:06   ` Philipp Tomsich
2019-03-28  3:01 ` [U-Boot] [PATCH 3/3] rockchip: correct ARCH_SOC name Kever Yang
2019-03-28  7:02   ` Philipp Tomsich
2019-03-28  9:31     ` Kever Yang
2019-05-01 13:06   ` Philipp Tomsich

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=20190401131330.GH4664@bill-the-cat \
    --to=trini@konsulko.com \
    --cc=u-boot@lists.denx.de \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.