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 31983C4321E for ; Sun, 4 Dec 2022 15:17:02 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EF01485537; Sun, 4 Dec 2022 16:08:45 +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="UGk7b3ga"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E4A10854A9; Sun, 4 Dec 2022 16:07:05 +0100 (CET) Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [IPv6:2a00:1450:4864:20::533]) (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 8EE7A8545A for ; Sun, 4 Dec 2022 16:07:00 +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-x533.google.com with SMTP id a16so12550055edb.9 for ; Sun, 04 Dec 2022 07:07:00 -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=mQFqxHaX6RH2NHTZcXEI8QLK5OmJ1BzB3IkGaAw2aKQ=; b=UGk7b3gaA0bWQ11gA/9M1BuddMMPJMfB7wMXZhxe5ywuDTsW68kK8Y0709X9pf3h9W oXeVCIlIlcOQwQ0vnoZnlWpBZqLz9A9+ygmYMtp8Ywcz4rocFzvwfi54FzbDVW/WsX57 Ri3sUXV9voZ3evZjk0+nNtClMICCof2z1u194= 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=mQFqxHaX6RH2NHTZcXEI8QLK5OmJ1BzB3IkGaAw2aKQ=; b=0m/Zc6XKS0T41yM07Wm5Z/+vvxGl16deuSulCYMDHRp8tIpHBt2/75dUSU52kNobpN pAziFA4hYuY48aC8nEaOgVn0SkM6PuW9s5LbvDPERudl/WLfxbWVeSVeQp/syjTXWQ8F K1DZF6Gg3UJPUNqctau3od34k6GZy2bkZT6IYeROI53fnEXGS0Ix+HZcEN5B0CMTR9hf K3hGAgn0n97DL5LfG51kOAq1EC71gVHG2+HODbqD3UKSGDnJDgA7mLe22KZMvqk/BZPF 2qWbo+XB/VigFg22lVc4jMJB2Edewp5ScxweesdO3jqse/NmsEXyku4EUdTKEVuH3Dvj yQxQ== X-Gm-Message-State: ANoB5pnZLYxpuDGjLVdF/T3lUOSG/eiJXiXExw8K+Ho0Ak6G9JMnAK9a mFxikZ8S2LSpiTTH4dPLBnYu3fWPhHBef9m5 X-Google-Smtp-Source: AA0mqf5aTZBzk/tkXi8BqJTcDHskbHe9ZnDcO0KEcjFVAawZvU+ZvJSeVBxgNKX8qp1emXLInLgbrQ== X-Received: by 2002:aa7:cd02:0:b0:46c:9536:8598 with SMTP id b2-20020aa7cd02000000b0046c95368598mr2593583edw.123.1670166419975; Sun, 04 Dec 2022 07:06:59 -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.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Dec 2022 07:06:59 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 056/149] global: Migrate CONFIG_KM_UBI_PARTITION_NAME_APP to CFG Date: Sun, 4 Dec 2022 10:04:21 -0500 Message-Id: <20221204150554.4165941-56-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_APP to CFG_KM_UBI_PARTITION_NAME_APP Signed-off-by: Tom Rini --- include/configs/km/keymile-common.h | 12 ++++++------ include/configs/kmcoge5ne.h | 2 +- include/configs/pg-wcom-expu1.h | 2 +- include/configs/pg-wcom-seli8.h | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index 7e347e5b8f4f..2e73d9d6d28f 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -28,7 +28,7 @@ #define CONFIG_KM_UBI_PART_BOOT_OPTS "" #endif /* CONFIG_KM_UBI_PART_BOOT_OPTS */ -#ifndef CONFIG_KM_UBI_PARTITION_NAME_APP +#ifndef CFG_KM_UBI_PARTITION_NAME_APP /* one flash chip only called boot */ /* boot: CONFIG_KM_UBI_PARTITION_NAME_BOOT */ # define CFG_KM_UBI_LINUX_MTD \ @@ -36,19 +36,19 @@ CONFIG_KM_UBI_PART_BOOT_OPTS # 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 */ +#else /* CFG_KM_UBI_PARTITION_NAME_APP */ /* two flash chips called boot and app */ /* boot: CONFIG_KM_UBI_PARTITION_NAME_BOOT */ -/* app: CONFIG_KM_UBI_PARTITION_NAME_APP */ +/* app: CFG_KM_UBI_PARTITION_NAME_APP */ # define CFG_KM_UBI_LINUX_MTD \ "ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT \ CONFIG_KM_UBI_PART_BOOT_OPTS " " \ - "ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_APP + "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 " CONFIG_KM_UBI_PARTITION_NAME_APP "; fi\0" -#endif /* CONFIG_KM_UBI_PARTITION_NAME_APP */ + "ubi part " CFG_KM_UBI_PARTITION_NAME_APP "; fi\0" +#endif /* CFG_KM_UBI_PARTITION_NAME_APP */ #ifdef CONFIG_NAND_ECC_BCH #define CONFIG_KM_UIMAGE_NAME "ecc_bch_uImage\0" diff --git a/include/configs/kmcoge5ne.h b/include/configs/kmcoge5ne.h index e4f28935370e..ebb3e6a04468 100644 --- a/include/configs/kmcoge5ne.h +++ b/include/configs/kmcoge5ne.h @@ -12,7 +12,7 @@ #define CFG_SYS_NAND_BASE CFG_SYS_KMBEC_FPGA_BASE /* PRIO_BASE_ADDRESS */ #define CONFIG_KM_UBI_PARTITION_NAME_BOOT "ubi0" -#define CONFIG_KM_UBI_PARTITION_NAME_APP "ubi1" +#define CFG_KM_UBI_PARTITION_NAME_APP "ubi1" /* include common defines/options for all Keymile boards */ #include "km/keymile-common.h" diff --git a/include/configs/pg-wcom-expu1.h b/include/configs/pg-wcom-expu1.h index 66c371336b27..36b5949c430d 100644 --- a/include/configs/pg-wcom-expu1.h +++ b/include/configs/pg-wcom-expu1.h @@ -9,7 +9,7 @@ #define WCOM_EXPU1 #define CONFIG_KM_UBI_PARTITION_NAME_BOOT "ubi0" -#define CONFIG_KM_UBI_PARTITION_NAME_APP "ubi1" +#define CFG_KM_UBI_PARTITION_NAME_APP "ubi1" /* CLIPS FPGA Definitions */ #define CFG_SYS_CSPR3_EXT (0x00) diff --git a/include/configs/pg-wcom-seli8.h b/include/configs/pg-wcom-seli8.h index 69829a5c9bd1..f50db92aa74c 100644 --- a/include/configs/pg-wcom-seli8.h +++ b/include/configs/pg-wcom-seli8.h @@ -7,7 +7,7 @@ #define __CONFIG_PG_WCOM_SELI8_H #define CONFIG_KM_UBI_PARTITION_NAME_BOOT "ubi0" -#define CONFIG_KM_UBI_PARTITION_NAME_APP "ubi1" +#define CFG_KM_UBI_PARTITION_NAME_APP "ubi1" /* PAXK FPGA Definitions */ #define CFG_SYS_CSPR3_EXT (0x00) -- 2.25.1