From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 03/12] ARM: hisi: add ARCH_HISI
Date: Mon, 14 Apr 2014 11:10:45 +0200 [thread overview]
Message-ID: <4602303.n32aAEEb8m@wuerfel> (raw)
In-Reply-To: <CAD6h2NTsxDwULLfWqJ1H2GbFuMUnRAdZRvc-KePNk3jD8fVJ2g@mail.gmail.com>
On Monday 14 April 2014 15:57:08 Haojian Zhuang wrote:
> On 8 April 2014 19:13, Arnd Bergmann <arnd@arndb.de> wrote:
> > On Tuesday 08 April 2014 16:00:43 Haojian Zhuang wrote:
> >> diff --git a/arch/arm/mach-hisi/Kconfig b/arch/arm/mach-hisi/Kconfig
> >> index feee4db..da16efd 100644
> >> --- a/arch/arm/mach-hisi/Kconfig
> >> +++ b/arch/arm/mach-hisi/Kconfig
> >> @@ -1,8 +1,16 @@
> >> -config ARCH_HI3xxx
> >> - bool "Hisilicon Hi36xx/Hi37xx family" if ARCH_MULTI_V7
> >> +config ARCH_HISI
> >> + bool "Hisilicon SoC Support"
> >> + depends on ARCH_MULTIPLATFORM
> >> select ARM_AMBA
> >> select ARM_GIC
> >> select ARM_TIMER_SP804
> >> +
> >> +if ARCH_HISI
> >> +
> >> +menu "Hisilicon platform type"
> >> +
> >> +config ARCH_HI3xxx
> >> + bool "Hisilicon Hi36xx/Hi37xx family" if ARCH_MULTI_V7
> >> select CACHE_L2X0
> >> select HAVE_ARM_SCU if SMP
> >> select HAVE_ARM_TWD if SMP
> >> @@ -10,3 +18,7 @@ config ARCH_HI3xxx
> >> select PINCTRL_SINGLE
> >> help
> >> Support for Hisilicon Hi36xx/Hi37xx processor family
> >> +
> >> +endmenu
> >
> > On second thought: You don't actually have any sub-options under
> > the main SoC specific option, so using 'menuconfig' as I suggested
> > first makes no sense.
> >
> > Just leave ARCH_HI3xxx and ARCH_HIP04 as top-level options and
> > drop this patch. There is no real need for a new menu here.
> > That also means you can drop patch 9.
> >
> > Arnd
>
> Since they're two archs. In arch/arm/Kconfig, I have to write as below.
>
> machine-$(CONFIG_ARCH_HI3xxx) += mach-hisi
> machine-$(CONFIG_ARCH_HIP04) += mach-hisi
>
> Then mach-hisi is duplicated in Kconfig. I'll get build error in below.
>
> Makefile:877: target `arch/arm/mach-hisi' given more than once in the same rule.
Ah, you are right.
You can use a top-level option then, but please use 'menuconfig for it'
Alternatively, you could make ARCH_HISI a hidden symbol like
config ARCH_HISI
def_bool ARCH_HI3xxx || ARCH_HIP04
and use that one in the Makefile.
Arnd
next prev parent reply other threads:[~2014-04-14 9:10 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-08 8:00 [PATCH v2 00/12] Add Hisilicon HiP04 SoC Haojian Zhuang
2014-04-08 8:00 ` [PATCH v2 01/12] ARM: debug: add HiP04 debug uart Haojian Zhuang
2014-04-08 8:00 ` [PATCH v2 02/12] ARM: append ARCH_MULTI_V7_LPAE Haojian Zhuang
2014-04-08 10:59 ` Arnd Bergmann
2014-04-14 6:26 ` Haojian Zhuang
2014-04-08 8:00 ` [PATCH v2 03/12] ARM: hisi: add ARCH_HISI Haojian Zhuang
2014-04-08 11:02 ` Arnd Bergmann
2014-04-08 11:13 ` Arnd Bergmann
2014-04-14 7:57 ` Haojian Zhuang
2014-04-14 9:10 ` Arnd Bergmann [this message]
2014-04-08 8:00 ` [PATCH v2 04/12] irq: gic: use mask field in GICC_IAR Haojian Zhuang
2014-04-08 8:00 ` [PATCH v2 05/12] irq: gic: extends the cpu interface to 16 Haojian Zhuang
2014-04-10 8:12 ` Marc Zyngier
2014-04-08 8:00 ` [PATCH v2 06/12] ARM: mcpm: change max clusters to 4 Haojian Zhuang
2014-04-10 9:56 ` Dave Martin
2014-04-11 2:39 ` Nicolas Pitre
2014-04-11 14:57 ` Dave Martin
2014-04-15 6:45 ` Haojian Zhuang
2014-04-15 8:15 ` Dave Martin
2014-04-15 14:48 ` Nicolas Pitre
2014-04-08 8:00 ` [PATCH v2 07/12] ARM: hisi: add hip04 SoC support Haojian Zhuang
2014-04-08 11:10 ` Arnd Bergmann
2014-04-15 7:02 ` Haojian Zhuang
2014-04-15 7:50 ` Arnd Bergmann
2014-04-10 8:50 ` Mark Rutland
2014-04-15 7:35 ` Haojian Zhuang
2014-04-10 11:21 ` Dave Martin
2014-04-08 8:00 ` [PATCH v2 08/12] ARM: dts: add hip04-d01 dts file Haojian Zhuang
2014-04-10 9:09 ` Mark Rutland
2014-04-10 10:25 ` Dave Martin
2014-04-08 8:00 ` [PATCH v2 09/12] ARM: config: append hip04_defconfig Haojian Zhuang
2014-04-08 11:18 ` Arnd Bergmann
2014-04-08 8:00 ` [PATCH v2 10/12] ARM: config: select ARCH_HISI in hi3xxx_defconfig Haojian Zhuang
2014-04-08 8:00 ` [PATCH v2 11/12] ARM: hisi: enable erratum 798181 of A15 on HiP04 Haojian Zhuang
2014-04-08 8:00 ` [PATCH v2 12/12] ARM: dts: Add PMU support in HiP04 Haojian Zhuang
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=4602303.n32aAEEb8m@wuerfel \
--to=arnd@arndb.de \
--cc=linux-arm-kernel@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;
as well as URLs for NNTP newsgroup(s).