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 51385C4332F for ; Sun, 20 Nov 2022 13:46:26 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6A31185366; Sun, 20 Nov 2022 14:35: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=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="OdqrkECH"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1E8FA85307; Sun, 20 Nov 2022 14:35:07 +0100 (CET) Received: from mail-qt1-x829.google.com (mail-qt1-x829.google.com [IPv6:2607:f8b0:4864:20::829]) (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 6CE9C852CA for ; Sun, 20 Nov 2022 14:34:49 +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-qt1-x829.google.com with SMTP id l2so5885439qtq.11 for ; Sun, 20 Nov 2022 05:34:49 -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=epw42V2sFMmIWFZ7BBmyXejCWlv/MEr/SKV6WJtvBB4=; b=OdqrkECHCm95BIiWdvtTZGG+Z8DmGnhO8KjQ66ARzX+NSpVb75SaL9YKn7F1DURtbG kVkhGpcOUVZLnln7rWJsXowhjW4DzrZOP3VX8lA7gXKYDinC3EOslXdiemeLNtayMTHU ISBNYSrQd4RiyRW3T/zIpU74kNk5SSCAjIACw= 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=epw42V2sFMmIWFZ7BBmyXejCWlv/MEr/SKV6WJtvBB4=; b=VmhHBsfMCSVKgZZ86jkxYxzL/aL9tsgepyO6+ptHe5SA/N0CRE7PHcSnL1OcUWTV9b 9RDUpF3AoQS4RtBoz3reY68AeUZdKfLUvv/xz5qDVfIQJdHKIBW/t24YAv6SEYHzIM2F fC+rQrfggs1O708p7SDeH9A4JkNhuEQ5gq1d2v621n3r0L30k3/zUxPLA65Yc45EaiaF bBq+iuJBfgZAo33rEREr3gQ2X6HulWgvJKwmQTOAd+QthXbZD6BWwbDB6ZTT1z2NvOYU Cp8QvQnpP5Kn83a/bJNwIXbtdax6yZ+UlVsBzzDGNpv6I/mhmOHYdHeBhnY/5WIaTnm6 mKlg== X-Gm-Message-State: ANoB5pkCtX7DXv/maVLqe0Ty9uV7wgPTOS9jaXpzxbaIeaWiSbk73QKn KBoO/Hp4Hgb0FvdSslBvfLD1XM3/hFahzQ== X-Google-Smtp-Source: AA0mqf5KEWDEWgrUyp18fJtTU1LLuDIXo4BuUO2WSYNimpznNG+ATZdIX8Dt5RYy/icCsIQDqq4l0A== X-Received: by 2002:a05:622a:50a7:b0:39c:eb15:b6df with SMTP id fp39-20020a05622a50a700b0039ceb15b6dfmr13712413qtb.518.1668951288147; Sun, 20 Nov 2022 05:34:48 -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.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:47 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 077/241] global: Migrate CONFIG_KM_UBI_PART_BOOT_OPTS to CFG Date: Sun, 20 Nov 2022 08:31:08 -0500 Message-Id: <20221120133352.3055600-78-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 | 10 +++++----- scripts/config_whitelist.txt | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index 720711ac8dde..b33bf3615e4f 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -24,16 +24,16 @@ #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 "" -#endif /* CONFIG_KM_UBI_PART_BOOT_OPTS */ +#ifndef CFG_KM_UBI_PART_BOOT_OPTS +#define CFG_KM_UBI_PART_BOOT_OPTS "" +#endif /* CFG_KM_UBI_PART_BOOT_OPTS */ #ifndef CFG_KM_UBI_PARTITION_NAME_APP /* one flash chip only called boot */ /* boot: CFG_KM_UBI_PARTITION_NAME_BOOT */ # define CFG_KM_UBI_LINUX_MTD \ "ubi.mtd=" CFG_KM_UBI_PARTITION_NAME_BOOT \ - CONFIG_KM_UBI_PART_BOOT_OPTS + CFG_KM_UBI_PART_BOOT_OPTS # define CFG_KM_DEV_ENV_FLASH_BOOT_UBI \ "ubiattach=ubi part " CFG_KM_UBI_PARTITION_NAME_BOOT "\0" #else /* CFG_KM_UBI_PARTITION_NAME_APP */ @@ -42,7 +42,7 @@ /* app: CFG_KM_UBI_PARTITION_NAME_APP */ # define CFG_KM_UBI_LINUX_MTD \ "ubi.mtd=" CFG_KM_UBI_PARTITION_NAME_BOOT \ - CONFIG_KM_UBI_PART_BOOT_OPTS " " \ + CFG_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; " \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index e166916e8f40..e5eeb35bfec4 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -85,7 +85,7 @@ CFG_KM_NEW_ENV CFG_KM_UBI_LINUX_MTD CFG_KM_UBI_PARTITION_NAME_APP CFG_KM_UBI_PARTITION_NAME_BOOT -CONFIG_KM_UBI_PART_BOOT_OPTS +CFG_KM_UBI_PART_BOOT_OPTS CONFIG_KM_UIMAGE_NAME CONFIG_KSNET_CPSW_NUM_PORTS CONFIG_KSNET_MAC_ID_BASE -- 2.25.1