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 5D1E4C433FE for ; Sun, 20 Nov 2022 13:46:05 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C8DCF85362; Sun, 20 Nov 2022 14:35:42 +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="cuaBzrHg"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 87798852F8; Sun, 20 Nov 2022 14:34:59 +0100 (CET) Received: from mail-qk1-x72d.google.com (mail-qk1-x72d.google.com [IPv6:2607:f8b0:4864:20::72d]) (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 33D7F8529D for ; Sun, 20 Nov 2022 14:34:44 +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-x72d.google.com with SMTP id k2so6488605qkk.7 for ; Sun, 20 Nov 2022 05:34:44 -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=fgw6lI2SF65OtsYasWzC/DOe++Q8CsKATQGgYSmjEPA=; b=cuaBzrHg0JhNY2ukOOjZbOaG43KdgYNnqTXwd2fqm8U893aXPG4dh12Bw1CT6lq0I2 XJPUNA3gemvBH8HiJWsH8AmNu/D12KeBYkhsPP0Hcfxl3Laf5g4OPQRp4/kcPDmGJ38S S+emhjlfOFdeO2qUhiVHIxJyzOV0NX0SXeNfI= 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=fgw6lI2SF65OtsYasWzC/DOe++Q8CsKATQGgYSmjEPA=; b=iqFum8XubyfGKwUlS0GrbR6o6HvJEUaHLjcbGdy7YqUzh/zVTZIavnH73hOU701VNN RRRfq4USyl8ZlFR4DVcFJCCldYhIJn+TWN0cF+Muky3mlUaiq9ObSTIxDtDPSLdZCxHI NJNpzl+RypVGHsVANd6t36nV4TAiiOJ0GWeHnIo4D3+PdYgbXb0hKt7NQIDWJJGr/WaS aLjA28eheCLw0wp+8XedEpuhGu+ttbnkzIN2xa8TfbshEIqa4EU08SwGzEtvjTHZUzjV zZQ8jhnvtkMt6wbo6ppVVa6MCbb1fvTxLHJNUsrP0wKoC17m5kt7H0rI03oKIGlTZOL6 z/fw== X-Gm-Message-State: ANoB5plbPB9ZHUidPHZyfPLDzvIzSnOoNro56BazS0ukKwMZtfML3pX1 kVYy6xVRdv9gk7nG3CTNUwHIaPPBuZz6bQ== X-Google-Smtp-Source: AA0mqf56JvWaNGa7r0qdgcWXud/kYFC0EuIDUeyWQu4igHQcEA8kIW5p2pGtrbuo6olzzy2HhNAnHQ== X-Received: by 2002:a05:620a:3706:b0:6e2:5472:345e with SMTP id de6-20020a05620a370600b006e25472345emr13004526qkb.391.1668951283540; Sun, 20 Nov 2022 05:34:43 -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.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:43 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 070/241] global: Migrate CONFIG_KM_DEF_ENV to CFG Date: Sun, 20 Nov 2022 08:31:01 -0500 Message-Id: <20221120133352.3055600-71-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/keymile-common.h | 30 +++++++++++++------------- include/configs/km/km-mpc83xx.h | 6 +++--- include/configs/km/km-powerpc.h | 2 +- include/configs/km/pg-wcom-ls102xa.h | 8 +++---- include/configs/kmcent2.h | 8 +++---- include/configs/socfpga_arria5_secu1.h | 4 ++-- scripts/config_whitelist.txt | 14 ++++++------ 7 files changed, 36 insertions(+), 36 deletions(-) diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index 94408e6efd9a..3d77b1770651 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -15,8 +15,8 @@ #define CFG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } -#ifndef CONFIG_KM_DEF_ENV_BOOTPARAMS -#define CONFIG_KM_DEF_ENV_BOOTPARAMS \ +#ifndef CFG_KM_DEF_ENV_BOOTPARAMS +#define CFG_KM_DEF_ENV_BOOTPARAMS \ "actual_bank=0\0" #endif @@ -65,7 +65,7 @@ * available targets: * - 'release': for a standalone system kernel/rootfs from flash */ -#define CONFIG_KM_DEF_ENV_BOOTTARGETS \ +#define CFG_KM_DEF_ENV_BOOTTARGETS \ "subbootcmds=ubiattach ubicopy checkfdt cramfsloadfdt " \ "set_fdthigh cramfsloadkernel flashargs add_default " \ "addpanic boot\0" \ @@ -88,7 +88,7 @@ * - 'flashargs': defaults arguments for flash base boot * */ -#define CONFIG_KM_DEF_ENV_BOOTARGS \ +#define CFG_KM_DEF_ENV_BOOTARGS \ "add_default=" \ "setenv bootargs ${bootargs} " \ "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}" \ @@ -120,7 +120,7 @@ * processor specific settings * - 'cramfsloadfdt': copy fdt from a cramfs to ram */ -#define CONFIG_KM_DEF_ENV_FLASH_BOOT \ +#define CFG_KM_DEF_ENV_FLASH_BOOT \ "cramfsaddr=" __stringify(CONFIG_KM_CRAMFS_ADDR) "\0" \ "cramfsloadkernel=cramfsload ${load_addr_r} ${uimage}\0" \ "ubicopy=ubi read ${cramfsaddr} bootfs${boot_bank}\0" \ @@ -133,7 +133,7 @@ * * - 'default': setup default environment */ -#define CONFIG_KM_DEF_ENV_CONSTANTS \ +#define CFG_KM_DEF_ENV_CONSTANTS \ "backup_bank=0\0" \ "release=run newenv; reset\0" \ "pnvramsize=" __stringify(CONFIG_KM_PNVRAM) "\0" \ @@ -142,15 +142,15 @@ "env_version=1\0" \ "" -#ifndef CONFIG_KM_DEF_ENV -#define CONFIG_KM_DEF_ENV \ - CONFIG_KM_DEF_ENV_BOOTPARAMS \ +#ifndef CFG_KM_DEF_ENV +#define CFG_KM_DEF_ENV \ + CFG_KM_DEF_ENV_BOOTPARAMS \ "netdev=" __stringify(CONFIG_KM_DEF_NETDEV) "\0" \ - CONFIG_KM_DEF_ENV_CPU \ - CONFIG_KM_DEF_ENV_BOOTTARGETS \ - CONFIG_KM_DEF_ENV_BOOTARGS \ - CONFIG_KM_DEF_ENV_FLASH_BOOT \ - CONFIG_KM_DEF_ENV_CONSTANTS \ + CFG_KM_DEF_ENV_CPU \ + CFG_KM_DEF_ENV_BOOTTARGETS \ + CFG_KM_DEF_ENV_BOOTARGS \ + CFG_KM_DEF_ENV_FLASH_BOOT \ + CFG_KM_DEF_ENV_CONSTANTS \ "altbootcmd=run bootcmd\0" \ "boot=bootm ${load_addr_r} - ${fdt_addr_r}\0" \ "bootcmd=km_checkbidhwk && " \ @@ -169,6 +169,6 @@ "load_addr_r=" __stringify(CONFIG_KM_KERNEL_ADDR) "\0" \ "load=tftpboot ${load_addr_r} ${u-boot}\0" \ "" -#endif /* CONFIG_KM_DEF_ENV */ +#endif /* CFG_KM_DEF_ENV */ #endif /* __CONFIG_KEYMILE_H */ diff --git a/include/configs/km/km-mpc83xx.h b/include/configs/km/km-mpc83xx.h index 33655d144df1..3192ca7742a7 100644 --- a/include/configs/km/km-mpc83xx.h +++ b/include/configs/km/km-mpc83xx.h @@ -74,8 +74,8 @@ /* * Environment Configuration */ -#ifndef CONFIG_KM_DEF_ENV /* if not set by keymile-common.h */ -#define CONFIG_KM_DEF_ENV "km-common=empty\0" +#ifndef CFG_KM_DEF_ENV /* if not set by keymile-common.h */ +#define CFG_KM_DEF_ENV "km-common=empty\0" #endif #ifndef CFG_KM_DEF_ARCH @@ -83,7 +83,7 @@ #endif #define CFG_EXTRA_ENV_SETTINGS \ - CONFIG_KM_DEF_ENV \ + CFG_KM_DEF_ENV \ CFG_KM_DEF_ARCH \ "newenv=" \ "prot off " __stringify(CONFIG_ENV_ADDR) " +0x40000 && " \ diff --git a/include/configs/km/km-powerpc.h b/include/configs/km/km-powerpc.h index da0ee3f27e7e..73a224f790e1 100644 --- a/include/configs/km/km-powerpc.h +++ b/include/configs/km/km-powerpc.h @@ -30,7 +30,7 @@ /* architecture specific default bootargs */ #define CFG_KM_DEF_BOOT_ARGS_CPU "" -#define CONFIG_KM_DEF_ENV_CPU \ +#define CFG_KM_DEF_ENV_CPU \ "u-boot="CFG_HOSTNAME "/u-boot.bin\0" \ "update=" \ "protect off " __stringify(BOOTFLASH_START) " +${filesize} && "\ diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h index 516fa76e3209..974486fc4c32 100644 --- a/include/configs/km/pg-wcom-ls102xa.h +++ b/include/configs/km/pg-wcom-ls102xa.h @@ -175,15 +175,15 @@ #define CFG_ENV_TOTAL_SIZE 0x40000 #define ENV_DEL_ADDR CONFIG_ENV_ADDR_REDUND /* direct for newenv */ -#ifndef CONFIG_KM_DEF_ENV /* if not set by keymile-common.h */ -#define CONFIG_KM_DEF_ENV +#ifndef CFG_KM_DEF_ENV /* if not set by keymile-common.h */ +#define CFG_KM_DEF_ENV #endif #ifndef CFG_KM_DEF_BOOT_ARGS_CPU #define CFG_KM_DEF_BOOT_ARGS_CPU "" #endif -#define CONFIG_KM_DEF_ENV_CPU \ +#define CFG_KM_DEF_ENV_CPU \ "boot=bootm ${load_addr_r} - ${fdt_addr_r}\0" \ "cramfsloadfdt=" \ "cramfsload ${fdt_addr_r} " \ @@ -224,7 +224,7 @@ #define CFG_EXTRA_ENV_SETTINGS \ CONFIG_KM_NEW_ENV \ - CONFIG_KM_DEF_ENV \ + CFG_KM_DEF_ENV \ CFG_HW_ENV_SETTINGS \ "EEprom_ivm=pca9547:70:9\0" \ "ethrotate=no\0" \ diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h index 3c49e174d9a0..35ec79f7b7db 100644 --- a/include/configs/kmcent2.h +++ b/include/configs/kmcent2.h @@ -390,13 +390,13 @@ int get_scl(void); /* * Environment Configuration */ -#ifndef CONFIG_KM_DEF_ENV /* if not set by keymile-common.h */ -#define CONFIG_KM_DEF_ENV +#ifndef CFG_KM_DEF_ENV /* if not set by keymile-common.h */ +#define CFG_KM_DEF_ENV #endif #define __USB_PHY_TYPE utmi -#define CONFIG_KM_DEF_ENV_CPU \ +#define CFG_KM_DEF_ENV_CPU \ "boot=bootm ${load_addr_r} - ${fdt_addr_r}\0" \ "cramfsloadfdt=" \ "cramfsload ${fdt_addr_r} " \ @@ -442,7 +442,7 @@ int get_scl(void); #endif #define CFG_EXTRA_ENV_SETTINGS \ - CONFIG_KM_DEF_ENV \ + CFG_KM_DEF_ENV \ CFG_KM_DEF_ARCH \ CONFIG_KM_NEW_ENV \ CFG_HW_ENV_SETTINGS \ diff --git a/include/configs/socfpga_arria5_secu1.h b/include/configs/socfpga_arria5_secu1.h index f12163ccc990..71aa5a7ca949 100644 --- a/include/configs/socfpga_arria5_secu1.h +++ b/include/configs/socfpga_arria5_secu1.h @@ -46,7 +46,7 @@ "newenv=" \ "nand erase 0x100000 0x40000\0" -#define CONFIG_KM_DEF_ENV_BOOTTARGETS \ +#define CFG_KM_DEF_ENV_BOOTTARGETS \ "release=" \ "run newenv; reset\0" \ "develop=" \ @@ -54,7 +54,7 @@ #define CFG_EXTRA_ENV_SETTINGS \ FPGA_RMTU_ENV \ - CONFIG_KM_DEF_ENV_BOOTTARGETS \ + CFG_KM_DEF_ENV_BOOTTARGETS \ CONFIG_KM_NEW_ENV \ "socfpga_legacy_reset_compat=1\0" \ "altbootcmd=run bootcmd;\0" \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index d203ede8c963..d5909de8762e 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -72,13 +72,13 @@ CFG_IRAM_SIZE CFG_IRAM_TOP CFG_KM_DEF_ARCH CFG_KM_DEF_BOOT_ARGS_CPU -CONFIG_KM_DEF_ENV -CONFIG_KM_DEF_ENV_BOOTARGS -CONFIG_KM_DEF_ENV_BOOTPARAMS -CONFIG_KM_DEF_ENV_BOOTTARGETS -CONFIG_KM_DEF_ENV_CONSTANTS -CONFIG_KM_DEF_ENV_CPU -CONFIG_KM_DEF_ENV_FLASH_BOOT +CFG_KM_DEF_ENV +CFG_KM_DEF_ENV_BOOTARGS +CFG_KM_DEF_ENV_BOOTPARAMS +CFG_KM_DEF_ENV_BOOTTARGETS +CFG_KM_DEF_ENV_CONSTANTS +CFG_KM_DEF_ENV_CPU +CFG_KM_DEF_ENV_FLASH_BOOT CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI CONFIG_KM_ECC_MODE CONFIG_KM_NEW_ENV -- 2.25.1