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 B168AC4321E for ; Sun, 4 Dec 2022 15:16:39 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B3BB485529; Sun, 4 Dec 2022 16:08:40 +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="Ozja4ent"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4B9EB8549A; Sun, 4 Dec 2022 16:07:03 +0100 (CET) Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) (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 BBE7C85492 for ; Sun, 4 Dec 2022 16:06:56 +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-ed1-x52c.google.com with SMTP id m19so12553949edj.8 for ; Sun, 04 Dec 2022 07:06:56 -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=abYj18G3JzgMVQgsBNnRp0YQSKMQqXsGFX8r7LLkPQw=; b=Ozja4entREXnlUvdZA74AVceNpGhZTiTGAnts5rVvBZhwAEKcDAUghErHBnDkLYLyI B6eG8XpVggqiat6VCoXo0RGcW/rweWs67UBrCvzGebt1UYmp8fiq07L79Gkd/Pb8Zo2U zq4nK2LdRuibB8V1iKsUaymbUfxmSd9GJdjpw= 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=abYj18G3JzgMVQgsBNnRp0YQSKMQqXsGFX8r7LLkPQw=; b=hvtMOlBTartJmF/+1tpvO3bytfgtTZ+EmS5mBuyBGPRJzFxLCj7HaG+ADt0VOhTAbD 9fTo1atA/xBrX2TraJNQePBD7MkB9dYoZOcEWsHGYASNS9xwnSk0uJYV1RFSzO0QOLv7 fdyXkaTgHw6JXsz8mQsSuTPw15zjCRLTDSeRShIVuowXTzDTmdbNeyz2GfdrTHhWv3Bi MQXD74vpXvF2ix06IGsbitJyi4QU8iyGFRjzJoEsTxR/AwZxCw7lqrC8Ao2s3STodLKu zE19rmfB16iQ7kncZMBf9p46ukimNb+yaXwM/rpi8hNIwXJTbZInU41kwOAu5QKg32Ph zn/g== X-Gm-Message-State: ANoB5plFHyYpFoENGkNsGY5YS43+gA+kJsd7StIL60USwSJHQwuCtGFd j9Swth8vW2CcJYCa03XqUFscFEibxsZAvF0Z X-Google-Smtp-Source: AA0mqf6CUzKPM0crHna7ALtLmGH0pT68iuKPkSdPYjCw9WeJVUqOvwKN47DbnEk3waegLRLf6Cd3bw== X-Received: by 2002:a05:6402:71a:b0:46b:1231:5f77 with SMTP id w26-20020a056402071a00b0046b12315f77mr3334969edx.244.1670166415918; Sun, 04 Dec 2022 07:06:55 -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.06.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Dec 2022 07:06:55 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 052/149] global: Migrate CONFIG_KM_DEF_ENV et al to CFG Date: Sun, 4 Dec 2022 10:04:17 -0500 Message-Id: <20221204150554.4165941-52-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 simple renames of: CONFIG_KM_DEF_ENV to CFG_KM_DEF_ENV CONFIG_KM_DEF_ENV_BOOTARGS to CFG_KM_DEF_ENV_BOOTARGS CONFIG_KM_DEF_ENV_BOOTPARAMS to CFG_KM_DEF_ENV_BOOTPARAMS CONFIG_KM_DEF_ENV_BOOTTARGETS to CFG_KM_DEF_ENV_BOOTTARGETS CONFIG_KM_DEF_ENV_CONSTANTS to CFG_KM_DEF_ENV_CONSTANTS CONFIG_KM_DEF_ENV_CPU to CFG_KM_DEF_ENV_CPU CONFIG_KM_DEF_ENV_FLASH_BOOT to CFG_KM_DEF_ENV_FLASH_BOOT CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI to CFG_KM_DEV_ENV_FLASH_BOOT_UBI Signed-off-by: Tom Rini --- include/configs/km/keymile-common.h | 36 +++++++++++++------------- 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 +-- 6 files changed, 32 insertions(+), 32 deletions(-) diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index 94408e6efd9a..5e3baca75b23 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 @@ -34,7 +34,7 @@ # define CONFIG_KM_UBI_LINUX_MTD \ "ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT \ CONFIG_KM_UBI_PART_BOOT_OPTS -# define CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI \ +# define CFG_KM_DEV_ENV_FLASH_BOOT_UBI \ "ubiattach=ubi part " CONFIG_KM_UBI_PARTITION_NAME_BOOT "\0" #else /* CONFIG_KM_UBI_PARTITION_NAME_APP */ /* two flash chips called boot and app */ @@ -44,7 +44,7 @@ "ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT \ CONFIG_KM_UBI_PART_BOOT_OPTS " " \ "ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_APP -# define CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI \ +# define CFG_KM_DEV_ENV_FLASH_BOOT_UBI \ "ubiattach=if test ${boot_bank} -eq 0; then; " \ "ubi part " CONFIG_KM_UBI_PARTITION_NAME_BOOT "; else; " \ "ubi part " CONFIG_KM_UBI_PARTITION_NAME_APP "; fi\0" @@ -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,12 +120,12 @@ * 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" \ "uimage=" CONFIG_KM_UIMAGE_NAME \ - CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI + CFG_KM_DEV_ENV_FLASH_BOOT_UBI /* * constants @@ -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 8f2a5a200562..a5c9cf4f7666 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 41ce6b5ee852..260a05f59e7f 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="CONFIG_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 00e4a1f2cb84..cc395682963a 100644 --- a/include/configs/km/pg-wcom-ls102xa.h +++ b/include/configs/km/pg-wcom-ls102xa.h @@ -172,15 +172,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} " \ @@ -221,7 +221,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 b384fc6a6f46..61b005a3c70c 100644 --- a/include/configs/kmcent2.h +++ b/include/configs/kmcent2.h @@ -388,13 +388,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} " \ @@ -440,7 +440,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" \ -- 2.25.1