| Message ID | 20230204002619.938387-35-sjg@chromium.org |
|---|---|
| State | RFC |
| 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=irvjxigS; 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 4P7tzv1Xwhz23hh for <incoming@patchwork.ozlabs.org>; Sat, 4 Feb 2023 11:43:23 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7F34086085; Sat, 4 Feb 2023 01:41:59 +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="irvjxigS"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1488E86012; Sat, 4 Feb 2023 01:30:06 +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-x131.google.com (mail-il1-x131.google.com [IPv6:2607:f8b0:4864:20::131]) (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 D6F8F86016 for <u-boot@lists.denx.de>; Sat, 4 Feb 2023 01:28:50 +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-x131.google.com with SMTP id l7so2793809ilf.0 for <u-boot@lists.denx.de>; Fri, 03 Feb 2023 16:28:50 -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=NVcvFKBzrmOy60Gt9o3oIl1cUaFlJprUEJ+4BOpArLc=; b=irvjxigSvxZgniC+KAMC6yYkiINL7yv7SQ+h+im+d0jTlMB8jzCTX7VU5ydRZYAho4 MyTFkeyHu2smI7tf5CeuUyO62TKFVNN6N12+lhYHpqdCQkqg5vZALB+jdmFp4j4+g8/b A8THPPr0LY/QewdtD6sGsSj3v/VAhM/rxNYRo= 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=NVcvFKBzrmOy60Gt9o3oIl1cUaFlJprUEJ+4BOpArLc=; b=02AXag40Xu59Zfk/XCXtwkv/iIgtdcazhApyft0jGm/ZKbzTYvvVmJM4AUvn5kENaG sCuZU+EblvjJ+J1P+H3Biract3WxGmdjul4ZZVm6Ncswc6MMlXlgGqqZoJ96A5N8UWGJ 0DOmD2/ajGiCO1v3uebRtSsaxbb0/Ic/fQ7Tr39bPYgdKoirLeycQjT3odcTj97bB859 HaP6GFuqxl/H08mZByJW+vlSIdZph4oP0jS3sogL4SI/6fsi7PGPQnUm8jG/OsIvx8Q4 4JwrY6RJxdspm0LaH/lw3g0V6ZXb/lq1zNyWPPB5lUK24POvPthg7js/+jO1ZpJTFjHu HL6g== X-Gm-Message-State: AO0yUKWDDi7RKiIGb3jUOhsdv+Ncwuu6qxXF6N22+Sjh7wtCrj3oYWYj aUPsPEnN4FPvosPJi7ZmDZrP8uhYddOWTHZK X-Google-Smtp-Source: AK7set+GIZ7U2sJ36CRoxc8M77GkxuWLinJLQJzoN1SbVve8kru8IQhPMYDhI1PnjMqSk7iqor7mlw== X-Received: by 2002:a05:6e02:1d82:b0:30f:5355:9c2 with SMTP id h2-20020a056e021d8200b0030f535509c2mr10206926ila.14.1675470508459; Fri, 03 Feb 2023 16:28:28 -0800 (PST) Received: from kea.bld.corp.google.com ([2620:15c:183:200:5b65:12f1:51b7:8157]) by smtp.gmail.com with ESMTPSA id j12-20020a02cc6c000000b003adab954c5asm1270255jaq.153.2023.02.03.16.28.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Feb 2023 16:28:28 -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>, Jeffy Chen <jeffy.chen@rock-chips.com>, Kever Yang <kever.yang@rock-chips.com>, huang lin <hl@rock-chips.com> Subject: [RFC PATCH v2 34/56] rockchip: Avoid checking environment without ENV_SUPPORT Date: Fri, 3 Feb 2023 17:25:57 -0700 Message-Id: <20230204002619.938387-35-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230204002619.938387-1-sjg@chromium.org> References: <20230204002619.938387-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 <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 |
Migrate to split config
|
expand
|
diff --git a/board/theobroma-systems/puma_rk3399/puma-rk3399.c b/board/theobroma-systems/puma_rk3399/puma-rk3399.c index 97f398bd754..34839dcb9f1 100644 --- a/board/theobroma-systems/puma_rk3399/puma-rk3399.c +++ b/board/theobroma-systems/puma_rk3399/puma-rk3399.c @@ -136,7 +136,7 @@ int mmc_get_env_dev(void) return CONFIG_SYS_MMC_ENV_DEV; } -#if !IS_ENABLED(CONFIG_ENV_IS_NOWHERE) +#if IS_ENABLED(CONFIG_ENV_SUPPORT) && !IS_ENABLED(CONFIG_ENV_IS_NOWHERE) #error Please enable CONFIG_ENV_IS_NOWHERE #endif diff --git a/board/theobroma-systems/ringneck_px30/ringneck-px30.c b/board/theobroma-systems/ringneck_px30/ringneck-px30.c index 47d1a40ef7c..9eb2fcfc48f 100644 --- a/board/theobroma-systems/ringneck_px30/ringneck-px30.c +++ b/board/theobroma-systems/ringneck_px30/ringneck-px30.c @@ -118,7 +118,7 @@ int mmc_get_env_dev(void) return CONFIG_SYS_MMC_ENV_DEV; } -#if !IS_ENABLED(CONFIG_ENV_IS_NOWHERE) +#if IS_ENABLED(CONFIG_ENV_SUPPORT) && !IS_ENABLED(CONFIG_ENV_IS_NOWHERE) #error Please enable CONFIG_ENV_IS_NOWHERE #endif
With split config, this causes a build error in SPL where the environment may not be enabled. It affects two rk3399 boards. Add a condition. Signed-off-by: Simon Glass <sjg@chromium.org> --- (no changes since v1) board/theobroma-systems/puma_rk3399/puma-rk3399.c | 2 +- board/theobroma-systems/ringneck_px30/ringneck-px30.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)