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 6597AC433FE for ; Sun, 20 Nov 2022 13:36:06 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9A24885271; Sun, 20 Nov 2022 14:34:22 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com 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=konsulko.com header.i=@konsulko.com header.b="DDEQwBEc"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0456085201; Sun, 20 Nov 2022 14:34:07 +0100 (CET) Received: from mail-qk1-x72f.google.com (mail-qk1-x72f.google.com [IPv6:2607:f8b0:4864:20::72f]) (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 6BCD18500E for ; Sun, 20 Nov 2022 14:34:04 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qk1-x72f.google.com with SMTP id z17so6488642qki.11 for ; Sun, 20 Nov 2022 05:34:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=R+tQCG8ONBUeJbWLonJiKgaDEZia+71w3dApcUC/VIo=; b=DDEQwBEcDvBKhHCkTSH3YOTO3Y61zPiHbL1sNzwGAu6T0KEiAyBpTxLNJeLq0lpoR3 CfHYUS2+LItcom0TGZcPbmDmyTuXbLAwC5oss/EVC+0dlA7jBh5SgWXarQ/dpktJ5W4Z g7drNZdgJKg+lSH/SjZvi8X1kuuz09cjxge1Q= 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:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=R+tQCG8ONBUeJbWLonJiKgaDEZia+71w3dApcUC/VIo=; b=tR0/dldOt/xmcOxFoW5gDq998r6B+H5OA/xH+IwygCpCL88/SSEpMOMveZyGOXnE/y Fs8qwQ09BxRGsslpSKHWwzb4XxWxDhMBX5djcVR+j/sqYsELhONyCTLL83yD/jBdcnRh tCi+oXc0HVK2nHisZ7mxTzK4u/fh3zSutbEBalB/cbQLOf/QUIjF2NvOiHesoriYKAcm pkje3Jg/ubONpvPUR0C5pC5tsMrgP2O3VDbmGbvSTnY6D9A/9zRSbTdBVeYHXiqb4O8H 0eSDrY3gKr4nOMvxCQ/vMAdyH95jKk9Abegj/YLXVgegvzhU7Snb4RsbIiDmxgZRTzcg /QHQ== X-Gm-Message-State: ANoB5pkAccNZDQ+wyRn+bV24ruHNzAxy+4O/MNvu7zvGVV1+W16fHzH1 Yydcjgmi21MImRVA2Im126gbDmN5H1D4ZA== X-Google-Smtp-Source: AA0mqf4e+VrIyejFi19lt8BRrn0UKLjf48pRr/THDQf6nzAqClv+Oda2/wf+BhEWFxdRjPTKhnkn7w== X-Received: by 2002:a05:620a:31d:b0:6fa:39f6:8c13 with SMTP id s29-20020a05620a031d00b006fa39f68c13mr12886417qkm.113.1668951243860; Sun, 20 Nov 2022 05:34:03 -0800 (PST) Received: from bill-the-cat.lan (2603-6081-7b00-6400-29a0-035f-b06a-235e.res6.spectrum.com. [2603:6081:7b00:6400:29a0:35f:b06a:235e]) by smtp.gmail.com with ESMTPSA id m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:03 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 011/241] global: Migrate CONFIG_ENV_IS_EMBEDDED to CFG Date: Sun, 20 Nov 2022 08:30:02 -0500 Message-Id: <20221120133352.3055600-12-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <20221120133352.3055600-1-trini@konsulko.com> 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 Signed-off-by: Tom Rini --- env/Makefile | 2 +- include/env_internal.h | 12 ++++++------ scripts/config_whitelist.txt | 2 +- tools/Makefile | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/env/Makefile b/env/Makefile index c4ad65432865..78e82173507f 100644 --- a/env/Makefile +++ b/env/Makefile @@ -11,7 +11,7 @@ obj-$(CONFIG_$(SPL_TPL_)ENV_SUPPORT) += flags.o ifndef CONFIG_SPL_BUILD obj-y += callback.o obj-$(CONFIG_ENV_IS_IN_EEPROM) += eeprom.o -extra-$(CONFIG_ENV_IS_EMBEDDED) += embedded.o +extra-$(CFG_ENV_IS_EMBEDDED) += embedded.o obj-$(CONFIG_ENV_IS_IN_EEPROM) += embedded.o extra-$(CONFIG_ENV_IS_IN_FLASH) += embedded.o obj-$(CONFIG_ENV_IS_IN_NVRAM) += embedded.o diff --git a/include/env_internal.h b/include/env_internal.h index f30fd6159d87..690e6da81078 100644 --- a/include/env_internal.h +++ b/include/env_internal.h @@ -41,8 +41,8 @@ (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) # define ENV_IS_EMBEDDED # endif -# ifdef CONFIG_ENV_IS_EMBEDDED -# error "do not define CONFIG_ENV_IS_EMBEDDED in your board config" +# ifdef CFG_ENV_IS_EMBEDDED +# error "do not define CFG_ENV_IS_EMBEDDED in your board config" # error "it is calculated automatically for you" # endif #endif /* CONFIG_ENV_IS_IN_FLASH */ @@ -61,15 +61,15 @@ extern unsigned long nand_env_oob_offset; * For the flash types where embedded env is supported, but it cannot be * calculated automatically (i.e. NAND), take the board opt-in. */ -#if defined(CONFIG_ENV_IS_EMBEDDED) && !defined(ENV_IS_EMBEDDED) +#if defined(CFG_ENV_IS_EMBEDDED) && !defined(ENV_IS_EMBEDDED) # define ENV_IS_EMBEDDED #endif /* The build system likes to know if the env is embedded */ #ifdef DO_DEPS_ONLY # ifdef ENV_IS_EMBEDDED -# ifndef CONFIG_ENV_IS_EMBEDDED -# define CONFIG_ENV_IS_EMBEDDED +# ifndef CFG_ENV_IS_EMBEDDED +# define CFG_ENV_IS_EMBEDDED # endif # endif #endif @@ -88,7 +88,7 @@ extern unsigned long nand_env_oob_offset; * If the environment is in RAM, allocate extra space for it in the malloc * region. */ -#if defined(CONFIG_ENV_IS_EMBEDDED) +#if defined(CFG_ENV_IS_EMBEDDED) #define TOTAL_MALLOC_LEN CONFIG_SYS_MALLOC_LEN #elif (CONFIG_ENV_ADDR + CONFIG_ENV_SIZE < CONFIG_SYS_MONITOR_BASE) || \ (CONFIG_ENV_ADDR >= CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) || \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 8d9496e6edba..040b0c89049a 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -11,7 +11,7 @@ CFG_DM9000_NO_SROM CFG_DM9000_USE_16BIT CFG_DW_WDT_CLOCK_KHZ CFG_ENV_FLAGS_LIST_STATIC -CONFIG_ENV_IS_EMBEDDED +CFG_ENV_IS_EMBEDDED CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS CONFIG_ENV_SETTINGS_NAND_V1 CONFIG_ENV_SETTINGS_NAND_V2 diff --git a/tools/Makefile b/tools/Makefile index 26be0a7ba2ea..b76876307a74 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -36,7 +36,7 @@ endif subdir-$(HOST_TOOLS_ALL) += gdb # Merge all the different vars for envcrc into one -ENVCRC-$(CONFIG_ENV_IS_EMBEDDED) = y +ENVCRC-$(CFG_ENV_IS_EMBEDDED) = y ENVCRC-$(CONFIG_ENV_IS_IN_EEPROM) = y ENVCRC-$(CONFIG_ENV_IS_IN_FLASH) = y ENVCRC-$(CONFIG_ENV_IS_IN_ONENAND) = y -- 2.25.1