Index: sys/arm64/arm64/machdep.c =================================================================== --- sys/arm64/arm64/machdep.c +++ sys/arm64/arm64/machdep.c @@ -83,6 +83,7 @@ #endif #ifdef FDT +#include #include #endif @@ -668,6 +669,20 @@ return (1); } +#ifdef FDT +static void +add_fdt_mem_regions(struct mem_region *mr, int mrcnt, vm_paddr_t *physmap, + u_int *physmap_idxp) +{ + + for (int i = 0; i < mrcnt; i++) { + if (!add_physmap_entry(mr[i].mr_start, mr[i].mr_size, physmap, + physmap_idxp)) + break; + } +} +#endif + #define efi_next_descriptor(ptr, size) \ ((struct efi_md *)(((uint8_t *) ptr) + size)) @@ -807,6 +822,11 @@ { struct efi_map_header *efihdr; struct pcpu *pcpup; +#ifdef FDT + struct mem_region mem_regions[FDT_MEM_REGIONS]; + u_long memsize; + int mem_regions_sz; +#endif vm_offset_t lastaddr; caddr_t kmdp; vm_paddr_t mem_len; @@ -834,7 +854,18 @@ physmap_idx = 0; efihdr = (struct efi_map_header *)preload_search_info(kmdp, MODINFO_METADATA | MODINFOMD_EFI_MAP); - add_efi_map_entries(efihdr, physmap, &physmap_idx); + if (efihdr) + add_efi_map_entries(efihdr, physmap, &physmap_idx); +#ifdef FDT + else { + /* Grab physical memory regions information from device tree. */ + if (fdt_get_mem_regions(mem_regions, &mem_regions_sz, + &memsize) != 0) + panic("Cannot get physical memory regions"); + add_fdt_mem_regions(mem_regions, mem_regions_sz, physmap, + &physmap_idx); + } +#endif /* Print the memory map */ mem_len = 0; Index: sys/arm64/conf/GENERIC =================================================================== --- sys/arm64/conf/GENERIC +++ sys/arm64/conf/GENERIC @@ -121,6 +121,7 @@ # Serial (COM) ports device uart # Generic UART driver +device uart_ns8250 device pl011 # USB support Index: sys/dev/uart/uart_cpu_fdt.c =================================================================== --- sys/dev/uart/uart_cpu_fdt.c +++ sys/dev/uart/uart_cpu_fdt.c @@ -162,8 +162,15 @@ break; } } - if (chosen == -1 || *name == NULL) - node = OF_finddevice("serial0"); /* Last ditch */ + if (chosen == -1 || *name == NULL) { + /* + * If chosen node is not available then we will use + * the first serial0 or uart0 node in device tree. + */ + node = OF_finddevice("serial0"); + if (node == -1) + node = OF_finddevice("/soc/uart0"); + } } else { node = OF_finddevice(cp); } Index: sys/dev/uart/uart_dev_ns8250.c =================================================================== --- sys/dev/uart/uart_dev_ns8250.c +++ sys/dev/uart/uart_dev_ns8250.c @@ -397,6 +397,7 @@ #ifdef FDT static struct ofw_compat_data compat_data[] = { {"ns16550", (uintptr_t)&uart_ns8250_class}, + {"ns16550a", (uintptr_t)&uart_ns8250_class}, {"snps,dw-apb-uart", (uintptr_t)&uart_ns8250_class}, {NULL, (uintptr_t)NULL}, };