From patchwork Tue Oct 10 18:59:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tuomas Tynkkynen X-Patchwork-Id: 824025 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ZBgv0Vf6"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3yBRJw4l8kz9t6M for ; Wed, 11 Oct 2017 06:00:48 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 3B943C21E0E; Tue, 10 Oct 2017 19:00:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id CAC3EC21DA5; Tue, 10 Oct 2017 18:59:58 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 362DEC21C51; Tue, 10 Oct 2017 18:59:57 +0000 (UTC) Received: from mail-lf0-f65.google.com (mail-lf0-f65.google.com [209.85.215.65]) by lists.denx.de (Postfix) with ESMTPS id AC200C21C26 for ; Tue, 10 Oct 2017 18:59:56 +0000 (UTC) Received: by mail-lf0-f65.google.com with SMTP id j73so11483663lfg.0 for ; Tue, 10 Oct 2017 11:59:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=Is2tenckEtA0pBgGKV/xoGRpJK5DOx/L3CIv+gdAsNQ=; b=ZBgv0Vf60dQbqOkUGh9fcsVUbgH89GQnx7qDOcPWvmXmrUd5lqXBkUhxJBroFtXzcZ ukPMLO8DubdXPcwFDfGLPQKmhsCjjvIg+8HBEK1L0upV686aMU0y853wK8sOzDat1L8l B8keo9Imp0AH3asXTKLw5jcNvx5961loJQxiVz6+Kf62GjzNVcz2HFH+txWaqbd7GvNR 4TNPFVB7WSm3OAfwDLHyxN/Wx52D1UUL61ANK+sGF3IlChqtSJcXB5SdpN3IonxqU5BL 77/b9bbZ6fWypjMSJl6N+cq5Fh+iseD1+b/COWQAUQS1U/cB+nVsZv72uM5qWXLQDhe1 ATIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=Is2tenckEtA0pBgGKV/xoGRpJK5DOx/L3CIv+gdAsNQ=; b=hABZaRVTUZAlYEdvxrqIbYfpbkJp2UGVUIgz9QOEfNXnOB2Bg7U+KxzZL8xJ53TjtC KuY4DISnVts2NyeIapszwfqhh11RN68XbZL3ndllO3PCpSLSp8DVbsHB+LrqU8TgkB0l ZhSYuYUPppsUfd5Daazfvd0RLNnNuqwFYbkK3SYav7GTZ2PNVRCK3jgS7d/OBt97MWM+ 0/lo/+G3QIskSxnxxZYbXiWQvi7pM9ItMAghXoxdrH7T0Tw6VTqYtB6anY1Sp2jVCFIA p5nbkM7dr5r5s/e60Zo6V+XZ34bQ43ZP8E3JiKEsMlGvi77yrg1k4wiI49gRxaD/b+pQ ChxA== X-Gm-Message-State: AMCzsaWTaD19lIs+NRru083JzZOPOZaYc7DddSuM/CqYlTZjKvoRkND1 ikZZGXoEzBVPMZOtFIYWciIPIA== X-Google-Smtp-Source: AOwi7QAlXkmX+3W2wQ/Hv0bNshLZ01p2yCFlecXww0nehHg16tJfN2tDpKb8atrYuHIpd2M8vrL0jg== X-Received: by 10.46.64.135 with SMTP id r7mr4681696lje.111.1507661995863; Tue, 10 Oct 2017 11:59:55 -0700 (PDT) Received: from duuni.pp.htv.fi (dytyyyyyk71bpbhncm94t-3.rev.dnainternet.fi. [2001:14ba:400:0:8dd:42c0:9962:5771]) by smtp.gmail.com with ESMTPSA id m3sm1901426lfe.37.2017.10.10.11.59.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Oct 2017 11:59:55 -0700 (PDT) From: Tuomas Tynkkynen To: u-boot@lists.denx.de Date: Tue, 10 Oct 2017 21:59:40 +0300 Message-Id: <20171010185943.25696-2-tuomas.tynkkynen@iki.fi> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171010185943.25696-1-tuomas.tynkkynen@iki.fi> References: <20171010185943.25696-1-tuomas.tynkkynen@iki.fi> Subject: [U-Boot] [PATCH 1/4] env: Drop CONFIG_ENV_IS_IN_DATAFLASH X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Last user of this option went away in commit: fdc7718999 ("board: usb_a9263: Update to support DT and DM") Signed-off-by: Tuomas Tynkkynen --- cmd/nvedit.c | 3 +-- env/Kconfig | 15 ----------- env/Makefile | 1 - env/dataflash.c | 75 --------------------------------------------------- env/env.c | 4 +-- include/environment.h | 1 - tools/Makefile | 1 - 7 files changed, 2 insertions(+), 98 deletions(-) delete mode 100644 env/dataflash.c diff --git a/cmd/nvedit.c b/cmd/nvedit.c index 90f76bbc20..4e79d03856 100644 --- a/cmd/nvedit.c +++ b/cmd/nvedit.c @@ -42,7 +42,6 @@ DECLARE_GLOBAL_DATA_PTR; #if !defined(CONFIG_ENV_IS_IN_EEPROM) && \ !defined(CONFIG_ENV_IS_IN_FLASH) && \ - !defined(CONFIG_ENV_IS_IN_DATAFLASH) && \ !defined(CONFIG_ENV_IS_IN_MMC) && \ !defined(CONFIG_ENV_IS_IN_FAT) && \ !defined(CONFIG_ENV_IS_IN_EXT4) && \ @@ -54,7 +53,7 @@ DECLARE_GLOBAL_DATA_PTR; !defined(CONFIG_ENV_IS_IN_REMOTE) && \ !defined(CONFIG_ENV_IS_IN_UBI) && \ !defined(CONFIG_ENV_IS_NOWHERE) -# error Define one of CONFIG_ENV_IS_IN_{EEPROM|FLASH|DATAFLASH|MMC|FAT|EXT4|\ +# error Define one of CONFIG_ENV_IS_IN_{EEPROM|FLASH|MMC|FAT|EXT4|\ NAND|NVRAM|ONENAND|SATA|SPI_FLASH|REMOTE|UBI} or CONFIG_ENV_IS_NOWHERE #endif diff --git a/env/Kconfig b/env/Kconfig index 024d4d79bd..25555ec2b8 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -40,21 +40,6 @@ config ENV_IS_NOWHERE stored. U-Boot will therefore always start up with a default environment. -config ENV_IS_IN_DATAFLASH - bool "Environment in dataflash" - depends on !CHAIN_OF_TRUST - help - Define this if you have a DataFlash memory device which you - want to use for the environment. - - - CONFIG_ENV_OFFSET: - - CONFIG_ENV_ADDR: - - CONFIG_ENV_SIZE: - - These three #defines specify the offset and size of the - environment area within the total memory of your DataFlash placed - at the specified address. - config ENV_IS_IN_EEPROM bool "Environment in EEPROM" depends on !CHAIN_OF_TRUST diff --git a/env/Makefile b/env/Makefile index 8df5b9d4c9..7ce8231d9a 100644 --- a/env/Makefile +++ b/env/Makefile @@ -11,7 +11,6 @@ ifndef CONFIG_SPL_BUILD obj-y += attr.o obj-y += callback.o obj-y += flags.o -obj-$(CONFIG_ENV_IS_IN_DATAFLASH) += dataflash.o obj-$(CONFIG_ENV_IS_IN_EEPROM) += eeprom.o extra-$(CONFIG_ENV_IS_EMBEDDED) += embedded.o obj-$(CONFIG_ENV_IS_IN_EEPROM) += embedded.o diff --git a/env/dataflash.c b/env/dataflash.c deleted file mode 100644 index 77bc595e0d..0000000000 --- a/env/dataflash.c +++ /dev/null @@ -1,75 +0,0 @@ -/* - * LowLevel function for DataFlash environment support - * Author : Gilles Gastaldi (Atmel) - * - * SPDX-License-Identifier: GPL-2.0+ - */ -#include -#include -#include -#include -#include -#include -#include - -DECLARE_GLOBAL_DATA_PTR; - -static int env_dataflash_get_char(int index) -{ - uchar c; - - read_dataflash(CONFIG_ENV_ADDR + index + offsetof(env_t, data), - 1, (char *)&c); - return c; -} - -static int env_dataflash_load(void) -{ - ulong crc, new = 0; - unsigned off; - char buf[CONFIG_ENV_SIZE]; - - /* Read old CRC */ - read_dataflash(CONFIG_ENV_ADDR + offsetof(env_t, crc), - sizeof(ulong), (char *)&crc); - - /* Read whole environment */ - read_dataflash(CONFIG_ENV_ADDR, CONFIG_ENV_SIZE, buf); - - /* Calculate the CRC */ - off = offsetof(env_t, data); - new = crc32(new, (unsigned char *)(buf + off), ENV_SIZE); - - if (crc == new) - env_import(buf, 1); - else - set_default_env("!bad CRC"); - - return 0; -} - -#ifdef CONFIG_ENV_OFFSET_REDUND -#error No support for redundant environment on dataflash yet! -#endif - -static int env_dataflash_save(void) -{ - env_t env_new; - int ret; - - ret = env_export(&env_new); - if (ret) - return ret; - - return write_dataflash(CONFIG_ENV_ADDR, - (unsigned long)&env_new, - CONFIG_ENV_SIZE); -} - -U_BOOT_ENV_LOCATION(dataflash) = { - .location = ENVL_DATAFLASH, - ENV_NAME("dataflash") - .get_char = env_dataflash_get_char, - .load = env_dataflash_load, - .save = env_save_ptr(env_dataflash_save), -}; diff --git a/env/env.c b/env/env.c index 43290d0832..76a5608628 100644 --- a/env/env.c +++ b/env/env.c @@ -28,9 +28,7 @@ static struct env_driver *env_driver_lookup(enum env_location loc) static enum env_location env_get_default_location(void) { - if IS_ENABLED(CONFIG_ENV_IS_IN_DATAFLASH) - return ENVL_DATAFLASH; - else if IS_ENABLED(CONFIG_ENV_IS_IN_EEPROM) + if IS_ENABLED(CONFIG_ENV_IS_IN_EEPROM) return ENVL_EEPROM; else if IS_ENABLED(CONFIG_ENV_IS_IN_FAT) return ENVL_FAT; diff --git a/include/environment.h b/include/environment.h index 03b41e0c51..7b98216389 100644 --- a/include/environment.h +++ b/include/environment.h @@ -198,7 +198,6 @@ enum env_valid { }; enum env_location { - ENVL_DATAFLASH, ENVL_EEPROM, ENVL_EXT4, ENVL_FAT, diff --git a/tools/Makefile b/tools/Makefile index c16477459d..5db2a54225 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -21,7 +21,6 @@ subdir-$(HOST_TOOLS_ALL) += gdb # Merge all the different vars for envcrc into one ENVCRC-$(CONFIG_ENV_IS_EMBEDDED) = y -ENVCRC-$(CONFIG_ENV_IS_IN_DATAFLASH) = y ENVCRC-$(CONFIG_ENV_IS_IN_EEPROM) = y ENVCRC-$(CONFIG_ENV_IS_IN_FLASH) = y ENVCRC-$(CONFIG_ENV_IS_IN_ONENAND) = y