From patchwork Thu Dec 14 18:16:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1876347 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.a=rsa-sha256 header.s=google header.b=kVAlUt40; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SrgYt5LMvz20H6 for ; Fri, 15 Dec 2023 05:17:38 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4A79487B78; Thu, 14 Dec 2023 19:17:11 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="kVAlUt40"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4C4CA87B65; Thu, 14 Dec 2023 19:17:07 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-yw1-x1134.google.com (mail-yw1-x1134.google.com [IPv6:2607:f8b0:4864:20::1134]) (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 E26C387B5B for ; Thu, 14 Dec 2023 19:17:02 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-yw1-x1134.google.com with SMTP id 00721157ae682-5e2eccf46ddso8026787b3.1 for ; Thu, 14 Dec 2023 10:17:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1702577821; x=1703182621; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=MIv6IFl5nq4Gq+dtmIlO8mX8iyRaUYsmxBVgWfyAKFk=; b=kVAlUt40ubE4YuIi4ECInjWF7s82xdavxXaNPo1lmMxQEJPjz5krobu2kMWcVRYsy5 UlQNv26svY4EnlJGOqvOVIv3MugVqaiCZrQGzt3ayV23s0c9MTLxtTDkJZP98/wmA7PR u5xKNwKQ0q9DBURZzbGpe5E7tHTSWImoaIS7k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702577821; x=1703182621; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MIv6IFl5nq4Gq+dtmIlO8mX8iyRaUYsmxBVgWfyAKFk=; b=iSmfqqV5RR8q/ZOJjKiAT4/YYrtUIk+u+h+ku5eOTx2pPf6LuOgas+PuKaVSruFlhb +VqfSkJarLtnimWzus+6yBsOH4wTOmqWUKi5OhDN/Zx0qD00BH5DfijQBlQzXuJE7UcN A7pnK69M6knzEixNkgfg3SBaGdgIK6h878GGDOrmKVdsRwovxDCNj/f+MF2HLGIZXYKQ r25Lcks4UAW11Mm4Uegts38bMyCeRbxGdBO02FSEDc8oyAOwgP3vPo9sgYtoHafNHo2H CBOoWnrGnf7lopnBXdfhrUZNBHaRCDHNEedvJLC/rzymQSFlO32DYzx6TCNd9Tty/EHa 9PBA== X-Gm-Message-State: AOJu0Yzu0obndp1up3InPCIorLISvZGvdOmLHPno9QxBNy2XygT/B6cv NdL3CD2yVAryDyqdYNIxLoJ71JB27fMcKctvZ78= X-Google-Smtp-Source: AGHT+IEemkSoEFCSdh0sVYIxx70XIsFimtAfj5naUNGQOYLkePVQ1dP/YM1IuSic4dBBYpoGuJzWkg== X-Received: by 2002:a0d:d649:0:b0:5e2:af70:4f11 with SMTP id y70-20020a0dd649000000b005e2af704f11mr2659180ywd.38.1702577820949; Thu, 14 Dec 2023 10:17:00 -0800 (PST) Received: from bill-the-cat.lan (2603-6081-7b00-6400-ef43-b142-0a3d-20b7.res6.spectrum.com. [2603:6081:7b00:6400:ef43:b142:a3d:20b7]) by smtp.gmail.com with ESMTPSA id s129-20020a0dd087000000b005d361dd6454sm5665698ywd.87.2023.12.14.10.17.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Dec 2023 10:17:00 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [v2 03/16] arm: Partial cleanup and audit usage of Date: Thu, 14 Dec 2023 13:16:45 -0500 Message-Id: <20231214181658.3359902-3-trini@konsulko.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231214181658.3359902-1-trini@konsulko.com> References: <20231214181658.3359902-1-trini@konsulko.com> MIME-Version: 1.0 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.8 at phobos.denx.de X-Virus-Status: Clean We need to include directly when a file needs to have something such as CFG_SYS_SDRAM_SIZE referenced as this file is not automatically globally included and is most commonly indirectly included via common.h. Remove most cases of arm including config.h directly, but add it where needed. This includes a few board-specific fixes. Signed-off-by: Tom Rini Reviewed-by: Simon Glass --- Changes in v2: - Update arch/arm/mach-keystone/cmd_mon.c --- arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h | 2 -- arch/arm/include/asm/arch-ls102xa/fsl_serdes.h | 2 -- arch/arm/include/asm/assembler.h | 1 - arch/arm/include/asm/secure.h | 1 - arch/arm/include/asm/string.h | 2 -- arch/arm/mach-davinci/include/mach/pinmux_defs.h | 1 - arch/arm/mach-exynos/exynos4_setup.h | 1 - arch/arm/mach-exynos/exynos5_setup.h | 1 - arch/arm/mach-k3/common.c | 1 + arch/arm/mach-k3/include/mach/clock.h | 2 -- arch/arm/mach-k3/include/mach/j721e_hardware.h | 1 - arch/arm/mach-k3/include/mach/j721s2_hardware.h | 1 - arch/arm/mach-keystone/cmd_mon.c | 1 + board/freescale/ls1088a/eth_ls1088aqds.c | 1 + board/freescale/ls2080aqds/eth.c | 1 + board/toradex/verdin-am62/verdin-am62.c | 1 + drivers/ddr/marvell/axp/ddr3_axp.h | 2 ++ 17 files changed, 7 insertions(+), 15 deletions(-) diff --git a/arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h b/arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h index 8f4365175697..9e29350ca4ba 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h @@ -7,8 +7,6 @@ #ifndef __FSL_SERDES_H__ #define __FSL_SERDES_H__ -#include - #ifdef CONFIG_FSL_LSCH3 enum srds_prtcl { /* diff --git a/arch/arm/include/asm/arch-ls102xa/fsl_serdes.h b/arch/arm/include/asm/arch-ls102xa/fsl_serdes.h index d99a6f318f8b..9244e0a78fd3 100644 --- a/arch/arm/include/asm/arch-ls102xa/fsl_serdes.h +++ b/arch/arm/include/asm/arch-ls102xa/fsl_serdes.h @@ -6,8 +6,6 @@ #ifndef __FSL_SERDES_H #define __FSL_SERDES_H -#include - enum srds_prtcl { /* * Nobody will check whether the device 'NONE' has been configured, diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h index 8d42ef4823e9..4fda483b8d8d 100644 --- a/arch/arm/include/asm/assembler.h +++ b/arch/arm/include/asm/assembler.h @@ -14,7 +14,6 @@ * assembler source. */ -#include #include /* diff --git a/arch/arm/include/asm/secure.h b/arch/arm/include/asm/secure.h index c7b00be8e0b9..abfa46470b2c 100644 --- a/arch/arm/include/asm/secure.h +++ b/arch/arm/include/asm/secure.h @@ -1,7 +1,6 @@ #ifndef __ASM_SECURE_H #define __ASM_SECURE_H -#include #include #define __secure __section("._secure.text") diff --git a/arch/arm/include/asm/string.h b/arch/arm/include/asm/string.h index ead3f2c35643..c9ecdde0d3d8 100644 --- a/arch/arm/include/asm/string.h +++ b/arch/arm/include/asm/string.h @@ -1,8 +1,6 @@ #ifndef __ASM_ARM_STRING_H #define __ASM_ARM_STRING_H -#include - /* * We don't do inline string functions, since the * optimised inline asm versions are not small. diff --git a/arch/arm/mach-davinci/include/mach/pinmux_defs.h b/arch/arm/mach-davinci/include/mach/pinmux_defs.h index 4901ba49c9bb..120935310807 100644 --- a/arch/arm/mach-davinci/include/mach/pinmux_defs.h +++ b/arch/arm/mach-davinci/include/mach/pinmux_defs.h @@ -9,7 +9,6 @@ #define __ASM_ARCH_PINMUX_DEFS_H #include -#include /* SPI0 pin muxer settings */ extern const struct pinmux_config spi0_pins_base[3]; diff --git a/arch/arm/mach-exynos/exynos4_setup.h b/arch/arm/mach-exynos/exynos4_setup.h index fbb45eb897e3..23c9011fbc63 100644 --- a/arch/arm/mach-exynos/exynos4_setup.h +++ b/arch/arm/mach-exynos/exynos4_setup.h @@ -8,7 +8,6 @@ #ifndef _ORIGEN_SETUP_H #define _ORIGEN_SETUP_H -#include #include /* Bus Configuration Register Address */ diff --git a/arch/arm/mach-exynos/exynos5_setup.h b/arch/arm/mach-exynos/exynos5_setup.h index af7a5afb03cd..e9874a8c1b24 100644 --- a/arch/arm/mach-exynos/exynos5_setup.h +++ b/arch/arm/mach-exynos/exynos5_setup.h @@ -8,7 +8,6 @@ #ifndef _SMDK5250_SETUP_H #define _SMDK5250_SETUP_H -#include #include #define NOT_AVAILABLE 0 diff --git a/arch/arm/mach-k3/common.c b/arch/arm/mach-k3/common.c index fd400e7e3dd8..d5db805c62ba 100644 --- a/arch/arm/mach-k3/common.c +++ b/arch/arm/mach-k3/common.c @@ -6,6 +6,7 @@ * Lokesh Vutla */ +#include #include #include #include diff --git a/arch/arm/mach-k3/include/mach/clock.h b/arch/arm/mach-k3/include/mach/clock.h index 32368ce0ede3..866319365f0a 100644 --- a/arch/arm/mach-k3/include/mach/clock.h +++ b/arch/arm/mach-k3/include/mach/clock.h @@ -7,8 +7,6 @@ #ifndef __ASM_ARCH_CLOCK_H #define __ASM_ARCH_CLOCK_H -#include - /* Clock Defines */ #define V_OSCK 24000000 #define V_SCLK V_OSCK diff --git a/arch/arm/mach-k3/include/mach/j721e_hardware.h b/arch/arm/mach-k3/include/mach/j721e_hardware.h index 780341124a8f..0ba37c9ec7d1 100644 --- a/arch/arm/mach-k3/include/mach/j721e_hardware.h +++ b/arch/arm/mach-k3/include/mach/j721e_hardware.h @@ -7,7 +7,6 @@ #ifndef __ASM_ARCH_J721E_HARDWARE_H #define __ASM_ARCH_J721E_HARDWARE_H -#include #ifndef __ASSEMBLY__ #include #endif diff --git a/arch/arm/mach-k3/include/mach/j721s2_hardware.h b/arch/arm/mach-k3/include/mach/j721s2_hardware.h index ad4fcdd4a97f..5aa2282f59a3 100644 --- a/arch/arm/mach-k3/include/mach/j721s2_hardware.h +++ b/arch/arm/mach-k3/include/mach/j721s2_hardware.h @@ -7,7 +7,6 @@ #ifndef __ASM_ARCH_J721S2_HARDWARE_H #define __ASM_ARCH_J721S2_HARDWARE_H -#include #ifndef __ASSEMBLY__ #include #endif diff --git a/arch/arm/mach-keystone/cmd_mon.c b/arch/arm/mach-keystone/cmd_mon.c index c6e7e2c3097d..d3b894c1b377 100644 --- a/arch/arm/mach-keystone/cmd_mon.c +++ b/arch/arm/mach-keystone/cmd_mon.c @@ -6,6 +6,7 @@ * Texas Instruments Incorporated, */ +#include #include #include #include diff --git a/board/freescale/ls1088a/eth_ls1088aqds.c b/board/freescale/ls1088a/eth_ls1088aqds.c index 2fece3a1b09b..e6033d251c56 100644 --- a/board/freescale/ls1088a/eth_ls1088aqds.c +++ b/board/freescale/ls1088a/eth_ls1088aqds.c @@ -3,6 +3,7 @@ * Copyright 2017 NXP */ +#include #include #include #include diff --git a/board/freescale/ls2080aqds/eth.c b/board/freescale/ls2080aqds/eth.c index 048ab44c5919..b47e2ec5a793 100644 --- a/board/freescale/ls2080aqds/eth.c +++ b/board/freescale/ls2080aqds/eth.c @@ -3,6 +3,7 @@ * Copyright 2015 Freescale Semiconductor, Inc. */ +#include #include #include #include diff --git a/board/toradex/verdin-am62/verdin-am62.c b/board/toradex/verdin-am62/verdin-am62.c index d09dda5bccc9..2718263eb19b 100644 --- a/board/toradex/verdin-am62/verdin-am62.c +++ b/board/toradex/verdin-am62/verdin-am62.c @@ -6,6 +6,7 @@ * */ +#include #include #include #include diff --git a/drivers/ddr/marvell/axp/ddr3_axp.h b/drivers/ddr/marvell/axp/ddr3_axp.h index c40cd768abf5..c3d282477f5c 100644 --- a/drivers/ddr/marvell/axp/ddr3_axp.h +++ b/drivers/ddr/marvell/axp/ddr3_axp.h @@ -6,6 +6,8 @@ #ifndef __DDR3_AXP_H #define __DDR3_AXP_H +#include + #define MV_78XX0_Z1_REV 0x0 #define MV_78XX0_A0_REV 0x1 #define MV_78XX0_B0_REV 0x2