From patchwork Fri Jan 5 10:29:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jorge Ramirez-Ortiz X-Patchwork-Id: 123490 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp635027qgn; Fri, 5 Jan 2018 02:33:28 -0800 (PST) X-Google-Smtp-Source: ACJfBovwF7oNL35LPEuagAYEahIxzrXY7RkDdBicpCqx3agd459zfJQzRx1J0gSBzV0eTZ60xJJP X-Received: by 10.80.183.184 with SMTP id h53mr3520018ede.249.1515148408838; Fri, 05 Jan 2018 02:33:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515148408; cv=none; d=google.com; s=arc-20160816; b=jl+225nq0hdckXv7c9H0DRlIKuqYiCEtxfVJP9P3Sk7mP21r6LxphhNPWvBzbco0wE TUtkTJIziVUxMbEqft6EO5Qq1Zcmwyd1KlEzT8DEazFZHHs713BBgcldXGTRfYjbA+Y3 BRQm8PjY39SD2cLMaLXDFUbtgTHYiVK/2vsAkDOv9FQP3ZIeLfM6HV4MfErRxOj1SZMu TEXU3++v8lAjIs4lYp1E9t9rYJa4bT6UPqJUQDEH5JjAuvv8rZxe7DqpkYm/QtgjYtPU C6mYXKb/lvWCkJHjWdHmMbaXAzSkGTNa4faByj5MRsuyS7U7eXa9fIXu+U9ph3MJMHI6 L3lA== 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=KEfNeRmIk1eSmTVArfTIXG8cL7IDQ45iygyQazNg5Ds=; b=Ej8F/Gw6sDunKMzgPWz6Ba8ub8hM9yL9ZB/1DbaMp9xwq1voF5IS0L7k+uOEt1ElXF dclPHPLyqzi/cvW1XLuNkDpvc/I8L69jSSOF69rMyEHZsV6+RQIyebPVCqAiGPK2ygHX z2boO+BD2KFvYo6eo9NGFrs07BBJ5Tt7XymSMKzthB99M9jGRFdEiYufA8hZAc6c7aYr aSZzggO5kGPXUSjkcpfH6LEIh7gP9V89zpF/Z5K3F7FreohHD/R3oTufDLtz4JivErzS 5DoBEutPTmT6hwdw4446zPsS/xGNL/l9ZvnKGS/YOvUFKFL39yzWiHJUb0Ovt2dVBs3x L8NQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=j6kc0hSP; 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 o91si3834457eda.277.2018.01.05.02.33.28; Fri, 05 Jan 2018 02:33:28 -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=j6kc0hSP; 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 49C09C21E57; Fri, 5 Jan 2018 10:33:03 +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 919D1C21E28; Fri, 5 Jan 2018 10:29:27 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 30B24C21E66; Fri, 5 Jan 2018 10:29:24 +0000 (UTC) Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by lists.denx.de (Postfix) with ESMTPS id D4CA6C21DA6 for ; Fri, 5 Jan 2018 10:29:18 +0000 (UTC) Received: by mail-wr0-f195.google.com with SMTP id s10so1040513wrb.6 for ; Fri, 05 Jan 2018 02:29:18 -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=td81RLADnCgc/CVM/ORUNb6PHbdDb4QTwucBRywdrpg=; b=j6kc0hSPsdfFo0G7mKNFeRVB8snkrCSy2AZuBzCipKzTAyWb7YwXekQmdmaO7IVcmj jcsjNknyyXLKg5Vojy3cO7FcL94wQ0V9wMNX8QOJEYJm4jxlw/RPfgRPcfPbPEHZBmJG cu+aJCuktZXwXY9mlFmdmOk9JcXnz989MMBM0= 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=td81RLADnCgc/CVM/ORUNb6PHbdDb4QTwucBRywdrpg=; b=V/TOg+m9aE32iqgMIdgEGK9dHy2qHrGptyQI5L+3WDRb9NWllpn8AxzgvMQaHWhv+G bL61JHj32RxeMuQEkmXom4vm8BYdg+T9ABgOO5JdDe+1fCJX+JlnX4udBoTEwmpLTJlQ oEG2JevmnvmO4pEOt72aaCz+xujjtEPVVhGlwpuo6x8MG5jyvSzV+ultlx1/KVphstcH 1+tWkwlwf7FSDC6enRNsE+dBGdG6SQxfLanUWIeVJc9ceXg2KWxhCd2sF9vbm3FqhvaN pM8nTZOjbdTiapjTv2oO3w/FLsYZxephDIiKcbwmXLSISv1rH7bdPEe/bxDX+WuAzICB F1lg== X-Gm-Message-State: AKGB3mJGTCZaQXhUo/sagqbnEByOT31oHrd/OkkxcEkVtQ6am3N/ACNg JMm3IG0aeJFoTQNDy288dp/Flg== X-Received: by 10.223.193.77 with SMTP id w13mr2422310wre.167.1515148158438; Fri, 05 Jan 2018 02:29:18 -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 n33sm10367629wrn.76.2018.01.05.02.29.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 05 Jan 2018 02:29:17 -0800 (PST) From: Jorge Ramirez-Ortiz To: jorge.ramirez-ortiz@linaro.org, u-boot@lists.denx.de Date: Fri, 5 Jan 2018 11:29:10 +0100 Message-Id: <1515148154-30138-1-git-send-email-jorge.ramirez-ortiz@linaro.org> X-Mailer: git-send-email 2.7.4 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" 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; }