Author: gonzo
Date: Sat Feb 7 01:03:45 2015
New Revision: 278341
URL: https://svnweb.freebsd.org/changeset/base/278341
Log:
Make VCHI driver optional and add "device vchiq" to default RPI-B config
Modified:
head/sys/arm/broadcom/bcm2835/files.bcm2835
head/sys/arm/conf/RPI-B
Modified: head/sys/arm/broadcom/bcm2835/files.bcm2835
==============================================================================
--- head/sys/arm/broadcom/bcm2835/files.bcm2835 Sat Feb 7 00:41:08 2015
(r278340)
+++ head/sys/arm/broadcom/bcm2835/files.bcm2835 Sat Feb 7 01:03:45 2015
(r278341)
@@ -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"
Modified: head/sys/arm/conf/RPI-B
==============================================================================
--- head/sys/arm/conf/RPI-B Sat Feb 7 00:41:08 2015 (r278340)
+++ head/sys/arm/conf/RPI-B Sat Feb 7 01:03:45 2015 (r278341)
@@ -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
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
