[U-Boot,v5,12/19] disk: converted with new env interfaces

Message ID	20190905082133.18996-13-takahiro.akashi@linaro.org
State	Changes Requested, archived
Delegated to:	Heinrich Schuchardt
Headers	show Return-Path: <u-boot-bounces@lists.denx.de> From: AKASHI Takahiro <takahiro.akashi@linaro.org> To: trini@konsulko.com, xypron.glpk@gmx.de, agraf@csgraf.de, wd@denx.de Date: Thu, 5 Sep 2019 17:21:26 +0900 Message-Id: <20190905082133.18996-13-takahiro.akashi@linaro.org> In-Reply-To: <20190905082133.18996-1-takahiro.akashi@linaro.org> References: <20190905082133.18996-1-takahiro.akashi@linaro.org> MIME-Version: 1.0 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH v5 12/19] disk: converted with new env interfaces Precedence: list Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
Series	efi_loader: non-volatile variables support \| expand [U-Boot,v5,00/19] efi_loader: non-volatile variables support [U-Boot,v5,01/19] env: extend interfaces allowing for env contexts [U-Boot,v5,02/19] env: define env context for U-Boot environment [U-Boot,v5,03/19] env: nowhere: rework with new env interfaces [U-Boot,v5,04/19] env: flash: support multiple env contexts [U-Boot,v5,05/19] env: fat: support multiple env contexts [U-Boot,v5,06/19] hashtable: support multiple env contexts [U-Boot,v5,07/19] api: converted with new env interfaces [U-Boot,v5,08/19] arch: converted with new env interfaces [U-Boot,v5,09/19] board: converted with new env interfaces [U-Boot,v5,10/19] cmd: converted with new env interfaces [U-Boot,v5,11/19] common: converted with new env interfaces [U-Boot,v5,12/19] disk: converted with new env interfaces [U-Boot,v5,13/19] drivers: converted with new env interfaces [U-Boot,v5,14/19] fs: converted with new env interfaces [U-Boot,v5,15/19] lib: converted with new env interfaces (except efi_loader) [U-Boot,v5,16/19] net: converted with new env interfaces [U-Boot,v5,17/19] post: converted with new env interfaces [U-Boot,v5,18/19] env, efi_loader: define env context for UEFI variables [U-Boot,v5,19/19] efi_loader: variable: rework with new env interfaces

Message ID

20190905082133.18996-13-takahiro.akashi@linaro.org

State

Changes Requested, archived

Delegated to:

Heinrich Schuchardt

Headers

From: AKASHI Takahiro <takahiro.akashi@linaro.org>
To: trini@konsulko.com,
	xypron.glpk@gmx.de,
	agraf@csgraf.de,
	wd@denx.de
Date: Thu,  5 Sep 2019 17:21:26 +0900
Message-Id: <20190905082133.18996-13-takahiro.akashi@linaro.org>
In-Reply-To: <20190905082133.18996-1-takahiro.akashi@linaro.org>
References: <20190905082133.18996-1-takahiro.akashi@linaro.org>
MIME-Version: 1.0
Cc: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v5 12/19] disk: converted with new env interfaces
Precedence: list
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Errors-To: u-boot-bounces@lists.denx.de
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>

Series

efi_loader: non-volatile variables support | expand

Commit Message

AKASHI Takahiro Sept. 5, 2019, 8:21 a.m. UTC

env_xxx(...) -> env_xxx(ctx_uboot, ...)

Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
---
 disk/part.c       | 2 +-
 disk/part_amiga.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/disk/part.c b/disk/part.c
index 8982ef3baed1..6bbb40c62182 100644
--- a/disk/part.c
+++ b/disk/part.c
@@ -491,7 +491,7 @@  int blk_get_device_part_str(const char *ifname, const char *dev_part_str,
 	/* If no dev_part_str, use bootdevice environment variable */
 	if (!dev_part_str || !strlen(dev_part_str) ||
 	    !strcmp(dev_part_str, "-"))
-		dev_part_str = env_get("bootdevice");
+		dev_part_str = env_get(ctx_uboot, "bootdevice");
 
 	/* If still no dev_part_str, it's an error */
 	if (!dev_part_str) {
diff --git a/disk/part_amiga.c b/disk/part_amiga.c
index 5a2bb718b597..c40baaeb9caf 100644
--- a/disk/part_amiga.c
+++ b/disk/part_amiga.c
@@ -132,7 +132,7 @@  struct rigid_disk_block *get_rdisk(struct blk_desc *dev_desc)
     int limit;
     char *s;
 
-    s = env_get("amiga_scanlimit");
+    s = env_get(ctx_uboot, "amiga_scanlimit");
     if (s)
 	limit = simple_strtoul(s, NULL, 10);
     else
@@ -172,7 +172,7 @@  struct bootcode_block *get_bootcode(struct blk_desc *dev_desc)
     int limit;
     char *s;
 
-    s = env_get("amiga_scanlimit");
+    s = env_get(ctx_uboot, "amiga_scanlimit");
     if (s)
 	limit = simple_strtoul(s, NULL, 10);
     else

[U-Boot,v5,12/19] disk: converted with new env interfaces

Commit Message

Patch