From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hans de Goede Date: Mon, 06 Oct 2014 09:48:50 +0200 Subject: [U-Boot] [PATCH for-next 1/3] sunxi: Kconfig: Consolidate SYS_CONFIG_NAME settings In-Reply-To: <1412412492-12282-1-git-send-email-ijc@hellion.org.uk> References: <1412412466.17796.65.camel@hellion.org.uk> <1412412492-12282-1-git-send-email-ijc@hellion.org.uk> Message-ID: <54324962.6020802@redhat.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi, On 10/04/2014 10:48 AM, Ian Campbell wrote: > No need to be so repetitive. Hmm, I also have a version of this in my tree, I thought I had already send that out, but maybe I did not, see: https://github.com/jwrdegoede/u-boot-sunxi/commit/387033b669d72b8621eeb52c4cdc503e0d63b86d Note this needs to be rebased on top current next, as it does not take the SUN6I changes into account. > Signed-off-by: Ian Campbell > --- > board/sunxi/Kconfig | 31 ++++--------------------------- > 1 file changed, 4 insertions(+), 27 deletions(-) > > diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig > index 05defac..c4b3167 100644 > --- a/board/sunxi/Kconfig > +++ b/board/sunxi/Kconfig > @@ -1,31 +1,8 @@ > -if TARGET_SUN4I > - > -config SYS_CONFIG_NAME > - default "sun4i" > - > -endif > - > -if TARGET_SUN5I > - > -config SYS_CONFIG_NAME > - default "sun5i" > - > -endif > - > -if TARGET_SUN6I > - > config SYS_CONFIG_NAME > - string > - default "sun6i" > - > -endif > - > -if TARGET_SUN7I > - > -config SYS_CONFIG_NAME > - default "sun7i" > - > -endif > + default "sun4i" if TARGET_SUN4I > + default "sun5i" if TARGET_SUN5I > + default "sun6i" if TARGET_SUN6I > + default "sun7i" if TARGET_SUN7I > > if TARGET_SUN4I || TARGET_SUN5I || TARGET_SUN6I || TARGET_SUN7I You need to move this up to the top of the Kconfig file, as it gets unconditionally sourced from arch/arm/Kconfig, and if this is not at the top, you will be unconditionally adding a SYS_CONFIG_NAME section which may conflict with other targets which also define it. With that fixed this is: Acked-by: Hans de Goede Regards, Hans