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 4D06BC4321E for ; Sun, 4 Dec 2022 15:17:15 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7D81982A12; Sun, 4 Dec 2022 16:08: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=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="rimloTHj"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 51EA1854A9; Sun, 4 Dec 2022 16:07:08 +0100 (CET) Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) (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 773438549D for ; Sun, 4 Dec 2022 16:07:02 +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-x535.google.com with SMTP id s5so12531226edc.12 for ; Sun, 04 Dec 2022 07:07:02 -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=+Pt2cRP2sPpr9flktbexCwUcZPpFw/6vYFQmwQR6Dtw=; b=rimloTHjcRC3V0EW0P9G/NmP8AHX0ZAU2w40sKbwOIEj+zCT1VZa9A0URcJmCZWE18 ezlPGiXnrgkSbLYTbPZ6CV+nbD6rnqH4X1L/LnP7ktUrbtMC2NzGWjEb+CAdK8HBci3N /zd9l0mXXRd2L4BFmfnayrQRov3bMMPvUpqOk= 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=+Pt2cRP2sPpr9flktbexCwUcZPpFw/6vYFQmwQR6Dtw=; b=iKJ3nQe5HATxx9L1tTPSnjvqv1YHsUcTlAsD8sh7y2nv7QbzTfuvdWXwAKklbCA/mV PYrqmYvcaBz2B8/EAn9zwtCg/pwhx8hhpMP5JRef7hjorLwvc1l1ELSqsxFVbRUWFtgm vKVci8BnmlY+Ih2yExTzsHtdqQcY5d5pNBcVYU347nR7mlirUzoIjnumAmCuGJcTa8Ap VO6pSZNwLMS3Vycndo2iFntbZZhkHAbV2XitD7qdnxLqwwCy6jBojBHffRKMFjk++BL9 gOSlEinDbWmJNIOlIykm16B8jwOQoCL8zZdHrVQaMcgClEg6jHruWfojwD0O7/AgvOA1 N7pQ== X-Gm-Message-State: ANoB5pnvow5mY6oGivyZezqhehrxDczNdhRAhX58roCCXI31jJSod/s9 vrdgf20hVsqmZn8x1XeIDzuIOFomQuWXVkVJ X-Google-Smtp-Source: AA0mqf7AmIprBG+vb5Qv6kjLMOKVTVmUaqCZuBAXXi9cGq7+BOxebB8TuKIeMYRHa0PXjFKM4iIFjw== X-Received: by 2002:a05:6402:10d1:b0:467:7508:89ca with SMTP id p17-20020a05640210d100b00467750889camr54913701edu.284.1670166422013; Sun, 04 Dec 2022 07:07:02 -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.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Dec 2022 07:07:01 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 058/149] global: Migrate CONFIG_KM_UBI_PART_BOOT_OPTS to CFG Date: Sun, 4 Dec 2022 10:04:23 -0500 Message-Id: <20221204150554.4165941-58-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_PART_BOOT_OPTS to CFG_KM_UBI_PART_BOOT_OPTS Signed-off-by: Tom Rini --- include/configs/km/keymile-common.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 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; " \ -- 2.25.1