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 8F45EC4321E for ; Sun, 4 Dec 2022 15:17:25 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B096880431; Sun, 4 Dec 2022 16:08:50 +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="ocd/scU6"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BC7CB8549F; Sun, 4 Dec 2022 16:07:09 +0100 (CET) Received: from mail-ej1-x636.google.com (mail-ej1-x636.google.com [IPv6:2a00:1450:4864:20::636]) (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 8A5BC85457 for ; Sun, 4 Dec 2022 16:07:01 +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-x636.google.com with SMTP id b2so22280369eja.7 for ; Sun, 04 Dec 2022 07:07:01 -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=y+X74FCBRcQMiylH8+P3+NcltOCiC1+XVbAG/1URm0M=; b=ocd/scU6AaQEu46ahXAGbs1lyeLOy00e592eRnj7r5cMacNtAnotBTZ+r4lZpavKjy Di857Ffj7XgvSaXMiQgf17ZcCgflqVcVJpsYF41Wn7IvwMVPxcW5gJDAr7LbPNovFJvM pnIzZM8fpYSxbVWfgNptI8//l6H6sC7cVFhzA= 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=y+X74FCBRcQMiylH8+P3+NcltOCiC1+XVbAG/1URm0M=; b=IEVSLedNxKK877QLb5W+NReAV4Zi45cmqvEBCiiFJJOUhW7tPTbctXkcsS9PnNcXN9 FFAD7CeD4s8Ijea8kVcvxhNxQSxnVohmFc6ISwR0YvtYCWzg0YzfCId8OoJztmMS+LOz 7Jri8Amg7DvDoeaL7x2L6WaWwQoaWDuSoswb1YkzEjG0QhOqzVxxxi71vG5nPRTQ+sAj 9G/j4Sd2gjb83Z6Olw4BuRLlOf1GIwHrlGUqoZPHOdGM7fc3YZ6nIxcZrtGOUk+iF2k5 XVGRKmH0WJiIUQW28NtsUB1LEZxHb/ZaB+6bdIEtk2lbnIZGBHyYIAZplBsZ035XCUkj fL5A== X-Gm-Message-State: ANoB5pldNtIolVrz+tp4bVRkunTEsOw0YIBO1FY+BYT5iKNbajkspy4+ X9c6ca1UchoWIGaxSM15bUAav88/ZN77n58i X-Google-Smtp-Source: AA0mqf77PQ8F6Pw2djm4DPhtkDToy+ebWRqREV4tIlXW5WBsp6KPPw3HgoXZuZf8KI9Gg52LoZAi+g== X-Received: by 2002:a17:906:a41a:b0:7c0:e80e:5af0 with SMTP id l26-20020a170906a41a00b007c0e80e5af0mr2582221ejz.235.1670166421060; Sun, 04 Dec 2022 07:07:01 -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.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Dec 2022 07:07:00 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 057/149] global: Migrate CONFIG_KM_UBI_PARTITION_NAME_BOOT to CFG Date: Sun, 4 Dec 2022 10:04:22 -0500 Message-Id: <20221204150554.4165941-57-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_KM_UBI_PARTITION_NAME_BOOT to CFG_KM_UBI_PARTITION_NAME_BOOT Signed-off-by: Tom Rini --- include/configs/km/keymile-common.h | 18 +++++++++--------- include/configs/kmcoge5ne.h | 2 +- include/configs/pg-wcom-expu1.h | 2 +- include/configs/pg-wcom-seli8.h | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index 2e73d9d6d28f..720711ac8dde 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -20,9 +20,9 @@ "actual_bank=0\0" #endif -#ifndef CONFIG_KM_UBI_PARTITION_NAME_BOOT -#define CONFIG_KM_UBI_PARTITION_NAME_BOOT "ubi0" -#endif /* CONFIG_KM_UBI_PARTITION_NAME_BOOT */ +#ifndef CFG_KM_UBI_PARTITION_NAME_BOOT +#define CFG_KM_UBI_PARTITION_NAME_BOOT "ubi0" +#endif /* CFG_KM_UBI_PARTITION_NAME_BOOT */ #ifndef CONFIG_KM_UBI_PART_BOOT_OPTS #define CONFIG_KM_UBI_PART_BOOT_OPTS "" @@ -30,23 +30,23 @@ #ifndef CFG_KM_UBI_PARTITION_NAME_APP /* one flash chip only called boot */ -/* boot: CONFIG_KM_UBI_PARTITION_NAME_BOOT */ +/* boot: CFG_KM_UBI_PARTITION_NAME_BOOT */ # define CFG_KM_UBI_LINUX_MTD \ - "ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT \ + "ubi.mtd=" CFG_KM_UBI_PARTITION_NAME_BOOT \ CONFIG_KM_UBI_PART_BOOT_OPTS # define CFG_KM_DEV_ENV_FLASH_BOOT_UBI \ - "ubiattach=ubi part " CONFIG_KM_UBI_PARTITION_NAME_BOOT "\0" + "ubiattach=ubi part " CFG_KM_UBI_PARTITION_NAME_BOOT "\0" #else /* CFG_KM_UBI_PARTITION_NAME_APP */ /* two flash chips called boot and app */ -/* boot: CONFIG_KM_UBI_PARTITION_NAME_BOOT */ +/* boot: CFG_KM_UBI_PARTITION_NAME_BOOT */ /* app: CFG_KM_UBI_PARTITION_NAME_APP */ # define CFG_KM_UBI_LINUX_MTD \ - "ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT \ + "ubi.mtd=" CFG_KM_UBI_PARTITION_NAME_BOOT \ CONFIG_KM_UBI_PART_BOOT_OPTS " " \ "ubi.mtd=" CFG_KM_UBI_PARTITION_NAME_APP # 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 " CFG_KM_UBI_PARTITION_NAME_BOOT "; else; " \ "ubi part " CFG_KM_UBI_PARTITION_NAME_APP "; fi\0" #endif /* CFG_KM_UBI_PARTITION_NAME_APP */ diff --git a/include/configs/kmcoge5ne.h b/include/configs/kmcoge5ne.h index ebb3e6a04468..b6386bdbcb7e 100644 --- a/include/configs/kmcoge5ne.h +++ b/include/configs/kmcoge5ne.h @@ -11,7 +11,7 @@ #define NAND_MAX_CHIPS 1 #define CFG_SYS_NAND_BASE CFG_SYS_KMBEC_FPGA_BASE /* PRIO_BASE_ADDRESS */ -#define CONFIG_KM_UBI_PARTITION_NAME_BOOT "ubi0" +#define CFG_KM_UBI_PARTITION_NAME_BOOT "ubi0" #define CFG_KM_UBI_PARTITION_NAME_APP "ubi1" /* include common defines/options for all Keymile boards */ diff --git a/include/configs/pg-wcom-expu1.h b/include/configs/pg-wcom-expu1.h index 36b5949c430d..88efa3e53b84 100644 --- a/include/configs/pg-wcom-expu1.h +++ b/include/configs/pg-wcom-expu1.h @@ -8,7 +8,7 @@ #define WCOM_EXPU1 -#define CONFIG_KM_UBI_PARTITION_NAME_BOOT "ubi0" +#define CFG_KM_UBI_PARTITION_NAME_BOOT "ubi0" #define CFG_KM_UBI_PARTITION_NAME_APP "ubi1" /* CLIPS FPGA Definitions */ diff --git a/include/configs/pg-wcom-seli8.h b/include/configs/pg-wcom-seli8.h index f50db92aa74c..f9c55ca32f6a 100644 --- a/include/configs/pg-wcom-seli8.h +++ b/include/configs/pg-wcom-seli8.h @@ -6,7 +6,7 @@ #ifndef __CONFIG_PG_WCOM_SELI8_H #define __CONFIG_PG_WCOM_SELI8_H -#define CONFIG_KM_UBI_PARTITION_NAME_BOOT "ubi0" +#define CFG_KM_UBI_PARTITION_NAME_BOOT "ubi0" #define CFG_KM_UBI_PARTITION_NAME_APP "ubi1" /* PAXK FPGA Definitions */ -- 2.25.1