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 D41DAC4321E for ; Sun, 4 Dec 2022 15:22:41 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5823D855CD; Sun, 4 Dec 2022 16:10:31 +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="awB7H+1j"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A2825854DA; Sun, 4 Dec 2022 16:07:39 +0100 (CET) Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) (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 140B4854C9 for ; Sun, 4 Dec 2022 16:07:34 +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-ej1-x62d.google.com with SMTP id b2so22282408eja.7 for ; Sun, 04 Dec 2022 07:07:34 -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=3ns92osslyQpOFs5xG1KKO0vhuwgwJp+PnkIGcPIyxs=; b=awB7H+1jFdj/Er3KvjOA1J5T7cMZLS9sfZ60sNwOdXO9zykKFrTszU3m4wNeT1/88b gn2RfYBsRnExyCHhhsUsPZpz1nsqFUYqMfHd8rs2uSg2zUUb/qdigf/csKu3VT1Yt6gf PuuYyERW1CTpyVlCexflBIqY7cpr8QsKdcvf8= 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=3ns92osslyQpOFs5xG1KKO0vhuwgwJp+PnkIGcPIyxs=; b=2gFNa5xTEm1CMeOPyvfFZyi2vtt7vMu1Fczd/7vNgFYHkDiyzZROFHTEM8pfOt465L piv653E7zkSKR7JOCK56y6EMXgTn/E8bUsOQoo75LB9r/rGnNxVMufI2w2XfrycV7Br0 3usP5eQhGhTKtI149DeQwj1JzXrTD+x8Bppy/Q4MWlciZy0n4+mGEr5Buz/8O42Pc50t 0BLP6BNFzUTjVR9KUIyKQ9ZeuUYjK81O8TFt6pFovxFrNAidOSvCR3GGgeoRruTJ8TgU 3Echs9xE54OrZH4GlfY1XarcK0mLcxSreUJCIZaVguKKjZj/9TpwIxlu6X9Zdtc2jG/7 cwfA== X-Gm-Message-State: ANoB5pkHl9BbnWNUzitqril7Hsq2titLpc8On3fabAoJPn4CF4/5t0Jp I4keqok1vkHNHLWCkZ+Phz9ZKBnnIrUGQamK X-Google-Smtp-Source: AA0mqf4BtJW0ppzcZCapZ2VgIJsnc/PrtMIy4HSzYeiUtScDM9X8mdFcqpEiNLuvqT/KmdpwdMPSSQ== X-Received: by 2002:a17:906:1844:b0:77a:4bfe:d6df with SMTP id w4-20020a170906184400b0077a4bfed6dfmr67809856eje.396.1670166453391; Sun, 04 Dec 2022 07:07:33 -0800 (PST) Received: from bill-the-cat.lan (2603-6081-7b00-6400-61c7-2644-b62d-0af3.res6.spectrum.com. [2603:6081:7b00:6400:61c7:2644:b62d:af3]) by smtp.gmail.com with ESMTPSA id g1-20020a17090604c100b0073dc5bb7c32sm5240058eja.64.2022.12.04.07.07.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Dec 2022 07:07:33 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 087/149] global: Migrate CONFIG_MFG_ENV_SETTINGS to CFG Date: Sun, 4 Dec 2022 10:04:52 -0500 Message-Id: <20221204150554.4165941-87-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221204150554.4165941-1-trini@konsulko.com> References: <20221202214251.3027264-41-trini@konsulko.com> <20221204150554.4165941-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 Perform a simple rename of CONFIG_MFG_ENV_SETTINGS to CFG_MFG_ENV_SETTINGS Signed-off-by: Tom Rini --- include/configs/capricorn-common.h | 4 ++-- include/configs/cgtqmx8.h | 4 ++-- include/configs/colibri-imx8x.h | 4 ++-- include/configs/imx8mq_phanbell.h | 4 ++-- include/configs/imx8qm_rom7720.h | 4 ++-- include/configs/mx7dsabresd.h | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h index 9e7322cdb937..9dcacad2fc00 100644 --- a/include/configs/capricorn-common.h +++ b/include/configs/capricorn-common.h @@ -60,7 +60,7 @@ "${loadaddr} ${m4_0_image}\0" \ "m4boot_0=run loadm4image_0; dcache flush; bootaux ${loadaddr} 0\0" \ -#define CONFIG_MFG_ENV_SETTINGS \ +#define CFG_MFG_ENV_SETTINGS \ MFG_ENV_SETTINGS_DEFAULT \ "initrd_addr=0x83100000\0" \ "initrd_high=0xffffffffffffffff\0" \ @@ -68,7 +68,7 @@ /* Initial environment variables */ #define CFG_EXTRA_ENV_SETTINGS \ - CONFIG_MFG_ENV_SETTINGS \ + CFG_MFG_ENV_SETTINGS \ M4_BOOT_ENV \ AHAB_ENV \ ENV_COMMON \ diff --git a/include/configs/cgtqmx8.h b/include/configs/cgtqmx8.h index a63325973846..91454df19720 100644 --- a/include/configs/cgtqmx8.h +++ b/include/configs/cgtqmx8.h @@ -42,7 +42,7 @@ #define FEC0_RESET IMX_GPIO_NR(2, 5) #define FEC0_PDOMAIN "conn_enet0" -#define CONFIG_MFG_ENV_SETTINGS \ +#define CFG_MFG_ENV_SETTINGS \ "mfgtool_args=setenv bootargs console=${console},${baudrate} " \ "rdinit=/linuxrc " \ "g_mass_storage.stall=0 g_mass_storage.removable=1 " \ @@ -56,7 +56,7 @@ /* Initial environment variables */ #define CFG_EXTRA_ENV_SETTINGS \ - CONFIG_MFG_ENV_SETTINGS \ + CFG_MFG_ENV_SETTINGS \ M4_BOOT_ENV \ "script=boot.scr\0" \ "image=Image\0" \ diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h index 13bc4e7e682a..2de116c59da7 100644 --- a/include/configs/colibri-imx8x.h +++ b/include/configs/colibri-imx8x.h @@ -43,7 +43,7 @@ #undef BOOTENV_RUN_NET_USB_START #define BOOTENV_RUN_NET_USB_START "" -#define CONFIG_MFG_ENV_SETTINGS \ +#define CFG_MFG_ENV_SETTINGS \ "mfgtool_args=setenv bootargs ${consoleargs} " \ "rdinit=/linuxrc g_mass_storage.stall=0 " \ "g_mass_storage.removable=1 g_mass_storage.idVendor=0x066F " \ @@ -59,7 +59,7 @@ #define CFG_EXTRA_ENV_SETTINGS \ AHAB_ENV \ BOOTENV \ - CONFIG_MFG_ENV_SETTINGS \ + CFG_MFG_ENV_SETTINGS \ M4_BOOT_ENV \ MEM_LAYOUT_ENV_SETTINGS \ "boot_file=Image\0" \ diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h index 5158f2cc605a..6d0c45311183 100644 --- a/include/configs/imx8mq_phanbell.h +++ b/include/configs/imx8mq_phanbell.h @@ -24,13 +24,13 @@ #define CFG_FEC_MXC_PHYADDR 0 #endif -#define CONFIG_MFG_ENV_SETTINGS \ +#define CFG_MFG_ENV_SETTINGS \ "initrd_addr=0x43800000\0" \ "initrd_high=0xffffffff\0" \ /* Initial environment variables */ #define CFG_EXTRA_ENV_SETTINGS \ - CONFIG_MFG_ENV_SETTINGS \ + CFG_MFG_ENV_SETTINGS \ "script=boot.scr\0" \ "image=Image\0" \ "console=ttymxc0,115200\0" \ diff --git a/include/configs/imx8qm_rom7720.h b/include/configs/imx8qm_rom7720.h index 5692e3d00007..df2cb8d9ced1 100644 --- a/include/configs/imx8qm_rom7720.h +++ b/include/configs/imx8qm_rom7720.h @@ -33,7 +33,7 @@ #define MFG_NAND_PARTITION "" #endif -#define CONFIG_MFG_ENV_SETTINGS \ +#define CFG_MFG_ENV_SETTINGS \ "mfgtool_args=setenv bootargs console=${console},${baudrate} " \ "rdinit=/linuxrc " \ "g_mass_storage.stall=0 g_mass_storage.removable=1 " \ @@ -48,7 +48,7 @@ /* Initial environment variables */ #define CFG_EXTRA_ENV_SETTINGS \ - CONFIG_MFG_ENV_SETTINGS \ + CFG_MFG_ENV_SETTINGS \ M4_BOOT_ENV \ "script=boot.scr\0" \ "image=Image\0" \ diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index e56083f8e61c..9c938f04e93c 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -32,7 +32,7 @@ #define UPDATE_M4_ENV "" #endif -#define CONFIG_MFG_ENV_SETTINGS \ +#define CFG_MFG_ENV_SETTINGS \ "mfgtool_args=setenv bootargs console=${console},${baudrate} " \ "rdinit=/linuxrc " \ "g_mass_storage.stall=0 g_mass_storage.removable=1 " \ @@ -52,7 +52,7 @@ #define CFG_EXTRA_ENV_SETTINGS \ UPDATE_M4_ENV \ - CONFIG_MFG_ENV_SETTINGS \ + CFG_MFG_ENV_SETTINGS \ CFG_DFU_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ -- 2.25.1