From patchwork Wed Oct 25 12:26:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 117113 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp787541qgn; Wed, 25 Oct 2017 05:28:38 -0700 (PDT) X-Google-Smtp-Source: ABhQp+Sf+z7n5BvwVoVWX6ulJnkM+NJXw5hqhyRQcS1iRlHWGzUMbZ5baCvsa7wyNqbhOR5urz3h X-Received: by 10.80.163.136 with SMTP id s8mr23451634edb.302.1508934518136; Wed, 25 Oct 2017 05:28:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508934518; cv=none; d=google.com; s=arc-20160816; b=LIMsU1x1J7FsyKsk2kV7zZEwyDgzKPOxVS0VxnmbGDWgidCsCWXQA4CzQeYpJvYVm4 OQPVGp/P281Mc9OkinBHHh3wWiFpme5gI6gpGlFY27ZzYjhs1ZQbZtxNPiEDfNUnsYBu GMi4XGSCL+5I7Bx9t7k1eh+hR0fK3h1UYltx/uNySgMIPOXiHYa4GxTsRLdPOD1x9VWC 9h6ChJ6H72oC3/Rg8XBP2HHFqgwrA6pbJ19qh1VXeuu53n+L1r/1ud+Z4Ya0XnI5yymr J/3JCD8+QK1+gfAVFpca4tQv/AswYxCOLOixuXI2udQ5mMHYJfw2SEA9S5Adfh0gzag2 tezA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:message-id :date:to:from:arc-authentication-results; bh=TW/xbyd61HT/Uqs9uvbHO/bMB8jFXGsYB8D04TzDUX0=; b=cGNqCA2AqkdkKxDcNE19/uLVkZXuPmxxl1/mw6WLOErbda99WMlFjk/b5RGY050i3a Q3AsYTNiZ6XAnUvOSQb8mhvRmK59grANsIXTpeIi32bVlzea0TN2kPU0Mh5aRkAqHyRB 6L71g+kT0C8BGSrbD08SapFHQl8AcPl9fPqwENxF3XPwUETj8tBu/lONi98G944MH6yc Y6C2DEAl8gET37XTXJHYATM+19S456cVtPj84Q8+yH0iHJMouBro7WdTHERQlJEYdrG4 YwjEqrxGkI5ec1j/YsRplFZJL/pW4Ypmu6HcEm9Hn3OEfECkWGrWWMSDPwDZopBU+ugX MY1Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id b92si1874908edf.338.2017.10.25.05.28.37; Wed, 25 Oct 2017 05:28:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id A06BDC21D92; Wed, 25 Oct 2017 12:27:16 +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=none 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 E01A9C21DF1; Wed, 25 Oct 2017 12:26:45 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 45D7AC21DC6; Wed, 25 Oct 2017 12:26:18 +0000 (UTC) Received: from mail.free-electrons.com (mail.free-electrons.com [62.4.15.54]) by lists.denx.de (Postfix) with ESMTP id 67914C21DB5 for ; Wed, 25 Oct 2017 12:26:15 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 110) id BA91320848; Wed, 25 Oct 2017 14:26:13 +0200 (CEST) Received: from localhost (unknown [185.94.189.189]) by mail.free-electrons.com (Postfix) with ESMTPSA id 0D212206D8; Wed, 25 Oct 2017 14:26:12 +0200 (CEST) From: Maxime Ripard To: Tom Rini Date: Wed, 25 Oct 2017 14:26:00 +0200 Message-Id: <20171025122601.28224-4-maxime.ripard@free-electrons.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171025122601.28224-1-maxime.ripard@free-electrons.com> References: <20171025122601.28224-1-maxime.ripard@free-electrons.com> Cc: Andre Przywara , agraf@suse.de, u-boot@lists.denx.de, Maxime Ripard , Jagan Teki Subject: [U-Boot] [RFC 3/4] env: Create an environment transition method 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" The current environment has been hardcoded to an offset that starts to be an issue given the current size of our main U-Boot binary. Introduce an environment method from storing the environment raw in the MMC to a file in a FAT partition. Eventually, and hopefully before we reach that limit again, we will have most of our users using that setup, and we'll be able to retire the raw environment, and gain more room for the U-Boot binary. Signed-off-by: Maxime Ripard --- cmd/nvedit.c | 1 + env/Kconfig | 12 ++++++--- env/Makefile | 1 + env/sunxi-transition.c | 59 ++++++++++++++++++++++++++++++++++++++++++ include/configs/sunxi-common.h | 2 +- include/environment.h | 1 + 6 files changed, 72 insertions(+), 4 deletions(-) create mode 100644 env/sunxi-transition.c diff --git a/cmd/nvedit.c b/cmd/nvedit.c index 4e79d03856fe..7b89ee428859 100644 --- a/cmd/nvedit.c +++ b/cmd/nvedit.c @@ -52,6 +52,7 @@ DECLARE_GLOBAL_DATA_PTR; !defined(CONFIG_ENV_IS_IN_SPI_FLASH) && \ !defined(CONFIG_ENV_IS_IN_REMOTE) && \ !defined(CONFIG_ENV_IS_IN_UBI) && \ + !defined(CONFIG_ENV_IS_SUNXI_TRANSITION) && \ !defined(CONFIG_ENV_IS_NOWHERE) # 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 diff --git a/env/Kconfig b/env/Kconfig index 02cb7cbb751d..fdd68fdfbdb6 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -30,6 +30,9 @@ choice partition on the device) or a filesystem (where the environment information is written to a file). +config ENV_IS_SUNXI_TRANSITION + bool "Environment transition for Allwinner SoCs" + config ENV_IS_NOWHERE bool "Environment is not stored" help @@ -369,17 +372,20 @@ config ENV_AES config ENV_FAT_INTERFACE string "Name of the block device for the environment" - depends on ENV_IS_IN_FAT + depends on ENV_IS_IN_FAT || ENV_IS_SUNXI_TRANSITION default "mmc" if TI_COMMON_CMD_OPTIONS || ARCH_ZYNQMP || ARCH_AT91 + default "mmc" if ARCH_SUNXI help Define this to a string that is the name of the block device. config ENV_FAT_DEVICE_AND_PART string "Device and partition for where to store the environemt in FAT" - depends on ENV_IS_IN_FAT + depends on ENV_IS_IN_FAT || ENV_IS_SUNXI_TRANSITION default "0:1" if TI_COMMON_CMD_OPTIONS default "0:auto" if ARCH_ZYNQMP default "0" if ARCH_AT91 + default "0:auto" if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA = -1 + default "1:auto" if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA != -1 help Define this to a string to specify the partition of the device. It can be as following: @@ -397,7 +403,7 @@ config ENV_FAT_DEVICE_AND_PART config ENV_FAT_FILE string "Name of the FAT file to use for the environemnt" - depends on ENV_IS_IN_FAT + depends on ENV_IS_IN_FAT || ENV_IS_SUNXI_TRANSITION default "uboot.env" help It's a string of the FAT file name. This file use to store the diff --git a/env/Makefile b/env/Makefile index 7ce8231d9a70..09ad342e6161 100644 --- a/env/Makefile +++ b/env/Makefile @@ -28,6 +28,7 @@ obj-$(CONFIG_ENV_IS_IN_SPI_FLASH) += sf.o obj-$(CONFIG_ENV_IS_IN_REMOTE) += remote.o obj-$(CONFIG_ENV_IS_IN_UBI) += ubi.o obj-$(CONFIG_ENV_IS_NOWHERE) += nowhere.o +obj-$(CONFIG_ENV_IS_SUNXI_TRANSITION) += fat.o mmc.o sunxi-transition.o endif ifdef CONFIG_SPL_BUILD diff --git a/env/sunxi-transition.c b/env/sunxi-transition.c new file mode 100644 index 000000000000..fae0603a897a --- /dev/null +++ b/env/sunxi-transition.c @@ -0,0 +1,59 @@ +/* + * (C) Copyright 2017 Maxime Ripard + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +/* #define DEBUG */ + +#include +#include + +int env_fat_load(void); +int env_fat_save(void); + +int env_mmc_load(void); +int env_mmc_save(void); + +static int env_sunxi_save(void) +{ + int ret; + + ret = env_fat_save(); + if (!ret) { + debug("Wrote env in FAT file\n"); + return 0; + } + + ret = env_mmc_save(); + if (!ret) + printf("The env is raw, this will be broken in the future, please upgrade to file-based env\n"); + + return ret; +} + +static int env_sunxi_load(void) +{ + int ret; + + ret = env_fat_load(); + if (!ret) { + debug("Found env in FAT partition, bailing out\n"); + return 0; + } + + ret = env_mmc_load(); + if (!ret) + printf("The env is raw, this will be broken in the future, please upgrade to file-based env\n"); + + return ret; +} + +U_BOOT_ENV_LOCATION(sunxi) = { + .location = ENVL_SUNXI_TRANSITION, + ENV_NAME("SUNXI") + .load = env_sunxi_load, +#ifndef CONFIG_SPL_BUILD + .save = env_save_ptr(env_sunxi_save), +#endif +}; diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 91751171ec2b..c894131576e2 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -147,7 +147,7 @@ #define CONFIG_MMC_SUNXI_SLOT 0 #endif -#if defined(CONFIG_ENV_IS_IN_MMC) +#if defined(CONFIG_ENV_IS_IN_MMC) || defined (CONFIG_ENV_IS_SUNXI_TRANSITION) #if CONFIG_MMC_SUNXI_SLOT_EXTRA != -1 /* If we have two devices (most likely eMMC + MMC), favour the eMMC */ #define CONFIG_SYS_MMC_ENV_DEV 1 diff --git a/include/environment.h b/include/environment.h index 7b9821638960..20c9cd13f11c 100644 --- a/include/environment.h +++ b/include/environment.h @@ -208,6 +208,7 @@ enum env_location { ENVL_ONENAND, ENVL_REMOTE, ENVL_SPI_FLASH, + ENVL_SUNXI_TRANSITION, ENVL_UBI, ENVL_NOWHERE,