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 AA964C636CD for ; Sun, 5 Feb 2023 22:45:59 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C55DA859EF; Sun, 5 Feb 2023 23:40: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=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="ofipIOJG"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8EDC68595E; Sun, 5 Feb 2023 23:39:47 +0100 (CET) Received: from mail-io1-xd2f.google.com (mail-io1-xd2f.google.com [IPv6:2607:f8b0:4864:20::d2f]) (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 3E69185984 for ; Sun, 5 Feb 2023 23:39:16 +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-xd2f.google.com with SMTP id y7so3880880iob.6 for ; Sun, 05 Feb 2023 14:39:16 -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=376UsQkSgwxipS/lGwF1c/KqW8Ny5tgA6zJUy9CFrc0=; b=ofipIOJGqfFfhpJhZFbBBkifc+wU79F8OW0hQNbQxJ36Q+TgS3Jp1UuVplvvFLznmG JDq1xJ1c+TB8WGXrfVEhkjaoHFPBxIAapUPqQGhm47X33vnEN/TTKyMbQKf3pNnqQvte C1CBw9T0/E0qMhLVQSx4HkcbV+xZ0L+Zh3ow8= 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=376UsQkSgwxipS/lGwF1c/KqW8Ny5tgA6zJUy9CFrc0=; b=kCImoNh4mNw4tlaqeXr/NaMboPXgnsl0lryG7J2U+LDjfXK1fy9vukpK0fgQNcrhiK /zr3j5GSz23yjkQkLZDMy6Anm3uCBjOo93GFFFhBncx5SIAITf2U4jLbYRWOakTSLbjM csNtc+ln7WP9Mv6BKbSIeyuwIXNh35ofP7BeDpc3cnU91KTCW2PIDuf3Lf2sBZrKycvM 7M3ZBrmYvO+Qi4hWAa3yUJG7lC2ufMUxg0/Uir5HqOE/zULbM30Dvp2oHxdMH6cOGMoQ Uffx5shNmyeFx9xUWz29FWLPyYGuNtC8E5eVOKj7rvuYQRIqCMA09xiDG7/Uodp8tWzJ oetw== X-Gm-Message-State: AO0yUKVl9wlU0G1NF38OL6VuQcI64zNH0NXb5xDe03hClalaPgS9/iIT cDsXfeMYbw2pJA9M+VrZuACWMlGoLv8aU6zW X-Google-Smtp-Source: AK7set9Sce2xbavQBlJ47/BVxCjjEtkONke2VvJWkPbOfzCbityEcr3HB2UuXx/FmFfhn/u0VGsg7w== X-Received: by 2002:a05:6602:2748:b0:704:c2fe:d923 with SMTP id b8-20020a056602274800b00704c2fed923mr8316210ioe.2.1675636748162; Sun, 05 Feb 2023 14:39:08 -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.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:07 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 024/169] Correct SPL uses of ALLEYCAT_5 Date: Sun, 5 Feb 2023 15:36:10 -0700 Message-Id: <20230205223836.231657-25-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_ALLEYCAT_5 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 2c94f899f37..b9745c3c99f 100644 --- a/arch/arm/mach-mvebu/arm64-common.c +++ b/arch/arm/mach-mvebu/arm64-common.c @@ -53,7 +53,7 @@ __weak int dram_init_banksize(void) return a8k_dram_init_banksize(); else if (CONFIG_IS_ENABLED(ARMADA_3700)) return a3700_dram_init_banksize(); - else if (CONFIG_IS_ENABLED(ALLEYCAT_5)) + else if (IS_ENABLED(CONFIG_ALLEYCAT_5)) return alleycat5_dram_init_banksize(); else return fdtdec_setup_memory_banksize(); @@ -70,7 +70,7 @@ __weak int dram_init(void) if (CONFIG_IS_ENABLED(ARMADA_3700)) return a3700_dram_init(); - if (CONFIG_IS_ENABLED(ALLEYCAT_5)) + if (IS_ENABLED(CONFIG_ALLEYCAT_5)) return alleycat5_dram_init(); if (fdtdec_setup_mem_size_base() != 0) -- 2.39.1.519.gcb327c4b5f-goog