Message ID | 20230130151612.212732-108-sjg@chromium.org |
---|---|
State | Changes Requested |
Delegated to: | Tom Rini |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=dXkq4R2q; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5CT61qjgz1yhq for <incoming@patchwork.ozlabs.org>; Tue, 31 Jan 2023 02:55:54 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A00AE85633; Mon, 30 Jan 2023 16:55:51 +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="dXkq4R2q"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B85FA85808; Mon, 30 Jan 2023 16:55:21 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 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 12A6C844AE for <u-boot@lists.denx.de>; Mon, 30 Jan 2023 16:17:26 +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 u7so3697721ilg.4 for <u-boot@lists.denx.de>; Mon, 30 Jan 2023 07:17:26 -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=H8DjhzBGvpivWCX9C7RZJIiQbMvzkYc3tQEWOAXx9Gk=; b=dXkq4R2qyqF3q7ui0aLS8QlFAritjDBpo4dI7pZxeFY1W+GKhIrG38pOBsamReli2T ZXG9GAt+U5pC1EAOHXpjnfN2EHAequu8n/lxzVrxs1hKvSI9tE8kfxmXUj9xZnVXjqw7 60WNuVcYk5cdQCfT+/AOde4q2ZwUE8a/FYMIU= 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=H8DjhzBGvpivWCX9C7RZJIiQbMvzkYc3tQEWOAXx9Gk=; b=F5YfmJU7TIHDkHB5mIGYvkP+8N0zFxWZIsTC61Io1rhkyOSvuA3I1WhPF1pdSvJ88J 105R+lryTmCu/xvNyP2owaO7wmCJatMmyMT2OkxvlKWnh6XGUNZjTsD29GGLRP9NTr3S XbTWtmjBk3v3/jJQZR+wLuPH2Cm/gdyqGtsdxp7yrUZ8ovVQZvXX05H77UimsAABL6xB eqIV9lrdj2QQnJVOImDYm+D3cB7VyFculAsKmFN93nzWBF8oWyFYGV5rFjBT4zTvRnJa FIqLiJYCWgYiKSEs9eVb3qtYXRtKt47Y6+tPZEIJW9lgRe0YaH6gs/xoPjnrxM6h+a1A y4AA== X-Gm-Message-State: AO0yUKXFcB6J8GJfHJ/pUU2ZUR4JSyRVTFsaNbTB+Q8sOJTbRR4lHRol 0ZLmGxzlOYX2u2MZOx4zlJ7JCMnAvAVwcovy X-Google-Smtp-Source: AK7set+Ni1D11VoX1oW5d73kn1MBC6Y4+CAPM+3DDSBsoLXIODO7t1UmJknzVNwluy88+DUrKYvVvg== X-Received: by 2002:a05:6e02:1a42:b0:310:aff3:4cf5 with SMTP id u2-20020a056e021a4200b00310aff34cf5mr13713905ilv.7.1675091832785; Mon, 30 Jan 2023 07:17:12 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:12 -0800 (PST) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Tom Rini <trini@konsulko.com>, Simon Glass <sjg@chromium.org>, Michal Simek <michal.simek@amd.com> Subject: [PATCH 107/171] Correct SPL uses of MICROBLAZE Date: Mon, 30 Jan 2023 08:15:08 -0700 Message-Id: <20230130151612.212732-108-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-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 <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean |
Series |
None
|
expand
|
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);
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 <sjg@chromium.org> --- board/xilinx/common/board.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)