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 B8C0AC433FE for ; Sun, 20 Nov 2022 13:46:46 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3633A8533E; Sun, 20 Nov 2022 14:35:46 +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="rB/fU+WY"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C3AE7852C5; Sun, 20 Nov 2022 14:35:11 +0100 (CET) Received: from mail-qk1-x72f.google.com (mail-qk1-x72f.google.com [IPv6:2607:f8b0:4864:20::72f]) (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 3E384852C5 for ; Sun, 20 Nov 2022 14:34:48 +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-x72f.google.com with SMTP id g10so6495682qkl.6 for ; Sun, 20 Nov 2022 05:34:48 -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=u5AtVz2SBU0fx5uNkiqgxI5vTxcegGOG793IpaER8W0=; b=rB/fU+WYD9gLSQVilE8A+0mbeNoj2wjxK7kcu3w7bAo+cp+6Fr0MESrYGdPPbeJB/O 2vgJlsQxiqC8zfza56EdRjxPZPg7jrh9pITWXDs86hLWJNCHbp9LulliBw2Y77gxidS8 1es/5y0zTyEGbbM2K+ll9B2z9b1ovlrse0XTE= 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=u5AtVz2SBU0fx5uNkiqgxI5vTxcegGOG793IpaER8W0=; b=GTua2TvpkiWhAxeW3vs1edpGU4NrNRndmbhTrqqkE7ccMKeWPkXn+4nCnQIiFS6Z+X PN1X1BZWLFP/8Na9M+iJtRS8FupTjSKWLJdD4SrbK+jbuEsl2eddr2wwAIRlt7i+leet 2MptbEGcVvuXW38jUUIOXqMtqxM9YCxunck07hUSyFiUV1QHTahoQUAJdM8rQm0iPepq 08N3FPZdt0h2r64romg2ZskPcwGpZ23WlQW6m3GutBDd2ZcnvKHc4e+i3nL1bkvBsRrS mXC6BhwHt6tevX1zdeTNybTLhvnHTBM8qG6cyhth2tc31Fx4URIttsXVeLTJPyLHtTFM Qhow== X-Gm-Message-State: ANoB5pmfSoQQrVsl2zIPcYhR6VDBmGDXUEUTAedSO6Ot1Smj3kBKYDgl bYotZe6r838zaj3aPu0fYaZkZGGvwIQssA== X-Google-Smtp-Source: AA0mqf77giqNXHy3kkYpNLbMJJE9/fd+cs+j9Yn3ckdhytmu3UBnrlNmY/tpNk8ToR1BZHeylESezQ== X-Received: by 2002:a05:620a:884:b0:6fa:3974:7f74 with SMTP id b4-20020a05620a088400b006fa39747f74mr12937155qka.631.1668951286908; Sun, 20 Nov 2022 05:34:46 -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.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:46 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 075/241] global: Migrate CONFIG_KM_UBI_PARTITION_NAME_APP to CFG Date: Sun, 20 Nov 2022 08:31:06 -0500 Message-Id: <20221120133352.3055600-76-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 | 12 ++++++------ include/configs/kmcoge5ne.h | 2 +- include/configs/pg-wcom-expu1.h | 2 +- include/configs/pg-wcom-seli8.h | 2 +- scripts/config_whitelist.txt | 2 +- 5 files changed, 10 insertions(+), 10 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 8681145c309f..9386daa19ccc 100644 --- a/include/configs/kmcoge5ne.h +++ b/include/configs/kmcoge5ne.h @@ -13,7 +13,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 5b5637762aca..f7a598b5f9cb 100644 --- a/include/configs/pg-wcom-expu1.h +++ b/include/configs/pg-wcom-expu1.h @@ -10,7 +10,7 @@ #define CFG_HOSTNAME "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 a1c1ca993d7e..b7051e3749d0 100644 --- a/include/configs/pg-wcom-seli8.h +++ b/include/configs/pg-wcom-seli8.h @@ -9,7 +9,7 @@ #define CFG_HOSTNAME "SELI8" #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) diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 19a4fc540336..a311539ab15c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -83,7 +83,7 @@ CFG_KM_DEV_ENV_FLASH_BOOT_UBI CFG_KM_ECC_MODE CFG_KM_NEW_ENV CFG_KM_UBI_LINUX_MTD -CONFIG_KM_UBI_PARTITION_NAME_APP +CFG_KM_UBI_PARTITION_NAME_APP CONFIG_KM_UBI_PARTITION_NAME_BOOT CONFIG_KM_UBI_PART_BOOT_OPTS CONFIG_KM_UIMAGE_NAME -- 2.25.1