Skip to contentSkip to conversation

fdt: Allow non-FDT kernels to boot when CONFIG_OF_LIBFDT is defined

PATCH New Suriyan Ramasami 3 participants 3 messages Nov 27, 2014 – Dec 8, 2014

lore
Share & tools
lore

Suriyan Ramasami

author
#0 lore raw

PATCH v2 1/1 fdt: Allow non-FDT kernels to boot when CONFIG_OF_LIBFDT is defined

The boot commands - bootz/bootm mandate a third argument which is the address to the FDT blob. In cases where this argument is not specified, boot fails with a message indicating a missing FDT.

This causes non-FDT kernels to fail to boot. This patch allows both FDT and non-FDT kernels to boot by making the third parameter to the bootm/bootz optional.

Signed-off-by Suriyan Ramasami <[email protected]>

---

Changes in v2:
- Simon: take care of real non error cases by introducing a no_fdt label to jump to instead of piggy backing on the error label. Also, use !select instead of argc <= 2.
- I am assuming this will have to be Tested-by and Acked-by again as there are more code changes than before. Hence dropping them.

Changes in v1:
- First try

 common/image-fdt.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)
common/image-fdt.c +11 -4
index 1d76bd6..e3f06cd 100644
@@ -237,6 +237,7 @@ int boot_get_fdt(int flag, int argc, char * const argv[], uint8_t arch,
 	int		fdt_noffset;
 #endif
 	const char *select = NULL;
+	int		ok_no_fdt = 0;
 
 	*of_flat_tree = NULL;
 	*of_size = 0;

@@ -309,7 +310,7 @@ int boot_get_fdt(int flag, int argc, char * const argv[], uint8_t arch,
 			       fdt_addr);
 			fdt_hdr = image_get_fdt(fdt_addr);
 			if (!fdt_hdr)
-				goto error;
+				goto no_fdt;
 
 			/*
 			 * move image data to the load address,

@@ -379,7 +380,7 @@ int boot_get_fdt(int flag, int argc, char * const argv[], uint8_t arch,
 			break;
 		default:
 			puts("ERROR: Did not find a cmdline Flattened Device Tree\n");
-			goto error;
+			goto no_fdt;
 		}
 
 		printf("   Booting using the fdt blob@%#08lx\n", fdt_addr);

@@ -413,11 +414,11 @@ int boot_get_fdt(int flag, int argc, char * const argv[], uint8_t arch,
 			}
 		} else {
 			debug("## No Flattened Device Tree\n");
-			goto error;
+			goto no_fdt;
 		}
 	} else {
 		debug("## No Flattened Device Tree\n");
-		goto error;
+		goto no_fdt;
 	}
 
 	*of_flat_tree = fdt_blob;

@@ -427,9 +428,15 @@ int boot_get_fdt(int flag, int argc, char * const argv[], uint8_t arch,
 
 	return 0;
 
+no_fdt:
+	ok_no_fdt = 1;
 error:
 	*of_flat_tree = NULL;
 	*of_size = 0;
+	if (!select && ok_no_fdt) {
+		debug("Continuing to boot without FDT\n");
+		return 0;
+	}
 	return 1;
 }
Signature · 1 line
1.8.3.1
#1 lore raw

PATCH v2 1/1 fdt: Allow non-FDT kernels to boot when CONFIG_OF_LIBFDT is defined

Quoted 19 lines · Suriyan Ramasami

The boot commands - bootz/bootm mandate a third argument which is the address to the FDT blob. In cases where this argument is not specified, boot fails with a message indicating a missing FDT.

This causes non-FDT kernels to fail to boot. This patch allows both FDT and non-FDT kernels to boot by making the third parameter to the bootm/bootz optional.

Signed-off-by Suriyan Ramasami <[email protected]>

---

Changes in v2:
- Simon: take care of real non error cases by introducing a no_fdt label to jump to instead of piggy backing on the error label. Also, use !select instead of argc <= 2.
- I am assuming this will have to be Tested-by and Acked-by again as there are more code changes than before. Hence dropping them.

Quoted 5 lines

Changes in v1:
- First try

 common/image-fdt.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

Looks good, thanks!

Acked-by Simon Glass <[email protected]>
#2 lore raw

PATCH v2 1/1 fdt: Allow non-FDT kernels to boot when CONFIG_OF_LIBFDT is defined

In reply to Suriyan Ramasami
Quoted 10 lines · Suriyan Ramasami

The boot commands - bootz/bootm mandate a third argument which is the address to the FDT blob. In cases where this argument is not specified, boot fails with a message indicating a missing FDT.

This causes non-FDT kernels to fail to boot. This patch allows both FDT and non-FDT kernels to boot by making the third parameter to the bootm/bootz optional.

Signed-off-by Suriyan Ramasami <[email protected]>
Acked-by Simon Glass <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20141208/8540f1db/attachment-0001.pgp>