---
 README             |    5 +++++
 common/cmd_bootm.c |    6 ++++--
 common/image.c     |   31 +++++++++++++++++++++++++++----
 3 files changed, 36 insertions(+), 6 deletions(-)

V2: Make this feature configurable
Document this feature

README +5 -0

index b273070..43fa160 100644
@@ -4422,6 +4422,11 @@ On some platforms, it's possible to boot Linux zImage. This is done
 using the "bootz" command. The syntax of "bootz" command is the same
 as the syntax of "bootm" command.
 
+Note, defining the CONFIG_SUPPORT_INITRD_RAW allows user to supply
+kernel with raw initrd images. The syntax is slightly different, the
+address of the initrd must be augmented by it's size, in the following
+format: "<initrd addres>:<initrd size>".
+
 
 Standalone HOWTO:
 =================

common/cmd_bootm.c +4 -2

index 9efac8b..872a49c 100644
@@ -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"

common/image.c +27 -4

index 95c7a15..1908df6 100644
@@ -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,21 @@ 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);
+
+#ifdef CONFIG_SUPPORT_RAW_INITRD
+				if (end[0] == ':') {
+					rd_len = simple_strtoul(++end,
+								NULL, 16);
+					debug("*  ramdisk: cmdline image "
+						"length = 0x%08lx\n",
+						rd_len);
+				}
+#endif
+
 			}
 #if defined(CONFIG_FIT)
 		} else {

@@ -990,9 +1002,20 @@ 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;
+#ifdef CONFIG_SUPPORT_RAW_INITRD
+			/*
+			 * Check if rd_len was manually overridden, if it was,
+			 * we're loading RAW ramdisk.
+			 */
+			if (rd_len != 0) {
+				rd_data = rd_addr;
+			} else
+#endif
+			{
+				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,

Signature · 1 line

1.7.9

Rob Herring

2012-03-16 15:54 UTC #2 lore raw

PATCH v2 1/1 BOOT: Add RAW ramdisk support to bootz

Quoted 74 lines · 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 <[email protected]>

Cc Tom Warren <[email protected]>

Cc albert.u.boot at aribaud.net

Cc afleming at gmail.com,

Cc Simon Glass <[email protected]>,

Cc Stephen Warren <[email protected]>

Cc Nicolas Pitre <[email protected]>

Cc Wolfgang Denk <[email protected]>

Cc Detlev Zundel <[email protected]>

---
 README             |    5 +++++
 common/cmd_bootm.c |    6 ++++--
 common/image.c     |   31 +++++++++++++++++++++++++++----
 3 files changed, 36 insertions(+), 6 deletions(-)

V2: Make this feature configurable
Document this feature

README +5 -0

index b273070..43fa160 100644
@@ -4422,6 +4422,11 @@ On some platforms, it's possible to boot Linux zImage. This is done
 using the "bootz" command. The syntax of "bootz" command is the same
 as the syntax of "bootm" command.
 
+Note, defining the CONFIG_SUPPORT_INITRD_RAW allows user to supply
+kernel with raw initrd images. The syntax is slightly different, the
+address of the initrd must be augmented by it's size, in the following
+format: "<initrd addres>:<initrd size>".
+
 
 Standalone HOWTO:
 =================

common/cmd_bootm.c +4 -2

index 9efac8b..872a49c 100644
@@ -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"

common/image.c +1 -0

index 95c7a15..1908df6 100644
@@ -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;

common/image.c int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images, · line 849

Quoted 5 lines

common/image.c +1 -1

@@ -845,10 +846,21 @@ 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);

V1 did not work for me and it looks like V2 has the same problem. You'll never get to this else because of the call to fit_parse_subimage above:

* fit_parse_subimage() expects subimage spec in the for of
* [<addr>]:<subimage>, where <addr> is a FIT image address that contains
* subimage with a <subimg> unit name.

With debug turned on, it thinks my size is the sub-image name:

* ramdisk: subimage '3DC72E' from image at 0x01000000 ramdisk start = 0x1ff912fc, ramdisk end = 0x3fe98ab4

Rob

Quoted 41 lines

common/image.c +25 -3

 				debug("*  ramdisk: cmdline image address = "
 						"0x%08lx\n",
 						rd_addr);
+
+#ifdef CONFIG_SUPPORT_RAW_INITRD
+				if (end[0] == ':') {
+					rd_len = simple_strtoul(++end,
+								NULL, 16);
+					debug("*  ramdisk: cmdline image "
+						"length = 0x%08lx\n",
+						rd_len);
+				}
+#endif
+
 			}
 #if defined(CONFIG_FIT)
 		} else {

@@ -990,9 +1002,20 @@ 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;
+#ifdef CONFIG_SUPPORT_RAW_INITRD
+			/*
+			 * Check if rd_len was manually overridden, if it was,
+			 * we're loading RAW ramdisk.
+			 */
+			if (rd_len != 0) {
+				rd_data = rd_addr;
+			} else
+#endif
+			{
+				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,

Marek Vasut

2012-03-16 21:30 UTC #3 lore raw

PATCH v2 1/1 BOOT: Add RAW ramdisk support to bootz

Dear Rob Herring,

Quoted 114 lines · Marek Vasut

Quoted 94 lines
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 <[email protected]>
Cc Tom Warren <[email protected]>
Cc albert.u.boot at aribaud.net
Cc afleming at gmail.com,
Cc Simon Glass <[email protected]>,
Cc Stephen Warren <[email protected]>
Cc Nicolas Pitre <[email protected]>
Cc Wolfgang Denk <[email protected]>
Cc Detlev Zundel <[email protected]>
---
 README             |    5 +++++
 common/cmd_bootm.c |    6 ++++--
 common/image.c     |   31 +++++++++++++++++++++++++++----
 3 files changed, 36 insertions(+), 6 deletions(-)
V2: Make this feature configurable
Document this feature
README +0 -0
index b273070..43fa160 100644
@@ -4422,6 +4422,11 @@ On some platforms, it's possible to boot Linux
zImage. This is done
using the "bootz" command. The syntax of "bootz" command is the same as the syntax of "bootm" command.
README +5 -0
+Note, defining the CONFIG_SUPPORT_INITRD_RAW allows user to supply
+kernel with raw initrd images. The syntax is slightly different, the
+address of the initrd must be augmented by it's size, in the following
+format: "<initrd addres>:<initrd size>".
+
 
 Standalone HOWTO:
 =================
common/cmd_bootm.c +4 -2
index 9efac8b..872a49c 100644
@@ -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"
common/image.c +1 -0
index 95c7a15..1908df6 100644
@@ -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)
common/image.c +0 -0
 	void		*fit_hdr;
 	const char	*fit_uname_config = NULL;
common/image.c int boot_get_ramdisk(int argc, char * const argv[], · line 854
Quoted 10 lines
common/image.c +1 -1
@@ -845,10 +846,21 @@ 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);
V1 did not work for me and it looks like V2 has the same problem. You'll never get to this else because of the call to fit_parse_subimage above:
* fit_parse_subimage() expects subimage spec in the for of
* [<addr>]:<subimage>, where <addr> is a FIT image address that contains
* subimage with a <subimg> unit name.

Quoted 4 lines

With debug turned on, it thinks my size is the sub-image name:
* ramdisk: subimage '3DC72E' from image at 0x01000000 ramdisk start = 0x1ff912fc, ramdisk end = 0x3fe98ab4

Good catch, thanks for testing ... will poke around further. But if you have any suggestions now that you dug in it, they're welcome :)

Quoted 57 lines

Rob

Quoted 54 lines

common/image.c +25 -3

 				debug("*  ramdisk: cmdline image address = "
 
 						"0x%08lx\n",
 						rd_addr);
 
+
+#ifdef CONFIG_SUPPORT_RAW_INITRD
+				if (end[0] == ':') {
+					rd_len = simple_strtoul(++end,
+								NULL, 16);
+					debug("*  ramdisk: cmdline image "
+						"length = 0x%08lx\n",
+						rd_len);
+				}
+#endif
+
 
 			}
 
 #if defined(CONFIG_FIT)
 
 		} else {

@@ -990,9 +1002,20 @@ 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;
+#ifdef CONFIG_SUPPORT_RAW_INITRD
+			/*
+			 * Check if rd_len was manually overridden, if it was,
+			 * we're loading RAW ramdisk.
+			 */
+			if (rd_len != 0) {
+				rd_data = rd_addr;
+			} else
+#endif
+			{
+				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,

Rob Herring

2012-03-18 21:47 UTC #4 lore raw

PATCH 1/1 BOOT: Add RAW ramdisk support to bootz

From: Marek Vasut <[email protected]>

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 <[email protected]>

Signed-off-by Rob Herring <[email protected]>

Cc Tom Warren <[email protected]>

Cc albert.u.boot at aribaud.net

Cc afleming at gmail.com

Cc Simon Glass <[email protected]>

Cc Stephen Warren <[email protected]>

Cc Nicolas Pitre <[email protected]>

Cc Wolfgang Denk <[email protected]>

Cc Detlev Zundel <[email protected]>

---
V3:
- fix operation when CONFIG_FIT is enabled as FIT images use <addr>[:<subimage>]

 README             |    5 +++++
 common/cmd_bootm.c |    6 ++++--
 common/image.c     |   15 ++++++++++++---
 3 files changed, 21 insertions(+), 5 deletions(-)

README +5 -0

index 5141751..068ec71 100644
@@ -4330,6 +4330,11 @@ On some platforms, it's possible to boot Linux zImage. This is done
 using the "bootz" command. The syntax of "bootz" command is the same
 as the syntax of "bootm" command.
 
+Note, defining the CONFIG_SUPPORT_INITRD_RAW allows user to supply
+kernel with raw initrd images. The syntax is slightly different, the
+address of the initrd must be augmented by it's size, in the following
+format: "<initrd addres>:<initrd size>".
+
 
 Standalone HOWTO:
 =================

common/cmd_bootm.c +4 -2

index b49d4f7..2f9b214 100644
@@ -1634,9 +1634,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"

common/image.c +12 -3

index 77ca6e4..2a25f5f 100644
@@ -796,6 +796,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;

@@ -989,9 +990,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;
+#ifdef CONFIG_SUPPORT_RAW_INITRD
+			if (argc >= 3 && (end = strchr(argv[2], ':'))) {
+				rd_len = simple_strtoul(++end, NULL, 16);
+				rd_data = rd_addr;
+			} else
+#endif
+			{
+				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,

Signature · 1 line

1.7.5.4

Rob Herring

2012-03-22 12:14 UTC #6 lore raw

PATCH 1/1 BOOT: Add RAW ramdisk support to bootz

Quoted 24 lines · Marek Vasut

Dear Rob Herring,
Quoted 11 lines
From: Marek Vasut <[email protected]>
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
Quoted 10 lines
Signed-off-by Marek Vasut <[email protected]>
Signed-off-by Rob Herring <[email protected]>
Cc Tom Warren <[email protected]>
Cc albert.u.boot at aribaud.net
Cc afleming at gmail.com
Cc Simon Glass <[email protected]>
Cc Stephen Warren <[email protected]>
Cc Nicolas Pitre <[email protected]>
Cc Wolfgang Denk <[email protected]>
Cc Detlev Zundel <[email protected]>

Quoted 2 lines

Doesn't this still colide with CONFIG_FIT? Aka. in case of CONFIG_FIT enabled, you can't use raw ramdisk?

No. All the parsing now is done after trying to read the image type. Only if a valid legacy or FIT uImage is not found, do we hit the raw image code and parse the size. I tested both with and without CONFIG_FIT enabled.

Quoted 2 lines

btw. maybe we should use "@" instead of ":" and be done with it?

Sub images will have an @ in the name. I thought about parsing for that, but DT has no requirement that you have to have an @ in the node name and it's not clear to me if u-boot convention requires it or not. Then I came up with the current patch, so it doesn't matter.

Rob

Quoted 81 lines

Quoted 68 lines

---
V3:
- fix operation when CONFIG_FIT is enabled as FIT images use <addr>[:<subimage>]

 README             |    5 +++++
 common/cmd_bootm.c |    6 ++++--
 common/image.c     |   15 ++++++++++++---
 3 files changed, 21 insertions(+), 5 deletions(-)

README +0 -0

index 5141751..068ec71 100644
@@ -4330,6 +4330,11 @@ On some platforms, it's possible to boot Linux

zImage. This is done using the "bootz" command. The syntax of "bootz" command is the same as the syntax of "bootm" command.

README +5 -0

+Note, defining the CONFIG_SUPPORT_INITRD_RAW allows user to supply
+kernel with raw initrd images. The syntax is slightly different, the
+address of the initrd must be augmented by it's size, in the following
+format: "<initrd addres>:<initrd size>".
+
 
 Standalone HOWTO:
 =================

common/cmd_bootm.c +0 -0

index b49d4f7..2f9b214 100644
@@ -1634,9 +1634,11 @@ static int do_bootz(cmd_tbl_t *cmdtp, int flag, int

argc, char * const argv[]) U_BOOT_CMD(

common/cmd_bootm.c +4 -2

 	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"

common/image.c +5 -3

index 77ca6e4..2a25f5f 100644
@@ -796,6 +796,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;

@@ -989,9 +990,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;
+#ifdef CONFIG_SUPPORT_RAW_INITRD
+			if (argc >= 3 && (end = strchr(argv[2], ':'))) {
+				rd_len = simple_strtoul(++end, NULL, 16);
+				rd_data = rd_addr;

common/image.c int boot_get_ramdisk(int argc, char * const argv[], · line 1006

Quoted 10 lines

common/image.c +7 -0

+			} else
+#endif
+			{
+				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,

Best regards,
Marek Vasut

Marek Vasut

2012-03-22 12:45 UTC #7 lore raw

PATCH 1/1 BOOT: Add RAW ramdisk support to bootz

Dear Rob Herring,

Quoted 33 lines · Marek Vasut

Quoted 24 lines
Dear Rob Herring,
Quoted 11 lines
From: Marek Vasut <[email protected]>
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
Quoted 10 lines
Signed-off-by Marek Vasut <[email protected]>
Signed-off-by Rob Herring <[email protected]>
Cc Tom Warren <[email protected]>
Cc albert.u.boot at aribaud.net
Cc afleming at gmail.com
Cc Simon Glass <[email protected]>
Cc Stephen Warren <[email protected]>
Cc Nicolas Pitre <[email protected]>
Cc Wolfgang Denk <[email protected]>
Cc Detlev Zundel <[email protected]>
Quoted 2 lines
Doesn't this still colide with CONFIG_FIT? Aka. in case of CONFIG_FIT enabled, you can't use raw ramdisk?
No. All the parsing now is done after trying to read the image type. Only if a valid legacy or FIT uImage is not found, do we hit the raw image code and parse the size. I tested both with and without CONFIG_FIT enabled.

Quoted 6 lines

Quoted 1 line
btw. maybe we should use "@" instead of ":" and be done with it?
Sub images will have an @ in the name. I thought about parsing for that, but DT has no requirement that you have to have an @ in the node name and it's not clear to me if u-boot convention requires it or not. Then I came up with the current patch, so it doesn't matter.

Dear Wolfgang Denk, are we OK with applying this and bootz patch please? Can we get it into .04 release please?

Quoted 102 lines

Rob

Quoted 99 lines

Quoted 91 lines

---
V3:
- fix operation when CONFIG_FIT is enabled as FIT images use

<addr>[:<subimage>]

 README             |    5 +++++
 common/cmd_bootm.c |    6 ++++--
 common/image.c     |   15 ++++++++++++---
 3 files changed, 21 insertions(+), 5 deletions(-)

README +0 -0

index 5141751..068ec71 100644
@@ -4330,6 +4330,11 @@ On some platforms, it's possible to boot Linux

zImage. This is done using the "bootz" command. The syntax of "bootz" command is the same as the syntax of "bootm" command.

README +5 -0

+Note, defining the CONFIG_SUPPORT_INITRD_RAW allows user to supply
+kernel with raw initrd images. The syntax is slightly different, the
+address of the initrd must be augmented by it's size, in the following
+format: "<initrd addres>:<initrd size>".
+
 
 Standalone HOWTO:
 =================

common/cmd_bootm.c +0 -0

index b49d4f7..2f9b214 100644
@@ -1634,9 +1634,11 @@ static int do_bootz(cmd_tbl_t *cmdtp, int flag,

int argc, char * const argv[]) U_BOOT_CMD(

common/cmd_bootm.c +4 -2

 	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"

common/image.c +1 -0

index 77ca6e4..2a25f5f 100644
@@ -796,6 +796,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)

common/image.c +11 -3

 	void		*fit_hdr;
 	const char	*fit_uname_config = NULL;

@@ -989,9 +990,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;
+#ifdef CONFIG_SUPPORT_RAW_INITRD
+			if (argc >= 3 && (end = strchr(argv[2], ':'))) {
+				rd_len = simple_strtoul(++end, NULL, 16);
+				rd_data = rd_addr;
+			} else
+#endif
+			{
+				puts("Wrong Ramdisk Image Format\n");
+				rd_data = rd_len = rd_load = 0;
+				return 1;
+			}

common/image.c int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images, · line 1006

Quoted 5 lines

common/image.c +0 -0

 		}
 
 	} else if (images->legacy_hdr_valid &&
 
 			image_check_type(&images->legacy_hdr_os_copy,

Best regards,
Marek Vasut

Wolfgang Denk

2012-03-22 13:33 UTC #8 lore raw

PATCH 1/1 BOOT: Add RAW ramdisk support to bootz

Dear Marek,

Quoted 8 lines · In message <[email protected]> you wrote:

Quoted 5 lines
Sub images will have an @ in the name. I thought about parsing for that, but DT has no requirement that you have to have an @ in the node name and it's not clear to me if u-boot convention requires it or not. Then I came up with the current patch, so it doesn't matter.
Dear Wolfgang Denk, are we OK with applying this and bootz patch please? Can we get it into .04 release please?

"this" - which patch version exactly are you referring to?

In any case this has been submitted long after the close of the MW, so this is stuff for "next".

Best regards,

Wolfgang Denk

Signature · 4 lines

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Today is the yesterday you worried about tomorrow.

Marek Vasut

2012-03-22 16:45 UTC #9 lore raw

PATCH 1/1 BOOT: Add RAW ramdisk support to bootz

Dear Wolfgang Denk,

Quoted 8 lines

Dear Marek,
Quoted 5 lines · In message <[email protected]> you wrote:
Quoted 4 lines
Sub images will have an @ in the name. I thought about parsing for that, but DT has no requirement that you have to have an @ in the node name and it's not clear to me if u-boot convention requires it or not. Then I came up with the current patch, so it doesn't matter.

Quoted 4 lines

Quoted 2 lines
Dear Wolfgang Denk, are we OK with applying this and bootz patch please? Can we get it into .04 release please?
"this" - which patch version exactly are you referring to?

Revision V6.

Quoted 3 lines

In any case this has been submitted long after the close of the MW, so this is stuff for "next".

I believe this patch is quite important to the linux-arm people and early adoption of this stuff would be very beneficial. Also, there are other patches that were applied after the MW was closed. Finally, this patch started long before .04 release cycle.

Quoted 4 lines

Best regards,
Wolfgang Denk

Best regards,
Marek Vasut

Wolfgang Denk

2012-03-22 23:04 UTC #10 lore raw

PATCH 1/1 BOOT: Add RAW ramdisk support to bootz

Dear Marek Vasut,

Quoted 7 lines · In message <[email protected]> you wrote:

Quoted 5 lines
Quoted 3 lines
Dear Wolfgang Denk, are we OK with applying this and bootz patch please? Can we get it into .04 release please?
"this" - which patch version exactly are you referring to?
Revision V6.

Could you please be a bit more specific? Like posting a link to the respective message on gmane, or in patchwork?

The Subject: of this message is "BOOT: Add RAW ramdisk support to bootz", but I have not seen any V6 for this patch. Ican only guess that you might be referring to [PATCH V6] BOOT: Add "bootz" command to boot Linux zImage on ARM - but I'd rather be sure.

Quoted 4 lines

I believe this patch is quite important to the linux-arm people and early adoption of this stuff would be very beneficial. Also, there are other patches that were applied after the MW was closed. Finally, this patch started long before .04 release cycle.

Where/when?

Best regards,

Wolfgang Denk

Signature · 5 lines

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
A little suffering is good for the soul.
	-- Kirk, "The Corbomite Maneuver", stardate 1514.0

Marek Vasut

2012-03-23 08:36 UTC #11 lore raw

PATCH 1/1 BOOT: Add RAW ramdisk support to bootz

Dear Wolfgang Denk,

Quoted 6 lines

Dear Marek Vasut,
Quoted 3 lines · In message <[email protected]> you wrote:
Quoted 3 lines
Quoted 2 lines
Dear Wolfgang Denk, are we OK with applying this and bootz patch please? Can we get it into .04 release please?

Quoted 6 lines

Quoted 3 lines
Quoted 1 line
"this" - which patch version exactly are you referring to?
Revision V6.
Could you please be a bit more specific? Like posting a link to the respective message on gmane, or in patchwork?

http://patchwork.ozlabs.org/patch/146848/
http://patchwork.ozlabs.org/patch/147440/

Quoted 5 lines

The Subject: of this message is "BOOT: Add RAW ramdisk support to bootz", but I have not seen any V6 for this patch. Ican only guess that you might be referring to [PATCH V6] BOOT: Add "bootz" command to boot Linux zImage on ARM - but I'd rather be sure.

Yes, see above two links please.

Quoted 7 lines

Quoted 5 lines
I believe this patch is quite important to the linux-arm people and early adoption of this stuff would be very beneficial. Also, there are other patches that were applied after the MW was closed. Finally, this patch started long before .04 release cycle.
Where/when?

If you mean the patch, here:
http://patchwork.ozlabs.org/patch/125318/

If you talk about accepting patches way past MW, almost all the time, at least in the ARM stuffs. And this works OK so far I believe, I see no breakage. Also, we didn't reach the RC phase yet either. Lastly, this change is not intrusive in any way.

Quoted 4 lines

Best regards,
Wolfgang Denk

Best regards,
Marek Vasut

Marek Vasut

2012-03-28 20:54 UTC #12 lore raw

PATCH 1/1 BOOT: Add RAW ramdisk support to bootz

Dear Wolfgang Denk,

Quoted 30 lines

Quoted 6 lines
Dear Marek Vasut,
Quoted 3 lines · In message <[email protected]> you wrote:
Quoted 3 lines
Quoted 2 lines
Dear Wolfgang Denk, are we OK with applying this and bootz patch please? Can we get it into .04 release please?
Quoted 6 lines
Quoted 3 lines
Quoted 1 line
"this" - which patch version exactly are you referring to?
Revision V6.
Could you please be a bit more specific? Like posting a link to the respective message on gmane, or in patchwork?
http://patchwork.ozlabs.org/patch/146848/
http://patchwork.ozlabs.org/patch/147440/
Quoted 4 lines
The Subject: of this message is "BOOT: Add RAW ramdisk support to bootz", but I have not seen any V6 for this patch. Ican only guess that you might be referring to [PATCH V6] BOOT: Add "bootz" command to boot Linux zImage on ARM - but I'd rather be sure.
Yes, see above two links please.
Quoted 6 lines
Quoted 4 lines
I believe this patch is quite important to the linux-arm people and early adoption of this stuff would be very beneficial. Also, there are other patches that were applied after the MW was closed. Finally, this patch started long before .04 release cycle.
Where/when?

Quoted 11 lines

If you mean the patch, here:
http://patchwork.ozlabs.org/patch/125318/
If you talk about accepting patches way past MW, almost all the time, at least in the ARM stuffs. And this works OK so far I believe, I see no breakage. Also, we didn't reach the RC phase yet either. Lastly, this change is not intrusive in any way.
Quoted 3 lines
Best regards,
Wolfgang Denk

Did you made up your mind on this patch please?

Best regards,
Marek Vasut

Wolfgang Denk

Applied

2012-03-30 21:01 UTC #13 lore raw

PATCH 1/1 BOOT: Add RAW ramdisk support to bootz

In reply to Rob Herring

Dear Rob Herring,

Quoted 26 lines · In message <[email protected]> you wrote:

From: Marek Vasut <[email protected]>
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 <[email protected]>
Signed-off-by Rob Herring <[email protected]>
Cc Tom Warren <[email protected]>
Cc albert.u.boot at aribaud.net
Cc afleming at gmail.com
Cc Simon Glass <[email protected]>
Cc Stephen Warren <[email protected]>
Cc Nicolas Pitre <[email protected]>
Cc Wolfgang Denk <[email protected]>
Cc Detlev Zundel <[email protected]>
---
V3:
- fix operation when CONFIG_FIT is enabled as FIT images use <addr>[:<subimage>]

Quoted 4 lines

 README             |    5 +++++
 common/cmd_bootm.c |    6 ++++--
 common/image.c     |   15 ++++++++++++---
 3 files changed, 21 insertions(+), 5 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 5 lines

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Never ascribe to malice that which can  adequately  be  explained  by
stupidity.

Wolfgang Denk

2012-03-30 21:12 UTC #14 lore raw

PATCH 1/1 BOOT: Add RAW ramdisk support to bootz

In reply to Rob Herring

Dear Rob & Marek,

Quoted 21 lines · In message <[email protected]> you wrote:

From: Marek Vasut <[email protected]>
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 <[email protected]>
Signed-off-by Rob Herring <[email protected]>
Cc Tom Warren <[email protected]>
Cc albert.u.boot at aribaud.net
Cc afleming at gmail.com
Cc Simon Glass <[email protected]>
Cc Stephen Warren <[email protected]>
Cc Nicolas Pitre <[email protected]>
Cc Wolfgang Denk <[email protected]>
Cc Detlev Zundel <[email protected]>

Quoted 4 lines

---
V3:
- fix operation when CONFIG_FIT is enabled as FIT images use <addr>[:<subimage>]

Argh...

This causes build warnings:

+ ./MAKEALL TQM860L
Configuring for TQM860L board...
image.c: In function 'boot_get_ramdisk':
image.c:800: warning: unused variable 'end'

Why do I get this at all? I did not enable any of the related bootz stuff on my board!

Please fix!

Best regards,

Wolfgang Denk

Signature · 5 lines

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Vulcans believe peace should not depend on force.
	-- Amanda, "Journey to Babel", stardate 3842.3