[U-Boot] [PATCH] BOOT: Add RAW ramdisk support to bootz

[Marek Vasut]

This patch allows loading RAW ramdisk via bootz command. The raw ramdisk is
loaded only in case it's size is specified:

  bootz <kernel addr> <ramdisk addr>:<ramdisk size> <fdt addr>

For example:

  bootz 0x42000000 0x43000000:0x12345 0x44000000

Signed-off-by: Marek Vasut <marex at denx.de>
Cc: Tom Warren <TWarren at nvidia.com>
Cc: albert.u.boot at aribaud.net
Cc: afleming at gmail.com,
Cc: Simon Glass <sjg at chromium.org>,
Cc: Stephen Warren <swarren at nvidia.com>
Cc: Nicolas Pitre <nico at fluxnic.net>
Cc: Wolfgang Denk <wd at denx.de>
Cc: Detlev Zundel <dzu at denx.de>
---
 common/cmd_bootm.c |    6 ++++--
 common/image.c     |   25 +++++++++++++++++++++----
 2 files changed, 25 insertions(+), 6 deletions(-)

NOTE: This patch depends on previous zImage/bootz patch. Testers are very
      welcome!

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 9efac8b..872a49c 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -1628,9 +1628,11 @@ static int do_bootz(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 U_BOOT_CMD(
 	bootz,	CONFIG_SYS_MAXARGS,	1,	do_bootz,
 	"boot Linux zImage image from memory",
-	"[addr [initrd] [fdt]]\n    - boot Linux zImage stored in memory\n"
+	"[addr [initrd[:size]] [fdt]]\n"
+	"    - boot Linux zImage stored in memory\n"
 	"\tThe argument 'initrd' is optional and specifies the address\n"
-	"\tof the initrd in memory.\n"
+	"\tof the initrd in memory. The optional argument ':size' allows\n"
+	"\tspecifying the size of RAW initrd.\n"
 #if defined(CONFIG_OF_LIBFDT)
 	"\tWhen booting a Linux kernel which requires a flat device-tree\n"
 	"\ta third argument is required which is the address of the\n"
diff --git a/common/image.c b/common/image.c
index 95c7a15..e9d87d8 100644
--- a/common/image.c
+++ b/common/image.c
@@ -797,6 +797,7 @@ int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images,
 	ulong rd_addr, rd_load;
 	ulong rd_data, rd_len;
 	const image_header_t *rd_hdr;
+	char *end;
 #if defined(CONFIG_FIT)
 	void		*fit_hdr;
 	const char	*fit_uname_config = NULL;
@@ -845,10 +846,18 @@ int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images,
 			} else
 #endif
 			{
-				rd_addr = simple_strtoul(argv[2], NULL, 16);
+				rd_addr = simple_strtoul(argv[2], &end, 16);
 				debug("*  ramdisk: cmdline image address = "
 						"0x%08lx\n",
 						rd_addr);
+
+				if (end[0] == ':') {
+					rd_len = simple_strtoul(++end,
+								NULL, 16);
+					debug("*  ramdisk: cmdline image "
+						"length = 0x%08lx\n",
+						rd_len);
+				}
 			}
 #if defined(CONFIG_FIT)
 		} else {
@@ -990,9 +999,17 @@ int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images,
 			break;
 #endif
 		default:
-			puts("Wrong Ramdisk Image Format\n");
-			rd_data = rd_len = rd_load = 0;
-			return 1;
+			/*
+			 * Check if rd_len was manually overridden, if it was,
+			 * we're loading RAW ramdisk.
+			 */
+			if (rd_len != 0) {
+				rd_data = rd_addr;
+			} else {
+				puts("Wrong Ramdisk Image Format\n");
+				rd_data = rd_len = rd_load = 0;
+				return 1;
+			}
 		}
 	} else if (images->legacy_hdr_valid &&
 			image_check_type(&images->legacy_hdr_os_copy,
-- 
1.7.9