From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 38F16C54EED for ; Mon, 30 Jan 2023 14:54:20 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id ABED1857E2; Mon, 30 Jan 2023 15:53:50 +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="kPacfnnr"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 50BA5857F1; Mon, 30 Jan 2023 15:53:15 +0100 (CET) Received: from mail-il1-x133.google.com (mail-il1-x133.google.com [IPv6:2607:f8b0:4864:20::133]) (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 61737857C2 for ; Mon, 30 Jan 2023 15:53:07 +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-il1-x133.google.com with SMTP id d10so5173570ilc.12 for ; Mon, 30 Jan 2023 06:53:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; 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=GKsLVaHrfhTzjWdlnTMX7J0tC36wnK3aibvpkKISD+U=; b=kPacfnnruHzD4nfYAxgcl4nU2zf01Bx3LHoPwCj/vr3+H0sTojhMJXBoFgvPokDqTl UIYSf9QyWJqWo0bmydu0wsXLfXPxe+wLNN2/LkhhRftWSoBk9oNBrcanaXAvcUUmv7oC 1xUrPipi4IktOo+BFLhHtsbGfq7I7LouB98ZU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=GKsLVaHrfhTzjWdlnTMX7J0tC36wnK3aibvpkKISD+U=; b=IFgv/tutYbsyaLWD2r6zS0b0bakxQwrlGXYX8+V+P3tQYh+S3f41b5eanSmVpNHjz6 SUatADtr3idHqf3zdHo+t+DuOB3d9PZy6NhyinQKjMKz507WbwH4JhqMnFEsGvTvNiFS J9KE5bokxHCb+4zGwf3upjk/DJGNCphnCO9rl4KrDqVDLeRDfz1Q68mf/iJnA1s2Ltil oUBoia8/1xh84LLpGiN5bFhC4nwKeUcNPCNqeQJip5KyejcN3Wxf7XhSdCfP+nASMhZh gQXlnqDsgaNHyK2CeyK8CIfee4el+7HIyel+rD8O1uVdQGliDGDzF3vZLYxLGa3koTab 0nzQ== X-Gm-Message-State: AFqh2krIL95kxQzld5RzwuUjG2j+2GVawP/mUVeki1lo0rk5HYF9EfD2 U/mL4wJXcLdsCOr9hIqTt8Uf57DEbdvn6UmC X-Google-Smtp-Source: AMrXdXuXaYYL5dnVcAUSedxTomLg1jYr64QcJM+3i/Wg8Uuolv6usnlf+dQxYdFxvZrSDPpVHR2Usw== X-Received: by 2002:a92:de09:0:b0:30e:f1e5:3e4a with SMTP id x9-20020a92de09000000b0030ef1e53e4amr33175780ilm.28.1675090385794; Mon, 30 Jan 2023 06:53:05 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.53.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:53:05 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Stefan Roese Subject: [PATCH 032/171] Correct SPL uses of ARMADA_8K Date: Mon, 30 Jan 2023 07:41:05 -0700 Message-Id: <20230130144324.206208-33-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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.6 at phobos.denx.de X-Virus-Status: Clean This converts 2 usages of this option to the non-SPL form, since there is no SPL_ARMADA_8K defined in Kconfig Signed-off-by: Simon Glass --- arch/arm/mach-mvebu/arm64-common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-mvebu/arm64-common.c b/arch/arm/mach-mvebu/arm64-common.c index 5ab6925480d..d3a95730be5 100644 --- a/arch/arm/mach-mvebu/arm64-common.c +++ b/arch/arm/mach-mvebu/arm64-common.c @@ -49,7 +49,7 @@ const struct mbus_dram_target_info *mvebu_mbus_dram_info(void) __weak int dram_init_banksize(void) { - if (CONFIG_IS_ENABLED(ARMADA_8K)) + if (IS_ENABLED(CONFIG_ARMADA_8K)) return a8k_dram_init_banksize(); else if (IS_ENABLED(CONFIG_ARMADA_3700)) return a3700_dram_init_banksize(); @@ -61,7 +61,7 @@ __weak int dram_init_banksize(void) __weak int dram_init(void) { - if (CONFIG_IS_ENABLED(ARMADA_8K)) { + if (IS_ENABLED(CONFIG_ARMADA_8K)) { gd->ram_size = a8k_dram_scan_ap_sz(); if (gd->ram_size != 0) return 0; -- 2.39.1.456.gfc5497dd1b-goog