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 8DAA9C636CD for ; Sun, 5 Feb 2023 22:44:51 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D4AED859EC; Sun, 5 Feb 2023 23:40:33 +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="JpgFQEoW"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F106D859D0; Sun, 5 Feb 2023 23:39:38 +0100 (CET) Received: from mail-io1-xd31.google.com (mail-io1-xd31.google.com [IPv6:2607:f8b0:4864:20::d31]) (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 C29B085997 for ; Sun, 5 Feb 2023 23:39:10 +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-xd31.google.com with SMTP id z21so3910633iol.0 for ; Sun, 05 Feb 2023 14:39:10 -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=uvFtM0iO3Hnk7hDMpZtaVDut3YP6Q5bQsfPs7tu0q+E=; b=JpgFQEoWWilvXgZxkEWBO7QGr+spLo1WzrN6FX7Tw5yfWgfxKi1Pv/y+pLfg+6+5bv d9Z74jtnPM3Zv+QofLzKx1V0TsfXebIzFf7gilRW+mCLUUeuH6Z6fFQz/eUFfqlfApSi aXIE2X2MjTvLuWXXvRQO0t2nYVJ6oDoWs7o7Y= 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=uvFtM0iO3Hnk7hDMpZtaVDut3YP6Q5bQsfPs7tu0q+E=; b=fSMlYIPPYuhy0l8RsW0K/SzjkVWnoBJWWXZqszP9+HuqJWG4jJ8j5SdFlBtQoKOD83 /Ojiu+2/eGTb59b2Ve+/BVUR+hay0lFE8P575RHdO+AFpT8aPuH2nQiy/48EzCH0uo8/ MwuZG1q/0lEDcSi+hP8brSlI0r1K+7hS0L3dQswaHw1dhlIH1CiYpmzMX/4LxchV1X19 3qFGG3DsIcSssEuETR3vS3rgjgRQnT5GsU6gjou+k15cGtuDbztAWktIDrVQ5CY/8i3x jCFMMzy82BrL+ggFFRZE5wSyz/fEMywZoKPDUspy9Mmkv6Ukli20vZOzfS2mAGsZuz5F FnlA== X-Gm-Message-State: AO0yUKXJ5RGhjlpsKZZB9FJ0frIb9vTLU0JeeMut/ADNUQYX7idv9vyX uv3mRLN1V+IuhruHg4xAAbVYOD67WN+Fex3i X-Google-Smtp-Source: AK7set+J31kPtW1Hk6XYF+LSL3PXGZZkk1ec3IUSwBMNOJdvwAgOF3GoM5UHyzGXbyo4jHtz/CndKA== X-Received: by 2002:a5d:890a:0:b0:71e:703b:63fe with SMTP id b10-20020a5d890a000000b0071e703b63femr10934425ion.5.1675636750276; Sun, 05 Feb 2023 14:39:10 -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.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:10 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 027/169] Correct SPL use of ARCH_ZYNQ Date: Sun, 5 Feb 2023 15:36:13 -0700 Message-Id: <20230205223836.231657-28-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 1 usage of this option to the non-SPL form, since there is no SPL_ARCH_ZYNQ defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) board/xilinx/common/board.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c index fbc76eef20d..e2c957fa163 100644 --- a/board/xilinx/common/board.c +++ b/board/xilinx/common/board.c @@ -419,7 +419,7 @@ int board_late_init_xilinx(void) ret |= env_set_hex("scriptaddr", gd->ram_base + scriptaddr); } - if (CONFIG_IS_ENABLED(ARCH_ZYNQ) || CONFIG_IS_ENABLED(MICROBLAZE)) + if (IS_ENABLED(CONFIG_ARCH_ZYNQ) || CONFIG_IS_ENABLED(MICROBLAZE)) bootm_size = min(bootm_size, (phys_size_t)(SZ_512M + SZ_256M)); ret |= env_set_hex("script_offset_f", CONFIG_BOOT_SCRIPT_OFFSET); -- 2.39.1.519.gcb327c4b5f-goog