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 CCDD1C636CD for ; Sun, 5 Feb 2023 22:47:16 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5CA14859B8; Sun, 5 Feb 2023 23:41:11 +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="MYREl/sH"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1548A844F5; Sun, 5 Feb 2023 23:39:51 +0100 (CET) Received: from mail-il1-x12d.google.com (mail-il1-x12d.google.com [IPv6:2607:f8b0:4864:20::12d]) (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 89D68844F5 for ; Sun, 5 Feb 2023 23:39:20 +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-x12d.google.com with SMTP id l7so4134775ilf.0 for ; Sun, 05 Feb 2023 14:39:20 -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=whVD8Qnn60MhggP9bjWeBPZrTeTG07a+a2uQ7mqSl3k=; b=MYREl/sHFz4uYyyHgxLS/sG7pNr3jPO0VVdRmDaQLWPlDCdFyXMMmXcgTBgcTN1zkn rvZx1o0lz40F26Xjtrp4etburZ58YS5gNJ8CD9NDhyqhOileUbrTn5Jh6bIb2zk9dCNB 9hZCM+ERfkGa01w4r2IUNR60MK2P2SlH3sDu8= 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=whVD8Qnn60MhggP9bjWeBPZrTeTG07a+a2uQ7mqSl3k=; b=Lr+s8Udi/ZNulrLYjn1ERtcxR0FgV02LgeDUjW3uHVAVuI4K7CvXB9ToerQ9XWyKhD InJpQrT8J3pMiaqQgIWVMyOKe3zH751Mk4H8Ouoc+PLcAYcKmeSj/5at7rpn0oH/xO0n BXP+En+akwn4lmeR9y9vVjbAb638Mf0b/T23NE/HnuvnaQkMVA1l19w+99Ku2Hq4utti 4FmyHydJyGpL3pGlSeMzOEa1uWYNK7O2OVyOmKWVsowwmPYDwX4xjMDOYcOx16IaOxMy plaJtHfPFlRgbZwfBsJYLIr9fMDdoMZWgOYLTPPBEC/3uwC0195KF8nbGSb23e2mUapy cVYg== X-Gm-Message-State: AO0yUKW+H6OWsUj4wBiL15givJokpLKPPiXP2ueoR8zBjGolKbQrQXTi aSxB84RgJE8cjwXcbHqz9LFrO7YcTkph6t2N X-Google-Smtp-Source: AK7set8k7XjUtTV+vOy6M9fThpxkEglfMGLIlm46O42tNIsKnF95qj9tqgIUPnbIvJfq5O4hsGTbmQ== X-Received: by 2002:a92:4406:0:b0:310:efbd:57ac with SMTP id r6-20020a924406000000b00310efbd57acmr9809821ila.16.1675636752395; Sun, 05 Feb 2023 14:39:12 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.39.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:12 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 030/169] Correct SPL uses of ARMADA_8K Date: Sun, 5 Feb 2023 15:36:16 -0700 Message-Id: <20230205223836.231657-31-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-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 --- (no changes since v1) 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.519.gcb327c4b5f-goog