Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B958BC433F5 for ; Thu, 10 Mar 2022 10:59:06 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 20D2E839DE; Thu, 10 Mar 2022 11:59:02 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 77DBF83A71; Thu, 10 Mar 2022 11:58:59 +0100 (CET) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by phobos.denx.de (Postfix) with ESMTP id 56EAA838C8 for ; Thu, 10 Mar 2022 11:58:55 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=andre.przywara@arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B9D191691; Thu, 10 Mar 2022 02:58:53 -0800 (PST) Received: from donnerap.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id F0EB23F66F; Thu, 10 Mar 2022 02:58:52 -0800 (PST) Date: Thu, 10 Mar 2022 10:58:50 +0000 From: Andre Przywara To: Tom Rini Cc: u-boot@lists.denx.de, Jagan Teki , Samuel Holland , Jernej Skrabec Subject: Re: [PATCH 02/15] arm: sunxi: Remove most SoC-specific config header files Message-ID: <20220310105850.49d40718@donnerap.cambridge.arm.com> In-Reply-To: <20220310014404.1251636-2-trini@konsulko.com> References: <20220310014404.1251636-1-trini@konsulko.com> <20220310014404.1251636-2-trini@konsulko.com> Organization: ARM X-Mailer: Claws Mail 3.18.0 (GTK+ 2.24.32; aarch64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean On Wed, 9 Mar 2022 20:43:51 -0500 Tom Rini wrote: Hi Tom, > At this point, sunxi-common.h is used for all systems except for some > MACH_SUN50I variants. Remove the now basically empty header files and > update CONFIG_SYS_CONFIG_NAME to use sunxi-common.h directly. So is this #include the only user of this symbol? I was on the brink of removing those files several times already, but wasn't sure if that has side effects. I think buildman names use that as well, so we can't run "./buildman sun7i" anymore? If that's the only thing, I am fine with this. Actually the content of sun50i.h is bogus, since we don't define CONFIG_GICV2, so don't need the GIC addresses. So this can go as well, and SYS_CONFIG_NAME can maybe just become "sunxi"? Samuel, does this torpedo any RISC-V efforts? Thanks for cleaning this up! Cheers, Andre > > Cc: Jagan Teki > Cc: Andre Przywara > Signed-off-by: Tom Rini > --- > arch/arm/mach-sunxi/Kconfig | 12 ++---------- > include/configs/sun4i.h | 19 ------------------- > include/configs/sun5i.h | 19 ------------------- > include/configs/sun6i.h | 18 ------------------ > include/configs/sun7i.h | 16 ---------------- > include/configs/sun8i.h | 22 ---------------------- > include/configs/sun9i.h | 20 -------------------- > include/configs/suniv.h | 14 -------------- > 8 files changed, 2 insertions(+), 138 deletions(-) > delete mode 100644 include/configs/sun4i.h > delete mode 100644 include/configs/sun5i.h > delete mode 100644 include/configs/sun6i.h > delete mode 100644 include/configs/sun7i.h > delete mode 100644 include/configs/sun8i.h > delete mode 100644 include/configs/sun9i.h > delete mode 100644 include/configs/suniv.h > > diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig > index 205fe3c9d3ca..2abc00e51154 100644 > --- a/arch/arm/mach-sunxi/Kconfig > +++ b/arch/arm/mach-sunxi/Kconfig > @@ -608,16 +608,8 @@ config SYS_CLK_FREQ > default 1008000000 if MACH_SUN50I_H616 > > config SYS_CONFIG_NAME > - default "suniv" if MACH_SUNIV > - default "sun4i" if MACH_SUN4I > - default "sun5i" if MACH_SUN5I > - default "sun6i" if MACH_SUN6I > - default "sun7i" if MACH_SUN7I > - default "sun8i" if MACH_SUN8I > - default "sun9i" if MACH_SUN9I > - default "sun50i" if MACH_SUN50I > - default "sun50i" if MACH_SUN50I_H6 > - default "sun50i" if MACH_SUN50I_H616 > + default "sun50i" if MACH_SUN50I || MACH_SUN50I_H6 || MACH_SUN50I_H616 > + default "sunxi-common" > > config SYS_BOARD > default "sunxi" > diff --git a/include/configs/sun4i.h b/include/configs/sun4i.h > deleted file mode 100644 > index 0e1baa91bb14..000000000000 > --- a/include/configs/sun4i.h > +++ /dev/null > @@ -1,19 +0,0 @@ > -/* SPDX-License-Identifier: GPL-2.0+ */ > -/* > - * (C) Copyright 2012-2013 Henrik Nordstrom > - * > - * Configuration settings for the Allwinner A10 (sun4i) CPU > - */ > -#ifndef __CONFIG_H > -#define __CONFIG_H > - > -/* > - * A10 specific configuration > - */ > - > -/* > - * Include common sunxi configuration where most the settings are > - */ > -#include > - > -#endif /* __CONFIG_H */ > diff --git a/include/configs/sun5i.h b/include/configs/sun5i.h > deleted file mode 100644 > index ada18de75374..000000000000 > --- a/include/configs/sun5i.h > +++ /dev/null > @@ -1,19 +0,0 @@ > -/* SPDX-License-Identifier: GPL-2.0+ */ > -/* > - * (C) Copyright 2012-2013 Henrik Nordstrom > - * > - * Configuration settings for the Allwinner A13 (sun5i) CPU > - */ > -#ifndef __CONFIG_H > -#define __CONFIG_H > - > -/* > - * High Level Configuration Options > - */ > - > -/* > - * Include common sunxi configuration where most the settings are > - */ > -#include > - > -#endif /* __CONFIG_H */ > diff --git a/include/configs/sun6i.h b/include/configs/sun6i.h > deleted file mode 100644 > index 0b1fedda1081..000000000000 > --- a/include/configs/sun6i.h > +++ /dev/null > @@ -1,18 +0,0 @@ > -/* SPDX-License-Identifier: GPL-2.0+ */ > -/* > - * (C) Copyright 2012-2013 Henrik Nordstrom > - * (C) Copyright 2013 Luke Kenneth Casson Leighton > - * (C) Copyright 2013 Maxime Ripard > - * > - * Configuration settings for the Allwinner A31 (sun6i) CPU > - */ > - > -#ifndef __CONFIG_H > -#define __CONFIG_H > - > -/* > - * Include common sunxi configuration where most the settings are > - */ > -#include > - > -#endif /* __CONFIG_H */ > diff --git a/include/configs/sun7i.h b/include/configs/sun7i.h > deleted file mode 100644 > index bc2779fa26f8..000000000000 > --- a/include/configs/sun7i.h > +++ /dev/null > @@ -1,16 +0,0 @@ > -/* SPDX-License-Identifier: GPL-2.0+ */ > -/* > - * (C) Copyright 2012-2013 Henrik Nordstrom > - * (C) Copyright 2013 Luke Kenneth Casson Leighton > - * > - * Configuration settings for the Allwinner A20 (sun7i) CPU > - */ > -#ifndef __CONFIG_H > -#define __CONFIG_H > - > -/* > - * Include common sunxi configuration where most the settings are > - */ > -#include > - > -#endif /* __CONFIG_H */ > diff --git a/include/configs/sun8i.h b/include/configs/sun8i.h > deleted file mode 100644 > index 106139d0904a..000000000000 > --- a/include/configs/sun8i.h > +++ /dev/null > @@ -1,22 +0,0 @@ > -/* SPDX-License-Identifier: GPL-2.0+ */ > -/* > - * (C) Copyright 2014 Chen-Yu Tsai > - * > - * Configuration settings for the Allwinner A23 (sun8i) CPU > - */ > - > -#ifndef __CONFIG_H > -#define __CONFIG_H > - > -/* > - * A23 specific configuration > - */ > - > -#include > - > -/* > - * Include common sunxi configuration where most the settings are > - */ > -#include > - > -#endif /* __CONFIG_H */ > diff --git a/include/configs/sun9i.h b/include/configs/sun9i.h > deleted file mode 100644 > index 6ee08cf0d95e..000000000000 > --- a/include/configs/sun9i.h > +++ /dev/null > @@ -1,20 +0,0 @@ > -/* SPDX-License-Identifier: GPL-2.0+ */ > -/* > - * (C) Copyright 2015 Hans de Goede > - * > - * Configuration settings for the Allwinner A80 (sun9i) CPU > - */ > - > -#ifndef __CONFIG_H > -#define __CONFIG_H > - > -/* > - * A80 specific configuration > - */ > - > -/* > - * Include common sunxi configuration where most the settings are > - */ > -#include > - > -#endif /* __CONFIG_H */ > diff --git a/include/configs/suniv.h b/include/configs/suniv.h > deleted file mode 100644 > index 6118cd5e1a69..000000000000 > --- a/include/configs/suniv.h > +++ /dev/null > @@ -1,14 +0,0 @@ > -/* SPDX-License-Identifier: GPL-2.0+ */ > -/* > - * Configuration settings for new Allwinner F-series (suniv) CPU > - */ > - > -#ifndef __CONFIG_H > -#define __CONFIG_H > - > -/* > - * Include common sunxi configuration where most the settings are > - */ > -#include > - > -#endif /* __CONFIG_H */