Merge git://git.denx.de/u-boot-cfi-flash

[people/ms/u-boot.git] / common / image-android.c

diff --git a/common/image-android.c b/common/image-android.c
index c668407817c8701a7bcce11450f300362ab0b390..e74d0aafca57e3d74ed2c7f898dfbc2f5ebfab08 100644 (file)
--- a/common/image-android.c
+++ b/common/image-android.c
@@ -72,7 +72,7 @@ int android_image_get_kernel(const struct andr_img_hdr *hdr, int verify,
                len += strlen(hdr->cmdline);
        }
 
-       char *bootargs = getenv("bootargs");
+       char *bootargs = env_get("bootargs");
        if (bootargs)
                len += strlen(bootargs);
 
@@ -90,7 +90,7 @@ int android_image_get_kernel(const struct andr_img_hdr *hdr, int verify,
        if (*hdr->cmdline)
                strcat(newbootargs, hdr->cmdline);
 
-       setenv("bootargs", newbootargs);
+       env_set("bootargs", newbootargs);
 
        if (os_data) {
                *os_data = (ulong)hdr;