From patchwork Tue Jan 9 09:11:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jorge Ramirez-Ortiz, Gmail" X-Patchwork-Id: 123928 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp3975217qgn; Tue, 9 Jan 2018 04:43:31 -0800 (PST) X-Google-Smtp-Source: ACJfBosAqo0NZ3dt3Ea/5NT7lm004LVeYnv3NIP8i4YBymbPy3cPy95oS7FHA9UMw2ckM+izvcD9 X-Received: by 10.80.158.78 with SMTP id z72mr21667209ede.65.1515501811725; Tue, 09 Jan 2018 04:43:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515501811; cv=none; d=google.com; s=arc-20160816; b=bdIucgs/aXqOv/S9rp5QpvWieBfsf7i8tXw3c/r0WxvVacaVJ/3OP/EZH7ZGmJtL3l MLd/BsHhLiz58ahTbCTmoFPXkhOVHUoRwDMbxB5Zfiyriu2i5DCkCDiK44mqw1HNjQPc K8Tv/2bJT/1yjs5YYz0EoXcAhzFGtF3P1tm4O0MbpLNjeKb/N+gbt8M3AoY5xerkJLqk qynVtSaoXYNuur7PpOzloscZzDhtJ8DEaOmIrvO3u5wjcCu8+mpcpcs2GLAdCH3BH7nz u9Nkp+O02qR39ZoNHsjAlJ2Tw4r9MxjzI/n2hvtqHGZxXnOPZTJBQ+eCsOZm93e9xTKu pkmQ== 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=Wtm1LdGDNhQtwrzRyDm6Xk1N3AckSDJhkXKkjOHyDpk=; b=xHnfI1/9sdzOvsgD7uHzAGPESBnerv+yw0Y+ReeV7qAX5CEUdk7+sji93yAq00f2qz 0cCYPwcZU90koK97mqWreVdshuCenBgRdd+9bNWkPxLAgF6oX93/MRJChdtDb5b28ueQ yK1wf8bGNoPQymTSdUZ0/hGcXBwYrKjTKh8OTo8X+djfo3FG0ZFwpDu1AUtoEzU6wZ37 G678pAfoFBv81eQeyPZuQrzlxbSNDESy4bHvFt7Qzv2LzD3O6/+WxyH+zmfgHTZTXUMW 4pZvwBqkngE8SFfLM9WmNKBA07ZRYdugWHYyqKur5xbNDwir2Zh2aiSAHRpzmmdg72xP Z9sA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=fPhB+/Kt; 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=gmail.com Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id g31si1484851edd.353.2018.01.09.04.43.31; Tue, 09 Jan 2018 04:43:31 -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=@gmail.com header.s=20161025 header.b=fPhB+/Kt; 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=gmail.com Received: by lists.denx.de (Postfix, from userid 105) id 80F76C2201E; Tue, 9 Jan 2018 12:36:14 +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=FREEMAIL_FROM, 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 3922EC21FA4; Tue, 9 Jan 2018 12:34:41 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 32183C22072; Tue, 9 Jan 2018 09:12:08 +0000 (UTC) Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by lists.denx.de (Postfix) with ESMTPS id A8A63C2203C for ; Tue, 9 Jan 2018 09:12:07 +0000 (UTC) Received: by mail-wr0-f196.google.com with SMTP id 16so906532wry.12 for ; Tue, 09 Jan 2018 01:12:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=fhhTPbDrJg2mgH33UcIF+IcXMyQLbrv5DZx/5bKFcqs=; b=fPhB+/Ktt7hPvy0RPVofZA6yQEnmYaQsQlRK8qph1ufW2auu/RkvEvDM8CqIItkInx rH8PTC7wkvvje0B7i9blztxJHR+Z2pQMEPPhw2aO2JIj0rdcuGWH3DhQE1+wXxZgARDC UGrjdVNrZrefUTlRebgtI3TFX99zqkDUNZatz5C2cTfgnZTSDu3zGxl7PTuB0u7Oolci QcpZRHXXEKRjmzOEdRIr6prMRPwi3tkRxMXKVCut0e8gkJvmH1JNETuzRruuBW83GGAd 106K4/jPeSqoGmhTZ6uheyj225YZvaqOJAxqScuXoRNX9KhZWwAlf6plaNhbPHhnPEt6 zs5A== 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=fhhTPbDrJg2mgH33UcIF+IcXMyQLbrv5DZx/5bKFcqs=; b=dnPGRKJMbE9Xqln1222vlqU6SpaKYopbWrBeXpF15dnfld+R5X6OpZUdZl2GhppBda 7E6CEQ0Up6hLhJwpUbjWdyzllOrbNxsR9pP8HajUuvVeSKFGXVM64/HXRtlBX3ftXPXX fJoPycD7su+AnAO7PeiWpP5XGsEAtsSRY7brLUlOovu8fot2jcuf+mhuPpgASx1wdeP5 8xs/DX72gS55LBEGTnBGMLn+11UGJjQv9QMzEPXCRf5jR6J+EpfqmPAz07ZKYg8O9Eoc 6MNF4r8PtzRizLYQI8uA75Fa51FqDeekfqHR0SfWCJL57o7B7qWxO+5sNv3MMNuRmUBv kpgw== X-Gm-Message-State: AKGB3mJdI4YpTTlK7NWXsF/sEn9ulJ2vhKQDGaZDVXzccZjLKB0cYpE9 dy9k8BorEYDv64zPlg8u/bo= X-Received: by 10.223.151.219 with SMTP id t27mr5870927wrb.276.1515489127263; Tue, 09 Jan 2018 01:12:07 -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 q7sm9943830wrf.31.2018.01.09.01.12.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 09 Jan 2018 01:12:06 -0800 (PST) From: Jorge Ramirez-Ortiz To: jorge.ramirez.ortiz@gmail.com, U-Boot@lists.denx.de, pbrobinson@gmail.com Date: Tue, 9 Jan 2018 10:11:59 +0100 Message-Id: <1515489123-6846-1-git-send-email-jorge.ramirez.ortiz@gmail.com> X-Mailer: git-send-email 2.7.4 X-Mailman-Approved-At: Tue, 09 Jan 2018 12:34:31 +0000 Subject: [U-Boot] [PATCH 01/05] 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" From: Jorge Ramirez-Ortiz 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 bef6e89..692f863 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; }