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 61867C4321E for ; Sun, 4 Dec 2022 15:06:55 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CC01C8530D; Sun, 4 Dec 2022 16:06:11 +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="ebh5jAOm"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 14652852F8; Sun, 4 Dec 2022 16:06:05 +0100 (CET) Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) (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 9E4BF852F9 for ; Sun, 4 Dec 2022 16:06: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-x52a.google.com with SMTP id d14so7634953edj.11 for ; Sun, 04 Dec 2022 07:06: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=zQoCIcZegGZyeQk/JeSPK9PYyNDV1/HmfoPKlIp10J4=; b=ebh5jAOm/h4gdhIVxzgYRluS1geIpkm/oK16fQh00sJqrsepf9vV3/2iw+7mo6zyrg DjLJsieYVhlGEoPSmI3YE3NafWktPGxRDLEB7E5F4vGxx/Ne/D810ey16j9X3O8vXL1H FKtQtf9Ba9STSKUmwEvuip/cBQHy6fvaRaM7w= 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=zQoCIcZegGZyeQk/JeSPK9PYyNDV1/HmfoPKlIp10J4=; b=Kb+QYeVNZPdlYTtLvk+gacFIuL3ozHtbmsWD7jseDumxiyvTzVVMP05U924vL92e4V 0NKBAqb2j4bObQwrDaWJRD2LLw6CmLVoaD6KbhCXZHXrbC5oH4vyhet4udUYBFh7J2S2 J8582VFp8E1spbqbpf0+GDPBungAWd5kiQCVbqQsvk9gcTBP3tkW7Tjy7X0+Pr0wNmPX pw9fnhZ1i6862snEeXpfe7j30wTFczJzDiDsognbQMqTGR5yg/hubbRL9elEMIMk8zRT kW8UMveOX/J8ByoXK8hv2dkY9KmwcepynZagQzCXFZy7gExH8X48J//RTlCJNgsPMxhi j/lA== X-Gm-Message-State: ANoB5pl27tV1fwjiWYwuj5/hSbn9ZN6hkCJVX62NkVx6abubOlbwtXOf UDMkSHqJw8ZNQHM1cQIKe4dRTXKvNl/2JM7S X-Google-Smtp-Source: AA0mqf4oUhx0dWucHYYeLQmFIIf3KiGXg2MWI8/QFDGxGm1nPylBmZjg1tD8M4mKPKk3UkOQ0emTkw== X-Received: by 2002:a50:fd9a:0:b0:46c:9976:8f53 with SMTP id o26-20020a50fd9a000000b0046c99768f53mr2398776edt.180.1670166362117; Sun, 04 Dec 2022 07:06: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.06.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Dec 2022 07:06:01 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 005/149] mtd: ubi: Finish moving configuration to Kconfig Date: Sun, 4 Dec 2022 10:03:30 -0500 Message-Id: <20221204150554.4165941-5-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 We have some unused and undefined symbols to remove references to, so do that. Move the final things that we do set (or need to keep unset) to Kconfig instead. Signed-off-by: Tom Rini --- drivers/mtd/ubi/Kconfig | 12 ++++++++++++ include/ubi_uboot.h | 22 ---------------------- 2 files changed, 12 insertions(+), 22 deletions(-) diff --git a/drivers/mtd/ubi/Kconfig b/drivers/mtd/ubi/Kconfig index 67a3cf1d7a50..5783d36c048f 100644 --- a/drivers/mtd/ubi/Kconfig +++ b/drivers/mtd/ubi/Kconfig @@ -20,6 +20,18 @@ config MTD_UBI if MTD_UBI +config MTD_UBI_BLOCK + def_bool n + +config MTD_UBI_MODULE + def_bool y + help + ubi_init() disables returning error codes when built into the Linux + kernel so that it doesn't hang the Linux kernel boot process. Since + the U-Boot driver code depends on getting valid error codes from this + function we just tell the UBI layer that we are building as a module + (which only enables the additional error reporting). + config MTD_UBI_WL_THRESHOLD int "UBI wear-leveling threshold" default 4096 diff --git a/include/ubi_uboot.h b/include/ubi_uboot.h index 0770228cd895..6da348eb6285 100644 --- a/include/ubi_uboot.h +++ b/include/ubi_uboot.h @@ -34,28 +34,6 @@ #include -/* configurable */ -#define CONFIG_MTD_UBI_BEB_RESERVE 1 - -/* debug options (Linux: drivers/mtd/ubi/Kconfig.debug) */ -#undef CONFIG_MTD_UBI_DEBUG -#undef CONFIG_MTD_UBI_DEBUG_PARANOID -#undef CONFIG_MTD_UBI_DEBUG_MSG -#undef CONFIG_MTD_UBI_DEBUG_MSG_EBA -#undef CONFIG_MTD_UBI_DEBUG_MSG_WL -#undef CONFIG_MTD_UBI_DEBUG_MSG_IO -#undef CONFIG_MTD_UBI_DEBUG_MSG_BLD - -#undef CONFIG_MTD_UBI_BLOCK - -/* ubi_init() disables returning error codes when built into the Linux - * kernel so that it doesn't hang the Linux kernel boot process. Since - * the U-Boot driver code depends on getting valid error codes from this - * function we just tell the UBI layer that we are building as a module - * (which only enables the additional error reporting). - */ -#define CONFIG_MTD_UBI_MODULE - /* build.c */ #define get_device(...) #define put_device(...) -- 2.25.1