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 880D9C63797 for ; Sun, 5 Feb 2023 23:17:17 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1696F85AC0; Mon, 6 Feb 2023 00:16:58 +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="amruyopa"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 92AAA859D1; Sun, 5 Feb 2023 23:39:40 +0100 (CET) Received: from mail-il1-x134.google.com (mail-il1-x134.google.com [IPv6:2607:f8b0:4864:20::134]) (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 344AE859AC for ; Sun, 5 Feb 2023 23:39:12 +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-x134.google.com with SMTP id u8so4089623ilq.13 for ; Sun, 05 Feb 2023 14:39:12 -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=g1OhUU6og2Aq2nDK8uBnWUephKZL9wJ5uunNeL97AqA=; b=amruyopauX5QvYrWLAY0floUfrGJQLbjVvN6s/Bq8W+fCpOxrYEEtm/Oe/MOKMzLy1 JiJswIak0s9s+BLh6LhPsjBUJgUStZJjKkkpzx80+K3AV54ttfB8BNlg00C6wEqB7XcE ulNc6defLdRNs58j9qY7sOE9YQ8pOQjxytoMg= 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=g1OhUU6og2Aq2nDK8uBnWUephKZL9wJ5uunNeL97AqA=; b=jyClc0sLnQHN8ViRxheinaeYQ11RxCkjv0SntJlpAYB+WjxfvejGosDCskRu/rrIwx F4u40NtnoitFBoH78aL3ISTV4m+frLFYgTcjtTNLPKNuaYnpYFLSIpt81abT1cooNi12 HgyMBbPWZzxY0jolLGp448u5dyx852p9N3tmCjsTo4PqAQWNBFMEVxg5gEHHvWe+kMsR o8fFpJqGpDsJrlQ60NPMVLr2Ekywk4XZBSqwgybreGwyhSILld3voODAWcRpbS3t1IEV h/7QWW0V/mtQIQphpIz1XUeTu0B6Wa3I75K0P4GvuXPKjdc6wePmldbmMgiOc99XjmG6 vh+Q== X-Gm-Message-State: AO0yUKUt3wFXLGXfnkWfOZib+AWIuP5M9q7ynMM3Rb+im8Kq5LfJapHP j8xEncrcTk2JxRPbyk1U5EZVD7R2FK2YR9al X-Google-Smtp-Source: AK7set8o8AcgyqJxPmF97Scjc/lxCUw4fd97VDAdHOerEs6tvc1i5/SilmLD5754z4Nhjo1mbkxTiQ== X-Received: by 2002:a05:6e02:1c45:b0:310:aff3:4cf5 with SMTP id d5-20020a056e021c4500b00310aff34cf5mr16904611ilg.7.1675636751649; Sun, 05 Feb 2023 14:39:11 -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:11 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 029/169] Correct SPL uses of ARMADA_3700 Date: Sun, 5 Feb 2023 15:36:15 -0700 Message-Id: <20230205223836.231657-30-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_3700 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 b9745c3c99f..5ab6925480d 100644 --- a/arch/arm/mach-mvebu/arm64-common.c +++ b/arch/arm/mach-mvebu/arm64-common.c @@ -51,7 +51,7 @@ __weak int dram_init_banksize(void) { if (CONFIG_IS_ENABLED(ARMADA_8K)) return a8k_dram_init_banksize(); - else if (CONFIG_IS_ENABLED(ARMADA_3700)) + else if (IS_ENABLED(CONFIG_ARMADA_3700)) return a3700_dram_init_banksize(); else if (IS_ENABLED(CONFIG_ALLEYCAT_5)) return alleycat5_dram_init_banksize(); @@ -67,7 +67,7 @@ __weak int dram_init(void) return 0; } - if (CONFIG_IS_ENABLED(ARMADA_3700)) + if (IS_ENABLED(CONFIG_ARMADA_3700)) return a3700_dram_init(); if (IS_ENABLED(CONFIG_ALLEYCAT_5)) -- 2.39.1.519.gcb327c4b5f-goog