[PATCH 2/4] ARM: drop <config.h> usage

Ahmad Fatoum a.fatoum at pengutronix.de
Fri Nov 28 02:58:42 PST 2025 

From: Ahmad Fatoum <a.fatoum at barebox.org>

There are no board-specific config.h on ARM any longer anyway, so drop
inclusion of that header.

Signed-off-by: Ahmad Fatoum <a.fatoum at barebox.org>
---
 arch/arm/boards/at91rm9200ek/{config.h => board.h} | 4 ++--
 arch/arm/boards/at91rm9200ek/lowlevel.c            | 2 +-
 arch/arm/boards/phytec-phycard-imx27/lowlevel.c    | 1 -
 arch/arm/cpu/cache-armv8.S                         | 1 -
 arch/arm/cpu/exceptions_32.S                       | 1 -
 arch/arm/cpu/exceptions_64.S                       | 1 -
 arch/arm/lib32/setjmp.S                            | 1 -
 arch/arm/lib64/setjmp.S                            | 1 -
 arch/arm/mach-mxs/lradc-init.c                     | 1 -
 arch/arm/mach-mxs/mem-init.c                       | 1 -
 arch/arm/mach-mxs/power-init.c                     | 1 -
 arch/arm/mach-omap/am33xx_mux.c                    | 1 -
 arch/arm/mach-omap/syslib.c                        | 1 -
 drivers/mci/imx-esdhc.c                            | 1 -
 drivers/mci/imx.c                                  | 1 -
 drivers/mci/omap_hsmmc.c                           | 1 -
 drivers/mci/omap_hsmmc_common.c                    | 1 -
 drivers/mtd/nand/raw/nand_fsl_ifc.c                | 1 -
 include/mach/imx/debug_ll.h                        | 1 -
 19 files changed, 3 insertions(+), 20 deletions(-)
 rename arch/arm/boards/at91rm9200ek/{config.h => board.h} (98%)

diff --git a/arch/arm/boards/at91rm9200ek/config.h b/arch/arm/boards/at91rm9200ek/board.h
similarity index 98%
rename from arch/arm/boards/at91rm9200ek/config.h
rename to arch/arm/boards/at91rm9200ek/board.h
index a3a0be18ec91..45e0c8268d6d 100644
--- a/arch/arm/boards/at91rm9200ek/config.h
+++ b/arch/arm/boards/at91rm9200ek/board.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#ifndef __CONFIG_H
-#define __CONFIG_H
+#ifndef __BOARD_H
+#define __BOARD_H
 
 #define MASTER_PLL_MUL		39
 #define MASTER_PLL_DIV		4
diff --git a/arch/arm/boards/at91rm9200ek/lowlevel.c b/arch/arm/boards/at91rm9200ek/lowlevel.c
index f412de7d4a6d..c8c252a31f89 100644
--- a/arch/arm/boards/at91rm9200ek/lowlevel.c
+++ b/arch/arm/boards/at91rm9200ek/lowlevel.c
@@ -15,7 +15,7 @@
 #include <mach/at91/at91_pmc.h>
 #include <mach/at91/hardware.h>
 
-#include "config.h"
+#include "board.h"
 
 void static inline access_sdram(void)
 {
diff --git a/arch/arm/boards/phytec-phycard-imx27/lowlevel.c b/arch/arm/boards/phytec-phycard-imx27/lowlevel.c
index a43406e1a20b..8e16edfb994b 100644
--- a/arch/arm/boards/phytec-phycard-imx27/lowlevel.c
+++ b/arch/arm/boards/phytec-phycard-imx27/lowlevel.c
@@ -9,7 +9,6 @@
 #include <common.h>
 #include <init.h>
 #include <io.h>
-#include <config.h>
 #include <asm/barebox-arm.h>
 #include <asm/barebox-arm-head.h>
 #include <mach/imx/imx27-regs.h>
diff --git a/arch/arm/cpu/cache-armv8.S b/arch/arm/cpu/cache-armv8.S
index 3e21b3591389..9d9e0fb585a1 100644
--- a/arch/arm/cpu/cache-armv8.S
+++ b/arch/arm/cpu/cache-armv8.S
@@ -7,7 +7,6 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <config.h>
 #include <linux/linkage.h>
 #include <init.h>
 
diff --git a/arch/arm/cpu/exceptions_32.S b/arch/arm/cpu/exceptions_32.S
index 235996f7ec29..dc3d42663cbe 100644
--- a/arch/arm/cpu/exceptions_32.S
+++ b/arch/arm/cpu/exceptions_32.S
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <config.h>
 #include <linux/linkage.h>
 #include <asm-generic/memory_layout.h>
 
diff --git a/arch/arm/cpu/exceptions_64.S b/arch/arm/cpu/exceptions_64.S
index 22034eaef975..18c535ecd41f 100644
--- a/arch/arm/cpu/exceptions_64.S
+++ b/arch/arm/cpu/exceptions_64.S
@@ -5,7 +5,6 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <config.h>
 #include <asm/ptrace.h>
 #include <asm/assembler64.h>
 #include <linux/linkage.h>
diff --git a/arch/arm/lib32/setjmp.S b/arch/arm/lib32/setjmp.S
index cc6cafa4af3e..d5ecd127a426 100644
--- a/arch/arm/lib32/setjmp.S
+++ b/arch/arm/lib32/setjmp.S
@@ -3,7 +3,6 @@
  * (C) 2017 Theobroma Systems Design und Consulting GmbH
  */
 
-#include <config.h>
 #include <asm/assembler.h>
 #include <linux/linkage.h>
 
diff --git a/arch/arm/lib64/setjmp.S b/arch/arm/lib64/setjmp.S
index 80be8cb0f201..6cd00415e03a 100644
--- a/arch/arm/lib64/setjmp.S
+++ b/arch/arm/lib64/setjmp.S
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /* SPDX-FileCopyrightText: 2017 Theobroma Systems Design und Consulting GmbH */
 
-#include <config.h>
 #include <linux/linkage.h>
 
 .pushsection .text.setjmp, "ax"
diff --git a/arch/arm/mach-mxs/lradc-init.c b/arch/arm/mach-mxs/lradc-init.c
index 10d0be77fdff..7f48893474ad 100644
--- a/arch/arm/mach-mxs/lradc-init.c
+++ b/arch/arm/mach-mxs/lradc-init.c
@@ -8,7 +8,6 @@
  */
 
 #include <common.h>
-#include <config.h>
 #include <asm/io.h>
 #include <mach/mxs/imx-regs.h>
 #include <mach/mxs/regs-lradc.h>
diff --git a/arch/arm/mach-mxs/mem-init.c b/arch/arm/mach-mxs/mem-init.c
index 0d289266d0e0..14d9c1411a4d 100644
--- a/arch/arm/mach-mxs/mem-init.c
+++ b/arch/arm/mach-mxs/mem-init.c
@@ -10,7 +10,6 @@
  */
 
 #include <common.h>
-#include <config.h>
 #include <io.h>
 #include <mach/mxs/imx-regs.h>
 #include <linux/compiler.h>
diff --git a/arch/arm/mach-mxs/power-init.c b/arch/arm/mach-mxs/power-init.c
index 408ff8ba9961..bed4052375b5 100644
--- a/arch/arm/mach-mxs/power-init.c
+++ b/arch/arm/mach-mxs/power-init.c
@@ -8,7 +8,6 @@
  */
 
 #include <common.h>
-#include <config.h>
 #include <io.h>
 #include <mach/mxs/imx-regs.h>
 
diff --git a/arch/arm/mach-omap/am33xx_mux.c b/arch/arm/mach-omap/am33xx_mux.c
index 3192e332c6e6..c89cc15bb699 100644
--- a/arch/arm/mach-omap/am33xx_mux.c
+++ b/arch/arm/mach-omap/am33xx_mux.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 #include <common.h>
-#include <config.h>
 #include <asm/io.h>
 #include <mach/omap/am33xx-mux.h>
 #include <mach/omap/am33xx-silicon.h>
diff --git a/arch/arm/mach-omap/syslib.c b/arch/arm/mach-omap/syslib.c
index f8fad243c637..cbc08efce9aa 100644
--- a/arch/arm/mach-omap/syslib.c
+++ b/arch/arm/mach-omap/syslib.c
@@ -22,7 +22,6 @@
  * GNU General Public License for more details.
  */
 
-#include <config.h>
 #include <common.h>
 #include <io.h>
 #include <mach/omap/syslib.h>
diff --git a/drivers/mci/imx-esdhc.c b/drivers/mci/imx-esdhc.c
index ae02d804430e..6dd3bef45756 100644
--- a/drivers/mci/imx-esdhc.c
+++ b/drivers/mci/imx-esdhc.c
@@ -6,7 +6,6 @@
  * Andy Fleming
  */
 
-#include <config.h>
 #include <common.h>
 #include <dma.h>
 #include <driver.h>
diff --git a/drivers/mci/imx.c b/drivers/mci/imx.c
index 480b758ba3ec..d462cb884325 100644
--- a/drivers/mci/imx.c
+++ b/drivers/mci/imx.c
@@ -12,7 +12,6 @@
  * Derived from pxamci.c by Russell King
  */
 
-#include <config.h>
 #include <common.h>
 #include <command.h>
 #include <mci.h>
diff --git a/drivers/mci/omap_hsmmc.c b/drivers/mci/omap_hsmmc.c
index 9101b4c30a2c..03f71eb453f1 100644
--- a/drivers/mci/omap_hsmmc.c
+++ b/drivers/mci/omap_hsmmc.c
@@ -2,7 +2,6 @@
 // SPDX-FileCopyrightText: 2008 Texas Instruments (http://www.ti.com/, Sukumar Ghorai <s-ghorai at ti.com>)
 
 /* #define DEBUG */
-#include <config.h>
 #include <common.h>
 #include <init.h>
 #include <driver.h>
diff --git a/drivers/mci/omap_hsmmc_common.c b/drivers/mci/omap_hsmmc_common.c
index 329908a6e4bd..ce146170d920 100644
--- a/drivers/mci/omap_hsmmc_common.c
+++ b/drivers/mci/omap_hsmmc_common.c
@@ -2,7 +2,6 @@
 // SPDX-FileCopyrightText: 2008 Texas Instruments (http://www.ti.com/, Sukumar Ghorai <s-ghorai at ti.com>)
 
 /* #define DEBUG */
-#include <config.h>
 #include <common.h>
 #include <init.h>
 #include <driver.h>
diff --git a/drivers/mtd/nand/raw/nand_fsl_ifc.c b/drivers/mtd/nand/raw/nand_fsl_ifc.c
index 1905e7b508d1..5eaa0533e8e1 100644
--- a/drivers/mtd/nand/raw/nand_fsl_ifc.c
+++ b/drivers/mtd/nand/raw/nand_fsl_ifc.c
@@ -7,7 +7,6 @@
  *
  */
 
-#include <config.h>
 #include <common.h>
 #include <driver.h>
 #include <init.h>
diff --git a/include/mach/imx/debug_ll.h b/include/mach/imx/debug_ll.h
index 618cbc784ea7..05e16a8f0248 100644
--- a/include/mach/imx/debug_ll.h
+++ b/include/mach/imx/debug_ll.h
@@ -4,7 +4,6 @@
 #define __MACH_IMX_DEBUG_LL_H__
 
 #include <io.h>
-#include <config.h>
 #include <common.h>
 #include <mach/imx/imx1-regs.h>
 #include <mach/imx/imx21-regs.h>
-- 
2.47.3

More information about the barebox mailing list