D36791.diff
No OneTemporary
Actions

Size

748 B

Referenced Files

None

Subscribers

None

D36791.diff
View Options

	diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c
	--- a/sys/arm64/arm64/machdep.c
	+++ b/sys/arm64/arm64/machdep.c
	@@ -768,7 +768,9 @@
	update_special_regs(0);

	link_elf_ireloc(kmdp);
	+#ifdef FDT
	try_load_dtb(kmdp);
	+#endif

	efi_systbl_phys = MD_FETCH(kmdp, MODINFOMD_FW_HANDLE, vm_paddr_t);

	diff --git a/sys/arm64/arm64/machdep_boot.c b/sys/arm64/arm64/machdep_boot.c
	--- a/sys/arm64/arm64/machdep_boot.c
	+++ b/sys/arm64/arm64/machdep_boot.c
	@@ -53,9 +53,10 @@

	extern int *end;
	static char *loader_envp;
	-static char static_kenv[4096];

	#ifdef FDT
	+static char static_kenv[4096];
	+
	#define CMDLINE_GUARD "FreeBSD:"
	#define LBABI_MAX_COMMAND_LINE 512
	static char linux_command_line[LBABI_MAX_COMMAND_LINE + 1];