From patchwork Mon Nov 27 19:19:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jorge Ramirez-Ortiz X-Patchwork-Id: 119786 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp711825qgn; Mon, 27 Nov 2017 11:23:57 -0800 (PST) X-Google-Smtp-Source: AGs4zMblKoPgvzyY1F8WuAOYbZA3nKqwX9TN0E5PxP/wcxvxaU9Y4n+TC9b9gtJSQHxc7p8kOG4n X-Received: by 10.223.195.203 with SMTP id d11mr36626040wrg.39.1511810637712; Mon, 27 Nov 2017 11:23:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511810637; cv=none; d=google.com; s=arc-20160816; b=miZ4wi/xVw8hVXs9TYiYNGcR9i/KTWHgVc8UVQTT1UjFfdLXZ6IDbAEiY504SOEfjC 4GHSqWZmkMo3y30Vzyy+ni1WdQmk+ZlcvOTzD/dgOpIzSJub3I1q2x3HTgX4UL6NhEwA 6+ZpvXPJYxbcYntw8Xu6+7Jgvgn8dkl0tVk0W4L/Xh0O7f+LVRQZpgVYA19s2adu91jI aHvzSxH+x0gwXFWLV2UXla8x3nwI0PFthQelw1ZdMe5IJbVZ4HOu5jQHVwIdN7fuKCVg dEh/JgvsjkEix9GRcDVdP4iwxoa6cEpXPyHJVQ1RCjEJSGRal5nwMDk7OeOM4/7V4rVV 7UNQ== 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:message-id:date:to:from:dkim-signature :arc-authentication-results; bh=7krR9XA7u2pG2ER1dnZ6BBNGdHQ29B1EXuJHJ2VwqQM=; b=lLgfoWicGQiXksn0ppArjAyrsiJJu3wCAONnaMXSmXuUYLV4gO9DzulgrOvrcx05xZ v16jt1UGMx7BqmlaP6v1b+4E1jxaJpvwh/nppncTtZkY/pv26eIoiddufNxx2TWfq0Je 4mFAGptPpNI44QQ8kE19Chm6/ovsChfpqFtueAPa1NFksq6i+KWF94dkXjClYO+NIfSL AMmEnTo6Pw7E9CTlKwwH0qwoAGTRxk8i9qPNsSMLWMX4jxjhiWb0M70Om+cjnDb6ZEiT wISu/jaZAaTDvsNCCiZMt2ez7M7J6DDAZAoJIVBNh8F3h5H3P+3X+2bQyqvOPm6OSGMW /KLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=WMG6ncGP; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id t63si9537884wma.85.2017.11.27.11.23.57; Mon, 27 Nov 2017 11:23:57 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=WMG6ncGP; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.denx.de (Postfix, from userid 105) id 46CC5C21DB5; Mon, 27 Nov 2017 19:20:48 +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_H2, 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 B90AAC21DE7; Mon, 27 Nov 2017 19:19:56 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 59127C21DA2; Mon, 27 Nov 2017 19:19:30 +0000 (UTC) Received: from mail-wr0-f172.google.com (mail-wr0-f172.google.com [209.85.128.172]) by lists.denx.de (Postfix) with ESMTPS id 807AEC21D79 for ; Mon, 27 Nov 2017 19:19:27 +0000 (UTC) Received: by mail-wr0-f172.google.com with SMTP id w95so27567593wrc.2 for ; Mon, 27 Nov 2017 11:19:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id; bh=pm3eqAFGAQHAEiPjI5M9BvFlQEe3c56yXmRtc3SQp3c=; b=WMG6ncGPKPbHbCM6LoKhS1axrqncCrzYA9kT3FuNciCwQbcDDfyoYwl/5K9w0K6fyH HuUSEP5oq4VQCd4ZoicLskuS4nB630J7OAbKtuPNBaOgOVrW+HQvWYY4Ep04sbvqF+Ds Caw2FuY807EtEKt9Sr3N0c5dkQ7lbRzvJtU9s= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=pm3eqAFGAQHAEiPjI5M9BvFlQEe3c56yXmRtc3SQp3c=; b=UpYUGNSZdBQqbBVVr2J+52LTXFCXhdHwzBGviEbBOfoClgSFjgXOaYo1gRG3bwUAJS evEOVay0ctw8w0YHMMJwgq4/yZ2gViaIET+dEwNjyBfWnxWFBGun8P2QNv8IZn497FWt T6wIZ9Ty40FVTI1dA6hHJIzwHipapJLCCVZenYo/xvAPZZOJ+ENQDrdIG7OGpVw9J0jP IOKMRxsBp35HbHCcKhHTZaS4T5LyX3lSc5GckxwnmzYcI7mOLYCJAsC9hyu1b52g9/zN EJ0eMQYrMLzPCAtd1TdEw7YgqMX1MZX0v+5uRP52uhvLBeDvs8PPBKAC4oHrpouB6HxW unDA== X-Gm-Message-State: AJaThX7iSiBE+QjTUGo54LuT1SkCpvUQa7qSRzo3/BfGDTeAir4yJcDT q+eZclm7BaMw/EkKibxckN4gVQ== X-Received: by 10.223.191.13 with SMTP id p13mr35604343wrh.69.1511810367034; Mon, 27 Nov 2017 11:19:27 -0800 (PST) Received: from igloo.80.58.61.254 (141.pool85-51-114.dynamic.orange.es. [85.51.114.141]) by smtp.gmail.com with ESMTPSA id x185sm11629476wmx.12.2017.11.27.11.19.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 27 Nov 2017 11:19:26 -0800 (PST) From: Jorge Ramirez-Ortiz To: jorge.ramirez-ortiz@linaro.org, u-boot@lists.denx.de, trini@konsulko.com Date: Mon, 27 Nov 2017 20:19:20 +0100 Message-Id: <1511810360-8539-1-git-send-email-jorge.ramirez-ortiz@linaro.org> X-Mailer: git-send-email 2.7.4 Subject: [U-Boot] [PATCHv4] env: enable accessing the environment in an EXT4 partition 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" For example to store the environment in a file named "/uboot.env" in MMC "0", where partition "1" contains the EXT4 filesystem, the following configs should be added to the board's default config: CONFIG_ENV_IS_IN_EXT4=y CONFIG_ENV_EXT4_DEVICE_AND_PART="0:1" CONFIG_ENV_EXT4_FILE="/uboot.env" CONFIG_ENV_EXT4_INTERFACE="mmc" Reviewed-by: Tom Rini --- env/Kconfig | 39 +++++++++++++++++++++++++++++++++++++++ env/env.c | 2 ++ env/ext4.c | 20 ++++++++++---------- 3 files changed, 51 insertions(+), 10 deletions(-) diff --git a/env/Kconfig b/env/Kconfig index 2477bf8..71529b2 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -81,6 +81,13 @@ config ENV_IS_IN_FAT - CONFIG_FAT_WRITE: This must be enabled. Otherwise it cannot save the environment file. +config ENV_IS_IN_EXT4 + bool "Environment is in a EXT4 filesystem" + depends on !CHAIN_OF_TRUST + select EXT4_WRITE + help + Define this if you want to use the EXT4 file system for the environment. + config ENV_IS_IN_FLASH bool "Environment in flash memory" depends on !CHAIN_OF_TRUST @@ -396,6 +403,38 @@ config ENV_FAT_FILE It's a string of the FAT file name. This file use to store the environment. +config ENV_EXT4_INTERFACE + string "Name of the block device for the environment" + depends on ENV_IS_IN_EXT4 + help + Define this to a string that is the name of the block device. + +config ENV_EXT4_DEVICE_AND_PART + string "Device and partition for where to store the environemt in EXT4" + depends on ENV_IS_IN_EXT4 + help + Define this to a string to specify the partition of the device. It can + be as following: + + "D:P", "D:0", "D", "D:" or "D:auto" (D, P are integers. And P >= 1) + - "D:P": device D partition P. Error occurs if device D has no + partition table. + - "D:0": device D. + - "D" or "D:": device D partition 1 if device D has partition + table, or the whole device D if has no partition + table. + - "D:auto": first partition in device D with bootable flag set. + If none, first valid partition in device D. If no + partition table then means device D. + +config ENV_EXT4_FILE + string "Name of the EXT4 file to use for the environemnt" + depends on ENV_IS_IN_EXT4 + default "uboot.env" + help + It's a string of the EXT4 file name. This file use to store the + environment (explicit path to the file) + if ARCH_SUNXI config ENV_OFFSET diff --git a/env/env.c b/env/env.c index 76a5608..7455632 100644 --- a/env/env.c +++ b/env/env.c @@ -32,6 +32,8 @@ static enum env_location env_get_default_location(void) return ENVL_EEPROM; else if IS_ENABLED(CONFIG_ENV_IS_IN_FAT) return ENVL_FAT; + else if IS_ENABLED(CONFIG_ENV_IS_IN_EXT4) + return ENVL_EXT4; else if IS_ENABLED(CONFIG_ENV_IS_IN_FLASH) return ENVL_FLASH; else if IS_ENABLED(CONFIG_ENV_IS_IN_MMC) diff --git a/env/ext4.c b/env/ext4.c index 6520221..07fd061 100644 --- a/env/ext4.c +++ b/env/ext4.c @@ -46,8 +46,8 @@ static int env_ext4_save(void) if (err) return err; - part = blk_get_device_part_str(EXT4_ENV_INTERFACE, - EXT4_ENV_DEVICE_AND_PART, + part = blk_get_device_part_str(CONFIG_ENV_EXT4_INTERFACE, + CONFIG_ENV_EXT4_DEVICE_AND_PART, &dev_desc, &info, 1); if (part < 0) return 1; @@ -57,16 +57,16 @@ static int env_ext4_save(void) if (!ext4fs_mount(info.size)) { printf("\n** Unable to use %s %s for saveenv **\n", - EXT4_ENV_INTERFACE, EXT4_ENV_DEVICE_AND_PART); + CONFIG_ENV_EXT4_INTERFACE, CONFIG_ENV_EXT4_DEVICE_AND_PART); return 1; } - err = ext4fs_write(EXT4_ENV_FILE, (void *)&env_new, sizeof(env_t)); + err = ext4fs_write(CONFIG_ENV_EXT4_FILE, (void *)&env_new, sizeof(env_t)); ext4fs_close(); if (err == -1) { printf("\n** Unable to write \"%s\" from %s%d:%d **\n", - EXT4_ENV_FILE, EXT4_ENV_INTERFACE, dev, part); + CONFIG_ENV_EXT4_FILE, CONFIG_ENV_EXT4_INTERFACE, dev, part); return 1; } @@ -84,8 +84,8 @@ static int env_ext4_load(void) int err; loff_t off; - part = blk_get_device_part_str(EXT4_ENV_INTERFACE, - EXT4_ENV_DEVICE_AND_PART, + part = blk_get_device_part_str(CONFIG_ENV_EXT4_INTERFACE, + CONFIG_ENV_EXT4_DEVICE_AND_PART, &dev_desc, &info, 1); if (part < 0) goto err_env_relocate; @@ -95,16 +95,16 @@ static int env_ext4_load(void) if (!ext4fs_mount(info.size)) { printf("\n** Unable to use %s %s for loading the env **\n", - EXT4_ENV_INTERFACE, EXT4_ENV_DEVICE_AND_PART); + CONFIG_ENV_EXT4_INTERFACE, CONFIG_ENV_EXT4_DEVICE_AND_PART); goto err_env_relocate; } - err = ext4_read_file(EXT4_ENV_FILE, buf, 0, CONFIG_ENV_SIZE, &off); + err = ext4_read_file(CONFIG_ENV_EXT4_FILE, buf, 0, CONFIG_ENV_SIZE, &off); ext4fs_close(); if (err == -1) { printf("\n** Unable to read \"%s\" from %s%d:%d **\n", - EXT4_ENV_FILE, EXT4_ENV_INTERFACE, dev, part); + CONFIG_ENV_EXT4_FILE, CONFIG_ENV_EXT4_INTERFACE, dev, part); goto err_env_relocate; }