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 260F9C4332F for ; Sun, 20 Nov 2022 13:48:36 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id F00818538E; Sun, 20 Nov 2022 14:36:12 +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="Cj4xP869"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E95AC85337; Sun, 20 Nov 2022 14:35:23 +0100 (CET) Received: from mail-qk1-x72e.google.com (mail-qk1-x72e.google.com [IPv6:2607:f8b0:4864:20::72e]) (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 E2A11852B4 for ; Sun, 20 Nov 2022 14:34:45 +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-x72e.google.com with SMTP id x18so6505419qki.4 for ; Sun, 20 Nov 2022 05:34:45 -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=QO2kz4xDDJdrVhW6gubZbga46uWQ3v8K+53nVTKt2Qs=; b=Cj4xP869WFA3HZRBW0fGl3GD1KryM8RFoiST65vW4GlD+B+BZ/jTCi4JAHqBu7weZA m+jQQ69dx7PEKm3ntZLPTEf8QrQI6isuGGlxEXssZQBqFHI9mCYSvEOm4HNvSMxZ6rfV GPCs35RppMuemxEoW/P0KR3nX6RfJMLawic3E= 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=QO2kz4xDDJdrVhW6gubZbga46uWQ3v8K+53nVTKt2Qs=; b=muTjeFFvrskgweeOQ2KdViMQiF4Pj6wB4o0wSxs21SRKyMvZBokgPsrQirffwVx8T9 twdRJCMseSXMOWUnYTVlza8VWSG4jw0p/kWa3MNzGtuV968x9ttScS7v6V/fPxVxF95z kEdLW1LN90KM+RTfXGYresD+tIIkzG563ql5+GTViNI670HWF/LiS/zegjhdL6A0M8x7 ltD/AHB0vanCIwM8JGlsdrs7fBU10BmDnuDTR3bDE2S3T3q5Thoemen2ojMxFST6ifUf vzaNlbZXen1jEOxmrWUI6oxgkP1/5Rjd+NojNvy7Rqveg5mRcZNMpiEXZuoqmncauskv GSYw== X-Gm-Message-State: ANoB5pmN7pxaCkMZ9/a8uL5ksCSjxq6PDC1XkRUtMxcSKKZ3GIMRJP90 ZGJQwCMePFN4F8msEOGAL519riK+uEpF0g== X-Google-Smtp-Source: AA0mqf4xKeVejMo+5mGQbxUAdc9v1255UsplTNRXVM5F1KzUvJONHFFu3aj7pLGvenRfOh3oztB1kw== X-Received: by 2002:a05:620a:2005:b0:6fa:2ddc:87f4 with SMTP id c5-20020a05620a200500b006fa2ddc87f4mr12659892qka.479.1668951285354; Sun, 20 Nov 2022 05:34:45 -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.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:45 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 073/241] global: Migrate CONFIG_KM_NEW_ENV to CFG Date: Sun, 20 Nov 2022 08:31:04 -0500 Message-Id: <20221120133352.3055600-74-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 --- include/configs/km/pg-wcom-ls102xa.h | 4 ++-- include/configs/kmcent2.h | 4 ++-- include/configs/socfpga_arria5_secu1.h | 4 ++-- scripts/config_whitelist.txt | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h index 974486fc4c32..856d2e909200 100644 --- a/include/configs/km/pg-wcom-ls102xa.h +++ b/include/configs/km/pg-wcom-ls102xa.h @@ -209,7 +209,7 @@ "checkfdt=true\0" \ "" -#define CONFIG_KM_NEW_ENV \ +#define CFG_KM_NEW_ENV \ "newenv=protect off " __stringify(ENV_DEL_ADDR) \ " +" __stringify(CFG_ENV_TOTAL_SIZE) " && " \ "erase " __stringify(ENV_DEL_ADDR) \ @@ -223,7 +223,7 @@ "asrc,spdif,lpuart1,ftm1\0" #define CFG_EXTRA_ENV_SETTINGS \ - CONFIG_KM_NEW_ENV \ + CFG_KM_NEW_ENV \ CFG_KM_DEF_ENV \ CFG_HW_ENV_SETTINGS \ "EEprom_ivm=pca9547:70:9\0" \ diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h index 35ec79f7b7db..97070bc77c45 100644 --- a/include/configs/kmcent2.h +++ b/include/configs/kmcent2.h @@ -428,7 +428,7 @@ int get_scl(void); "usb_phy_type=" __stringify(__USB_PHY_TYPE) "\0" \ "usb_dr_mode=host\0" -#define CONFIG_KM_NEW_ENV \ +#define CFG_KM_NEW_ENV \ "newenv=protect off " __stringify(ENV_DEL_ADDR) \ " +" __stringify(CFG_ENV_TOTAL_SIZE) " && " \ "erase " __stringify(ENV_DEL_ADDR) \ @@ -444,7 +444,7 @@ int get_scl(void); #define CFG_EXTRA_ENV_SETTINGS \ CFG_KM_DEF_ENV \ CFG_KM_DEF_ARCH \ - CONFIG_KM_NEW_ENV \ + CFG_KM_NEW_ENV \ CFG_HW_ENV_SETTINGS \ "EEprom_ivm=pca9547:70:9\0" \ "" diff --git a/include/configs/socfpga_arria5_secu1.h b/include/configs/socfpga_arria5_secu1.h index 71aa5a7ca949..6fb7a895995b 100644 --- a/include/configs/socfpga_arria5_secu1.h +++ b/include/configs/socfpga_arria5_secu1.h @@ -42,7 +42,7 @@ "_fpga_loadsafe=echo Loading FPGA SAFE image..." \ " && mw ${rmtu_page} ${fpga_safebase} && mw ${rmtu_reconfig} 1\0" \ -#define CONFIG_KM_NEW_ENV \ +#define CFG_KM_NEW_ENV \ "newenv=" \ "nand erase 0x100000 0x40000\0" @@ -55,7 +55,7 @@ #define CFG_EXTRA_ENV_SETTINGS \ FPGA_RMTU_ENV \ CFG_KM_DEF_ENV_BOOTTARGETS \ - CONFIG_KM_NEW_ENV \ + CFG_KM_NEW_ENV \ "socfpga_legacy_reset_compat=1\0" \ "altbootcmd=run bootcmd;\0" \ "bootlimit=6\0" \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 11a501212b8c..471b3243f380 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -81,7 +81,7 @@ CFG_KM_DEF_ENV_CPU CFG_KM_DEF_ENV_FLASH_BOOT CFG_KM_DEV_ENV_FLASH_BOOT_UBI CFG_KM_ECC_MODE -CONFIG_KM_NEW_ENV +CFG_KM_NEW_ENV CONFIG_KM_UBI_LINUX_MTD CONFIG_KM_UBI_PARTITION_NAME_APP CONFIG_KM_UBI_PARTITION_NAME_BOOT -- 2.25.1