Index: conf/files.arm64
===================================================================
--- conf/files.arm64	(revision 307239)
+++ conf/files.arm64	(working copy)
@@ -96,6 +96,42 @@
 arm64/cavium/thunder_pcie_pem_fdt.c	optional	soc_cavm_thunderx pci fdt
 arm64/cavium/thunder_pcie_common.c	optional	soc_cavm_thunderx pci
 arm64/cloudabi64/cloudabi64_sysvec.c	optional compat_cloudabi64
+arm/broadcom/bcm2835/bcm2835_bsc.c		optional bcm2835_bsc
+arm/broadcom/bcm2835/bcm2835_common.c		optional fdt soc_brcm_bcm2837
+arm/broadcom/bcm2835/bcm2835_cpufreq.c		optional soc_brcm_bcm2837
+arm/broadcom/bcm2835/bcm2835_dma.c		optional soc_brcm_bcm2837
+arm/broadcom/bcm2835/bcm2835_fbd.c		optional vt soc_brcm_bcm2837
+arm/broadcom/bcm2835/bcm2835_ft5406.c		optional evdev bcm2835_ft5406 soc_brcm_bcm2837
+arm/broadcom/bcm2835/bcm2835_gpio.c		optional gpio soc_brcm_bcm2837
+arm/broadcom/bcm2835/bcm2835_intr.c		optional soc_brcm_bcm2837
+arm/broadcom/bcm2835/bcm2835_mbox.c		optional soc_brcm_bcm2837
+arm/broadcom/bcm2835/bcm2835_rng.c		optional random soc_brcm_bcm2837
+arm/broadcom/bcm2835/bcm2835_sdhci.c		optional sdhci soc_brcm_bcm2837
+arm/broadcom/bcm2835/bcm2835_spi.c		optional bcm2835_spi soc_brcm_bcm2837
+arm/broadcom/bcm2835/bcm2835_vcio.c		optional soc_brcm_bcm2837
+arm/broadcom/bcm2835/bcm2835_wdog.c		optional soc_brcm_bcm2837
+arm/broadcom/bcm2835/bcm2836.c			optional soc_brcm_bcm2837
+arm/broadcom/bcm2835/bcm283x_dwc_fdt.c		optional dwcotg fdt soc_brcm_bcm2837
+arm/broadcom/bcm2835/bcm2835_audio.c		optional sound vchiq \
+	compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq"
+contrib/vchiq/interface/compat/vchi_bsd.c	optional vchiq soc_brcm_bcm2837 \
+	compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq"
+contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c	optional vchiq soc_brcm_bcm2837 \
+	compile-with "${NORMAL_C} -Wno-unused -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq"
+contrib/vchiq/interface/vchiq_arm/vchiq_arm.c	optional vchiq soc_brcm_bcm2837 \
+	compile-with "${NORMAL_C} -Wno-unused -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq"
+contrib/vchiq/interface/vchiq_arm/vchiq_connected.c	optional vchiq soc_brcm_bcm2837 \
+	compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq"
+contrib/vchiq/interface/vchiq_arm/vchiq_core.c	optional vchiq soc_brcm_bcm2837 \
+	compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq"
+contrib/vchiq/interface/vchiq_arm/vchiq_kern_lib.c	optional vchiq soc_brcm_bcm2837 \
+	compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq"
+contrib/vchiq/interface/vchiq_arm/vchiq_kmod.c	optional vchiq soc_brcm_bcm2837 \
+	compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq"
+contrib/vchiq/interface/vchiq_arm/vchiq_shim.c	optional vchiq soc_brcm_bcm2837 \
+	compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq"
+contrib/vchiq/interface/vchiq_arm/vchiq_util.c	optional vchiq soc_brcm_bcm2837 \
+	compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq"
 crypto/blowfish/bf_enc.c	optional	crypto | ipsec
 crypto/des/des_enc.c		optional	crypto | ipsec | netsmb
 dev/acpica/acpi_if.m		optional	acpi
Index: conf/options.arm64
===================================================================
--- conf/options.arm64	(revision 307257)
+++ conf/options.arm64	(working copy)
@@ -9,6 +9,6 @@
 
 # SoC Support
 SOC_ALLWINNER_A64		opt_soc.h
-SOC_BCM2837			opt_global.h
+SOC_BRCM_BCM2837		opt_soc.h
 SOC_CAVM_THUNDERX		opt_soc.h
 SOC_HISI_HI6220			opt_soc.h
Index: arm64/broadcom/bcm2837/files.bcm2837
===================================================================
--- arm64/broadcom/bcm2837/files.bcm2837	(revision 307328)
+++ arm64/broadcom/bcm2837/files.bcm2837	(nonexistent)
@@ -1,3 +0,0 @@
-# $FreeBSD$
-
-arm/broadcom/bcm2835/bcm2836.c		standard

Property changes on: arm64/broadcom/bcm2837/files.bcm2837
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: arm64/conf/RPI3
===================================================================
--- arm64/conf/RPI3	(revision 307257)
+++ arm64/conf/RPI3	(working copy)
@@ -22,9 +22,6 @@
 cpu		ARM64
 ident		RPI3
 
-files	"../../arm/broadcom/bcm2835/files.bcm283x"
-files	"../broadcom/bcm2837/files.bcm2837"
-
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 #makeoptions	WITH_CTF=1		# Run ctfconvert(1) for DTrace support
 
@@ -91,7 +88,7 @@
 options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
 options 	MALLOC_DEBUG_MAXZONES=8	# Separate malloc(9) zones
 
-options 	SOC_BCM2837
+options 	SOC_BRCM_BCM2837
 
 options 	ROOTDEVNAME=\"ufs:mmcsd0s2\"
 
Index: arm/broadcom/bcm2835/bcm2835_vcbus.h
===================================================================
--- arm/broadcom/bcm2835/bcm2835_vcbus.h	(revision 307257)
+++ arm/broadcom/bcm2835/bcm2835_vcbus.h	(working copy)
@@ -33,16 +33,21 @@
 #ifndef _BCM2835_VCBUS_H_
 #define _BCM2835_VCBUS_H_
 
+/*
+ * ARM64 define its SOC options in opt_soc.h
+ */
+#include "opt_soc.h"
+
 #define	BCM2835_VCBUS_SDRAM_CACHED	0x40000000
 #define	BCM2835_VCBUS_IO_BASE		0x7E000000
 #define	BCM2835_VCBUS_SDRAM_UNCACHED	0xC0000000
 
-#if defined(SOC_BCM2836) || defined(SOC_BCM2837)
+#if defined(SOC_BCM2835)
+#define	BCM2835_ARM_IO_BASE		0x20000000
+#define	BCM2835_VCBUS_SDRAM_BASE	BCM2835_VCBUS_SDRAM_CACHED
+#else
 #define	BCM2835_ARM_IO_BASE		0x3f000000
 #define	BCM2835_VCBUS_SDRAM_BASE	BCM2835_VCBUS_SDRAM_UNCACHED
-#else
-#define	BCM2835_ARM_IO_BASE		0x20000000
-#define	BCM2835_VCBUS_SDRAM_BASE	BCM2835_VCBUS_SDRAM_CACHED
 #endif
 #define	BCM2835_ARM_IO_SIZE		0x01000000