D38248.id116031.diff
No OneTemporary
Actions

Size

770 B

Referenced Files

None

Subscribers

None

D38248.id116031.diff
View Options

	diff --git a/stand/kboot/arch/powerpc64/load_addr.c b/stand/kboot/arch/powerpc64/load_addr.c
	--- a/stand/kboot/arch/powerpc64/load_addr.c
	+++ b/stand/kboot/arch/powerpc64/load_addr.c
	@@ -208,3 +208,15 @@
	return (bits);
	}
	#endif
	+
	+/* Need to transition from current hacky FDT way to this code */
	+bool enumerate_memory_arch(void)
	+{
	+ /*
	+ * For now, we dig it out of the FDT, plus we need to pass all data into
	+ * the kernel via the (adjusted) FDT we find.
	+ */
	+ setenv("usefdt", "1", 1);
	+
	+ return true;
	+}
	diff --git a/stand/kboot/main.c b/stand/kboot/main.c
	--- a/stand/kboot/main.c
	+++ b/stand/kboot/main.c
	@@ -215,7 +215,6 @@
	printf("\n%s", bootprog_info);

	setenv("LINES", "24", 1);
	- setenv("usefdt", "1", 1);

	/*
	* Find acpi, if it exists