From patchwork Thu Oct 12 23:03:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1847820 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=a/MrSSj5; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S64xS319rz1ypX for ; Fri, 13 Oct 2023 10:05:48 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BABCF86DF6; Fri, 13 Oct 2023 01:04:42 +0200 (CEST) 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="a/MrSSj5"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C3E0F86D33; Fri, 13 Oct 2023 01:04:25 +0200 (CEST) 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 autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-yw1-x1131.google.com (mail-yw1-x1131.google.com [IPv6:2607:f8b0:4864:20::1131]) (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 1281486D94 for ; Fri, 13 Oct 2023 01:04:03 +0200 (CEST) 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-x1131.google.com with SMTP id 00721157ae682-5a7ac4c3666so18524067b3.3 for ; Thu, 12 Oct 2023 16:04:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1697151841; x=1697756641; darn=lists.denx.de; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=2h5sFJaNM0uPjKGK7BJ6K3/KLIDbeOp37CTU7HdAnKY=; b=a/MrSSj50vjl3jB344fg7D/GpOmS8JWljs6l5PL918kdkjxn+IlKo8cM/WC9nDYBIK sgoOHP46xDyl2fXxipVyETauFA4nx0GsC0SroxFbbcqtI+TrD5uJ6zI0Pfj7BGTl/1HT 74cavVjofYYLxAZkGzta+arlrk8eq09ns0R24= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697151841; x=1697756641; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=2h5sFJaNM0uPjKGK7BJ6K3/KLIDbeOp37CTU7HdAnKY=; b=rAzppHumzGbzhAnpD0kIJb46SqoFVhc6Cve2wqpcGVwkL8EuE3S6weFBLUWtYSdfyC 7SjdU3Bq7GeQz3hqKvuQtaUNULpcdK4/dmfH3rXCswF5/gWe//OXpP3cES/245/3xvdL Mv91vG1MvfJUR13YGLLUsAwRLF/mNcbmvq1Qor4qtWMEyHfWMvi59TbS7qZqtr2uYXxd LVJ5t+Fkumi2P4i0fOXMFDgYcGxQCyezIJCLEA4E/j/PUmnL3GRCHlSHHJwgdCZRku9E GsqubT4D5TBfCjdxz1cFGR5ygU/U17LoiCeQO0t6W9IEIAY0wA5Jn/2NkZoP/nKca9Mg AoRw== X-Gm-Message-State: AOJu0YxhqxGDSQBwhPT71M2PboKC4ZfIyxx1IUB8nrs5jRQ0HZhmy15W P2/cm/85I1vsvQ+S5FB6c6zpcsLWXuMKbvXy2qH+eg== X-Google-Smtp-Source: AGHT+IGG6mRvMYHuUTyke15BBOpkb/DlH2Ax+sbSmQiYvZ0w+5gqTqlLOLbTuyjb/iLPAEkQEv0Q4g== X-Received: by 2002:a05:690c:f05:b0:5a7:e726:13f7 with SMTP id dc5-20020a05690c0f0500b005a7e72613f7mr7712256ywb.8.1697151841358; Thu, 12 Oct 2023 16:04:01 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b00-6400-5647-4a14-f04e-8d8d.res6.spectrum.com. [2603:6081:7b00:6400:5647:4a14:f04e:8d8d]) by smtp.gmail.com with ESMTPSA id k7-20020a816f07000000b005925765aa30sm278730ywc.135.2023.10.12.16.04.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Oct 2023 16:04:00 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: Simon Glass Subject: [PATCH 1/7] checkpatch.pl: Make common.h check boarder Date: Thu, 12 Oct 2023 19:03:53 -0400 Message-Id: <20231012230359.2005249-1-trini@konsulko.com> X-Mailer: git-send-email 2.34.1 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 At this point in time we should not add common.h to any new files, so make checkpatch.pl complain. Signed-off-by: Tom Rini Reviewed-by: Simon Glass --- Cc: Simon Glass This causes a bunch of patman tests, for checkpatch, to now fail and I don't really understand why, at all. And that was before I added a test for the new error, which I had hoped would clear up the problem. --- scripts/checkpatch.pl | 8 +++++++- tools/patman/test_checkpatch.py | 7 ++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 488d73a0ed77..c3314da8a3c7 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -2636,12 +2636,18 @@ sub u_boot_line { "All CONFIG symbols are managed by Kconfig\n" . $herecurr); } - # Don't put common.h and dm.h in header files + # Don't put dm.h in header files if ($realfile =~ /\.h$/ && $rawline =~ /^\+#include\s*<(common|dm)\.h>*/) { ERROR("BARRED_INCLUDE_IN_HDR", "Avoid including common.h and dm.h in header files\n" . $herecurr); } + # Don't add common.h to files + if ($rawline =~ /^\+#include\s*<(common|dm)\.h>*/) { + ERROR("BARRED_INCLUDE_COMMON_H", + "Do not add common.h to files\n" . $herecurr); + } + # Do not disable fdt / initrd relocation if ($rawline =~ /^\+.*(fdt|initrd)_high=0xffffffff/) { ERROR("DISABLE_FDT_OR_INITRD_RELOC", diff --git a/tools/patman/test_checkpatch.py b/tools/patman/test_checkpatch.py index a8bb364e42b2..187736d617d5 100644 --- a/tools/patman/test_checkpatch.py +++ b/tools/patman/test_checkpatch.py @@ -401,10 +401,15 @@ index 0000000..2234c87 def test_barred_include_in_hdr(self): """Test for using a barred include in a header file""" pm = PatchMaker() - #pm.add_line('include/myfile.h', '#include ') pm.add_line('include/myfile.h', '#include ') self.check_single_message(pm, 'BARRED_INCLUDE_IN_HDR', 'error') + def test_barred_include_common_h(self): + """Test for adding common.h to a file""" + pm = PatchMaker() + pm.add_line('include/myfile.h', '#include ') + self.check_single_message(pm, 'BARRED_INCLUDE_COMMON_H', 'error') + def test_config_is_enabled_config(self): """Test for accidental CONFIG_IS_ENABLED(CONFIG_*) calls""" pm = PatchMaker() From patchwork Thu Oct 12 23:03:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1847819 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=E1hBVjWo; 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) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S64wP5BQkz1yqZ for ; Fri, 13 Oct 2023 10:04:51 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 862DE86DC7; Fri, 13 Oct 2023 01:04:39 +0200 (CEST) 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="E1hBVjWo"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 239AD86689; Fri, 13 Oct 2023 01:04:25 +0200 (CEST) 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 autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-yw1-x1135.google.com (mail-yw1-x1135.google.com [IPv6:2607:f8b0:4864:20::1135]) (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 ADCC886E0E for ; Fri, 13 Oct 2023 01:04:03 +0200 (CEST) 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-x1135.google.com with SMTP id 00721157ae682-579de633419so18202857b3.3 for ; Thu, 12 Oct 2023 16:04:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1697151842; x=1697756642; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=W//peJYtzJoT8fZiZ2pPMsOa0HGkNle8EbMYeXK9/dM=; b=E1hBVjWo7zk67TQmwfY8fR3wJ1zJIIP9eY1zcXr3PV1gCh79L/rK+53Keex2PyrFA0 ZJwTXpH2HvMaC5SmkH/5Ols6gQNad2caIUF0QBWbptQXehKuwdz2XnOCnzIq4uBtwHUz VTUnpCzIwKld7LQ9sg3CpvPurkzGkTWAduHOo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697151842; x=1697756642; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=W//peJYtzJoT8fZiZ2pPMsOa0HGkNle8EbMYeXK9/dM=; b=fZpZ0Rz4X2fkqGHfPBETaen8Aw3m81EV7DcsyovHOt4X5ZSZx2wir/iTnZCq5cQXC+ pMWnsK0qPB7RSHzbUXL/+FhBBOK+/jyUi1QdKINTA4pNyfMmep1pHTzVxgaCfOSNDjke n5qwn0MMsF84FFKPsGswkl5ray2fe2aKHeKL2RQ/vV75b0f6NJvsfoIuZ5ZI1L+sZjOg r2ij4wvOVHwHI1KS3aKgcKYMZWhkkziwaZ3jMiY+x9Oi3X+7f9RVgpnCaiNPAaAEi+77 5tzGujujHUnbArc84YKgKo+C931Q6R5edBM6FDkX9bEZP9M3ssGJOFD+sU1tLzJjRqgu ibHQ== X-Gm-Message-State: AOJu0Yy2UFFZ7RDbTyoM/54Tc5T1wfCoPRnaf3RAn/iAQ7huIPDaTm8P 59avKIRjAX9zeAgblHfccXCHxSz5PheZneydepGxGg== X-Google-Smtp-Source: AGHT+IGq0MnqER/feiwnUN3pe05c9jDXV9RloJ3vKttZn4WnZJZmO6DVfzQjArMYLlPSn99auT8obg== X-Received: by 2002:a05:690c:fc8:b0:5a8:102:fe3e with SMTP id dg8-20020a05690c0fc800b005a80102fe3emr2992892ywb.11.1697151842034; Thu, 12 Oct 2023 16:04:02 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b00-6400-5647-4a14-f04e-8d8d.res6.spectrum.com. [2603:6081:7b00:6400:5647:4a14:f04e:8d8d]) by smtp.gmail.com with ESMTPSA id k7-20020a816f07000000b005925765aa30sm278730ywc.135.2023.10.12.16.04.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Oct 2023 16:04:01 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: Simon Glass Subject: [PATCH 2/7] include: Add in a few places Date: Thu, 12 Oct 2023 19:03:54 -0400 Message-Id: <20231012230359.2005249-2-trini@konsulko.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231012230359.2005249-1-trini@konsulko.com> References: <20231012230359.2005249-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 These files references a number of types that are defined in (and so forth), so include it here rather than rely on indirect inclusion. Signed-off-by: Tom Rini Reviewed-by: Simon Glass --- Cc: Simon Glass --- include/bootstage.h | 1 + include/cache.h | 2 ++ include/cpu.h | 2 ++ 3 files changed, 5 insertions(+) diff --git a/include/bootstage.h b/include/bootstage.h index f9376c320c96..affb0e5c6a6a 100644 --- a/include/bootstage.h +++ b/include/bootstage.h @@ -11,6 +11,7 @@ #ifndef _BOOTSTAGE_H #define _BOOTSTAGE_H +#include #include /* Flags for each bootstage record */ diff --git a/include/cache.h b/include/cache.h index b12fec259156..296ae3c8b48e 100644 --- a/include/cache.h +++ b/include/cache.h @@ -6,6 +6,8 @@ #ifndef __CACHE_H #define __CACHE_H +#include + struct udevice; /* diff --git a/include/cpu.h b/include/cpu.h index be02a1671298..2077ff30634b 100644 --- a/include/cpu.h +++ b/include/cpu.h @@ -7,6 +7,8 @@ #ifndef __CPU_H #define __CPU_H +#include + struct udevice; /** From patchwork Thu Oct 12 23:03:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1847821 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=qL+Jjy81; 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) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S654411DZz1yqn for ; Fri, 13 Oct 2023 10:11:31 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3226C86D41; Fri, 13 Oct 2023 01:08:00 +0200 (CEST) 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="qL+Jjy81"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 86DF986E29; Fri, 13 Oct 2023 01:04:52 +0200 (CEST) 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 autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-yw1-x1136.google.com (mail-yw1-x1136.google.com [IPv6:2607:f8b0:4864:20::1136]) (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 6067886E14 for ; Fri, 13 Oct 2023 01:04:04 +0200 (CEST) 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-x1136.google.com with SMTP id 00721157ae682-5a7b91faf40so18667267b3.1 for ; Thu, 12 Oct 2023 16:04:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1697151843; x=1697756643; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MDDWxFObcOzyD/5K86YshAwKABbQgEW7aLOLVkqTdNE=; b=qL+Jjy81Y7SlxaPEq61o96vdlcSlyOV9a/Gq1HMJ5QbatREMWRuEQCL/W78vVrRMiT nmTcLCGs9wstpt6mPlxIPWxoyrG2S3c5tEh1gMud35HegH0Uj+/vcnfwXjZujpfeV3D5 PJSZ+kaPj/ipx1w6RYSTUIFcfVSISOB0ayGP0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697151843; x=1697756643; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MDDWxFObcOzyD/5K86YshAwKABbQgEW7aLOLVkqTdNE=; b=PCxtoDq8UctF0sbQRKA2HkSjQgunPn87V3UwT2V6xckSAj26BfMMfT96LUizCkD5Sl Z3OLkqsnvnSEHWcHM+8b4Xvy/Ke9Q22JoPN5OIaTERam/sMfhmjwTzvMqD1ii8WVHvUU j7ZjpFoAsn6VoR5APqkUTqD0GcXMlSQ4Mxq8XXJOAQnJFeERDkqCUDSloW8yhkepH780 ISPTRzO9lvpVBZybxb+n5P0VustLvJkpmjb2YDPSoPiIzQnSlfKsvdimzRm5eonH515L HvphTlm80TRSztBc/XLUAAT0IOFzwmzLSS0xdAcLKn1FmUX1JdGXyNFlPWtak4/hZLTo Ia1w== X-Gm-Message-State: AOJu0YzrB9agpXunIAoDnp4fzmVW4L0VqMCp76Dl8t/SxsOqHrb/DmD2 yRH4N4f5hcemkpN6E68RO74jFKE2Ijx/t+UWaYFouA== X-Google-Smtp-Source: AGHT+IHJj5qR3ZlK9hpN93FZUHTIbTkuvHxceVdaithjjF37IQ0fVQYHo3pjPYQBPIeE6Dm02Jd2Gw== X-Received: by 2002:a81:65d6:0:b0:59b:dbb7:5c74 with SMTP id z205-20020a8165d6000000b0059bdbb75c74mr25517646ywb.32.1697151842830; Thu, 12 Oct 2023 16:04:02 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b00-6400-5647-4a14-f04e-8d8d.res6.spectrum.com. [2603:6081:7b00:6400:5647:4a14:f04e:8d8d]) by smtp.gmail.com with ESMTPSA id k7-20020a816f07000000b005925765aa30sm278730ywc.135.2023.10.12.16.04.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Oct 2023 16:04:02 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: Alexey Brodkin , Eugeniy Paltsev , uboot-snps-arc@synopsys.com Subject: [PATCH 3/7] arc: Remove common.h usage Date: Thu, 12 Oct 2023 19:03:55 -0400 Message-Id: <20231012230359.2005249-3-trini@konsulko.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231012230359.2005249-1-trini@konsulko.com> References: <20231012230359.2005249-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 can remove common.h from most cases of the code here, and only a few places need an additional header instead. Signed-off-by: Tom Rini Acked-by: Alexey Brodkin --- Cc: Alexey Brodkin Cc: Eugeniy Paltsev Cc: uboot-snps-arc@synopsys.com --- arch/arc/lib/bootm.c | 1 - arch/arc/lib/cache.c | 1 - arch/arc/lib/cpu.c | 1 - arch/arc/lib/init_helpers.c | 1 - arch/arc/lib/interrupts.c | 2 +- arch/arc/lib/relocate.c | 1 - arch/arc/lib/reset.c | 1 - board/abilis/tb100/tb100.c | 1 - board/synopsys/axs10x/axs10x.c | 1 - board/synopsys/emsdp/emsdp.c | 1 - board/synopsys/hsdk/clk-lib.h | 1 - board/synopsys/hsdk/env-lib.c | 2 ++ board/synopsys/hsdk/env-lib.h | 1 - board/synopsys/hsdk/hsdk.c | 1 - board/synopsys/iot_devkit/iot_devkit.c | 1 - board/synopsys/nsim/nsim.c | 1 - 16 files changed, 3 insertions(+), 15 deletions(-) diff --git a/arch/arc/lib/bootm.c b/arch/arc/lib/bootm.c index 2dd003445f8f..44ec5864a1c6 100644 --- a/arch/arc/lib/bootm.c +++ b/arch/arc/lib/bootm.c @@ -3,7 +3,6 @@ * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. */ -#include #include #include #include diff --git a/arch/arc/lib/cache.c b/arch/arc/lib/cache.c index d97a5787424e..22e748868a74 100644 --- a/arch/arc/lib/cache.c +++ b/arch/arc/lib/cache.c @@ -4,7 +4,6 @@ */ #include -#include #include #include #include diff --git a/arch/arc/lib/cpu.c b/arch/arc/lib/cpu.c index 156785796183..803dfd425580 100644 --- a/arch/arc/lib/cpu.c +++ b/arch/arc/lib/cpu.c @@ -3,7 +3,6 @@ * Copyright (C) 2013-2014, 2018 Synopsys, Inc. All rights reserved. */ -#include #include #include #include diff --git a/arch/arc/lib/init_helpers.c b/arch/arc/lib/init_helpers.c index 023eae190759..858b388cc0b9 100644 --- a/arch/arc/lib/init_helpers.c +++ b/arch/arc/lib/init_helpers.c @@ -5,7 +5,6 @@ #include #include -#include int init_cache_f_r(void) { diff --git a/arch/arc/lib/interrupts.c b/arch/arc/lib/interrupts.c index db21fbb11428..523b44cb95a4 100644 --- a/arch/arc/lib/interrupts.c +++ b/arch/arc/lib/interrupts.c @@ -3,8 +3,8 @@ * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. */ -#include #include +#include #include #include diff --git a/arch/arc/lib/relocate.c b/arch/arc/lib/relocate.c index fd6f4fbc9304..95b6d5150c78 100644 --- a/arch/arc/lib/relocate.c +++ b/arch/arc/lib/relocate.c @@ -3,7 +3,6 @@ * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. */ -#include #include #include #include diff --git a/arch/arc/lib/reset.c b/arch/arc/lib/reset.c index b8589d0f0a47..fa60fa963381 100644 --- a/arch/arc/lib/reset.c +++ b/arch/arc/lib/reset.c @@ -4,7 +4,6 @@ */ #include -#include #include __weak void reset_cpu(void) diff --git a/board/abilis/tb100/tb100.c b/board/abilis/tb100/tb100.c index 89e73225a7df..3dc9e14ef8c0 100644 --- a/board/abilis/tb100/tb100.c +++ b/board/abilis/tb100/tb100.c @@ -3,7 +3,6 @@ * (C) Copyright 2014 Pierrick Hascoet, Abilis Systems */ -#include #include #include #include diff --git a/board/synopsys/axs10x/axs10x.c b/board/synopsys/axs10x/axs10x.c index 75e4d037623e..95297a18357f 100644 --- a/board/synopsys/axs10x/axs10x.c +++ b/board/synopsys/axs10x/axs10x.c @@ -3,7 +3,6 @@ * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. */ -#include #include #include #include diff --git a/board/synopsys/emsdp/emsdp.c b/board/synopsys/emsdp/emsdp.c index a3cee23411d0..adec7d321994 100644 --- a/board/synopsys/emsdp/emsdp.c +++ b/board/synopsys/emsdp/emsdp.c @@ -3,7 +3,6 @@ * Copyright (C) 2018 Synopsys, Inc. All rights reserved. */ -#include #include #include #include diff --git a/board/synopsys/hsdk/clk-lib.h b/board/synopsys/hsdk/clk-lib.h index 970bcd4a17e7..e1140a10b23a 100644 --- a/board/synopsys/hsdk/clk-lib.h +++ b/board/synopsys/hsdk/clk-lib.h @@ -7,7 +7,6 @@ #ifndef __BOARD_CLK_LIB_H #define __BOARD_CLK_LIB_H -#include #include enum clk_ctl_ops { diff --git a/board/synopsys/hsdk/env-lib.c b/board/synopsys/hsdk/env-lib.c index d85e8167332f..85a2249f17f2 100644 --- a/board/synopsys/hsdk/env-lib.c +++ b/board/synopsys/hsdk/env-lib.c @@ -7,6 +7,8 @@ #include "env-lib.h" #include #include +#include +#include #include #define MAX_CMD_LEN 25 diff --git a/board/synopsys/hsdk/env-lib.h b/board/synopsys/hsdk/env-lib.h index 48c17c4d4f62..cabca1d0f3d3 100644 --- a/board/synopsys/hsdk/env-lib.h +++ b/board/synopsys/hsdk/env-lib.h @@ -7,7 +7,6 @@ #ifndef __BOARD_ENV_LIB_H #define __BOARD_ENV_LIB_H -#include #include #include diff --git a/board/synopsys/hsdk/hsdk.c b/board/synopsys/hsdk/hsdk.c index 6cbc89ae7874..8eb10f2226fc 100644 --- a/board/synopsys/hsdk/hsdk.c +++ b/board/synopsys/hsdk/hsdk.c @@ -4,7 +4,6 @@ * Author: Eugeniy Paltsev */ -#include #include #include #include diff --git a/board/synopsys/iot_devkit/iot_devkit.c b/board/synopsys/iot_devkit/iot_devkit.c index 650958f94c26..dec49e3ce5d6 100644 --- a/board/synopsys/iot_devkit/iot_devkit.c +++ b/board/synopsys/iot_devkit/iot_devkit.c @@ -3,7 +3,6 @@ * Copyright (C) 2018 Synopsys, Inc. All rights reserved. */ -#include #include #include #include diff --git a/board/synopsys/nsim/nsim.c b/board/synopsys/nsim/nsim.c index 00e5cc36414b..5953b365fd20 100644 --- a/board/synopsys/nsim/nsim.c +++ b/board/synopsys/nsim/nsim.c @@ -3,7 +3,6 @@ * Copyright (C) 2020 Synopsys, Inc. All rights reserved. */ -#include #include #include #include From patchwork Thu Oct 12 23:03:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1847822 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=qOlP/ZrG; 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 4S65481dzxz1yqn for ; Fri, 13 Oct 2023 10:11:36 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5E18A86E5D; Fri, 13 Oct 2023 01:08:18 +0200 (CEST) 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="qOlP/ZrG"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8666386D41; Fri, 13 Oct 2023 01:04:58 +0200 (CEST) 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 autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-yw1-x112a.google.com (mail-yw1-x112a.google.com [IPv6:2607:f8b0:4864:20::112a]) (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 BE35686E2F for ; Fri, 13 Oct 2023 01:04:06 +0200 (CEST) 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-x112a.google.com with SMTP id 00721157ae682-5a7ab31fb8bso17915437b3.1 for ; Thu, 12 Oct 2023 16:04:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1697151844; x=1697756644; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dtFD3tWyDFRWcXgCw9Jkw0wGOIvWaUR+FYfNfCf6VWw=; b=qOlP/ZrGGj3A/NKrZ0CtXi9jTxUI/9XwbbgQozHP7yAEtcHWo1VTZ3/taDHoRzqNml Xpw6QKoTjy6lqRvGSLPcJzVwcHwXx2jG7WTKDqGpzlfWGcCOBNYj/sK2tGb48Zhg6Nzw sgw2qv0vZp1R9JKXW6i2cMfhLEdX/4yhQvqXs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697151844; x=1697756644; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dtFD3tWyDFRWcXgCw9Jkw0wGOIvWaUR+FYfNfCf6VWw=; b=Sa6afeoY8pxftoMa4O+HTitSaZSCkiGDzKyjQ1YubIgUjSYWEHVkp5cEf/RQJnlJrZ Jeh4dV20h/9M6l2KNi1BvxhFZSwXIJ45L6ZUzi/M17D3GMtpjBSUGXVnSmFdDk3P+brD 3AoPClE4bprDvDnjQtAggWw9uM9qrC/UIdncT3vjAubrcTgjvIPmyNc2VI5tMFSe+K41 t6lckzVzrqHthamQEedus6VV3sdRhcvdsEmaPetmlEMYGpC4xQvEhaF7Ek0lurkf6us6 /s2bb7Lo8MbNrgXzhYyE4Srci9V/ewx9IvnOY1qzqQT1ge6/40M8AZHCVFgTolXF2BJ+ 6/9Q== X-Gm-Message-State: AOJu0YxkfmKrWAqD6OyqlLLidgeiPrbf1sEkaGwhtDHoeesHJFih9crA sKYSRyDqtHRQF54k+39wxK7i8H7Y1JYVDtACs3JRgQ== X-Google-Smtp-Source: AGHT+IG0Ijj7MgfG78vaEFDJfYNK+O2d20iA2K54dLEYITb/LwzjjZV8br+RYt5YGy04z/Kwsb0Frw== X-Received: by 2002:a05:690c:fd3:b0:5a8:17d4:aea1 with SMTP id dg19-20020a05690c0fd300b005a817d4aea1mr1145513ywb.28.1697151843531; Thu, 12 Oct 2023 16:04:03 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b00-6400-5647-4a14-f04e-8d8d.res6.spectrum.com. [2603:6081:7b00:6400:5647:4a14:f04e:8d8d]) by smtp.gmail.com with ESMTPSA id k7-20020a816f07000000b005925765aa30sm278730ywc.135.2023.10.12.16.04.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Oct 2023 16:04:03 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: Angelo Dureghello Subject: [PATCH 4/7] m68k: Remove common.h usage Date: Thu, 12 Oct 2023 19:03:56 -0400 Message-Id: <20231012230359.2005249-4-trini@konsulko.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231012230359.2005249-1-trini@konsulko.com> References: <20231012230359.2005249-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 can remove common.h from most cases of the code here, and only a few places need an additional header instead. Signed-off-by: Tom Rini Acked-by: Angelo Dureghello --- Cc: Angelo Dureghello --- arch/m68k/cpu/mcf523x/cpu.c | 1 - arch/m68k/cpu/mcf523x/cpu_init.c | 1 - arch/m68k/cpu/mcf523x/interrupts.c | 1 - arch/m68k/cpu/mcf523x/speed.c | 1 - arch/m68k/cpu/mcf52x2/cpu.c | 1 - arch/m68k/cpu/mcf52x2/cpu_init.c | 3 +-- arch/m68k/cpu/mcf52x2/interrupts.c | 1 - arch/m68k/cpu/mcf52x2/speed.c | 1 - arch/m68k/cpu/mcf530x/cpu.c | 1 - arch/m68k/cpu/mcf530x/cpu_init.c | 1 - arch/m68k/cpu/mcf530x/interrupts.c | 1 - arch/m68k/cpu/mcf530x/speed.c | 1 - arch/m68k/cpu/mcf532x/cpu.c | 1 - arch/m68k/cpu/mcf532x/cpu_init.c | 1 - arch/m68k/cpu/mcf532x/interrupts.c | 1 - arch/m68k/cpu/mcf532x/speed.c | 1 - arch/m68k/cpu/mcf5445x/cpu.c | 1 - arch/m68k/cpu/mcf5445x/cpu_init.c | 1 - arch/m68k/cpu/mcf5445x/dspi.c | 1 - arch/m68k/cpu/mcf5445x/interrupts.c | 1 - arch/m68k/cpu/mcf5445x/speed.c | 1 - arch/m68k/cpu/mcf5445x/start.S | 1 - arch/m68k/include/asm/immap.h | 1 + arch/m68k/include/asm/immap_520x.h | 1 + arch/m68k/include/asm/immap_5235.h | 1 + arch/m68k/include/asm/immap_5272.h | 1 + arch/m68k/include/asm/immap_5275.h | 1 + arch/m68k/include/asm/immap_5282.h | 1 + arch/m68k/include/asm/immap_5301x.h | 1 + arch/m68k/include/asm/immap_5307.h | 2 ++ arch/m68k/include/asm/immap_5329.h | 1 + arch/m68k/include/asm/immap_5441x.h | 1 + arch/m68k/lib/bdinfo.c | 3 ++- arch/m68k/lib/bootm.c | 1 - arch/m68k/lib/cache.c | 2 +- arch/m68k/lib/fec.c | 2 +- arch/m68k/lib/interrupts.c | 2 +- arch/m68k/lib/time.c | 1 - arch/m68k/lib/traps.c | 1 - 39 files changed, 17 insertions(+), 30 deletions(-) diff --git a/arch/m68k/cpu/mcf523x/cpu.c b/arch/m68k/cpu/mcf523x/cpu.c index bef67767b425..c843a381ea1f 100644 --- a/arch/m68k/cpu/mcf523x/cpu.c +++ b/arch/m68k/cpu/mcf523x/cpu.c @@ -8,7 +8,6 @@ * TsiChung Liew (Tsi-Chung.Liew@freescale.com) */ -#include #include #include #include diff --git a/arch/m68k/cpu/mcf523x/cpu_init.c b/arch/m68k/cpu/mcf523x/cpu_init.c index 10be73822fa5..a05cbdcb3852 100644 --- a/arch/m68k/cpu/mcf523x/cpu_init.c +++ b/arch/m68k/cpu/mcf523x/cpu_init.c @@ -8,7 +8,6 @@ * TsiChung Liew (Tsi-Chung.Liew@freescale.com) */ -#include #include #include #include diff --git a/arch/m68k/cpu/mcf523x/interrupts.c b/arch/m68k/cpu/mcf523x/interrupts.c index 09c7f9e67cc7..46c9207a93bb 100644 --- a/arch/m68k/cpu/mcf523x/interrupts.c +++ b/arch/m68k/cpu/mcf523x/interrupts.c @@ -6,7 +6,6 @@ */ /* CPU specific interrupt routine */ -#include #include #include #include diff --git a/arch/m68k/cpu/mcf523x/speed.c b/arch/m68k/cpu/mcf523x/speed.c index 6b08a12af0b6..2eb43cc7eb9a 100644 --- a/arch/m68k/cpu/mcf523x/speed.c +++ b/arch/m68k/cpu/mcf523x/speed.c @@ -8,7 +8,6 @@ * TsiChung Liew (Tsi-Chung.Liew@freescale.com) */ -#include #include #include #include diff --git a/arch/m68k/cpu/mcf52x2/cpu.c b/arch/m68k/cpu/mcf52x2/cpu.c index 5042a38b3e9e..6bfde5e9bd70 100644 --- a/arch/m68k/cpu/mcf52x2/cpu.c +++ b/arch/m68k/cpu/mcf52x2/cpu.c @@ -13,7 +13,6 @@ * Copyright (C) 2012 Freescale Semiconductor, Inc. All Rights Reserved. */ -#include #include #include #include diff --git a/arch/m68k/cpu/mcf52x2/cpu_init.c b/arch/m68k/cpu/mcf52x2/cpu_init.c index 99eb61f16758..4506eb39edfc 100644 --- a/arch/m68k/cpu/mcf52x2/cpu_init.c +++ b/arch/m68k/cpu/mcf52x2/cpu_init.c @@ -17,7 +17,7 @@ * Copyright (C) 2008 Arthur Shipkowski (art@videon-central.com) */ -#include +#include #include #include #include @@ -25,7 +25,6 @@ #include #if defined(CONFIG_CMD_NET) -#include #include #include #endif diff --git a/arch/m68k/cpu/mcf52x2/interrupts.c b/arch/m68k/cpu/mcf52x2/interrupts.c index c5ed06007369..264bdc7d6c7e 100644 --- a/arch/m68k/cpu/mcf52x2/interrupts.c +++ b/arch/m68k/cpu/mcf52x2/interrupts.c @@ -7,7 +7,6 @@ * TsiChung Liew (Tsi-Chung.Liew@freescale.com) */ -#include #include #include #include diff --git a/arch/m68k/cpu/mcf52x2/speed.c b/arch/m68k/cpu/mcf52x2/speed.c index 6c7628252b59..538e4c623d42 100644 --- a/arch/m68k/cpu/mcf52x2/speed.c +++ b/arch/m68k/cpu/mcf52x2/speed.c @@ -7,7 +7,6 @@ * Hayden Fraser (Hayden.Fraser@freescale.com) */ -#include #include #include #include diff --git a/arch/m68k/cpu/mcf530x/cpu.c b/arch/m68k/cpu/mcf530x/cpu.c index 53a25d8362cd..92a0ef76895c 100644 --- a/arch/m68k/cpu/mcf530x/cpu.c +++ b/arch/m68k/cpu/mcf530x/cpu.c @@ -4,7 +4,6 @@ * */ -#include #include #include #include diff --git a/arch/m68k/cpu/mcf530x/cpu_init.c b/arch/m68k/cpu/mcf530x/cpu_init.c index dad47d87ab31..8f6e668d103a 100644 --- a/arch/m68k/cpu/mcf530x/cpu_init.c +++ b/arch/m68k/cpu/mcf530x/cpu_init.c @@ -4,7 +4,6 @@ * */ -#include #include #include #include diff --git a/arch/m68k/cpu/mcf530x/interrupts.c b/arch/m68k/cpu/mcf530x/interrupts.c index 11686202dc73..99cf86385037 100644 --- a/arch/m68k/cpu/mcf530x/interrupts.c +++ b/arch/m68k/cpu/mcf530x/interrupts.c @@ -4,7 +4,6 @@ * */ -#include #include #include #include diff --git a/arch/m68k/cpu/mcf530x/speed.c b/arch/m68k/cpu/mcf530x/speed.c index c8d079016f2e..6542fc43ab10 100644 --- a/arch/m68k/cpu/mcf530x/speed.c +++ b/arch/m68k/cpu/mcf530x/speed.c @@ -4,7 +4,6 @@ * */ -#include #include #include #include diff --git a/arch/m68k/cpu/mcf532x/cpu.c b/arch/m68k/cpu/mcf532x/cpu.c index 18d20a892655..6973af9d045d 100644 --- a/arch/m68k/cpu/mcf532x/cpu.c +++ b/arch/m68k/cpu/mcf532x/cpu.c @@ -8,7 +8,6 @@ * TsiChung Liew (Tsi-Chung.Liew@freescale.com) */ -#include #include #include #include diff --git a/arch/m68k/cpu/mcf532x/cpu_init.c b/arch/m68k/cpu/mcf532x/cpu_init.c index 844d2cd7600f..62a45f96314d 100644 --- a/arch/m68k/cpu/mcf532x/cpu_init.c +++ b/arch/m68k/cpu/mcf532x/cpu_init.c @@ -8,7 +8,6 @@ * TsiChung Liew (Tsi-Chung.Liew@freescale.com) */ -#include #include #include #include diff --git a/arch/m68k/cpu/mcf532x/interrupts.c b/arch/m68k/cpu/mcf532x/interrupts.c index 4f72fa88e58c..e37893c3e535 100644 --- a/arch/m68k/cpu/mcf532x/interrupts.c +++ b/arch/m68k/cpu/mcf532x/interrupts.c @@ -6,7 +6,6 @@ */ /* CPU specific interrupt routine */ -#include #include #include #include diff --git a/arch/m68k/cpu/mcf532x/speed.c b/arch/m68k/cpu/mcf532x/speed.c index 32ffac08135d..166916526eb9 100644 --- a/arch/m68k/cpu/mcf532x/speed.c +++ b/arch/m68k/cpu/mcf532x/speed.c @@ -8,7 +8,6 @@ * TsiChung Liew (Tsi-Chung.Liew@freescale.com) */ -#include #include #include #include diff --git a/arch/m68k/cpu/mcf5445x/cpu.c b/arch/m68k/cpu/mcf5445x/cpu.c index d9a71c6b920d..b811ac355e4d 100644 --- a/arch/m68k/cpu/mcf5445x/cpu.c +++ b/arch/m68k/cpu/mcf5445x/cpu.c @@ -8,7 +8,6 @@ * TsiChung Liew (Tsi-Chung.Liew@freescale.com) */ -#include #include #include #include diff --git a/arch/m68k/cpu/mcf5445x/cpu_init.c b/arch/m68k/cpu/mcf5445x/cpu_init.c index bc3a2f3aed63..3277617120c7 100644 --- a/arch/m68k/cpu/mcf5445x/cpu_init.c +++ b/arch/m68k/cpu/mcf5445x/cpu_init.c @@ -8,7 +8,6 @@ * TsiChung Liew (Tsi-Chung.Liew@freescale.com) */ -#include #include #include #include diff --git a/arch/m68k/cpu/mcf5445x/dspi.c b/arch/m68k/cpu/mcf5445x/dspi.c index 456af171a4e2..13eb6ecee101 100644 --- a/arch/m68k/cpu/mcf5445x/dspi.c +++ b/arch/m68k/cpu/mcf5445x/dspi.c @@ -6,7 +6,6 @@ * CPU specific dspi routines */ -#include #include #include diff --git a/arch/m68k/cpu/mcf5445x/interrupts.c b/arch/m68k/cpu/mcf5445x/interrupts.c index 400f3dee879e..913290086dca 100644 --- a/arch/m68k/cpu/mcf5445x/interrupts.c +++ b/arch/m68k/cpu/mcf5445x/interrupts.c @@ -9,7 +9,6 @@ */ /* CPU specific interrupt routine */ -#include #include #include #include diff --git a/arch/m68k/cpu/mcf5445x/speed.c b/arch/m68k/cpu/mcf5445x/speed.c index 5c78eb983496..41cb9e999adc 100644 --- a/arch/m68k/cpu/mcf5445x/speed.c +++ b/arch/m68k/cpu/mcf5445x/speed.c @@ -5,7 +5,6 @@ * TsiChung Liew (Tsi-Chung.Liew@freescale.com) */ -#include #include #include #include diff --git a/arch/m68k/cpu/mcf5445x/start.S b/arch/m68k/cpu/mcf5445x/start.S index 5c3bfff79183..f0264671d386 100644 --- a/arch/m68k/cpu/mcf5445x/start.S +++ b/arch/m68k/cpu/mcf5445x/start.S @@ -7,7 +7,6 @@ * TsiChung Liew (Tsi-Chung.Liew@freescale.com) */ -#include #include #include #include diff --git a/arch/m68k/include/asm/immap.h b/arch/m68k/include/asm/immap.h index aafa4f40cb35..411b00899c25 100644 --- a/arch/m68k/include/asm/immap.h +++ b/arch/m68k/include/asm/immap.h @@ -9,6 +9,7 @@ #ifndef __IMMAP_H #define __IMMAP_H +#include #if defined(CONFIG_MCF520x) #include #include diff --git a/arch/m68k/include/asm/immap_520x.h b/arch/m68k/include/asm/immap_520x.h index 7c7443b96885..d3c2f4a4091d 100644 --- a/arch/m68k/include/asm/immap_520x.h +++ b/arch/m68k/include/asm/immap_520x.h @@ -36,6 +36,7 @@ #define MMAP_GPIO (CFG_SYS_MBAR + 0x000A4000) #define MMAP_SDRAM (CFG_SYS_MBAR + 0x000A8000) +#include #include #include #include diff --git a/arch/m68k/include/asm/immap_5235.h b/arch/m68k/include/asm/immap_5235.h index a1825c2a944f..d9b0be1d7d41 100644 --- a/arch/m68k/include/asm/immap_5235.h +++ b/arch/m68k/include/asm/immap_5235.h @@ -46,6 +46,7 @@ #define MMAP_ETPU (CFG_SYS_MBAR + 0x001D0000) #define MMAP_CAN2 (CFG_SYS_MBAR + 0x001F0000) +#include #include #include #include diff --git a/arch/m68k/include/asm/immap_5272.h b/arch/m68k/include/asm/immap_5272.h index c5c3cc751258..5378ed1aac16 100644 --- a/arch/m68k/include/asm/immap_5272.h +++ b/arch/m68k/include/asm/immap_5272.h @@ -27,6 +27,7 @@ #define MMAP_FEC (CFG_SYS_MBAR + 0x00000840) #define MMAP_USB (CFG_SYS_MBAR + 0x00001000) +#include #include /* System configuration registers */ diff --git a/arch/m68k/include/asm/immap_5275.h b/arch/m68k/include/asm/immap_5275.h index 9b8d71d30d44..c4cce3f94f14 100644 --- a/arch/m68k/include/asm/immap_5275.h +++ b/arch/m68k/include/asm/immap_5275.h @@ -49,6 +49,7 @@ #define MMAP_USB (CFG_SYS_MBAR + 0x001C0000) #define MMAP_PWM0 (CFG_SYS_MBAR + 0x001D0000) +#include #include #include #include diff --git a/arch/m68k/include/asm/immap_5282.h b/arch/m68k/include/asm/immap_5282.h index f810a4dd5cb5..e5f400e6ae32 100644 --- a/arch/m68k/include/asm/immap_5282.h +++ b/arch/m68k/include/asm/immap_5282.h @@ -45,6 +45,7 @@ #define MMAP_CFMC (CFG_SYS_MBAR + 0x001D0000) #define MMAP_CFMMEM (CFG_SYS_MBAR + 0x04000000) +#include #include #include #include diff --git a/arch/m68k/include/asm/immap_5301x.h b/arch/m68k/include/asm/immap_5301x.h index e1f7858b1007..3ade4f04756c 100644 --- a/arch/m68k/include/asm/immap_5301x.h +++ b/arch/m68k/include/asm/immap_5301x.h @@ -50,6 +50,7 @@ #define MMAP_IIM (CFG_SYS_MBAR + 0x000C8000) #define MMAP_ESDHC (CFG_SYS_MBAR + 0x000CC000) +#include #include #include #include diff --git a/arch/m68k/include/asm/immap_5307.h b/arch/m68k/include/asm/immap_5307.h index d6442d95b4ba..d96dd146efb0 100644 --- a/arch/m68k/include/asm/immap_5307.h +++ b/arch/m68k/include/asm/immap_5307.h @@ -17,6 +17,8 @@ #define MMAP_UART1 (CFG_SYS_MBAR + 0x00000200) #define MMAP_GPIO (CFG_SYS_MBAR + 0x00000244) +#include + typedef struct sim { u8 rsr; u8 sypcr; diff --git a/arch/m68k/include/asm/immap_5329.h b/arch/m68k/include/asm/immap_5329.h index dbf3a2260eed..6f1795a207a1 100644 --- a/arch/m68k/include/asm/immap_5329.h +++ b/arch/m68k/include/asm/immap_5329.h @@ -51,6 +51,7 @@ #define MMAP_SSI 0xFC0BC000 #define MMAP_PLL 0xFC0C0000 +#include #include #include #include diff --git a/arch/m68k/include/asm/immap_5441x.h b/arch/m68k/include/asm/immap_5441x.h index 708d0db755a8..c8f3effe2407 100644 --- a/arch/m68k/include/asm/immap_5441x.h +++ b/arch/m68k/include/asm/immap_5441x.h @@ -76,6 +76,7 @@ #define MMAP_CCM 0xEC090000 #define MMAP_GPIO 0xEC094000 +#include #include #include #include diff --git a/arch/m68k/lib/bdinfo.c b/arch/m68k/lib/bdinfo.c index 0b4629f1c8a7..3719f11c03c6 100644 --- a/arch/m68k/lib/bdinfo.c +++ b/arch/m68k/lib/bdinfo.c @@ -6,8 +6,9 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */ -#include +#include #include +#include #include DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/m68k/lib/bootm.c b/arch/m68k/lib/bootm.c index f18bed235d45..79d8b34c0d56 100644 --- a/arch/m68k/lib/bootm.c +++ b/arch/m68k/lib/bootm.c @@ -4,7 +4,6 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */ -#include #include #include #include diff --git a/arch/m68k/lib/cache.c b/arch/m68k/lib/cache.c index 57e5632fdb5b..de04124404cf 100644 --- a/arch/m68k/lib/cache.c +++ b/arch/m68k/lib/cache.c @@ -4,7 +4,7 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */ -#include +#include #include #include #include diff --git a/arch/m68k/lib/fec.c b/arch/m68k/lib/fec.c index eecea7a02354..d6f238e4b347 100644 --- a/arch/m68k/lib/fec.c +++ b/arch/m68k/lib/fec.c @@ -3,8 +3,8 @@ * (C) 2019 Angelo Dureghello */ -#include #include +#include #include #include diff --git a/arch/m68k/lib/interrupts.c b/arch/m68k/lib/interrupts.c index 799daab5612d..175ec689533e 100644 --- a/arch/m68k/lib/interrupts.c +++ b/arch/m68k/lib/interrupts.c @@ -7,7 +7,7 @@ * TsiChung Liew (Tsi-Chung.Liew@freescale.com) */ -#include +#include #include #include #include diff --git a/arch/m68k/lib/time.c b/arch/m68k/lib/time.c index 61db1e6c5002..4249488c01d1 100644 --- a/arch/m68k/lib/time.c +++ b/arch/m68k/lib/time.c @@ -6,7 +6,6 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */ -#include #include #include #include diff --git a/arch/m68k/lib/traps.c b/arch/m68k/lib/traps.c index 28fe803928ea..c283351181d8 100644 --- a/arch/m68k/lib/traps.c +++ b/arch/m68k/lib/traps.c @@ -7,7 +7,6 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */ -#include #include #include #include From patchwork Thu Oct 12 23:03:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1847829 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=csp02xTx; 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 4S65Bx1fKjz1yqZ for ; Fri, 13 Oct 2023 10:17:29 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 077DF86EB8; Fri, 13 Oct 2023 01:14:34 +0200 (CEST) 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="csp02xTx"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 84B3A86AE6; Fri, 13 Oct 2023 01:04:39 +0200 (CEST) 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 autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-yw1-x112b.google.com (mail-yw1-x112b.google.com [IPv6:2607:f8b0:4864:20::112b]) (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 BE3DB86E37 for ; Fri, 13 Oct 2023 01:04:06 +0200 (CEST) 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-x112b.google.com with SMTP id 00721157ae682-5a7af52ee31so18571557b3.2 for ; Thu, 12 Oct 2023 16:04:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1697151844; x=1697756644; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JAwqw5kEw5iMkMzO/RkA1BXByBiCKV756AmtJ+Of06E=; b=csp02xTxoYNDV4jX09IQmWqGkVvaLY97eaufAjJqq4nmzNtfmSCHGhgOcC1LJEcp7+ 3HmyJQ5EaROYmuGR5R+ozqudsAjx8kqe5YClTxw2qvKxbg7CgyQZx6+LvfeDezquVhLZ K78GwrJiDjqBDbUbRo9fwFGaxKgycsak0Qb6Y= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697151844; x=1697756644; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JAwqw5kEw5iMkMzO/RkA1BXByBiCKV756AmtJ+Of06E=; b=qgEOtM99NhnN7gFwPwd/ZLc4YVQwDb2mc+4/+nmpa3RwBjSkOXGFQmVZs01tPvbv7o DMDIyIdyKkt/klkPHfAtTkGavzHz91+iuoNCCxaMsF4haBL0IKURSD+jI1Duq8tlMRS8 SgcDjb5+jlW0AJp1HVEtBDHE9dYH4Xu7DFa89QoDUdjCgpjFpteept7+SnSww4uihgOa OnX7T+YsbNStZXf+WlPCc4aFH9TbO/BVrpC97GNW1LtZnpljC7tPYvlU8p/QJ+D5k8zX d6RkyHhLPUSBxO4A8bvdIVVyX/r1KmuOaU6VYvTD0cgOfbbacZdGECjrzcSHxgMlVYQF FBdw== X-Gm-Message-State: AOJu0Yxuka0WuyVvtzDtarvrwKidz5nbbLAZXwSB3yK7zDYN+jBeZnY7 B+aIdeB9t/WRg0s9RwEntHQlxCFvTeMGTT0AT8zC9Q== X-Google-Smtp-Source: AGHT+IFxaJLG/wXeezCrauI3KgsZM8MAiWiDyXxym6HQj2CzxX0qit9E1IBZqZH8HzPHdQOljbio6g== X-Received: by 2002:a81:4f88:0:b0:5a8:1aa2:1ac1 with SMTP id d130-20020a814f88000000b005a81aa21ac1mr464235ywb.12.1697151844466; Thu, 12 Oct 2023 16:04:04 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b00-6400-5647-4a14-f04e-8d8d.res6.spectrum.com. [2603:6081:7b00:6400:5647:4a14:f04e:8d8d]) by smtp.gmail.com with ESMTPSA id k7-20020a816f07000000b005925765aa30sm278730ywc.135.2023.10.12.16.04.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Oct 2023 16:04:03 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: Michal Simek Subject: [PATCH 5/7] microblaze: Remove common.h usage Date: Thu, 12 Oct 2023 19:03:57 -0400 Message-Id: <20231012230359.2005249-5-trini@konsulko.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231012230359.2005249-1-trini@konsulko.com> References: <20231012230359.2005249-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 can remove common.h from most cases of the code here, and only a few places need an additional header instead. Signed-off-by: Tom Rini Acked-by: Michal Simek --- Cc: Michal Simek --- arch/microblaze/cpu/cache.c | 1 - arch/microblaze/cpu/cpuinfo.c | 1 - arch/microblaze/cpu/exception.c | 2 +- arch/microblaze/cpu/interrupts.c | 3 ++- arch/microblaze/cpu/pvr.c | 1 - arch/microblaze/cpu/relocate.c | 3 ++- arch/microblaze/cpu/spl.c | 1 - arch/microblaze/include/asm/cpuinfo.h | 2 ++ arch/microblaze/lib/bootm.c | 1 - board/xilinx/microblaze-generic/microblaze-generic.c | 1 - 10 files changed, 7 insertions(+), 9 deletions(-) diff --git a/arch/microblaze/cpu/cache.c b/arch/microblaze/cpu/cache.c index 829e6c7ae605..75ec0a8fd24f 100644 --- a/arch/microblaze/cpu/cache.c +++ b/arch/microblaze/cpu/cache.c @@ -5,7 +5,6 @@ * Michal SIMEK */ -#include #include #include #include diff --git a/arch/microblaze/cpu/cpuinfo.c b/arch/microblaze/cpu/cpuinfo.c index 6b15d6ca41c0..2bfdf767f3a5 100644 --- a/arch/microblaze/cpu/cpuinfo.c +++ b/arch/microblaze/cpu/cpuinfo.c @@ -2,7 +2,6 @@ /* * Copyright (C) 2022, Ovidiu Panait */ -#include #include #include diff --git a/arch/microblaze/cpu/exception.c b/arch/microblaze/cpu/exception.c index 9414776afa7f..6b329fc7b3a2 100644 --- a/arch/microblaze/cpu/exception.c +++ b/arch/microblaze/cpu/exception.c @@ -5,8 +5,8 @@ * Michal SIMEK */ -#include #include +#include #include void _hw_exception_handler (void) diff --git a/arch/microblaze/cpu/interrupts.c b/arch/microblaze/cpu/interrupts.c index ac53208bda67..244f7fd15eba 100644 --- a/arch/microblaze/cpu/interrupts.c +++ b/arch/microblaze/cpu/interrupts.c @@ -7,7 +7,8 @@ * Yasushi SHOJI */ -#include +#include +#include #include void enable_interrupts(void) diff --git a/arch/microblaze/cpu/pvr.c b/arch/microblaze/cpu/pvr.c index 23c0f912d435..71aea0b9380c 100644 --- a/arch/microblaze/cpu/pvr.c +++ b/arch/microblaze/cpu/pvr.c @@ -2,7 +2,6 @@ /* * Copyright (C) 2022, Ovidiu Panait */ -#include #include #include diff --git a/arch/microblaze/cpu/relocate.c b/arch/microblaze/cpu/relocate.c index 7a15fb2ec397..e46fe5bdd5d7 100644 --- a/arch/microblaze/cpu/relocate.c +++ b/arch/microblaze/cpu/relocate.c @@ -4,8 +4,9 @@ * Michal Simek */ -#include #include +#include +#include #define R_MICROBLAZE_NONE 0 #define R_MICROBLAZE_32 1 diff --git a/arch/microblaze/cpu/spl.c b/arch/microblaze/cpu/spl.c index c21beafdb810..cb224bd25423 100644 --- a/arch/microblaze/cpu/spl.c +++ b/arch/microblaze/cpu/spl.c @@ -5,7 +5,6 @@ * Michal Simek */ -#include #include #include #include diff --git a/arch/microblaze/include/asm/cpuinfo.h b/arch/microblaze/include/asm/cpuinfo.h index 3c58e52217c4..fbd9418a2f8b 100644 --- a/arch/microblaze/include/asm/cpuinfo.h +++ b/arch/microblaze/include/asm/cpuinfo.h @@ -6,6 +6,8 @@ #ifndef __ASM_MICROBLAZE_CPUINFO_H #define __ASM_MICROBLAZE_CPUINFO_H +#include + /** * struct microblaze_cpuinfo - CPU info for microblaze processor core. * diff --git a/arch/microblaze/lib/bootm.c b/arch/microblaze/lib/bootm.c index 930384f4015f..f3ec4b741b88 100644 --- a/arch/microblaze/lib/bootm.c +++ b/arch/microblaze/lib/bootm.c @@ -7,7 +7,6 @@ * Yasushi SHOJI */ -#include #include #include #include diff --git a/board/xilinx/microblaze-generic/microblaze-generic.c b/board/xilinx/microblaze-generic/microblaze-generic.c index a427ac94a170..2b035d535892 100644 --- a/board/xilinx/microblaze-generic/microblaze-generic.c +++ b/board/xilinx/microblaze-generic/microblaze-generic.c @@ -10,7 +10,6 @@ * header files */ -#include #include #include #include From patchwork Thu Oct 12 23:03:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1847831 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=fr9KhAV4; 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 4S65M53pVLz1ypX for ; Fri, 13 Oct 2023 10:24:33 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 42CB586EC5; Fri, 13 Oct 2023 01:14:37 +0200 (CEST) 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="fr9KhAV4"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9BDFF86D3F; Fri, 13 Oct 2023 01:04:50 +0200 (CEST) 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 autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-yw1-x112b.google.com (mail-yw1-x112b.google.com [IPv6:2607:f8b0:4864:20::112b]) (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 E4DDE86E42 for ; Fri, 13 Oct 2023 01:04:06 +0200 (CEST) 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-x112b.google.com with SMTP id 00721157ae682-5a7be61fe74so19601787b3.2 for ; Thu, 12 Oct 2023 16:04:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1697151845; x=1697756645; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=We9n4I/AhHSllFzQJ6yhqbkBuIxLBQgVcxL+OoVwbCI=; b=fr9KhAV4qEv0dJ9vJHGWXg/wn8tCptBxfRn0PFw0lBpwQ8tnxLXVRBVzfIKwLqJqxR gGwASIexHzaFJVv6QKpApBPG/ttr5473mgCHGrGcb5Wf4a19R+4z79cMd6EMztC6/Jfi lJhLxBmgEVJaOZ5XTksn/c6SPXY5w3p72q+7k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697151845; x=1697756645; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=We9n4I/AhHSllFzQJ6yhqbkBuIxLBQgVcxL+OoVwbCI=; b=j99a5vexhnFemRVuBj2z5k4fZXaNryJ/w6KpPlUCkYOdjvr6/Q3WsybP9SWaYuXe/C Uz4fhyK2i5uVaGCcFnTNiFDQ3JitEIGCQ3Fx9Y5EDZrM4AXwkFE6AzSX8fED6LW1pSN/ 0DwSqo1Fwti25AsWsTQLthrJQFNbl3ln1bThnPu+G/mbuEnt9RmTFpgipNxubIfdAvq5 YvGzmUxsHij/jLF+y22ox6m0t+d56Bx0sc/l6PiiZphV1xlzeqNQThyogyvB06txjV6L 2tpkTxForlw0Pl9Ij5aycr9h5FsP8UGJgQRy3ED/EdXzcM9Ep1Y3vzjpV/xheOyq8cXx voWA== X-Gm-Message-State: AOJu0YxzKMgzU68dm42kVnDfXbusJDxUNbaKGXKzq0bbyGoTriMwWRYk KdJwrORFA0cLsb2OOuf8P0ERpm1syBiCuFnt33IvVg== X-Google-Smtp-Source: AGHT+IFYTJzs+xDXqrs73YNXA9inCDMORB5dpxq8rIWTUJ/zTTnJOwKQG/8fy9Ka0f62YBlOkK09Jw== X-Received: by 2002:a0d:e2c6:0:b0:5a7:cadb:c721 with SMTP id l189-20020a0de2c6000000b005a7cadbc721mr8680645ywe.12.1697151845227; Thu, 12 Oct 2023 16:04:05 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b00-6400-5647-4a14-f04e-8d8d.res6.spectrum.com. [2603:6081:7b00:6400:5647:4a14:f04e:8d8d]) by smtp.gmail.com with ESMTPSA id k7-20020a816f07000000b005925765aa30sm278730ywc.135.2023.10.12.16.04.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Oct 2023 16:04:04 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: Daniel Schwierzeck Subject: [PATCH 6/7] mips: Remove common.h usage Date: Thu, 12 Oct 2023 19:03:58 -0400 Message-Id: <20231012230359.2005249-6-trini@konsulko.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231012230359.2005249-1-trini@konsulko.com> References: <20231012230359.2005249-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 can remove common.h from most cases of the code here, and only a few places need an additional header instead. Signed-off-by: Tom Rini --- Cc: Daniel Schwierzeck --- arch/mips/cpu/cpu.c | 1 - arch/mips/cpu/interrupts.c | 1 - arch/mips/cpu/time.c | 1 - arch/mips/include/asm/cacheops.h | 1 + arch/mips/lib/boot.c | 1 - arch/mips/lib/bootm.c | 1 - arch/mips/lib/cache.c | 1 - arch/mips/lib/reloc.c | 1 - arch/mips/lib/spl.c | 1 - arch/mips/lib/stack.c | 1 - arch/mips/lib/traps.c | 3 ++- arch/mips/mach-ath79/ar933x/clk.c | 1 - arch/mips/mach-ath79/ar933x/ddr.c | 1 - arch/mips/mach-ath79/ar934x/clk.c | 1 - arch/mips/mach-ath79/ar934x/cpu.c | 2 -- arch/mips/mach-ath79/ar934x/ddr.c | 1 - arch/mips/mach-ath79/cpu.c | 1 - arch/mips/mach-ath79/dram.c | 1 - arch/mips/mach-ath79/qca953x/clk.c | 1 - arch/mips/mach-ath79/qca953x/ddr.c | 1 - arch/mips/mach-ath79/qca956x/clk.c | 1 - arch/mips/mach-ath79/qca956x/cpu.c | 2 -- arch/mips/mach-ath79/qca956x/ddr.c | 1 - arch/mips/mach-ath79/reset.c | 1 - arch/mips/mach-bmips/dram.c | 1 - arch/mips/mach-jz47xx/jz4780/gpio.c | 1 - arch/mips/mach-jz47xx/jz4780/jz4780.c | 1 - arch/mips/mach-jz47xx/jz4780/pll.c | 1 - arch/mips/mach-jz47xx/jz4780/reset.c | 1 - arch/mips/mach-jz47xx/jz4780/sdram.c | 1 - arch/mips/mach-jz47xx/jz4780/timer.c | 1 - arch/mips/mach-mscc/cpu.c | 1 - arch/mips/mach-mscc/dram.c | 1 - arch/mips/mach-mscc/gpio.c | 1 - arch/mips/mach-mscc/include/mach/ddr.h | 1 + arch/mips/mach-mscc/phy.c | 1 - arch/mips/mach-mscc/reset.c | 2 -- arch/mips/mach-mtmips/cpu.c | 1 - arch/mips/mach-mtmips/ddr_cal.c | 1 - arch/mips/mach-mtmips/ddr_init.c | 1 - arch/mips/mach-mtmips/mt7628/ddr.c | 1 - arch/mips/mach-mtmips/mt7628/init.c | 1 - arch/mips/mach-mtmips/mt7628/serial.c | 1 - arch/mips/mach-mtmips/spl.c | 1 - arch/mips/mach-pic32/cpu.c | 1 - arch/mips/mach-pic32/reset.c | 1 - 46 files changed, 4 insertions(+), 47 deletions(-) diff --git a/arch/mips/cpu/cpu.c b/arch/mips/cpu/cpu.c index f0e20da28f76..acfc9dc43f17 100644 --- a/arch/mips/cpu/cpu.c +++ b/arch/mips/cpu/cpu.c @@ -4,7 +4,6 @@ * Wolfgang Denk, DENX Software Engineering, */ -#include #include #include #include diff --git a/arch/mips/cpu/interrupts.c b/arch/mips/cpu/interrupts.c index b3ba9aaeae1e..f7f9a185ed49 100644 --- a/arch/mips/cpu/interrupts.c +++ b/arch/mips/cpu/interrupts.c @@ -4,7 +4,6 @@ * Wolfgang Denk, DENX Software Engineering, */ -#include #include int interrupt_init(void) diff --git a/arch/mips/cpu/time.c b/arch/mips/cpu/time.c index 5e7a7144d027..210709d3b81d 100644 --- a/arch/mips/cpu/time.c +++ b/arch/mips/cpu/time.c @@ -4,7 +4,6 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */ -#include #include #include diff --git a/arch/mips/include/asm/cacheops.h b/arch/mips/include/asm/cacheops.h index 641e2ad58dec..c1015c885e14 100644 --- a/arch/mips/include/asm/cacheops.h +++ b/arch/mips/include/asm/cacheops.h @@ -11,6 +11,7 @@ #include #ifndef __ASSEMBLY__ +#include static inline void mips_cache(int op, const volatile void *addr) { diff --git a/arch/mips/lib/boot.c b/arch/mips/lib/boot.c index 1b29d637ce9b..749625aa9748 100644 --- a/arch/mips/lib/boot.c +++ b/arch/mips/lib/boot.c @@ -3,7 +3,6 @@ * Copyright (C) 2020 Stefan Roese */ -#include #include #include #include diff --git a/arch/mips/lib/bootm.c b/arch/mips/lib/bootm.c index ab92bd06b0ee..d6d2f7d9d031 100644 --- a/arch/mips/lib/bootm.c +++ b/arch/mips/lib/bootm.c @@ -4,7 +4,6 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */ -#include #include #include #include diff --git a/arch/mips/lib/cache.c b/arch/mips/lib/cache.c index d23b38d6b93f..d365578b926c 100644 --- a/arch/mips/lib/cache.c +++ b/arch/mips/lib/cache.c @@ -4,7 +4,6 @@ * Wolfgang Denk, DENX Software Engineering, */ -#include #include #include #include diff --git a/arch/mips/lib/reloc.c b/arch/mips/lib/reloc.c index 9cf6809f4068..69dd63a31d21 100644 --- a/arch/mips/lib/reloc.c +++ b/arch/mips/lib/reloc.c @@ -26,7 +26,6 @@ * terminating R_MIPS_NONE reloc includes no offset. */ -#include #include #include #include diff --git a/arch/mips/lib/spl.c b/arch/mips/lib/spl.c index f96fda5b2de9..b4087546dd1d 100644 --- a/arch/mips/lib/spl.c +++ b/arch/mips/lib/spl.c @@ -3,7 +3,6 @@ * Copyright (C) 2020 Stefan Roese */ -#include #include #include #include diff --git a/arch/mips/lib/stack.c b/arch/mips/lib/stack.c index 930d21856d90..5797271ae94e 100644 --- a/arch/mips/lib/stack.c +++ b/arch/mips/lib/stack.c @@ -1,6 +1,5 @@ // SPDX-License-Identifier: GPL-2.0+ -#include #include #include #include diff --git a/arch/mips/lib/traps.c b/arch/mips/lib/traps.c index 7a682f256a65..40469d1be090 100644 --- a/arch/mips/lib/traps.c +++ b/arch/mips/lib/traps.c @@ -10,9 +10,9 @@ * Copyright (C) 2014, Imagination Technologies Ltd. */ -#include #include #include +#include #include #include #include @@ -20,6 +20,7 @@ #include #include #include +#include DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/mips/mach-ath79/ar933x/clk.c b/arch/mips/mach-ath79/ar933x/clk.c index 68d48939d7d2..86fc40a657e1 100644 --- a/arch/mips/mach-ath79/ar933x/clk.c +++ b/arch/mips/mach-ath79/ar933x/clk.c @@ -3,7 +3,6 @@ * Copyright (C) 2015-2016 Wills Wang */ -#include #include #include #include diff --git a/arch/mips/mach-ath79/ar933x/ddr.c b/arch/mips/mach-ath79/ar933x/ddr.c index 09166ecf8f07..a932efbfbd79 100644 --- a/arch/mips/mach-ath79/ar933x/ddr.c +++ b/arch/mips/mach-ath79/ar933x/ddr.c @@ -4,7 +4,6 @@ * Based on Atheros LSDK/QSDK */ -#include #include #include #include diff --git a/arch/mips/mach-ath79/ar934x/clk.c b/arch/mips/mach-ath79/ar934x/clk.c index 6ed4057353a8..bdaa6839a2bd 100644 --- a/arch/mips/mach-ath79/ar934x/clk.c +++ b/arch/mips/mach-ath79/ar934x/clk.c @@ -3,7 +3,6 @@ * Copyright (C) 2016 Marek Vasut */ -#include #include #include #include diff --git a/arch/mips/mach-ath79/ar934x/cpu.c b/arch/mips/mach-ath79/ar934x/cpu.c index 7daac0367149..f2e4ef191eb5 100644 --- a/arch/mips/mach-ath79/ar934x/cpu.c +++ b/arch/mips/mach-ath79/ar934x/cpu.c @@ -3,7 +3,5 @@ * Copyright (C) 2016 Marek Vasut */ -#include - /* The lowlevel_init() is not needed on AR934x */ void lowlevel_init(void) {} diff --git a/arch/mips/mach-ath79/ar934x/ddr.c b/arch/mips/mach-ath79/ar934x/ddr.c index 9df48b97ef46..e260783d9597 100644 --- a/arch/mips/mach-ath79/ar934x/ddr.c +++ b/arch/mips/mach-ath79/ar934x/ddr.c @@ -5,7 +5,6 @@ * Based on RAM init sequence by Piotr Dymacz */ -#include #include #include #include diff --git a/arch/mips/mach-ath79/cpu.c b/arch/mips/mach-ath79/cpu.c index 79f419088a99..24160ef11521 100644 --- a/arch/mips/mach-ath79/cpu.c +++ b/arch/mips/mach-ath79/cpu.c @@ -3,7 +3,6 @@ * Copyright (C) 2015-2016 Wills Wang */ -#include #include #include #include diff --git a/arch/mips/mach-ath79/dram.c b/arch/mips/mach-ath79/dram.c index 545b1199e106..247691d3378f 100644 --- a/arch/mips/mach-ath79/dram.c +++ b/arch/mips/mach-ath79/dram.c @@ -3,7 +3,6 @@ * Copyright (C) 2015-2016 Wills Wang */ -#include #include #include #include diff --git a/arch/mips/mach-ath79/qca953x/clk.c b/arch/mips/mach-ath79/qca953x/clk.c index f5438ef1c8d9..379085f1ff7f 100644 --- a/arch/mips/mach-ath79/qca953x/clk.c +++ b/arch/mips/mach-ath79/qca953x/clk.c @@ -3,7 +3,6 @@ * Copyright (C) 2015-2016 Wills Wang */ -#include #include #include #include diff --git a/arch/mips/mach-ath79/qca953x/ddr.c b/arch/mips/mach-ath79/qca953x/ddr.c index 78f2370e09ce..0eb69d3a0fb1 100644 --- a/arch/mips/mach-ath79/qca953x/ddr.c +++ b/arch/mips/mach-ath79/qca953x/ddr.c @@ -4,7 +4,6 @@ * Based on Atheros LSDK/QSDK */ -#include #include #include #include diff --git a/arch/mips/mach-ath79/qca956x/clk.c b/arch/mips/mach-ath79/qca956x/clk.c index 6a58dba91f3f..6138a915efcd 100644 --- a/arch/mips/mach-ath79/qca956x/clk.c +++ b/arch/mips/mach-ath79/qca956x/clk.c @@ -3,7 +3,6 @@ * Copyright (C) 2019 Rosy Song */ -#include #include #include #include diff --git a/arch/mips/mach-ath79/qca956x/cpu.c b/arch/mips/mach-ath79/qca956x/cpu.c index 08a8c84e72dd..7da8d0e60f19 100644 --- a/arch/mips/mach-ath79/qca956x/cpu.c +++ b/arch/mips/mach-ath79/qca956x/cpu.c @@ -3,7 +3,5 @@ * Copyright (C) 2019 Rosy Song */ -#include - /* The lowlevel_init() is not needed on QCA956X */ void lowlevel_init(void) {} diff --git a/arch/mips/mach-ath79/qca956x/ddr.c b/arch/mips/mach-ath79/qca956x/ddr.c index f9cf8daa2242..2e46e24f4830 100644 --- a/arch/mips/mach-ath79/qca956x/ddr.c +++ b/arch/mips/mach-ath79/qca956x/ddr.c @@ -5,7 +5,6 @@ * Based on QSDK */ -#include #include #include #include diff --git a/arch/mips/mach-ath79/reset.c b/arch/mips/mach-ath79/reset.c index 6cd5e77fd15a..62da8b92a7d4 100644 --- a/arch/mips/mach-ath79/reset.c +++ b/arch/mips/mach-ath79/reset.c @@ -4,7 +4,6 @@ * Copyright (C) 2018-2019 Rosy Song */ -#include #include #include #include diff --git a/arch/mips/mach-bmips/dram.c b/arch/mips/mach-bmips/dram.c index bba6cd6f4aaf..eec8b44e47ea 100644 --- a/arch/mips/mach-bmips/dram.c +++ b/arch/mips/mach-bmips/dram.c @@ -4,7 +4,6 @@ * Copyright (C) 2017 Álvaro Fernández Rojas */ -#include #include #include #include diff --git a/arch/mips/mach-jz47xx/jz4780/gpio.c b/arch/mips/mach-jz47xx/jz4780/gpio.c index d4884e7fa9f1..7f6717efc16f 100644 --- a/arch/mips/mach-jz47xx/jz4780/gpio.c +++ b/arch/mips/mach-jz47xx/jz4780/gpio.c @@ -1,7 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ #include -#include #include #include #include diff --git a/arch/mips/mach-jz47xx/jz4780/jz4780.c b/arch/mips/mach-jz47xx/jz4780/jz4780.c index 56fdf04bca9d..1d6fb6a4e27c 100644 --- a/arch/mips/mach-jz47xx/jz4780/jz4780.c +++ b/arch/mips/mach-jz47xx/jz4780/jz4780.c @@ -7,7 +7,6 @@ */ #include -#include #include #include #include diff --git a/arch/mips/mach-jz47xx/jz4780/pll.c b/arch/mips/mach-jz47xx/jz4780/pll.c index 4519b478ccb0..8ef00f99a106 100644 --- a/arch/mips/mach-jz47xx/jz4780/pll.c +++ b/arch/mips/mach-jz47xx/jz4780/pll.c @@ -7,7 +7,6 @@ */ #include -#include #include #include #include diff --git a/arch/mips/mach-jz47xx/jz4780/reset.c b/arch/mips/mach-jz47xx/jz4780/reset.c index bf6addccb5de..d2e9eb79e6df 100644 --- a/arch/mips/mach-jz47xx/jz4780/reset.c +++ b/arch/mips/mach-jz47xx/jz4780/reset.c @@ -7,7 +7,6 @@ */ #include -#include #include #include #include diff --git a/arch/mips/mach-jz47xx/jz4780/sdram.c b/arch/mips/mach-jz47xx/jz4780/sdram.c index 690f3c5601da..09296ee21ada 100644 --- a/arch/mips/mach-jz47xx/jz4780/sdram.c +++ b/arch/mips/mach-jz47xx/jz4780/sdram.c @@ -9,7 +9,6 @@ * Copyright (c) 2006-2013 Ingenic Semiconductor */ -#include #include #include #include diff --git a/arch/mips/mach-jz47xx/jz4780/timer.c b/arch/mips/mach-jz47xx/jz4780/timer.c index 82bb9e8c3bfa..94ef505f18fe 100644 --- a/arch/mips/mach-jz47xx/jz4780/timer.c +++ b/arch/mips/mach-jz47xx/jz4780/timer.c @@ -7,7 +7,6 @@ */ #include -#include #include #include #include diff --git a/arch/mips/mach-mscc/cpu.c b/arch/mips/mach-mscc/cpu.c index d484eb92c419..22b1b98e0ef4 100644 --- a/arch/mips/mach-mscc/cpu.c +++ b/arch/mips/mach-mscc/cpu.c @@ -3,7 +3,6 @@ * Copyright (c) 2018 Microsemi Corporation */ -#include #include #include #include diff --git a/arch/mips/mach-mscc/dram.c b/arch/mips/mach-mscc/dram.c index f7fbd33cc4b9..c7c2040a11ab 100644 --- a/arch/mips/mach-mscc/dram.c +++ b/arch/mips/mach-mscc/dram.c @@ -3,7 +3,6 @@ * Copyright (c) 2018 Microsemi Corporation */ -#include #include #include diff --git a/arch/mips/mach-mscc/gpio.c b/arch/mips/mach-mscc/gpio.c index d6b4c5d7684b..6cd0e2436e78 100644 --- a/arch/mips/mach-mscc/gpio.c +++ b/arch/mips/mach-mscc/gpio.c @@ -3,7 +3,6 @@ * Copyright (c) 2018 Microsemi Corporation */ -#include #include #include diff --git a/arch/mips/mach-mscc/include/mach/ddr.h b/arch/mips/mach-mscc/include/mach/ddr.h index 75fb3ca00d2c..3ba33d27c178 100644 --- a/arch/mips/mach-mscc/include/mach/ddr.h +++ b/arch/mips/mach-mscc/include/mach/ddr.h @@ -6,6 +6,7 @@ #ifndef __ASM_MACH_DDR_H #define __ASM_MACH_DDR_H +#include #include #include #include diff --git a/arch/mips/mach-mscc/phy.c b/arch/mips/mach-mscc/phy.c index 83d3e5bdd28f..444d1f5315d5 100644 --- a/arch/mips/mach-mscc/phy.c +++ b/arch/mips/mach-mscc/phy.c @@ -3,7 +3,6 @@ * Copyright (c) 2018 Microsemi Corporation */ -#include #include #include diff --git a/arch/mips/mach-mscc/reset.c b/arch/mips/mach-mscc/reset.c index a1214573b51a..ca9a7c679d94 100644 --- a/arch/mips/mach-mscc/reset.c +++ b/arch/mips/mach-mscc/reset.c @@ -3,8 +3,6 @@ * Copyright (c) 2018 Microsemi Corporation */ -#include - #include #include diff --git a/arch/mips/mach-mtmips/cpu.c b/arch/mips/mach-mtmips/cpu.c index e88dab10c76e..243938a0ebb7 100644 --- a/arch/mips/mach-mtmips/cpu.c +++ b/arch/mips/mach-mtmips/cpu.c @@ -3,7 +3,6 @@ * Copyright (C) 2018 Stefan Roese */ -#include #include #include #include diff --git a/arch/mips/mach-mtmips/ddr_cal.c b/arch/mips/mach-mtmips/ddr_cal.c index 762619a960f3..e2e1760a6468 100644 --- a/arch/mips/mach-mtmips/ddr_cal.c +++ b/arch/mips/mach-mtmips/ddr_cal.c @@ -5,7 +5,6 @@ * Author: Weijie Gao */ -#include #include #include #include diff --git a/arch/mips/mach-mtmips/ddr_init.c b/arch/mips/mach-mtmips/ddr_init.c index 9c986daea6f5..cab53561e42e 100644 --- a/arch/mips/mach-mtmips/ddr_init.c +++ b/arch/mips/mach-mtmips/ddr_init.c @@ -5,7 +5,6 @@ * Author: Weijie Gao */ -#include #include #include #include diff --git a/arch/mips/mach-mtmips/mt7628/ddr.c b/arch/mips/mach-mtmips/mt7628/ddr.c index 4e72459906e8..198bf262f92b 100644 --- a/arch/mips/mach-mtmips/mt7628/ddr.c +++ b/arch/mips/mach-mtmips/mt7628/ddr.c @@ -5,7 +5,6 @@ * Author: Weijie Gao */ -#include #include #include #include diff --git a/arch/mips/mach-mtmips/mt7628/init.c b/arch/mips/mach-mtmips/mt7628/init.c index 6b535129df12..2996fd9ef4ee 100644 --- a/arch/mips/mach-mtmips/mt7628/init.c +++ b/arch/mips/mach-mtmips/mt7628/init.c @@ -5,7 +5,6 @@ * Author: Weijie Gao */ -#include #include #include #include diff --git a/arch/mips/mach-mtmips/mt7628/serial.c b/arch/mips/mach-mtmips/mt7628/serial.c index e5f3f87a6737..11a2149e1273 100644 --- a/arch/mips/mach-mtmips/mt7628/serial.c +++ b/arch/mips/mach-mtmips/mt7628/serial.c @@ -5,7 +5,6 @@ * Author: Weijie Gao */ -#include #include #include "mt7628.h" diff --git a/arch/mips/mach-mtmips/spl.c b/arch/mips/mach-mtmips/spl.c index fe5b49e702f1..0208bc423dfb 100644 --- a/arch/mips/mach-mtmips/spl.c +++ b/arch/mips/mach-mtmips/spl.c @@ -5,7 +5,6 @@ * Author: Weijie Gao */ -#include #include #include #include diff --git a/arch/mips/mach-pic32/cpu.c b/arch/mips/mach-pic32/cpu.c index 7ed306e045ea..dbf8c9cd221d 100644 --- a/arch/mips/mach-pic32/cpu.c +++ b/arch/mips/mach-pic32/cpu.c @@ -4,7 +4,6 @@ * Purna Chandra Mandal * */ -#include #include #include #include diff --git a/arch/mips/mach-pic32/reset.c b/arch/mips/mach-pic32/reset.c index 8071b13f7b48..efd6985b44a1 100644 --- a/arch/mips/mach-pic32/reset.c +++ b/arch/mips/mach-pic32/reset.c @@ -4,7 +4,6 @@ * */ -#include #include #include From patchwork Thu Oct 12 23:03:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1847832 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=abTYYqaL; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4S65Qz1qGLz1yqn for ; Fri, 13 Oct 2023 10:27:55 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 036FD86E8B; Fri, 13 Oct 2023 01:14:44 +0200 (CEST) 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="abTYYqaL"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B9DAB869CA; Fri, 13 Oct 2023 01:05:00 +0200 (CEST) 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 autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-yw1-x1130.google.com (mail-yw1-x1130.google.com [IPv6:2607:f8b0:4864:20::1130]) (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 2C67586E5D for ; Fri, 13 Oct 2023 01:04:08 +0200 (CEST) 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-x1130.google.com with SMTP id 00721157ae682-5a7c011e113so20515627b3.1 for ; Thu, 12 Oct 2023 16:04:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1697151846; x=1697756646; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Y9IV3LCsNvJZo//pm0Ndh0AQd0el7BAqKWXkoJyz/g0=; b=abTYYqaLts+U7BFAPQhPsZD5Oth9peF0ie36W/CvT3MmYqqaZh6YYsCMdY+TGAuEha sWj4EE4Hcu8YFQ4qomQsnnG+F/1/PtIBEzz5Cyr71llq20nwh/AGhQ4Nv+mKHH9z32Du oIAKFj7NMDtWn/skI94xh7WtfY21zoLrBsLYY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697151846; x=1697756646; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Y9IV3LCsNvJZo//pm0Ndh0AQd0el7BAqKWXkoJyz/g0=; b=V+YHb5gP+3YCm1odj9YkjIlxWEygKNSa9fjFGtu9d1lm77C1R5xSKL1PLt+mu/ZY7Q rfh4S5VI+8SrF9nkCvrCBV4EYNKbu07crQ+/hf+ApJtrsmvVLL6hFGY/AxxBopstKVAe PuZxwT6Z4DZ0+wwYPueK8U+dwAaTDyvZJyqhYsH7qCgk5/FcYZO1wcEs7qQk70RoWmUC tDU4505wZzF6HiEjRI/KXQm48b7uRNbEVoNMJN+w5kWYVmhJjW+JBrUNaOqBQHtnnwPK RqjSegXSyoymx85tLpgV1VA7BG1i9RFMq4FIQE9DApAT26I1TtIu6BsM3IwZz6r8nY5O cWPw== X-Gm-Message-State: AOJu0YxIGZAfoTM/t8yXDZGhypx0wI1KUxV6xBEgEgzYQAwY+XMZCs8W TNqtHujWN4YUgWgczvAURexIUtYNFrPLcyGy7ENKvg== X-Google-Smtp-Source: AGHT+IFiam2u1c3jT7n8zJKaHX0oN3M6F0RmGR0hKmLMA6FiGNPM1dYp68bwo3HmDAgP4HiUPb8vqA== X-Received: by 2002:a81:4306:0:b0:5a7:a81d:e410 with SMTP id q6-20020a814306000000b005a7a81de410mr11889286ywa.18.1697151846258; Thu, 12 Oct 2023 16:04:06 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b00-6400-5647-4a14-f04e-8d8d.res6.spectrum.com. [2603:6081:7b00:6400:5647:4a14:f04e:8d8d]) by smtp.gmail.com with ESMTPSA id k7-20020a816f07000000b005925765aa30sm278730ywc.135.2023.10.12.16.04.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Oct 2023 16:04:05 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: Rick Chen , Leo Subject: [PATCH 7/7] riscv: Remove common.h usage Date: Thu, 12 Oct 2023 19:03:59 -0400 Message-Id: <20231012230359.2005249-7-trini@konsulko.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231012230359.2005249-1-trini@konsulko.com> References: <20231012230359.2005249-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 can remove common.h from most cases of the code here, and only a few places need an additional header instead. Signed-off-by: Tom Rini Reviewed-by: Rick Chen --- Cc: Rick Chen Cc: Leo --- arch/riscv/cpu/andesv5/cache.c | 1 - arch/riscv/cpu/andesv5/cpu.c | 1 - arch/riscv/cpu/andesv5/spl.c | 1 - arch/riscv/cpu/cpu.c | 1 - arch/riscv/cpu/fu540/dram.c | 1 - arch/riscv/cpu/fu740/dram.c | 1 - arch/riscv/cpu/generic/cpu.c | 1 - arch/riscv/cpu/generic/dram.c | 1 - arch/riscv/cpu/jh7110/dram.c | 1 - arch/riscv/cpu/jh7110/spl.c | 1 - arch/riscv/cpu/mtrap.S | 1 - arch/riscv/cpu/start.S | 1 - arch/riscv/include/asm/arch-andes/csr.h | 1 + arch/riscv/include/asm/arch-jh7110/eeprom.h | 2 ++ arch/riscv/include/asm/dma-mapping.h | 1 - arch/riscv/include/asm/smp.h | 2 ++ arch/riscv/lib/aclint_ipi.c | 1 - arch/riscv/lib/andes_plicsw.c | 1 - arch/riscv/lib/asm-offsets.c | 1 - arch/riscv/lib/boot.c | 3 +-- arch/riscv/lib/bootm.c | 1 - arch/riscv/lib/cache.c | 1 - arch/riscv/lib/fdt_fixup.c | 1 - arch/riscv/lib/image.c | 1 - arch/riscv/lib/interrupts.c | 1 - arch/riscv/lib/reset.c | 1 - arch/riscv/lib/sbi.c | 2 +- arch/riscv/lib/sbi_ipi.c | 1 - arch/riscv/lib/sifive_cache.c | 2 +- arch/riscv/lib/smp.c | 1 - arch/riscv/lib/spl.c | 1 - board/AndesTech/ae350/ae350.c | 2 +- board/sifive/unmatched/hifive-platform-i2c-eeprom.c | 1 - board/sifive/unmatched/unmatched.c | 1 - 34 files changed, 9 insertions(+), 32 deletions(-) diff --git a/arch/riscv/cpu/andesv5/cache.c b/arch/riscv/cpu/andesv5/cache.c index 40d77f671c87..269bb27f75a6 100644 --- a/arch/riscv/cpu/andesv5/cache.c +++ b/arch/riscv/cpu/andesv5/cache.c @@ -6,7 +6,6 @@ #include #include -#include #include #include #include diff --git a/arch/riscv/cpu/andesv5/cpu.c b/arch/riscv/cpu/andesv5/cpu.c index 06e379bcb1fe..63bc24cdfc7c 100644 --- a/arch/riscv/cpu/andesv5/cpu.c +++ b/arch/riscv/cpu/andesv5/cpu.c @@ -5,7 +5,6 @@ */ /* CPU specific code */ -#include #include #include #include diff --git a/arch/riscv/cpu/andesv5/spl.c b/arch/riscv/cpu/andesv5/spl.c index 413849043b18..a13dc4095a45 100644 --- a/arch/riscv/cpu/andesv5/spl.c +++ b/arch/riscv/cpu/andesv5/spl.c @@ -3,7 +3,6 @@ * Copyright (C) 2023 Andes Technology Corporation * Rick Chen, Andes Technology Corporation */ -#include #include #include #include diff --git a/arch/riscv/cpu/cpu.c b/arch/riscv/cpu/cpu.c index c1a9638c1ab7..ebd39cb41a60 100644 --- a/arch/riscv/cpu/cpu.c +++ b/arch/riscv/cpu/cpu.c @@ -3,7 +3,6 @@ * Copyright (C) 2018, Bin Meng */ -#include #include #include #include diff --git a/arch/riscv/cpu/fu540/dram.c b/arch/riscv/cpu/fu540/dram.c index 94d8018407e6..7b5a3471ac88 100644 --- a/arch/riscv/cpu/fu540/dram.c +++ b/arch/riscv/cpu/fu540/dram.c @@ -3,7 +3,6 @@ * Copyright (C) 2018, Bin Meng */ -#include #include #include #include diff --git a/arch/riscv/cpu/fu740/dram.c b/arch/riscv/cpu/fu740/dram.c index 8657fcd165c3..61f551763f1c 100644 --- a/arch/riscv/cpu/fu740/dram.c +++ b/arch/riscv/cpu/fu740/dram.c @@ -3,7 +3,6 @@ * Copyright (C) 2018, Bin Meng */ -#include #include #include #include diff --git a/arch/riscv/cpu/generic/cpu.c b/arch/riscv/cpu/generic/cpu.c index d78e1a3453af..f13c18942f3d 100644 --- a/arch/riscv/cpu/generic/cpu.c +++ b/arch/riscv/cpu/generic/cpu.c @@ -3,7 +3,6 @@ * Copyright (C) 2018, Bin Meng */ -#include #include #include diff --git a/arch/riscv/cpu/generic/dram.c b/arch/riscv/cpu/generic/dram.c index 94d8018407e6..7b5a3471ac88 100644 --- a/arch/riscv/cpu/generic/dram.c +++ b/arch/riscv/cpu/generic/dram.c @@ -3,7 +3,6 @@ * Copyright (C) 2018, Bin Meng */ -#include #include #include #include diff --git a/arch/riscv/cpu/jh7110/dram.c b/arch/riscv/cpu/jh7110/dram.c index 1a9fa46d14b9..664b9b93eb62 100644 --- a/arch/riscv/cpu/jh7110/dram.c +++ b/arch/riscv/cpu/jh7110/dram.c @@ -4,7 +4,6 @@ * Author: Yanhong Wang */ -#include #include #include #include diff --git a/arch/riscv/cpu/jh7110/spl.c b/arch/riscv/cpu/jh7110/spl.c index 4047b10efe83..6bdf8b9c72f0 100644 --- a/arch/riscv/cpu/jh7110/spl.c +++ b/arch/riscv/cpu/jh7110/spl.c @@ -3,7 +3,6 @@ * Copyright (C) 2022 StarFive Technology Co., Ltd. * Author: Yanhong Wang */ -#include #include #include #include diff --git a/arch/riscv/cpu/mtrap.S b/arch/riscv/cpu/mtrap.S index e40c7bd3f4ff..6eb3ed1d5a88 100644 --- a/arch/riscv/cpu/mtrap.S +++ b/arch/riscv/cpu/mtrap.S @@ -11,7 +11,6 @@ * Copyright (C) 2018, Bin Meng */ -#include #include #ifdef CONFIG_32BIT diff --git a/arch/riscv/cpu/start.S b/arch/riscv/cpu/start.S index 30cf6743701b..6cecadfac56d 100644 --- a/arch/riscv/cpu/start.S +++ b/arch/riscv/cpu/start.S @@ -11,7 +11,6 @@ #include #include -#include #include #include #include diff --git a/arch/riscv/include/asm/arch-andes/csr.h b/arch/riscv/include/asm/arch-andes/csr.h index c7ed920cde57..393d51c6dde1 100644 --- a/arch/riscv/include/asm/arch-andes/csr.h +++ b/arch/riscv/include/asm/arch-andes/csr.h @@ -7,6 +7,7 @@ #define _ASM_ANDES_CSR_H #include +#include #include #define CSR_MCACHE_CTL 0x7ca diff --git a/arch/riscv/include/asm/arch-jh7110/eeprom.h b/arch/riscv/include/asm/arch-jh7110/eeprom.h index f354d5c60cdc..d2776d5b6cb3 100644 --- a/arch/riscv/include/asm/arch-jh7110/eeprom.h +++ b/arch/riscv/include/asm/arch-jh7110/eeprom.h @@ -7,6 +7,8 @@ #ifndef _ASM_RISCV_EEPROM_H #define _ASM_RISCV_EEPROM_H +#include + u8 get_pcb_revision_from_eeprom(void); u32 get_ddr_size_from_eeprom(void); diff --git a/arch/riscv/include/asm/dma-mapping.h b/arch/riscv/include/asm/dma-mapping.h index 6ecadab41cd9..d0cc5d7c7757 100644 --- a/arch/riscv/include/asm/dma-mapping.h +++ b/arch/riscv/include/asm/dma-mapping.h @@ -9,7 +9,6 @@ #ifndef __ASM_RISCV_DMA_MAPPING_H #define __ASM_RISCV_DMA_MAPPING_H -#include #include #include #include diff --git a/arch/riscv/include/asm/smp.h b/arch/riscv/include/asm/smp.h index 4284a332e98f..ee749dd11954 100644 --- a/arch/riscv/include/asm/smp.h +++ b/arch/riscv/include/asm/smp.h @@ -7,6 +7,8 @@ #ifndef _ASM_RISCV_SMP_H #define _ASM_RISCV_SMP_H +#include + /** * struct ipi_data - Inter-processor interrupt (IPI) data structure * diff --git a/arch/riscv/lib/aclint_ipi.c b/arch/riscv/lib/aclint_ipi.c index 90b8e128cb16..dcd7e5e6b344 100644 --- a/arch/riscv/lib/aclint_ipi.c +++ b/arch/riscv/lib/aclint_ipi.c @@ -8,7 +8,6 @@ * associated with software and timer interrupts. */ -#include #include #include #include diff --git a/arch/riscv/lib/andes_plicsw.c b/arch/riscv/lib/andes_plicsw.c index 75184080890f..c188bfffc7c2 100644 --- a/arch/riscv/lib/andes_plicsw.c +++ b/arch/riscv/lib/andes_plicsw.c @@ -8,7 +8,6 @@ * similar to RISC-V PLIC. */ -#include #include #include #include diff --git a/arch/riscv/lib/asm-offsets.c b/arch/riscv/lib/asm-offsets.c index 452dfcea97f7..875bb9a6d983 100644 --- a/arch/riscv/lib/asm-offsets.c +++ b/arch/riscv/lib/asm-offsets.c @@ -8,7 +8,6 @@ * assembly language modules. */ -#include #include #include diff --git a/arch/riscv/lib/boot.c b/arch/riscv/lib/boot.c index 778d011f7cea..03014c56dce2 100644 --- a/arch/riscv/lib/boot.c +++ b/arch/riscv/lib/boot.c @@ -4,8 +4,7 @@ * Rick Chen, Andes Technology Corporation */ -#include -#include +#include unsigned long do_go_exec(ulong (*entry)(int, char * const []), int argc, char *const argv[]) diff --git a/arch/riscv/lib/bootm.c b/arch/riscv/lib/bootm.c index cc30efc90498..f9e1e18ae026 100644 --- a/arch/riscv/lib/bootm.c +++ b/arch/riscv/lib/bootm.c @@ -6,7 +6,6 @@ * Rick Chen, Andes Technology Corporation */ -#include #include #include #include diff --git a/arch/riscv/lib/cache.c b/arch/riscv/lib/cache.c index 686e699efbcd..c46b49eb0ac6 100644 --- a/arch/riscv/lib/cache.c +++ b/arch/riscv/lib/cache.c @@ -4,7 +4,6 @@ * Rick Chen, Andes Technology Corporation */ -#include #include void invalidate_icache_all(void) diff --git a/arch/riscv/lib/fdt_fixup.c b/arch/riscv/lib/fdt_fixup.c index 36c16e9be2ae..c658e72bd39e 100644 --- a/arch/riscv/lib/fdt_fixup.c +++ b/arch/riscv/lib/fdt_fixup.c @@ -6,7 +6,6 @@ #define LOG_CATEGORY LOGC_ARCH -#include #include #include #include diff --git a/arch/riscv/lib/image.c b/arch/riscv/lib/image.c index a65a5b8d17c1..a82f48e9a505 100644 --- a/arch/riscv/lib/image.c +++ b/arch/riscv/lib/image.c @@ -6,7 +6,6 @@ * Based on arm/lib/image.c */ -#include #include #include #include diff --git a/arch/riscv/lib/interrupts.c b/arch/riscv/lib/interrupts.c index e966afa7e3e3..02dbcfd42380 100644 --- a/arch/riscv/lib/interrupts.c +++ b/arch/riscv/lib/interrupts.c @@ -10,7 +10,6 @@ */ #include -#include #include #include #include diff --git a/arch/riscv/lib/reset.c b/arch/riscv/lib/reset.c index 8779c619cc5a..712e1bdb8e1d 100644 --- a/arch/riscv/lib/reset.c +++ b/arch/riscv/lib/reset.c @@ -3,7 +3,6 @@ * Copyright (C) 2018, Bin Meng */ -#include #include #include diff --git a/arch/riscv/lib/sbi.c b/arch/riscv/lib/sbi.c index 55a3bc3b5c9d..35a7d3b12f51 100644 --- a/arch/riscv/lib/sbi.c +++ b/arch/riscv/lib/sbi.c @@ -7,7 +7,7 @@ * Taken from Linux arch/riscv/kernel/sbi.c */ -#include +#include #include #include diff --git a/arch/riscv/lib/sbi_ipi.c b/arch/riscv/lib/sbi_ipi.c index d02e2b4c4882..511d3816da84 100644 --- a/arch/riscv/lib/sbi_ipi.c +++ b/arch/riscv/lib/sbi_ipi.c @@ -4,7 +4,6 @@ * Lukas Auer */ -#include #include #include diff --git a/arch/riscv/lib/sifive_cache.c b/arch/riscv/lib/sifive_cache.c index 28154878fcc8..39b0248c3234 100644 --- a/arch/riscv/lib/sifive_cache.c +++ b/arch/riscv/lib/sifive_cache.c @@ -3,9 +3,9 @@ * Copyright (C) 2021 SiFive, Inc */ -#include #include #include +#include #include void enable_caches(void) diff --git a/arch/riscv/lib/smp.c b/arch/riscv/lib/smp.c index f3cd8b9044a8..a692f065edd7 100644 --- a/arch/riscv/lib/smp.c +++ b/arch/riscv/lib/smp.c @@ -4,7 +4,6 @@ * Lukas Auer */ -#include #include #include #include diff --git a/arch/riscv/lib/spl.c b/arch/riscv/lib/spl.c index 9b242ed82129..9a7a4f6ac8d3 100644 --- a/arch/riscv/lib/spl.c +++ b/arch/riscv/lib/spl.c @@ -3,7 +3,6 @@ * Copyright (C) 2019 Fraunhofer AISEC, * Lukas Auer */ -#include #include #include #include diff --git a/board/AndesTech/ae350/ae350.c b/board/AndesTech/ae350/ae350.c index 1c2288b6ce9f..36375d9def99 100644 --- a/board/AndesTech/ae350/ae350.c +++ b/board/AndesTech/ae350/ae350.c @@ -4,7 +4,7 @@ * Rick Chen, Andes Technology Corporation */ -#include +#include #include #include #include diff --git a/board/sifive/unmatched/hifive-platform-i2c-eeprom.c b/board/sifive/unmatched/hifive-platform-i2c-eeprom.c index 2b985b9b228e..938cedea6481 100644 --- a/board/sifive/unmatched/hifive-platform-i2c-eeprom.c +++ b/board/sifive/unmatched/hifive-platform-i2c-eeprom.c @@ -9,7 +9,6 @@ * Timur Tabi (timur@freescale.com) */ -#include #include #include #include diff --git a/board/sifive/unmatched/unmatched.c b/board/sifive/unmatched/unmatched.c index 6675548c2bf8..c8696270ba27 100644 --- a/board/sifive/unmatched/unmatched.c +++ b/board/sifive/unmatched/unmatched.c @@ -6,7 +6,6 @@ * Pragnesh Patel */ -#include #include #include #include