diff mbox series

[v2,02/15] arm: sunxi: Remove SoC-specific config header files

Message ID 20220311141210.2810346-2-trini@konsulko.com
State Deferred
Delegated to: Tom Rini
Headers show
Series [v2,01/15] Convert CONFIG_ARMV7_SECURE_BASE et al to Kconfig | expand

Commit Message

Tom Rini March 11, 2022, 2:11 p.m. UTC 
At this point, sunxi-common.h is used for all systems as-is, so remove
the other headers and rename sunxi-common.h to sunxi.h.

Cc: Jagan Teki <jagan@amarulasolutions.com>
Cc: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
Changes in v2:
- Drop sun50i.h, rename to "sunxi" per Andre
---
 arch/arm/mach-sunxi/Kconfig                 | 11 +--------
 include/configs/sun4i.h                     | 19 ---------------
 include/configs/sun50i.h                    | 26 ---------------------
 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 -----------
 include/configs/{sunxi-common.h => sunxi.h} |  0
 10 files changed, 1 insertion(+), 164 deletions(-)
 delete mode 100644 include/configs/sun4i.h
 delete mode 100644 include/configs/sun50i.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
 rename include/configs/{sunxi-common.h => sunxi.h} (100%)

Comments

Tom Rini March 18, 2022, 4:50 p.m. UTC | #1 
On Fri, Mar 11, 2022 at 09:11:57AM -0500, Tom Rini wrote:

> At this point, sunxi-common.h is used for all systems as-is, so remove
> the other headers and rename sunxi-common.h to sunxi.h.
> 
> Cc: Jagan Teki <jagan@amarulasolutions.com>
> Cc: Andre Przywara <andre.przywara@arm.com>
> Signed-off-by: Tom Rini <trini@konsulko.com>
> ---
> Changes in v2:
> - Drop sun50i.h, rename to "sunxi" per Andre

So, first as Andre asked on IRC and I was wrong about, this stops the
ability to build "sun4i", etc.  And this is a problem for CI as we can't
split the Azure job such that all 32bit sunxi ARM platforms build within
an hour.  So for now, I'm deferring this.  I think this can be revisited
however.
diff mbox series

Patch

diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
index 205fe3c9d3ca..ccf28ef2fdcd 100644
--- a/arch/arm/mach-sunxi/Kconfig
+++ b/arch/arm/mach-sunxi/Kconfig
@@ -608,16 +608,7 @@  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 "sunxi"
 
 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 <henrik@henriknordstrom.net>
- *
- * 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 <configs/sunxi-common.h>
-
-#endif /* __CONFIG_H */
diff --git a/include/configs/sun50i.h b/include/configs/sun50i.h
deleted file mode 100644
index bc2e3a3d0088..000000000000
--- a/include/configs/sun50i.h
+++ /dev/null
@@ -1,26 +0,0 @@ 
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Configuration settings for the Allwinner A64 (sun50i) CPU
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-/*
- * A64 specific configuration
- */
-
-#ifndef CONFIG_SUN50I_GEN_H6
-#define GICD_BASE		0x1c81000
-#define GICC_BASE		0x1c82000
-#else
-#define GICD_BASE		0x3021000
-#define GICC_BASE		0x3022000
-#endif
-
-/*
- * Include common sunxi configuration where most the settings are
- */
-#include <configs/sunxi-common.h>
-
-#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 <henrik@henriknordstrom.net>
- *
- * 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 <configs/sunxi-common.h>
-
-#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 <henrik@henriknordstrom.net>
- * (C) Copyright 2013 Luke Kenneth Casson Leighton <lkcl@lkcl.net>
- * (C) Copyright 2013 Maxime Ripard <maxime.ripard@free-electrons.com>
- *
- * Configuration settings for the Allwinner A31 (sun6i) CPU
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-/*
- * Include common sunxi configuration where most the settings are
- */
-#include <configs/sunxi-common.h>
-
-#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 <henrik@henriknordstrom.net>
- * (C) Copyright 2013 Luke Kenneth Casson Leighton <lkcl@lkcl.net>
- *
- * Configuration settings for the Allwinner A20 (sun7i) CPU
- */
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-/*
- * Include common sunxi configuration where most the settings are
- */
-#include <configs/sunxi-common.h>
-
-#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 <wens@csie.org>
- *
- * Configuration settings for the Allwinner A23 (sun8i) CPU
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-/*
- * A23 specific configuration
- */
-
-#include <asm/arch/cpu.h>
-
-/*
- * Include common sunxi configuration where most the settings are
- */
-#include <configs/sunxi-common.h>
-
-#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 <hdegoede@redhat.com>
- *
- * 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 <configs/sunxi-common.h>
-
-#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 <configs/sunxi-common.h>
-
-#endif /* __CONFIG_H */
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi.h
similarity index 100%
rename from include/configs/sunxi-common.h
rename to include/configs/sunxi.h