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 8C6A7C433FE for ; Sun, 20 Nov 2022 13:38:23 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BE16B852B0; Sun, 20 Nov 2022 14:34:47 +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="dNcMlSdm"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2145F851EF; Sun, 20 Nov 2022 14:34:16 +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 7054E85213 for ; Sun, 20 Nov 2022 14:34:13 +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 x18so6505013qki.4 for ; Sun, 20 Nov 2022 05:34:13 -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=sKBez5Kp/87gRMc5brA0YOP9rK4hDZMw7OFdPpIC1NE=; b=dNcMlSdmOn538vlxcmAQ/Nt1/SHL+e/Uwl7yppXRyvWF9lyHBYrfxVUWTepB66nr5I dGAjKjt+7m8fTXUvsN5bBeXAJLEAXVBSo3ZGouHLoJDz4VE7LJijs7tlo3x53dQofpGI LA0EAjuTGeI69jScu+h3JyT0KDue1V135Txpg= 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=sKBez5Kp/87gRMc5brA0YOP9rK4hDZMw7OFdPpIC1NE=; b=0gLA8Z3I+KTkK1R626SALP4aBD4aAvZP8Mb6Wn+/b/RQyKNAzbx3Ep1YQWcJ+qeHPb dTiAaWoIZnSxnnS1OI1aZCp83nn+lHAG0fKcxI/h+QkBz2E5bilOPOL9N8sGVirMpCUy nScnSS+TiC9OOdmpgjU580IDp8fw8DD2vn0Y1H36YQ10xFKfdkeJC3OjQKo3lfN/2WiA QBdd04bVDo/RXrkeRCnnWik/IWxRj5vxLp//cbsM/6G0Pv3JmZIdvpf3g5lOM5MNpoo9 c84mbn+SYNgCuOdeUKjmYRtpNWJICv5O8ots3uMtgcyo4pNrr4DyQHoSym9wn3BnHDX4 vVag== X-Gm-Message-State: ANoB5pmAU4hIMdV4Zaj7SOVO15DGCyx2zGPozlu9gNNp8Xk+ictmbbO/ hu7K/5ozr5UV44qzAQzOxwS7x1QTzdT8Zg== X-Google-Smtp-Source: AA0mqf58qhCEbBkMU7e0hVDLyuLIM9pzILq3Lartud8ej7+LKBW9SHBe1rMfH6C4j7bXjzQPtIj3Ww== X-Received: by 2002:a05:620a:15d5:b0:6ee:988f:84b7 with SMTP id o21-20020a05620a15d500b006ee988f84b7mr12831811qkm.315.1668951252881; Sun, 20 Nov 2022 05:34:12 -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.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:12 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 024/241] global: Migrate CONFIG_FDTFILE to CFG Date: Sun, 20 Nov 2022 08:30:15 -0500 Message-Id: <20221120133352.3055600-25-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/MPC837XERDB.h | 4 ++-- include/configs/embestmx6boards.h | 6 +++--- scripts/config_whitelist.txt | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 2a71e0ad4dce..2eea26d7bee7 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -229,7 +229,7 @@ #define CONFIG_ROOTPATH "/nfsroot" /* U-Boot image on TFTP server */ #define CONFIG_UBOOTPATH "u-boot.bin" -#define CONFIG_FDTFILE "mpc8379_rdb.dtb" +#define CFG_FDTFILE "mpc8379_rdb.dtb" #define CFG_EXTRA_ENV_SETTINGS \ "netdev=" CONFIG_NETDEV "\0" \ @@ -246,7 +246,7 @@ "cmp.b $loadaddr " __stringify(CONFIG_TEXT_BASE) \ " $filesize\0" \ "fdtaddr=780000\0" \ - "fdtfile=" CONFIG_FDTFILE "\0" \ + "fdtfile=" CFG_FDTFILE "\0" \ "ramdiskaddr=1000000\0" \ "ramdiskfile=rootfs.ext2.gz.uboot\0" \ "console=ttyS0\0" \ diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h index 4a929937b416..8f03c2ff3c0d 100644 --- a/include/configs/embestmx6boards.h +++ b/include/configs/embestmx6boards.h @@ -35,11 +35,11 @@ #if defined(CONFIG_ENV_IS_IN_MMC) /* RiOTboard */ -#define CONFIG_FDTFILE "imx6dl-riotboard.dtb" +#define CFG_FDTFILE "imx6dl-riotboard.dtb" #define CFG_SYS_FSL_USDHC_NUM 3 #elif defined(CONFIG_ENV_IS_IN_SPI_FLASH) /* MarSBoard */ -#define CONFIG_FDTFILE "imx6q-marsboard.dtb" +#define CFG_FDTFILE "imx6q-marsboard.dtb" #define CFG_SYS_FSL_USDHC_NUM 2 #endif @@ -79,7 +79,7 @@ #define CFG_EXTRA_ENV_SETTINGS \ CONSOLE_ENV_SETTINGS \ MEM_LAYOUT_ENV_SETTINGS \ - "fdtfile=" CONFIG_FDTFILE "\0" \ + "fdtfile=" CFG_FDTFILE "\0" \ "finduuid=part uuid mmc 0:1 uuid\0" \ BOOTENV diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index e436bf55d94d..6a20473cd6ea 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -24,7 +24,7 @@ CFG_ETHBASE CFG_EXTRA_ENV_SETTINGS CFG_FB_ADDR CFG_FDTADDR -CONFIG_FDTFILE +CFG_FDTFILE CONFIG_FEC_ENET_DEV CONFIG_FEC_FIXED_SPEED CONFIG_FEC_MXC_PHYADDR -- 2.25.1