summaryrefslogtreecommitdiffstats
path: root/sys/arm
diff options
context:
space:
mode:
authorgonzo <gonzo@FreeBSD.org>2015-02-07 01:03:45 +0000
committergonzo <gonzo@FreeBSD.org>2015-02-07 01:03:45 +0000
commit2d2fbd053f7779579b9f26331eaa57bdc4a71287 (patch)
tree3a7cc1b00219d7129ed57172bb566ccd06a4c961 /sys/arm
parentcc5ead19f5dee833baffebfd2b0ec923c579d175 (diff)
downloadFreeBSD-src-2d2fbd053f7779579b9f26331eaa57bdc4a71287.zip
FreeBSD-src-2d2fbd053f7779579b9f26331eaa57bdc4a71287.tar.gz
Make VCHI driver optional and add "device vchiq" to default RPI-B config
Diffstat (limited to 'sys/arm')
-rw-r--r--sys/arm/broadcom/bcm2835/files.bcm283518
-rw-r--r--sys/arm/conf/RPI-B2
2 files changed, 11 insertions, 9 deletions
diff --git a/sys/arm/broadcom/bcm2835/files.bcm2835 b/sys/arm/broadcom/bcm2835/files.bcm2835
index 95bb9c5..416fb4a 100644
--- a/sys/arm/broadcom/bcm2835/files.bcm2835
+++ b/sys/arm/broadcom/bcm2835/files.bcm2835
@@ -29,21 +29,21 @@ dev/mbox/mbox_if.m standard
dev/ofw/ofw_cpu.c standard
# VideoCore driver
-contrib/vchiq/interface/compat/vchi_bsd.c standard \
+contrib/vchiq/interface/compat/vchi_bsd.c optional vchiq \
compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq"
-contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c standard \
+contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c optional vchiq \
compile-with "${NORMAL_C} -Wno-unused -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq"
-contrib/vchiq/interface/vchiq_arm/vchiq_arm.c standard \
+contrib/vchiq/interface/vchiq_arm/vchiq_arm.c optional vchiq \
compile-with "${NORMAL_C} -Wno-unused -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq"
-contrib/vchiq/interface/vchiq_arm/vchiq_connected.c standard \
+contrib/vchiq/interface/vchiq_arm/vchiq_connected.c optional vchiq \
compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq"
-contrib/vchiq/interface/vchiq_arm/vchiq_core.c standard \
+contrib/vchiq/interface/vchiq_arm/vchiq_core.c optional vchiq \
compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq"
-contrib/vchiq/interface/vchiq_arm/vchiq_kern_lib.c standard \
+contrib/vchiq/interface/vchiq_arm/vchiq_kern_lib.c optional vchiq \
compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq"
-contrib/vchiq/interface/vchiq_arm/vchiq_kmod.c standard \
+contrib/vchiq/interface/vchiq_arm/vchiq_kmod.c optional vchiq \
compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq"
-contrib/vchiq/interface/vchiq_arm/vchiq_shim.c standard \
+contrib/vchiq/interface/vchiq_arm/vchiq_shim.c optional vchiq \
compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq"
-contrib/vchiq/interface/vchiq_arm/vchiq_util.c standard \
+contrib/vchiq/interface/vchiq_arm/vchiq_util.c optional vchiq \
compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq"
diff --git a/sys/arm/conf/RPI-B b/sys/arm/conf/RPI-B
index 1c28f10..41566ef 100644
--- a/sys/arm/conf/RPI-B
+++ b/sys/arm/conf/RPI-B
@@ -129,6 +129,8 @@ device smsc
device spibus
device bcm2835_spi
+device vchiq
+
# Flattened Device Tree
options FDT # Configure using FDT/DTB data
# Note: DTB is normally loaded and modified by RPi boot loader, then
OpenPOWER on IntegriCloud