From patchwork Mon Jan 17 15:04:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1580822 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=Daza0ger; dkim-atps=neutral Authentication-Results: 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=) 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 RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JcwDm5Vd8z9ssD for ; Tue, 18 Jan 2022 02:04:56 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D7967837B5; Mon, 17 Jan 2022 16:04:53 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="Daza0ger"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9FBF08343B; Mon, 17 Jan 2022 16:04:51 +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.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, 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-io1-xd2d.google.com (mail-io1-xd2d.google.com [IPv6:2607:f8b0:4864:20::d2d]) (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 6DBD082DA1 for ; Mon, 17 Jan 2022 16:04:48 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd2d.google.com with SMTP id i82so21897025ioa.8 for ; Mon, 17 Jan 2022 07:04:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7UFXBUqXA2j6GyjaHcib+0OpJbLNb8h2OTuQJncdaB4=; b=Daza0gerep2X5vW5JXuivFwjFo19V7Dgz+Rr4ObWQOyfz4AVI/M1vy9iyJTQauzWAd RxkZiVXbeOfAPM8hjRmFZJEfmJARQIrE+IQOYFL3iBATtRuukJYa9yCOfrgn16IlErGX Kk+SOBVknHTjqpHwwrdDVUcFJIsyeqty/Bq28= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7UFXBUqXA2j6GyjaHcib+0OpJbLNb8h2OTuQJncdaB4=; b=hKXYd8/cOxzu+uqKHFDyEIumvXLc6zfo8YsTzIJw/8+R43EfE2U9SeC7ufRf29Ju5d HmXeYDXvudcszdpdzKqVBG5SKN77uzXVbBxCj+4rCdD7BLAwitN6USl3rpIE+slxgPPj qqal8M8yiXYUHuq0gYL9LxfPMiiAdo4mijSUu49skUM7XoHQlUI3E7lr7xX/NJVSQApg nEzfl1U/taxay9pHOkfXc0pgNTbQa1OMCP3MNoCStMJt3Natc1ASanrIOFF59TXwJ02T g4al3Vbh8+EtVS9sVL+J0DwywIODXoRhWYEGtffcD9YgmRt4EHe7g3jzJNpmQrGKalKM m7Qw== X-Gm-Message-State: AOAM531cpVn0BK0Yv91jdoSoLK8estC5QniVBWuaXQOh4fdVpT4f+1K3 3G85jTXmRvFvVBTYvkiXJ1qBCEdjV5y2nQ== X-Google-Smtp-Source: ABdhPJw4ul5w3SbkaY42gj6WquxX/0/C6S19/y61U+N7IXd6Gtja6aQdrQGzyddWPd+d9GaVd418wg== X-Received: by 2002:a02:cb4f:: with SMTP id k15mr2715368jap.184.1642431887080; Mon, 17 Jan 2022 07:04:47 -0800 (PST) Received: from kiwi.bld.corp.google.com (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id f21sm9379320iol.42.2022.01.17.07.04.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Jan 2022 07:04:46 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Ilias Apalodimas , Tom Rini , =?utf-8?q?Fran=C3=A7ois_Ozog?= , Heinrich Schuchardt , Bill Mills , Simon Glass , Alexandru Gagniuc , Bin Meng , =?utf-8?q?Pali_Roh=C3=A1r?= , Patrick Delaunay Subject: [PATCH v2 01/16] spl: Tidy up the header includes Date: Mon, 17 Jan 2022 08:04:13 -0700 Message-Id: <20220117080353.v2.1.Ie563607416a8f7504c69b46ce608c1c1df75caa6@changeid> X-Mailer: git-send-email 2.34.1.703.g22d0c6ccf7-goog In-Reply-To: <20220117150428.1580273-1-sjg@chromium.org> References: <20220117150428.1580273-1-sjg@chromium.org> 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.2 at phobos.denx.de X-Virus-Status: Clean These are out of order. Fix them. Signed-off-by: Simon Glass --- (no changes since v1) common/spl/spl.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/common/spl/spl.c b/common/spl/spl.c index f51d1f32052..932ad53614d 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -9,33 +9,31 @@ #include #include #include +#include #include #include +#include #include #include +#include #include #include #include +#include #include +#include #include #include -#include -#include -#include -#include -#include #if CONFIG_IS_ENABLED(BANNER_PRINT) #include #endif #include -#include -#include -#include +#include +#include +#include #include #include -#include -#include -#include +#include DECLARE_GLOBAL_DATA_PTR;