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 0F587C433EF for ; Thu, 10 Mar 2022 01:45:56 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8A9E083A70; Thu, 10 Mar 2022 02:45:37 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=konsulko.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 92BC383A34; Thu, 10 Mar 2022 02:44:41 +0100 (CET) Received: from mail-qt1-f182.google.com (mail-qt1-f182.google.com [209.85.160.182]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 2F0BB839C9 for ; Thu, 10 Mar 2022 02:44:16 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qt1-f182.google.com with SMTP id a1so3470531qta.13 for ; Wed, 09 Mar 2022 17:44:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qhD981M1xS0SU4UenN//flclZ9FoZiecmnxnahexirk=; b=RqOYA4v3VRpriKs/K6z7BwPRz6RwNi53wq3Lv3mzwZfVEtUgM4M85OTrO7azxANG/m RdF3bu6e7gUFTjGDUVnTjXpdRnhV6rcrYWlIRr1vWRflsxVsmpD+tWvRsOeIYzKgZRbl qh4B6PGBY4FPtLyj50QvrY5pnDejAZU7r/wDS3jQTSP6JTj4x1GQzVf+bY/dEycM7+aB /UaT4jxf4BlvJO+bzRId33qoA4VUMs2kgCfLRnr8X+7PoHpnORPL0EYo4Jjc90n2CtWz 8oSdctOwII1qcz7UI7gyDXU77DecRXWomFfrhoj0QgnSLnUbBtfi5RgKkKwnd02srzEB QpuA== X-Gm-Message-State: AOAM532XID4tgrVYKobw4rWAhr491z7XyatvQiR1xJJsu3+39jzgeFtM K7l/hw7RK33B8SficRuZFBNv+oOf5A== X-Google-Smtp-Source: ABdhPJxl0HwI7zzarNWKFls1m66n7CWwsGl7gMf0AaaVLyV62etXOTp5wg2AVIq/oCvdvZ2X4ZCfkA== X-Received: by 2002:ac8:5a0f:0:b0:2e1:a907:62ee with SMTP id n15-20020ac85a0f000000b002e1a90762eemr1232402qta.582.1646876649622; Wed, 09 Mar 2022 17:44:09 -0800 (PST) Received: from bill-the-cat.lan (2603-6081-7b01-cbda-2ef0-5dff-fedb-a8ba.res6.spectrum.com. [2603:6081:7b01:cbda:2ef0:5dff:fedb:a8ba]) by smtp.gmail.com with ESMTPSA id t7-20020a05622a180700b002e0ccf0aa49sm2486328qtc.62.2022.03.09.17.44.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Mar 2022 17:44:09 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Cc: Jagan Teki , Andre Przywara Subject: [PATCH 02/15] arm: sunxi: Remove most SoC-specific config header files Date: Wed, 9 Mar 2022 20:43:51 -0500 Message-Id: <20220310014404.1251636-2-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220310014404.1251636-1-trini@konsulko.com> References: <20220310014404.1251636-1-trini@konsulko.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 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. 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 */ -- 2.25.1