Permalink
Browse files

Make vchiq enabled by default. Tidy Kconfig file.

  • Loading branch information...
1 parent a542809 commit 63bbe8a30dadec5dc1c0bd59e93ae3b83b931d14 @popcornmix popcornmix committed Oct 5, 2012
Showing with 1 addition and 84 deletions.
  1. +1 −1 drivers/misc/vc04_services/Kconfig
  2. +0 −83 drivers/misc/vc04_services/Makefile
@@ -1,7 +1,7 @@
config BCM2708_VCHIQ
tristate "Videocore VCHIQ"
depends on MACH_BCM2708
- default CONFIG_BCM_VC_SERVICES
+ default y
help
Kernel to VideoCore communication interface for the
BCM2708 family of products.
@@ -1,11 +1,5 @@
ifeq ($(CONFIG_MACH_BCM2708),y)
-##############################################################################
-#
-# This section is for building the RaspberryPi model
-#
-##############################################################################
-
obj-$(CONFIG_BCM2708_VCHIQ) += vchiq.o
vchiq-objs := \
@@ -22,80 +16,3 @@ EXTRA_CFLAGS += -DVCOS_VERIFY_BKPTS=1 -Idrivers/misc/vc04_services -DUSE_VCHIQ_A
endif
-ifeq ($(CONFIG_ARCH_KONA),y)
-
-##############################################################################
-#
-# This section is for building the Capri/Island model
-#
-##############################################################################
-
-# Remove the quotes from the platform config name
-VCHIQ_PLATFORM_CONFIG = $(patsubst "%",%,$(CONFIG_VCHIQ_PLATFORM_CFG_NAME))
-
-$(info VCHIQ_PLATFORM_CONFIG = $(VCHIQ_PLATFORM_CONFIG))
-include $(srctree)/drivers/misc/vc04_services/interface/vchiq_arm/platform-cfg/$(VCHIQ_PLATFORM_CONFIG).mk
-
-$(info Building for MAP build system)
-$(info CONFIG_ARCH_KONA = $(CONFIG_ARCH_KONA))
-
-EXTRA_CFLAGS += -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -Wno-declaration-after-statement -Wno-parentheses
-
-EXTRA_CFLAGS += -I"drivers/misc/vc04_services/"
-EXTRA_CFLAGS += -I"drivers/misc/vc04_services/interface/vchiq_arm"
-EXTRA_CFLAGS += -I"drivers/misc/vc04_services/interface/debug_sym"
-EXTRA_CFLAGS += -I"include/linux/broadcom"
-
-EXTRA_CFLAGS += -Werror
-
-VCHIQ_HOST_BUS_ALIGNMENT = 3
-
-EXTRA_CFLAGS += -DOS_ASSERT_FAILURE
-EXTRA_CFLAGS += -D__STDC_VERSION=199901L
-EXTRA_CFLAGS += -D__STDC_VERSION__=199901L
-EXTRA_CFLAGS += -D__VCCOREVER__=0
-EXTRA_CFLAGS += -D__linux__
-EXTRA_CFLAGS += -D__KERNEL__
-EXTRA_CFLAGS += -DVCHIQ_HOST_BUS_ALIGNMENT=$(VCHIQ_HOST_BUS_ALIGNMENT)
-EXTRA_CFLAGS += -DVCHIQ_SLOT_PADDING=16
-EXTRA_CFLAGS += -DVCHIQ_ARM_SIDE
-EXTRA_CFLAGS += -DUSE_VCHIQ_ARM
-ifeq ($(VCHIQ_SM_ALLOC),vcddr)
-EXTRA_CFLAGS += -DVCHIQ_SM_ALLOC_VCDDR
-endif
-
-obj-$(CONFIG_KONA_VCHIQ) += vc-vchiq.o
-vc-vchiq-objs := \
- interface/vchiq_arm/vchiq_arm.o \
- interface/vchiq_arm/vchiq_connected.o \
- interface/vchiq_arm/vchiq_core.o \
- interface/vchiq_arm/vchiq_kern_lib.o \
- interface/vchiq_arm/vchiq_shim.o \
- interface/vchiq_arm/vchiq_util.o \
- interface/vchiq_arm/vchiq_kona_arm.o \
- interface/vchiq_arm/vchiq_$(VCHIQ_PLATFORM)_arm.o \
- interface/vchiq_arm/vchiq_version.o \
- interface/vchiq_arm/vchiq_proc.o
-ifeq ($(VCHIQ_SM_ALLOC),vcddr)
-vc-vchiq-objs += \
- interface/debug_sym/debug_sym.o
-endif
-
-obj-$(CONFIG_KONA_VCHIQ_MEMDRV) += vc-vchiq-memdrv-kona.o
-vc-vchiq-memdrv-kona-objs := \
- interface/vchiq_arm/vchiq_memdrv_kona.o
-
-genversion = drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion
-
-GENVERSION_SRC_ROOT_DIR = .
-ifeq ($(CONFIG_ANDROID),y)
-GENVERSION_SRC_ROOT_DIR = $(srctree)
-endif
-
-$(obj)/interface/vchiq_arm/vchiq_version.c: $(genversion) FORCE
- echo "(new) Generating $@ ..."
- perl $(srctree)/$(genversion) vchiq $(GENVERSION_SRC_ROOT_DIR) > $@
-
-clean-files := vchiq_version.c
-
-endif

0 comments on commit 63bbe8a

Please sign in to comment.