Patched in Tegra support.

2 files changed, 26 insertions, 28 deletions

diff --git a/usr/Kconfig b/usr/Kconfig
index 085872bb2bb..65b845bd4e3 100644
--- a/usr/Kconfig
+++ b/usr/Kconfig
@@ -134,7 +134,7 @@ config INITRAMFS_COMPRESSION_BZIP2
         depends on RD_BZIP2
         help
           Its compression ratio and speed is intermediate.
-          Decompression speed is slowest among the choices.  The initramfs
+          Decompression speed is slowest among the four.  The initramfs
           size is about 10% smaller with bzip2, in comparison to gzip.
           Bzip2 uses a large amount of memory. For modern kernels you
           will need at least 8MB RAM or more for booting.
@@ -143,9 +143,9 @@ config INITRAMFS_COMPRESSION_LZMA
         bool "LZMA"
         depends on RD_LZMA
         help
-          This algorithm's compression ratio is best.
-          Decompression speed is between the other choices.
-          Compression is slowest. The initramfs size is about 33%
+          The most recent compression algorithm.
+          Its ratio is best, decompression speed is between the other
+          three. Compression is slowest. The initramfs size is about 33%
           smaller with LZMA in comparison to gzip.
 
 config INITRAMFS_COMPRESSION_XZ
@@ -161,7 +161,7 @@ config INITRAMFS_COMPRESSION_LZO
         bool "LZO"
         depends on RD_LZO
         help
-          Its compression ratio is the poorest among the choices. The kernel
+          Its compression ratio is the poorest among the four. The kernel
           size is about 10% bigger than gzip; however its speed
           (both compression and decompression) is the fastest.
 
diff --git a/usr/gen_init_cpio.c b/usr/gen_init_cpio.c
index af8c925e93e..af0f22fb1ef 100644
--- a/usr/gen_init_cpio.c
+++ b/usr/gen_init_cpio.c
@@ -303,7 +303,7 @@ static int cpio_mkfile(const char *name, const char *location,
         int retval;
         int rc = -1;
         int namesize;
-        unsigned int i;
+        int i;
 
         mode |= S_IFREG;
 
@@ -381,30 +381,28 @@ error:
 
 static char *cpio_replace_env(char *new_location)
 {
-        char expanded[PATH_MAX + 1];
-        char env_var[PATH_MAX + 1];
-        char *start;
-        char *end;
-
-        for (start = NULL; (start = strstr(new_location, "${")); ) {
-                end = strchr(start, '}');
-                if (start < end) {
-                        *env_var = *expanded = '\0';
-                        strncat(env_var, start + 2, end - start - 2);
-                        strncat(expanded, new_location, start - new_location);
-                        strncat(expanded, getenv(env_var),
-                                PATH_MAX - strlen(expanded));
-                        strncat(expanded, end + 1,
-                                PATH_MAX - strlen(expanded));
-                        strncpy(new_location, expanded, PATH_MAX);
-                        new_location[PATH_MAX] = 0;
-                } else
-                        break;
-        }
-
-        return new_location;
+       char expanded[PATH_MAX + 1];
+       char env_var[PATH_MAX + 1];
+       char *start;
+       char *end;
+
+       for (start = NULL; (start = strstr(new_location, "${")); ) {
+               end = strchr(start, '}');
+               if (start < end) {
+                       *env_var = *expanded = '\0';
+                       strncat(env_var, start + 2, end - start - 2);
+                       strncat(expanded, new_location, start - new_location);
+                       strncat(expanded, getenv(env_var), PATH_MAX);
+                       strncat(expanded, end + 1, PATH_MAX);
+                       strncpy(new_location, expanded, PATH_MAX);
+               } else
+                       break;
+       }
+
+       return new_location;
 }
 
+
 static int cpio_mkfile_line(const char *line)
 {
         char name[PATH_MAX + 1];