From patchwork Thu Dec 14 11:53:54 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: 121909 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp6699333qgn; Thu, 14 Dec 2017 03:54:15 -0800 (PST) X-Google-Smtp-Source: ACJfBos/2DsLe8Yt3sp5szCYqQr4qtOpCA14SHegNU129ftgO7TqgbAwLCfYN8CsPfNPM+sLfOsL X-Received: by 10.80.176.70 with SMTP id i64mr12124696edd.187.1513252455444; Thu, 14 Dec 2017 03:54:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513252455; cv=none; d=google.com; s=arc-20160816; b=Z2y0eBwOPnIZ0PP+W0LO2FlqcxakyzuTIbspGIQWb3OTFIDHVuljcNer4kugJKIOQS Ipno3YO1Tqi1CzodSX56FRjicQ5lsuWeaNDarHsEI9sp0L8PcvgwGQ7hAaa9wVaLaLyk 5rf/rnVHv1wyLS7TEzPC2qs1vCvNgSpkzpkvA2T/v+47RrZEQTuE6GFQ+BNvoRy9OFno Jum/LwOCfuQnknrMSuySSz5ZSYlz7zW59S/cTtXJc+jSxNgLL/ez43mB/SuG5pFV+Kpl DAil/U4+rmf7iOK4k+Vcq9RmKD/3o/rfMDkPm/8ffluenhtkD/WQ4T+OT9VdBx0abylC qETg== 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=aS49BlLBkMLVcJoVcuRzvSz4xEX2Lf7O8iaitJJSs0A=; b=ZgIRgMdWD3ZqbFRFjROmp60xrWdPmJVDYipWKyrsgW0XNEVqj4xMfo+R2LuPzBGPw6 AmjhvNeSFChaQ5kd00hL1qcPBkTg8MvvfsQtt7EbtGqlulRBX5h2Y0LfolMfx0+Y/O18 ev3VItBQjVe/Mvnl7+eAUN4JKW941HA7LUzDYU70QRdbP6//Q7Bs2c0tkDS4UJmHlJs/ 6uCRF+rul8+Kx/kxVnh46uChGZWKAFu9T5b6gzgtMV6fmvv7EC9Oii2gjk9gqws51lq5 /0IIa+RdT8uCTH3gMqPqPO65odp7f8gHFCLBw1a2JvhvskapjV1E0Gof1aKsQRaYRrBa +kKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=InHmwgHH; 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 c91si1785542edf.457.2017.12.14.03.54.15; Thu, 14 Dec 2017 03:54:15 -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=InHmwgHH; 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 EBDAFC21E10; Thu, 14 Dec 2017 11:54:11 +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 3912FC21DB2; Thu, 14 Dec 2017 11:54:09 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 8DA8CC21DA5; Thu, 14 Dec 2017 11:54:07 +0000 (UTC) Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by lists.denx.de (Postfix) with ESMTPS id 0AD16C21DA6 for ; Thu, 14 Dec 2017 11:54:07 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id 64so10867266wme.3 for ; Thu, 14 Dec 2017 03:54:07 -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=x3Lh60uoS4haCy780x/MJ9/5h1co7duWn8Yj3sdiPFU=; b=InHmwgHHURH9D45Irbl9N5bh2h2hBCLUNH7wZ3iWU6R4jVZA5neq5Q+Qp9Z7OJcbDm t2A0J96b6OxCYcM5CwgtCm/arSghEpY0XsDh1XOadukolcEUL87RSzMNCnAdRlZyijCS 6qx2i+hkiVq0vNnvX8HBZBlm88hBUBKX9Uy8g= 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=x3Lh60uoS4haCy780x/MJ9/5h1co7duWn8Yj3sdiPFU=; b=XEOg05kFurvdXf+U6fnMt3hm+xi3rY1mNaTovDINiuzV8/NfEUC1y8e5SQpEhNvzY8 /GsWp0KnkxbwJ6bc0OMfvODMts5CYVyAcmBMT/2ng0TdXNH2vVsdEnz8Ot8i03f7qR7R VYCT1jk120Mt2Pu5JGAG9R+wpGkbB3u3n4DGqU+adL/TgSKKAlgmr+W5qStvRn/OvBDu oZ5v2eKcK2Bbq1WJo295xr3iNaXLnYnQRWCG58G6M9vMDrasJMA4QAnXvSCVyXiYfuys 50Zw37dw3Zjm3BnA+tuQubBzZOzVlPT4CtFduLg94e/C4dsss7wkesSxji1/tFo3PjGM cciw== X-Gm-Message-State: AKGB3mKlRvU9KelLcMy8SA7/JHy559onZWkrcYGTeu6LGidnxT17R++k 1cj9iDwimCm5GmufgVtqn3SBMQ== X-Received: by 10.28.157.7 with SMTP id g7mr1735113wme.99.1513252446473; Thu, 14 Dec 2017 03:54:06 -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 e197sm11797509wmf.42.2017.12.14.03.54.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 14 Dec 2017 03:54:05 -0800 (PST) From: Jorge Ramirez-Ortiz To: jorge.ramirez-ortiz@linaro.org, u-boot@lists.denx.de Date: Thu, 14 Dec 2017 12:53:54 +0100 Message-Id: <1513252441-29520-1-git-send-email-jorge.ramirez-ortiz@linaro.org> X-Mailer: git-send-email 2.7.4 Subject: [U-Boot] [PATCH 1/8] 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" Signed-off-by: Jorge Ramirez-Ortiz --- 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; }