summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-10-10 12:05:14 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-11-10 23:48:54 +0100
commitabbdc56b17d662ae710bc0c30cf0d0e9da805fd4 (patch)
treec2efabf42a66ab0494c937d4e83521977397d24e
parent424a4b595e35df700314ca528ea91483edef9636 (diff)
downloadlinux-abbdc56b17d662ae710bc0c30cf0d0e9da805fd4.tar.gz
linux-abbdc56b17d662ae710bc0c30cf0d0e9da805fd4.tar.bz2
linux-abbdc56b17d662ae710bc0c30cf0d0e9da805fd4.zip
staging: vc04_services: add CONFIG_COMPILE_TEST ability
It would be nice to be able to build this code on other platforms other than only the RPi, so add some empty macros to allow this to happen, and turn off BROKEN as the code can now build properly thanks to Michael's work. Cc: Michael Zoran <mzoran@crowfest.net> Cc: Daniel Stone <daniels@collabora.com> Cc: "Noralf Trønnes" <noralf@tronnes.org> Cc: Pranith Kumar <bobby.prani@gmail.com> Cc: popcornmix <popcornmix@gmail.com> Cc: Eric Anholt <eric@anholt.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/vc04_services/Kconfig2
-rw-r--r--drivers/staging/vc04_services/interface/vchiq_arm/vchiq.h11
2 files changed, 12 insertions, 1 deletions
diff --git a/drivers/staging/vc04_services/Kconfig b/drivers/staging/vc04_services/Kconfig
index f839a542a2ff..660dcedc2820 100644
--- a/drivers/staging/vc04_services/Kconfig
+++ b/drivers/staging/vc04_services/Kconfig
@@ -1,6 +1,6 @@
config BCM2835_VCHIQ
tristate "Videocore VCHIQ"
- depends on RASPBERRYPI_FIRMWARE && BROKEN
+ depends on RASPBERRYPI_FIRMWARE || COMPILE_TEST
default y
help
Kernel to VideoCore communication interface for the
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq.h
index ad398bae6ee4..21adf89a9065 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq.h
@@ -37,4 +37,15 @@
#include "vchiq_if.h"
#include "vchiq_util.h"
+/* Do this so that we can test-build the code on non-rpi systems */
+#if IS_ENABLED(CONFIG_RASPBERRYPI_FIRMWARE)
+
+#else
+
+#ifndef dsb
+#define dsb(a)
+#endif
+
+#endif /* IS_ENABLED(CONFIG_RASPBERRYPI_FIRMWARE) */
+
#endif