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 E630AC636CD for ; Sun, 5 Feb 2023 23:02:52 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 31D6785B5C; Sun, 5 Feb 2023 23:55:55 +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="Rm/MWpXf"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 74AB985B41; Sun, 5 Feb 2023 23:54:04 +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 31ED485AC8 for ; Sun, 5 Feb 2023 23:43:01 +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 n2so658987ili.11 for ; Sun, 05 Feb 2023 14:43:01 -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=5fCIQMYVQwZcjBh2eS1XCqo+uN8a9nNESjH1EVVQpFQ=; b=Rm/MWpXfPsrSELpUPeoMErmvcOOb2zaNQhwkdrC5hTCqZZ7fg/T8QZkaus4c4OimKn R//3177R2Utp2Q72Qt55oFq1vB7gae8TcMaYfVsyFVqm3Go+UEcYd0H6rDOgTZwY83su I2HmmyP9rYQEVuho/aKwlm3/kkItBSI76xG3g= 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=5fCIQMYVQwZcjBh2eS1XCqo+uN8a9nNESjH1EVVQpFQ=; b=EEaml+5KkhlAegwsV77vJVldpaaUb1q/ZdOtYv1DxyBm7SnXh/Pi9tD9hDAbIVbN7n 0eh41fQlsyeJ8xnV5pbUG1PDQctGOMxgQi3v2CMM9Yz8gGUFrYseWLvc4enIt+upKUdP MYbxjMGfyyEKxK2giko07hfa5F3eF7+xaElL98jirgfdI590lAxJfWYHs/UDrMOJepN6 1AGdSPK8R36EzqiOL7jYrusoGgB7TXUBiYX6/SrkriTMVrXUm+wgPWdwGlEScQjmvE4Y GqN2oAJ7FVyEJBFSGjdsRDbfXIRzQPJnwNudG8lZyzNCa0ozZg0NYB++mShB2FLRjEbT Q7yg== X-Gm-Message-State: AO0yUKWIO+UoLS11b68hqF5NpmAOMlL4gHET3ZSt+b7Ek1TDfx7Qqn/Q 0wjVjmnsNfXPjGY+lMffYrdda9SOG4bKYmqk X-Google-Smtp-Source: AK7set/7adZLYie2Be6/Ffi7lbt1zMz3TrEDD9RF2PStstxjcDX0AaThCG+udO8AFO044XLtuCPqKA== X-Received: by 2002:a05:6e02:19c7:b0:311:1655:7519 with SMTP id r7-20020a056e0219c700b0031116557519mr16261256ill.28.1675636980223; Sun, 05 Feb 2023 14:43:00 -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 z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.42.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:42:59 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 105/169] Correct SPL uses of MICROBLAZE Date: Sun, 5 Feb 2023 15:40:14 -0700 Message-Id: <20230205224118.233425-106-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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_MICROBLAZE defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) board/xilinx/common/board.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c index aa9f3ef071c..bed15319934 100644 --- a/board/xilinx/common/board.c +++ b/board/xilinx/common/board.c @@ -412,14 +412,14 @@ int board_late_init_xilinx(void) struct xilinx_board_description *desc; phys_size_t bootm_size = gd->ram_top - gd->ram_base; - if (!CONFIG_IS_ENABLED(MICROBLAZE)) { + if (!IS_ENABLED(CONFIG_MICROBLAZE)) { ulong scriptaddr; scriptaddr = env_get_hex("scriptaddr", 0); ret |= env_set_hex("scriptaddr", gd->ram_base + scriptaddr); } - if (IS_ENABLED(CONFIG_ARCH_ZYNQ) || CONFIG_IS_ENABLED(MICROBLAZE)) + if (IS_ENABLED(CONFIG_ARCH_ZYNQ) || IS_ENABLED(CONFIG_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