d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm64: fix build without FDT

Browse Source 
static_kenv is only used under `FDT`, and `try_load_dtb` is only defined
with `FDT`.

Reviewed by:	andrew, imp, manu
Differential Revision:	https://reviews.freebsd.org/D36791
This commit is contained in:
Kyle Evans 2022-09-29 14:33:33 -05:00
parent 23c318ed86
commit 78f3c734a5
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/arm64/arm64/machdep.c
View File

@ -768,7 +768,9 @@ initarm(struct arm64_bootparams *abp)
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);

3
sys/arm64/arm64/machdep_boot.c
View File

@ -53,9 +53,10 @@ __FBSDID("$FreeBSD$");
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];